coding-tool-x 3.8.0 → 3.8.1

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

@@ -3,6 +3,7 @@ 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 COUNTS_CACHE_TTL_MS = 30 * 1000;
 const SCAN_FILES_CACHE_TTL_MS = 15 * 1000;
@@ -227,78 +228,15 @@ function normalizeSession(codexSession) {
  * 聚合项目列表
  * @returns {Array} 项目对象数组
  */
-function getProjects(options = {}) {
-  if (options.force) {
-    invalidateCodexSessionCaches();
-  } else {
-    const cached = globalCache.get(CODEX_PROJECTS_CACHE_KEY);
-    if (cached) {
-      return cached;
-    }
-  }
-
-  const sessions = getAllSessions();
-  const projectMap = new Map();
-
-  sessions.forEach(session => {
-    const meta = session.meta;
-
-    // 优先使用 Git 仓库名，否则使用 cwd 的最后一级目录
-    const projectName = extractCodexProjectNameFromMeta(meta);
-    const projectPath = (typeof meta.cwd === 'string' && meta.cwd.trim()) ? meta.cwd.trim() : projectName;
-    if (!projectName) return;
-
-    if (!projectMap.has(projectName)) {
-      projectMap.set(projectName, {
-        name: projectName,
-        displayName: projectName,
-        fullPath: projectPath,
-        path: projectPath,
-        gitRepo: meta.git?.repositoryUrl,
-        branch: meta.git?.branch,
-        sessionCount: 0,
-        lastUsed: null,
-        source: 'codex'
-      });
-    }
-
-    const project = projectMap.get(projectName);
-    project.sessionCount++;
-
-    // 更新最后活动时间
-    const sessionTime = session.mtimeMs || new Date(session.meta.timestamp || 0).getTime() || 0;
-    if (!project.lastUsed || sessionTime > project.lastUsed) {
-      project.lastUsed = sessionTime;
-    }
-  });
-
-  // 获取保存的排序
+async function getProjects(options = {}) {
+  const projects = await idxListProjects('codex', options);
   const savedOrder = getProjectOrder();
-  const projects = Array.from(projectMap.values());
-
-  // 应用保存的排序
-  if (savedOrder.length > 0) {
-    const ordered = [];
-    const projectsMap = new Map(projects.map(p => [p.name, p]));
-
-    // 按保存的顺序添加项目
-    for (const projectName of savedOrder) {
-      if (projectsMap.has(projectName)) {
-        ordered.push(projectsMap.get(projectName));
-        projectsMap.delete(projectName);
-      }
-    }
-
-    // 添加剩余的新项目（不在保存顺序中的）
-    ordered.push(...projectsMap.values());
-    globalCache.set(CODEX_PROJECTS_CACHE_KEY, ordered, PROJECTS_CACHE_TTL_MS);
-    return ordered;
-  }
+  if (savedOrder.length === 0) return projects;
 
-  // 默认按最后活动时间排序
-  const sorted = projects.sort((a, b) => (b.lastUsed || 0) - (a.lastUsed || 0));
-  globalCache.set(CODEX_PROJECTS_CACHE_KEY, sorted, PROJECTS_CACHE_TTL_MS);
-  return sorted;
+  const byName = new Map(projects.map(project => [project.name, project]));
+  const ordered = savedOrder.flatMap(name => byName.has(name) ? [byName.get(name)] : []);
+  savedOrder.forEach(name => byName.delete(name));
+  return [...ordered, ...byName.values()];
 }
 
 /**
@@ -306,71 +244,23 @@ function getProjects(options = {}) {
  * @param {string} projectName - 项目名称
  * @returns {Array} 归一化的会话数组
  */
-function getSessionsByProject(projectName, options = {}) {
-  const cacheKey = getCodexSessionsCacheKey(projectName);
-  if (options.force) {
-    invalidateCodexSessionCaches({ projectName });
-  } else {
-    const cached = globalCache.get(cacheKey);
-    if (cached) {
-      return cached;
-    }
-  }
-
-  const sessions = getAllSessions();
-
-  // 获取 fork 关系
-  const { getForkRelations } = require('./sessions');
-  const forkRelations = getForkRelations();
-
-  // 获取保存的排序
+async function getSessionsByProject(projectName, options = {}) {
+  const indexed = await idxListSessions('codex', projectName, options);
+  const forkRelations = require('./sessions').getForkRelations();
+  const aliases = require('./alias').loadAliases();
+  const sessions = indexed.map(session => ({
+    ...session,
+    mtime: new Date(session.mtime).toISOString(),
+    forkedFrom: forkRelations[session.sessionId] || null,
+    alias: aliases[session.sessionId] || null
+  }));
   const savedOrder = getSessionOrder(projectName);
+  if (savedOrder.length === 0) return sessions;
 
-  // 过滤并归一化会话
-  const filteredSessions = sessions
-    .filter(session => {
-      const sessionProjectName = extractCodexProjectNameFromMeta(session.meta);
-      return sessionProjectName === projectName;
-    })
-    .map(session => {
-      const normalized = normalizeSession(session);
-      // 添加 fork 关系
-      normalized.forkedFrom = forkRelations[normalized.sessionId] || null;
-      return normalized;
-    });
-
-  // 应用保存的排序
-  let orderedSessions = filteredSessions;
-  if (savedOrder.length > 0) {
-    const orderedFromSaved = [];
-    const sessionMap = new Map(filteredSessions.map(s => [s.sessionId, s]));
-
-    for (const sessionId of savedOrder) {
-      const session = sessionMap.get(sessionId);
-      if (session) {
-        orderedFromSaved.push(session);
-        sessionMap.delete(sessionId);
-      }
-    }
-
-    const newSessions = [...sessionMap.values()];
-    newSessions.sort((a, b) => {
-      return new Date(b.mtime).getTime() - new Date(a.mtime).getTime();
-    });
-
-    // 新会话在前，旧会话在后（按保存顺序）
-    orderedSessions = [...newSessions, ...orderedFromSaved];
-  } else {
-    // 默认按时间倒序
-    orderedSessions.sort((a, b) => {
-      return new Date(b.mtime).getTime() - new Date(a.mtime).getTime();
-    });
-  }
-
-  globalCache.set(cacheKey, orderedSessions, PROJECT_SESSIONS_CACHE_TTL_MS);
-  codexSessionCacheKeys.add(cacheKey);
-
-  return orderedSessions;
+  const byId = new Map(sessions.map(session => [session.sessionId, session]));
+  const ordered = savedOrder.flatMap(id => byId.has(id) ? [byId.get(id)] : []);
+  savedOrder.forEach(id => byId.delete(id));
+  return [...byId.values(), ...ordered];
 }
 
 /**
@@ -378,23 +268,12 @@ function getSessionsByProject(projectName, options = {}) {
  * @param {string} sessionId - 会话 ID
  * @returns {Object|null} 归一化的会话对象
  */
-function getSessionById(sessionId) {
-  const file = findSessionFileById(sessionId);
-
-  if (!file) {
-    return null;
-  }
-
-  const session = parseSession(file.filePath);
-  if (!session) {
-    return null;
-  }
-
-  return {
-    ...normalizeSession(session),
-    messages: session.messages, // 包含完整消息
-    filePath: file.filePath
-  };
+async function getSessionById(sessionId) {
+  const status = await idxGetSessionStatus('codex', sessionId);
+  if (!status) return null;
+  const session = parseSession(status.filePath);
+  if (!session) return null;
+  return { ...normalizeSession(session), messages: session.messages, filePath: status.filePath };
 }
 
 /**
@@ -402,56 +281,8 @@ function getSessionById(sessionId) {
  * @param {string} keyword - 搜索关键词
  * @returns {Array} 搜索结果
  */
-function searchSessions(keyword) {
-  const files = scanSessionFiles();
-  const results = [];
-
-  files.forEach(file => {
-    // 使用完整解析获取消息内容
-    const session = parseSession(file.filePath);
-
-    if (!session || !session.messages || !Array.isArray(session.messages)) {
-      return;
-    }
-
-    session.messages.forEach((message, index) => {
-      if (message.role !== 'user' && message.role !== 'assistant') {
-        return;
-      }
-
-      const content = (message.content || '').toLowerCase();
-      const keywordLower = keyword.toLowerCase();
-
-      if (content.includes(keywordLower)) {
-        // 提取上下文
-        const startIndex = Math.max(0, content.indexOf(keywordLower) - 50);
-        const endIndex = Math.min(content.length, content.indexOf(keywordLower) + keyword.length + 50);
-        const context = content.substring(startIndex, endIndex);
-
-        // 确定项目名
-        let projectName;
-        if (session.meta?.git?.repositoryUrl) {
-          projectName = session.meta.git.repositoryUrl.split('/').pop().replace('.git', '');
-        } else if (session.meta?.cwd) {
-          projectName = path.basename(session.meta.cwd);
-        } else {
-          projectName = 'Unknown';
-        }
-
-        results.push({
-          sessionId: file.sessionId,
-          projectName,
-          messageIndex: index,
-          role: message.role,
-          context: (startIndex > 0 ? '...' : '') + context + (endIndex < content.length ? '...' : ''),
-          timestamp: message.timestamp,
-          source: 'codex'
-        });
-      }
-    });
-  });
-
-  return results;
+async function searchSessions(keyword) {
+  return idxSearch('codex', keyword);
 }
 
 /**
@@ -545,39 +376,16 @@ function deleteProject(projectName) {
  * @param {number} limit - 返回数量限制，默认 5
  * @returns {Array} 最近会话数组
  */
-function getRecentSessions(limit = 5) {
-  const sessions = getAllSessions();
-
-  // 获取 fork 关系和别名
-  const { getForkRelations } = require('./sessions');
-  const { loadAliases } = require('./alias');
-  const forkRelations = getForkRelations();
-  const aliases = loadAliases();
-
-  // 归一化所有会话
-  const allNormalizedSessions = sessions.map(session => {
-    const normalized = normalizeSession(session);
-
-    // 添加项目信息
-    const projectName = extractCodexProjectNameFromMeta(session.meta) || 'Unknown';
-    const projectPath = (typeof session.meta.cwd === 'string' && session.meta.cwd.trim())
-      ? session.meta.cwd
-      : projectName;
-
-    return {
-      ...normalized,
-      forkedFrom: forkRelations[normalized.sessionId] || null,
-      alias: aliases[normalized.sessionId] || null,
-      projectName: projectName,
-      projectDisplayName: projectName,
-      projectFullPath: projectPath
-    };
-  });
-
-  // 按 mtime 倒序排序，取前 N 个
-  return allNormalizedSessions
-    .sort((a, b) => new Date(b.mtime).getTime() - new Date(a.mtime).getTime())
-    .slice(0, limit);
+async function getRecentSessions(limit = 5) {
+  const indexed = await idxGetRecent('codex', limit);
+  const forkRelations = require('./sessions').getForkRelations();
+  const aliases = require('./alias').loadAliases();
+  return indexed.map(session => ({
+    ...session,
+    mtime: new Date(session.mtime).toISOString(),
+    forkedFrom: forkRelations[session.sessionId] || null,
+    alias: aliases[session.sessionId] || null
+  }));
 }
 
 /**

package/src/server/services/dashboard-snapshot-worker.js

@@ -32,12 +32,12 @@ async function buildProjectsPayload(source, config = {}, options = {}) {
     }
     case 'codex': {
       const { getProjects } = require('./codex-sessions');
-      const projects = getProjects({ force: options.force === true });
+      const projects = await getProjects({ force: options.force === true });
       return { projects, currentProject: projects[0] ? projects[0].name : null };
     }
     case 'gemini': {
       const { getProjects } = require('./gemini-sessions');
-      const projects = getProjects({ force: options.force === true });
+      const projects = await getProjects({ force: options.force === true });
       return { projects, currentProject: projects[0] ? projects[0].name : null };
     }
     case 'opencode': {
@@ -47,7 +47,7 @@ async function buildProjectsPayload(source, config = {}, options = {}) {
     }
     case 'omp': {
       const { getProjects } = require('./omp-sessions');
-      const projects = getProjects({ force: options.force === true });
+      const projects = await getProjects({ force: options.force === true });
       return { projects, currentProject: projects[0] ? projects[0].name : null };
     }
     default:
@@ -55,10 +55,10 @@ async function buildProjectsPayload(source, config = {}, options = {}) {
   }
 }
 
-function buildCountsPayload(source, config = {}, options = {}) {
+async function buildCountsPayload(source, config = {}, options = {}) {
   switch (source) {
     case 'claude':
-      return require('./sessions').getProjectAndSessionCounts(config, { force: options.force === true });
+      return require('./sessions').getProjectAndSessionCounts(config);
     case 'codex':
       return require('./codex-sessions').getProjectAndSessionCounts({ force: options.force === true });
     case 'gemini':

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

@@ -4,6 +4,7 @@ const crypto = require('crypto');
 const { HOME_DIR } = require('../../config/paths');
 const { getGeminiDir } = require('./gemini-config');
 const { resolveModelPricing } = require('../utils/pricing');
+const { listProjects: idxListProjects, listSessions: idxListSessions, getSessionStatus: idxGetSessionStatus, getRecentSessions: idxGetRecent, searchSessions: idxSearch } = require('./session-history-index');
 
 const HASH_RE = /^[a-f0-9]{64}$/;
 const SESSION_FILE_RE = /^session-(.*)-([a-f0-9]+)\.(json|jsonl)$/;
@@ -628,59 +629,20 @@ function getProjectPath(projectHash, options = {}) {
  * 聚合项目列表
  * @returns {Array} 项目对象数组
  */
-function getProjects(options = {}) {
-  if (options.force) {
-    pathMappingCache = null;
-    pathMappingCacheTime = 0;
-  }
-  const sessions = getAllSessions();
-  const projectMap = new Map();
-
-  sessions.forEach(session => {
-    const projectHash = session.projectHash;
-
-    if (!projectMap.has(projectHash)) {
-      const projectPath = session.projectRoot || getProjectPath(projectHash);
-
-      // 如果找到了真实路径，使用目录名作为显示名称
-      let displayName;
-      if (projectPath) {
-        displayName = path.basename(projectPath);
-        // 如果是 home 目录，显示 ~
-        if (projectPath === HOME_DIR) {
-          displayName = '~';
-        }
-      } else {
-        // 未找到路径，使用 hash 前 8 位
-        displayName = `Project ${projectHash.substring(0, 8)}`;
-      }
-
-      projectMap.set(projectHash, {
-        name: projectHash,
-        displayName,
-        path: projectPath,
-        fullPath: projectPath,
-        storageName: session.storageName,
-        sessionCount: 0,
-        lastUpdated: session.lastUpdated,
-        source: 'gemini'
-      });
-    }
-
-    const project = projectMap.get(projectHash);
-    project.sessionCount++;
-
-    // 更新最后活动时间
-    if (new Date(session.lastUpdated) > new Date(project.lastUpdated)) {
-      project.lastUpdated = session.lastUpdated;
-    }
+async function getProjects(options = {}) {
+  const projects = await idxListProjects('gemini', options);
+  const paths = buildPathMapping();
+  return projects.map(project => {
+    const fullPath = project.fullPath || paths.get(project.name) || null;
+    return {
+      ...project,
+      displayName: fullPath ? path.basename(fullPath) : project.displayName,
+      path: fullPath,
+      fullPath,
+      storageName: fullPath ? path.basename(fullPath) : project.name,
+      lastUpdated: new Date(project.lastUsed).toISOString()
+    };
   });
-
-  // 转换为数组并排序（按最后活动时间）
-  const projects = Array.from(projectMap.values());
-  projects.sort((a, b) => new Date(b.lastUpdated) - new Date(a.lastUpdated));
-
-  return projects;
 }
 
 /**
@@ -688,15 +650,25 @@ function getProjects(options = {}) {
  * @param {string} projectHash - 项目 hash
  * @returns {Array} 会话对象数组
  */
-function getProjectSessions(projectHash, options = {}) {
-  if (options.force) {
-    pathMappingCache = null;
-    pathMappingCacheTime = 0;
-  }
-  const allSessions = getAllSessions();
-  return allSessions
-    .filter(session => session.projectHash === projectHash)
-    .map(normalizeSession);
+async function getProjectSessions(projectHash, options = {}) {
+  const indexed = await idxListSessions('gemini', projectHash, options);
+  return indexed.map(session => ({
+    sessionId: session.sessionId,
+    mtime: new Date(session.mtime).toISOString(),
+    size: session.size,
+    filePath: session.filePath,
+    gitBranch: null,
+    firstMessage: session.firstMessage,
+    forkedFrom: session.extra?.forkedFrom || null,
+    source: 'gemini',
+    tokens: session.tokens?.total ?? session.tokens ?? 0,
+    cost: session.extra?.cost || 0,
+    model: session.model || 'gemini-2.5-pro',
+    projectHash: session.projectName,
+    projectName: session.projectName,
+    storageName: session.extra?.storageName || session.projectName,
+    projectRoot: session.projectFullPath || null
+  }));
 }
 
 /**
@@ -704,15 +676,9 @@ function getProjectSessions(projectHash, options = {}) {
  * @param {string} sessionId - 会话 ID
  * @returns {Object|null} 完整会话数据
  */
-function getSession(sessionId) {
-  const allSessions = getAllSessions();
-  const session = allSessions.find(s => s.sessionId === sessionId);
-
-  if (!session) {
-    return null;
-  }
-
-  return readSessionFull(session.filePath);
+async function getSession(sessionId) {
+  const status = await idxGetSessionStatus('gemini', sessionId);
+  return status ? readSessionFull(status.filePath) : null;
 }
 
 /**
@@ -773,11 +739,13 @@ function saveProjectOrder(order) {
  * @param {number} limit - 限制数量
  * @returns {Array} 会话对象数组
  */
-function getRecentSessions(limit = 5) {
-  const allSessions = getAllSessions();
-  return allSessions
-    .slice(0, limit)
-    .map(normalizeSession);
+async function getRecentSessions(limit = 5) {
+  const sessions = await idxGetRecent('gemini', limit);
+  return sessions.map(session => ({
+    ...session,
+    mtime: new Date(session.mtime).toISOString(),
+    projectHash: session.projectName
+  }));
 }
 
 /**
@@ -785,26 +753,16 @@ function getRecentSessions(limit = 5) {
  * @param {string} sessionId - 会话 ID
  * @returns {Object|null} 完整会话数据
  */
-function getSessionById(sessionId) {
-  const allSessions = getAllSessions();
-  const sessionMeta = allSessions.find(s => s.sessionId === sessionId);
-
-  if (!sessionMeta) {
-    return null;
-  }
-
-  const fullSession = readSessionFull(sessionMeta.filePath);
-
-  if (!fullSession) {
-    return null;
-  }
-
-  // 合并元数据
+async function getSessionById(sessionId) {
+  const status = await idxGetSessionStatus('gemini', sessionId);
+  if (!status) return null;
+  const fullSession = readSessionFull(status.filePath);
+  if (!fullSession) return null;
   return {
     ...fullSession,
-    filePath: sessionMeta.filePath,
-    size: sessionMeta.size,
-    mtime: sessionMeta.mtime,
+    filePath: status.filePath,
+    size: status.size,
+    mtime: new Date(status.lastModified).toISOString(),
     source: 'gemini'
   };
 }
@@ -815,70 +773,22 @@ function getSessionById(sessionId) {
  * @param {number} contextLength - 上下文长度（可选）
  * @returns {Array} 搜索结果数组
  */
-function searchSessions(keyword, contextLength = 35) {
-  const allSessions = getAllSessions();
-  const results = [];
-
-  allSessions.forEach(sessionMeta => {
-    const fullSession = readSessionFull(sessionMeta.filePath);
-
-    if (!fullSession || !fullSession.messages) {
-      return;
-    }
-
-    const matches = [];
-
-    fullSession.messages.forEach((msg, index) => {
-      let content = '';
-
-      // 提取消息内容
-      if (msg.type === 'user' || msg.type === 'assistant' || msg.type === 'gemini') {
-        content = extractContentText(msg.content);
-      }
-
-      // 搜索关键词
-      const lowerContent = content.toLowerCase();
-      const lowerKeyword = keyword.toLowerCase();
-
-      if (lowerContent.includes(lowerKeyword)) {
-        const keywordIndex = lowerContent.indexOf(lowerKeyword);
-
-        // 提取上下文
-        const start = Math.max(0, keywordIndex - contextLength);
-        const end = Math.min(content.length, keywordIndex + keyword.length + contextLength);
-
-        let context = content.substring(start, end);
-
-        // 添加省略号
-        if (start > 0) context = '...' + context;
-        if (end < content.length) context = context + '...';
-
-        matches.push({
-          messageIndex: index,
-          role: msg.type,
-          context,
-          timestamp: msg.timestamp
-        });
-      }
-    });
-
-    if (matches.length > 0) {
-      results.push({
-        sessionId: sessionMeta.sessionId,
-        projectHash: sessionMeta.projectHash,
-        firstMessage: sessionMeta.firstMessage,
-        lastUpdated: sessionMeta.lastUpdated,
-        matches,
-        matchCount: matches.length,
-        source: 'gemini'
-      });
-    }
-  });
-
-  // 按匹配数量排序
-  results.sort((a, b) => b.matchCount - a.matchCount);
-
-  return results;
+async function searchSessions(keyword, contextLength = 35) {
+  const results = await idxSearch('gemini', keyword, { contextLength });
+  return results.map(result => ({
+    sessionId: result.sessionId,
+    projectHash: result.projectName,
+    firstMessage: result.firstMessage,
+    lastUpdated: result.updatedAt || null,
+    matches: result.matches.map(match => ({
+      messageIndex: match.ordinal,
+      role: match.type === 'gemini' ? 'gemini' : match.role,
+      context: match.context,
+      timestamp: match.timestamp
+    })),
+    matchCount: result.matchCount,
+    source: 'gemini'
+  }));
 }
 
 /**