coding-tool-x 3.8.4 → 3.8.6

package/src/{server/services/session-history-adapters/codex.js → platforms/drivers/codex/session-history-adapter.js}

@@ -2,47 +2,59 @@
 
 const fs = require('fs');
 const path = require('path');
-const { getCodexDir } = require('../codex-config');
-const { extractSessionMeta, extractMessages, extractTokenUsage, readJSONL } = require('../codex-parser');
+const { getCodexDir } = require('./config');
+const { parseSession } = require('./parser');
+
+function configure({ pathContext } = {}) {
+  require('./config').configure?.({ pathContext });
+}
+
+function extractSessionIdFromRolloutFilename(filePath) {
+  const basename = path.basename(filePath, '.jsonl');
+  const match = basename.match(/([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i);
+  return match ? match[1] : basename;
+}
 
 /**
  * Scan all Codex session files recursively.
  * @returns {Array<{filePath: string, size: number, mtimeMs: number, sessionId: string}>}
  */
-function scanSessionFiles() {
+async function scanSessionFiles(projectsDir = null) {
   const results = [];
-  const sessionsDir = path.join(getCodexDir(), 'sessions');
+  const sessionsDir = projectsDir || path.join(getCodexDir(), 'sessions');
 
-  if (!fs.existsSync(sessionsDir)) {
+  try {
+    await fs.promises.stat(sessionsDir);
+  } catch (_) {
     return results;
   }
 
-  function scanDir(dir) {
+  async function scanDir(dir) {
     let entries;
     try {
-      entries = fs.readdirSync(dir, { withFileTypes: true });
+      entries = await fs.promises.readdir(dir, { withFileTypes: true });
     } catch (_) {
       return;
     }
     for (const entry of entries) {
       const fullPath = path.join(dir, entry.name);
       if (entry.isDirectory()) {
-        scanDir(fullPath);
+        await scanDir(fullPath);
       } else if (entry.isFile() && entry.name.match(/^rollout-.*\.jsonl$/)) {
         try {
-          const stat = fs.statSync(fullPath);
+          const stat = await fs.promises.stat(fullPath);
           results.push({
             filePath: fullPath,
             size: stat.size,
             mtimeMs: stat.mtimeMs,
-            sessionId: entry.name.replace(/\.jsonl$/, '')
+            sessionId: extractSessionIdFromRolloutFilename(fullPath)
           });
         } catch (_) {}
       }
     }
   }
 
-  scanDir(sessionsDir);
+  await scanDir(sessionsDir);
   return results;
 }
 
@@ -67,8 +79,8 @@ function extractCodexProjectName(meta) {
  * Inventory all Codex session files.
  * @returns {Promise<Array>}
  */
-async function inventory() {
-  const files = scanSessionFiles();
+async function inventory({ projectsDir } = {}) {
+  const files = await scanSessionFiles(projectsDir);
   return files.map(f => ({
     filePath: f.filePath,
     size: f.size,
@@ -83,13 +95,15 @@ async function inventory() {
  */
 async function parse(descriptor) {
   const { filePath, size, mtimeMs, sessionId } = descriptor;
-  const lines = readJSONL(filePath);
-
-  const meta = extractSessionMeta(lines);
-  const messages = extractMessages(lines);
-  const tokenUsage = extractTokenUsage(lines);
-
+  const parsed = parseSession(filePath);
+  const meta = parsed?.meta;
+  const messages = parsed?.messages || [];
+  const tokenUsage = parsed?.tokens;
   const projectName = extractCodexProjectName(meta);
+  const descriptorIdIsNative = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(sessionId);
+  const nativeSessionId = descriptorIdIsNative
+    ? sessionId
+    : (typeof meta?.sessionId === 'string' && meta.sessionId.trim() ? meta.sessionId.trim() : sessionId);
   const usageJson = tokenUsage ? JSON.stringify(tokenUsage) : null;
 
   // Build normalized messages
@@ -119,7 +133,7 @@ async function parse(descriptor) {
 
     const isUser = msg.role === 'user' || msg.role === 'human';
     return {
-      messageId: msg.id || `codex-${sessionId}-${idx}`,
+      messageId: msg.id || `codex-${nativeSessionId}-${idx}`,
       role: msg.role || 'unknown',
       type: msg.type || msg.role || 'unknown',
       subtype: msg.subtype || null,
@@ -136,10 +150,10 @@ async function parse(descriptor) {
   const lastMsg = normalizedMessages[normalizedMessages.length - 1];
 
   const session = {
-    sessionId,
+    sessionId: nativeSessionId,
     projectName,
     projectDisplayName: projectName,
-    projectFullPath: null,
+    projectFullPath: typeof meta?.cwd === 'string' && meta.cwd.trim() ? meta.cwd.trim() : null,
     firstMessage: firstUserMsg ? firstUserMsg.content : null,
     gitBranch: meta ? (meta.gitBranch || null) : null,
     provider: null,
@@ -155,4 +169,4 @@ async function parse(descriptor) {
   return { session, messages: normalizedMessages };
 }
 
-module.exports = { inventory, parse, extractCodexProjectName };
+module.exports = { configure, inventory, parse, extractCodexProjectName };

package/src/{server/services/codex-sessions.js → platforms/drivers/codex/sessions-implementation.js}

@@ -1,9 +1,29 @@
 const fs = require('fs');
 const path = require('path');
-const { getCodexDir } = require('./codex-config');
-const { parseSession, parseSessionMeta, extractSessionMeta, readJSONL } = require('./codex-parser');
-const { globalCache, CacheKeys } = require('./enhanced-cache');
-const { listProjects: idxListProjects, listSessions: idxListSessions, getSessionStatus: idxGetSessionStatus, getRecentSessions: idxGetRecent, searchSessions: idxSearch } = require('./session-history-index');
+const { getCodexDir } = require('./config');
+const { parseSession, parseSessionMeta, extractSessionMeta, readJSONL } = require('./parser');
+const { globalCache, CacheKeys } = require('../../../server/services/enhanced-cache');
+let sessionHistoryIndex = null;
+let codexDirOverride = null;
+
+function configure({ sessionHistoryIndex: index, pathContext } = {}) {
+  sessionHistoryIndex = index || null;
+  codexDirOverride = pathContext?.customized ? (pathContext.native?.dir || null) : null;
+}
+
+function getSessionHistoryIndex(options = {}) {
+  if (!sessionHistoryIndex) {
+    const { getDefaultDependencies } = require('../../../platforms/runtime');
+    sessionHistoryIndex = getDefaultDependencies().sessionHistoryIndex;
+    if (!sessionHistoryIndex) {
+      const indexModule = require('../../../server/services/session-history-index');
+      sessionHistoryIndex = Object.keys(options).length > 0
+        ? indexModule.createSessionHistoryIndex({ config: options })
+        : indexModule;
+    }
+  }
+  return sessionHistoryIndex;
+}
 
 const COUNTS_CACHE_TTL_MS = 30 * 1000;
 const SCAN_FILES_CACHE_TTL_MS = 15 * 1000;
@@ -44,7 +64,7 @@ function getCodexSessionsCacheKey(projectName) {
  * 获取会话目录
  */
 function getSessionsDir() {
-  return path.join(getCodexDir(), 'sessions');
+  return path.join(codexDirOverride || getCodexDir(), 'sessions');
 }
 
 /**
@@ -229,7 +249,8 @@ function normalizeSession(codexSession) {
  * @returns {Array} 项目对象数组
  */
 async function getProjects(options = {}) {
-  const projects = await idxListProjects('codex', options);
+  if (!fs.existsSync(getSessionsDir())) return [];
+  const projects = await getSessionHistoryIndex({ ...options, projectsDir: getSessionsDir() }).listProjects('codex', options);
   const savedOrder = getProjectOrder();
   if (savedOrder.length === 0) return projects;
 
@@ -245,9 +266,9 @@ async function getProjects(options = {}) {
  * @returns {Array} 归一化的会话数组
  */
 async function getSessionsByProject(projectName, options = {}) {
-  const indexed = await idxListSessions('codex', projectName, options);
-  const forkRelations = require('./sessions').getForkRelations();
-  const aliases = require('./alias').loadAliases();
+  const indexed = await getSessionHistoryIndex().listSessions('codex', projectName, options);
+  const forkRelations = require('../claude/sessions-implementation').getForkRelations();
+  const aliases = require('../../../server/services/alias').loadAliases();
   const sessions = indexed.map(session => ({
     ...session,
     mtime: new Date(session.mtime).toISOString(),
@@ -269,7 +290,7 @@ async function getSessionsByProject(projectName, options = {}) {
  * @returns {Object|null} 归一化的会话对象
  */
 async function getSessionById(sessionId) {
-  const status = await idxGetSessionStatus('codex', sessionId);
+  const status = await getSessionHistoryIndex().getSessionStatus('codex', sessionId);
   if (!status) return null;
   const session = parseSession(status.filePath);
   if (!session) return null;
@@ -282,7 +303,7 @@ async function getSessionById(sessionId) {
  * @returns {Array} 搜索结果
  */
 async function searchSessions(keyword) {
-  return idxSearch('codex', keyword);
+  return getSessionHistoryIndex().searchSessions('codex', keyword);
 }
 
 /**
@@ -305,8 +326,8 @@ function deleteProject(projectName) {
 
   // 删除所有会话文件
   let deletedCount = 0;
-  const { getForkRelations, saveForkRelations } = require('./sessions');
-  const { deleteAlias } = require('./alias');
+  const { getForkRelations, saveForkRelations } = require('../claude/sessions-implementation');
+  const { deleteAlias } = require('../../../server/services/alias');
   const forkRelations = getForkRelations();
   let forkRelationsModified = false;
 
@@ -377,9 +398,9 @@ function deleteProject(projectName) {
  * @returns {Array} 最近会话数组
  */
 async function getRecentSessions(limit = 5) {
-  const indexed = await idxGetRecent('codex', limit);
-  const forkRelations = require('./sessions').getForkRelations();
-  const aliases = require('./alias').loadAliases();
+  const indexed = await getSessionHistoryIndex().getRecentSessions('codex', limit);
+  const forkRelations = require('../claude/sessions-implementation').getForkRelations();
+  const aliases = require('../../../server/services/alias').loadAliases();
   return indexed.map(session => ({
     ...session,
     mtime: new Date(session.mtime).toISOString(),
@@ -404,7 +425,7 @@ function deleteSession(sessionId) {
   fs.unlinkSync(targetFile.filePath);
 
   // 清理 fork 关系
-  const { getForkRelations, saveForkRelations } = require('./sessions');
+  const { getForkRelations, saveForkRelations } = require('../claude/sessions-implementation');
   const forkRelations = getForkRelations();
 
   // 删除作为源的 fork 关系
@@ -420,7 +441,7 @@ function deleteSession(sessionId) {
   saveForkRelations(forkRelations);
 
   // 清理别名
-  const { deleteAlias } = require('./alias');
+  const { deleteAlias } = require('../../../server/services/alias');
   try {
     deleteAlias(sessionId);
   } catch (err) {
@@ -444,17 +465,17 @@ function forkSession(sessionId, options = {}) {
     throw new Error('Session not found');
   }
 
-  // 读取原会话文件内容
-  const originalContent = fs.readFileSync(sourceFile.filePath, 'utf8');
-  const content = sliceCodexContentByUserMessage(
-    originalContent,
-    options.afterUserMessageNumber
-  );
-
   // 生成新的 session ID (使用 crypto.randomUUID 生成 v4 UUID)
   const crypto = require('crypto');
   const newSessionId = crypto.randomUUID();
 
+  // 读取原会话文件内容，并确保副本的原生元数据使用新 ID
+  const originalContent = fs.readFileSync(sourceFile.filePath, 'utf8');
+  const content = rewriteCodexSessionId(
+    sliceCodexContentByUserMessage(originalContent, options.afterUserMessageNumber),
+    newSessionId
+  );
+
   // 生成新的时间戳（Codex 格式：YYYY-MM-DDTHH-MM-SS）
   const now = new Date();
   const timestamp = now.toISOString()
@@ -480,12 +501,12 @@ function forkSession(sessionId, options = {}) {
   fs.writeFileSync(newFilePath, content, 'utf8');
 
   // 保存 fork 关系（复用 Claude Code 的 fork 关系存储）
-  const { getForkRelations, saveForkRelations } = require('./sessions');
+  const { getForkRelations, saveForkRelations } = require('../claude/sessions-implementation');
   const forkRelations = getForkRelations();
   forkRelations[newSessionId] = sessionId;
   saveForkRelations(forkRelations);
   if (options.alias) {
-    const { setAlias } = require('./alias');
+    const { setAlias } = require('../../../server/services/alias');
     setAlias(newSessionId, options.alias);
   }
 
@@ -506,7 +527,7 @@ function forkSession(sessionId, options = {}) {
  * @returns {Array} 会话 ID 数组
  */
 function getSessionOrder(projectName) {
-  const { getSessionOrder: getClaudeSessionOrder } = require('./sessions');
+  const { getSessionOrder: getClaudeSessionOrder } = require('../claude/sessions-implementation');
   // 复用 Claude Code 的排序存储，使用 "codex-" 前缀区分
   return getClaudeSessionOrder(`codex-${projectName}`);
 }
@@ -517,7 +538,7 @@ function getSessionOrder(projectName) {
  * @param {Array} order - 会话 ID 数组
  */
 function saveSessionOrder(projectName, order) {
-  const { saveSessionOrder: saveClaudeSessionOrder } = require('./sessions');
+  const { saveSessionOrder: saveClaudeSessionOrder } = require('../claude/sessions-implementation');
   // 复用 Claude Code 的排序存储，使用 "codex-" 前缀区分
   saveClaudeSessionOrder(`codex-${projectName}`, order);
   const cacheKey = getCodexSessionsCacheKey(projectName);
@@ -530,10 +551,10 @@ function saveSessionOrder(projectName, order) {
  * @returns {Array} 项目名称数组
  */
 function getProjectOrder() {
-  const { getProjectOrder: getClaudeProjectOrder } = require('./sessions');
-  const { getCodexDir } = require('./codex-config');
+  const { getProjectOrder: getClaudeProjectOrder } = require('../claude/sessions-implementation');
+  const { getCodexDir } = require('./config');
   // 复用 Claude Code 的排序存储，使用特殊的配置对象标识 Codex
-  return getClaudeProjectOrder({ projectsDir: getCodexDir() });
+  return getClaudeProjectOrder({ projectsDir: codexDirOverride || getCodexDir() });
 }
 
 /**
@@ -541,10 +562,10 @@ function getProjectOrder() {
  * @param {Array} order - 项目名称数组
  */
 function saveProjectOrder(order) {
-  const { saveProjectOrder: saveClaudeProjectOrder } = require('./sessions');
-  const { getCodexDir } = require('./codex-config');
+  const { saveProjectOrder: saveClaudeProjectOrder } = require('../claude/sessions-implementation');
+  const { getCodexDir } = require('./config');
   // 复用 Claude Code 的排序存储
-  saveClaudeProjectOrder({ projectsDir: getCodexDir() }, order);
+  saveClaudeProjectOrder({ projectsDir: codexDirOverride || getCodexDir() }, order);
   globalCache.delete(CODEX_PROJECTS_CACHE_KEY);
 }
 
@@ -644,6 +665,22 @@ function joinTextPreserveEol(lines, eol, hasTrailingEol) {
   return hasTrailingEol ? `${text}${eol}` : text;
 }
 
+function rewriteCodexSessionId(content, sessionId) {
+  const { lines, eol, hasTrailingEol } = splitTextPreserveEol(content);
+  const rewritten = lines.map(line => {
+    if (!line.trim()) return line;
+    try {
+      const record = JSON.parse(line);
+      if (record?.type === 'session_meta' && record.payload && typeof record.payload === 'object') {
+        record.payload.id = sessionId;
+        return JSON.stringify(record);
+      }
+    } catch (_) {}
+    return line;
+  });
+  return joinTextPreserveEol(rewritten, eol, hasTrailingEol);
+}
+
 function sliceCodexContentByUserMessage(content, afterUserMessageNumber) {
   if (!Number.isInteger(afterUserMessageNumber) || afterUserMessageNumber <= 0) {
     return content;
@@ -767,54 +804,23 @@ function findSessionFileById(sessionId) {
   return null;
 }
 
-function calculateProjectAndSessionCounts() {
-  const sessions = scanSessionFiles();
-  if (sessions.length === 0) {
-    return EMPTY_COUNTS;
-  }
-
-  const projectNames = new Set();
-  sessions.forEach((session) => {
-    const payload = readSessionMetaPayloadFast(session.filePath);
-    const projectName = extractCodexProjectNameFromMeta(payload || {});
-    if (projectName) {
-      projectNames.add(projectName);
-    }
-  });
-
-  return {
-    projectCount: projectNames.size,
-    sessionCount: sessions.length
-  };
-}
 
 /**
  * 获取 Codex 项目与会话数量（用于仪表盘轻量统计）
  */
-function getProjectAndSessionCounts(options = {}) {
-  const now = Date.now();
-  if (options.force) {
-    countsCache.expiresAt = 0;
-    scanFilesCache.expiresAt = 0;
-    sessionFileIndexCache.expiresAt = 0;
-  }
-  if (!options.force && countsCache.expiresAt > now) {
-    return countsCache.value;
-  }
-
-  try {
-    const counts = calculateProjectAndSessionCounts();
-    countsCache = {
-      value: counts,
-      expiresAt: now + COUNTS_CACHE_TTL_MS
-    };
-    return counts;
-  } catch (err) {
-    return countsCache.value || EMPTY_COUNTS;
+async function getProjectAndSessionCounts(options = {}) {
+  if (!fs.existsSync(getSessionsDir())) {
+    return { projectCount: 0, sessionCount: 0 };
   }
+  const projects = await getSessionHistoryIndex({ ...options, projectsDir: getSessionsDir() }).listProjects('codex', options);
+  return {
+    projectCount: projects.length,
+    sessionCount: projects.reduce((sum, project) => sum + (project.sessionCount || 0), 0)
+  };
 }
 
 module.exports = {
+  configure,
   getSessionsDir,
   scanSessionFiles,
   getAllSessions,

package/src/platforms/drivers/codex/sessions.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const { createCapabilityDriver } = require('../../../shared/capability-driver');
+
+function createDriver(context = {}) {
+  return createCapabilityDriver({
+    ...context,
+    platform: 'codex',
+    capability: 'sessions',
+    parserVersion: 2,
+    servicePath: './codex/sessions-implementation',
+    localServicePath: '../platforms/drivers/codex/sessions-implementation',
+    adapterLocalPath: '../platforms/drivers/codex/session-history-adapter',
+    adapterMethods: { inventory: 'inventory', parse: 'parse' },
+    methods: {
+      listSessions: 'getSessionsByProject',
+      recent: 'getRecentSessions',
+      search: 'searchSessions',
+      getSessionById: 'getSessionById',
+      delete: 'deleteSession',
+      fork: 'forkSession',
+      saveSessionOrder: 'saveSessionOrder',
+      getSessionOrder: 'getSessionOrder',
+      getProjectOrder: 'getProjectOrder',
+      status: 'getSessionStatus',
+      messages: 'getSessionMessages'
+    },
+    onSuccess: operation => {
+      if (['delete', 'fork', 'saveSessionOrder'].includes(operation)) {
+        context.sessionHistoryIndex?.invalidateSource('codex');
+      }
+    }
+  });
+}
+
+module.exports = { createDriver };

package/src/{server/services/codex-statistics-service.js → platforms/drivers/codex/statistics-implementation.js}

@@ -3,8 +3,8 @@ const {
   getStatistics: getSharedStatistics,
   getDailyStatistics: getSharedDailyStatistics,
   getTodayStatistics: getSharedTodayStatistics
-} = require('./statistics-service');
-const { normalizeUsageTokens, toNumber } = require('./proxy-log-helper');
+} = require('../../../server/services/statistics-service');
+const { normalizeUsageTokens, toNumber } = require('../../../server/services/usage-log-utils');
 
 const TOOL_TYPE = 'codex';
 

package/src/platforms/drivers/codex/statistics.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const { createCapabilityDriver } = require('../../../shared/capability-driver');
+
+function createDriver(context = {}) {
+  return createCapabilityDriver({
+    ...context,
+    platform: 'codex',
+    capability: 'statistics',
+    servicePath: './codex/statistics-implementation',
+    localServicePath: '../platforms/drivers/codex/statistics-implementation',
+    methods: {"getStatistics":"getStatistics","getDailyStatistics":"getDailyStatistics","getTodayStatistics":"getTodayStatistics","recordRequest":"recordRequest","resetStatistics":"resetStatistics"}
+  });
+}
+
+module.exports = { createDriver };

package/src/platforms/drivers/gemini/api-operations.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const { createApiOperationsDriver } = require('../../../shared/driver-factories/api');
+
+function createDriver(context = {}) {
+  return createApiOperationsDriver({ ...context, platform: 'gemini' });
+}
+
+module.exports = { createDriver };