lumencode 1.1.0 → 1.3.0

package/lib/parsers/base.js

@@ -1,67 +1,69 @@
-/**
- * AI 工具日志解析器基类
- * 所有具体解析器必须继承此类并实现抽象方法
- */
-export class BaseParser {
-  constructor() {
-    if (this.constructor === BaseParser) {
-      throw new Error('BaseParser 是抽象类，不能直接实例化');
-    }
-  }
-
-  /**
-   * 返回工具元信息
-   * @returns {{name: string, displayName: string, defaultDir: string, envVar: string}}
-   */
-  getInfo() {
-    throw new Error(`${this.constructor.name}.getInfo() 未实现`);
-  }
-
-  /**
-   * 检测该工具的数据目录是否存在且有有效数据
-   * @param {Object} config - 完整配置对象
-   * @returns {Promise<boolean>}
-   */
-  async detect(config) {
-    throw new Error(`${this.constructor.name}.detect() 未实现`);
-  }
-
-  /**
-   * 解析日志文件，返回 UsageRecord[]
-   * @param {Object} config - 完整配置对象
-   * @param {Object} options - 解析选项
-   * @returns {Promise<Array>}
-   */
-  async parse(config, options = {}) {
-    throw new Error(`${this.constructor.name}.parse() 未实现`);
-  }
-
-  /**
-   * 获取该工具的数据目录路径（从配置或环境变量）
-   * @param {Object} config
-   * @returns {string|null}
-   */
-  getDataDir(config) {
-    const info = this.getInfo();
-    const configKey = `${info.name}Dir`;
-    if (config[configKey] && config[configKey] !== '') {
-      return config[configKey];
-    }
-    const envVal = process.env[info.envVar];
-    if (envVal) return envVal;
-    const home = process.env.HOME || process.env.USERPROFILE;
-    if (home) {
-      return home + info.defaultDir.replace(/^~/, '');
-    }
-    return null;
-  }
-
-  /**
-   * 获取工具版本号（子类可覆写）
-   * @param {Object} config
-   * @returns {Promise<string|null>}
-   */
-  async getVersion(config) {
-    return null;
-  }
-}
+import { homedir } from 'os';
+
+/**
+ * AI 工具日志解析器基类
+ * 所有具体解析器必须继承此类并实现抽象方法
+ */
+export class BaseParser {
+  constructor() {
+    if (this.constructor === BaseParser) {
+      throw new Error('BaseParser 是抽象类，不能直接实例化');
+    }
+  }
+
+  /**
+   * 返回工具元信息
+   * @returns {{name: string, displayName: string, defaultDir: string, envVar: string}}
+   */
+  getInfo() {
+    throw new Error(`${this.constructor.name}.getInfo() 未实现`);
+  }
+
+  /**
+   * 检测该工具的数据目录是否存在且有有效数据
+   * @param {Object} config - 完整配置对象
+   * @returns {Promise<boolean>}
+   */
+  async detect(config) {
+    throw new Error(`${this.constructor.name}.detect() 未实现`);
+  }
+
+  /**
+   * 解析日志文件，返回 UsageRecord[]
+   * @param {Object} config - 完整配置对象
+   * @param {Object} options - 解析选项
+   * @returns {Promise<Array>}
+   */
+  async parse(config, options = {}) {
+    throw new Error(`${this.constructor.name}.parse() 未实现`);
+  }
+
+  /**
+   * 获取该工具的数据目录路径（从配置或环境变量）
+   * @param {Object} config
+   * @returns {string|null}
+   */
+  getDataDir(config) {
+    const info = this.getInfo();
+    const configKey = `${info.name}Dir`;
+    if (config[configKey] && config[configKey] !== '') {
+      return config[configKey];
+    }
+    const envVal = process.env[info.envVar];
+    if (envVal) return envVal;
+    const home = homedir();
+    if (home) {
+      return home + info.defaultDir.replace(/^~/, '');
+    }
+    return null;
+  }
+
+  /**
+   * 获取工具版本号（子类可覆写）
+   * @param {Object} config
+   * @returns {Promise<string|null>}
+   */
+  async getVersion(config) {
+    return null;
+  }
+}

package/lib/parsers/claude.js

@@ -1,29 +1,34 @@
-import { readFileSync, readdirSync, statSync, existsSync } from 'fs';
-import { join, dirname, basename } from 'path';
-import { BaseParser } from './base.js';
-import { createUsageRecord } from '../models/usage-record.js';
-import { getCachedFileRecords } from '../cache.js';
-
-function encodeProjectPath(projectPath) {
-  return projectPath
-    .replace(/:[\\/]/, '--')
-    .replace(/[\\/]/g, '-');
-}
-
-function decodeProjectName(dirName) {
-  let decoded = dirName
-    .replace(/^([A-Z])-/, '$1:/')
-    .replace(/--/g, '/')
-    .replace(/-/g, '/');
-  if (dirName.startsWith('...')) {
-    decoded = '.../' + decoded.slice(3);
-  }
-  decoded = decoded.replace(/\/+$/, '');
-  if (/^[A-Z]:$/.test(decoded)) {
-    decoded = decoded + ' [空路径]';
-  }
-  return decoded || '[未知项目]';
-}
+import { readFileSync, readdirSync, statSync, existsSync } from 'fs';
+import { join, dirname, basename } from 'path';
+import { execFileSync } from 'child_process';
+import { BaseParser } from './base.js';
+import { createUsageRecord } from '../models/usage-record.js';
+import { getCachedFileRecords } from '../cache.js';
+import { getProjectDisplayName } from '../aggregate.js';
+
+const gitRootCache = new Map();
+
+function normalizePath(value) {
+  return String(value || '').replace(/\\/g, '/').replace(/\/$/, '');
+}
+
+function resolveGitRoot(cwd) {
+  const normalized = normalizePath(cwd);
+  if (!normalized) return '';
+  if (gitRootCache.has(normalized)) return gitRootCache.get(normalized);
+  let root = normalized;
+  try {
+    root = normalizePath(execFileSync('git', ['rev-parse', '--show-toplevel'], {
+      cwd: normalized,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim());
+  } catch {
+    root = normalized;
+  }
+  gitRootCache.set(normalized, root);
+  return root;
+}
 
 export class ClaudeParser extends BaseParser {
   getInfo() {
@@ -48,7 +53,7 @@ export class ClaudeParser extends BaseParser {
 
   async parse(config, options = {}) {
     const dir = this.getDataDir(config);
-    const { excludeProjects = [], includeProjects = null } = options;
+    const { excludeProjects = [] } = options;
     const records = [];
 
     if (!dir) return records;
@@ -64,27 +69,15 @@ export class ClaudeParser extends BaseParser {
       return records;
     }
 
-    // includeProjects 过滤 + 反查正确项目名
-    const normalizedIp = includeProjects
-      ? includeProjects.map(p => p.replace(/\\/g, '/').replace(/\/+/g, '/').replace(/\/$/, ''))
-      : null;
-    const encodedIncludes = normalizedIp
-      ? new Set(normalizedIp.map(p => encodeProjectPath(p)))
-      : null;
-    // encoded → 原始 includeProject 路径的反查表
-    const encodedToOriginal = normalizedIp
-      ? new Map(normalizedIp.map(p => [encodeProjectPath(p), p]))
-      : null;
+    // includeProjects 过滤交由外层 parseAllEnabledTools 按 basename 统一处理
+    // 不在内层按 encoded 路径精确匹配，避免路径编码差异导致 session 全部丢失
 
     for (const projDir of dirs) {
-      if (encodedIncludes && !encodedIncludes.has(projDir)) continue;
-
       const projPath = join(projectsDir, projDir);
       const allEntries = readdirSync(projPath);
       const jsonlFiles = allEntries.filter(f => f.endsWith('.jsonl') && !f.includes('subagents'));
 
-      // 优先使用 includeProject 原始路径（避免 decodeProjectName 的有损解码）
-      const projName = (encodedToOriginal && encodedToOriginal.get(projDir)) || decodeProjectName(projDir);
+      const projName = getProjectDisplayName(projDir);
 
       // 并行读取所有 JSONL 文件（减少串行 IO 等待）
       const fileResults = await Promise.all(
@@ -97,14 +90,14 @@ export class ClaudeParser extends BaseParser {
             for (const r of fileRecords) {
               result.push(this._convertToUsageRecord(r, projName, sessionIdFromFile));
             }
-          } catch {}
+          } catch (e) { console.warn(`[claude] 读取文件记录失败: ${filePath}`, e.message); }
           // 子 agent 日志
           try {
             const subRecords = this._parseSubagentFiles(dirname(filePath));
             for (const r of subRecords) {
               result.push(this._convertToUsageRecord(r, projName, sessionIdFromFile));
             }
-          } catch {}
+          } catch (e) { console.warn(`[claude] 解析子agent失败: ${filePath}`, e.message); }
           return result;
         })
       );
@@ -128,7 +121,7 @@ export class ClaudeParser extends BaseParser {
             for (const r of subRecords) {
               records.push(this._convertToUsageRecord(r, projName, uuidDir));
             }
-          } catch {}
+          } catch (e) { console.warn(`[claude] 扫描UUID子目录subagent失败: ${uuidDir}`, e.message); }
         }
       }
     }
@@ -136,8 +129,13 @@ export class ClaudeParser extends BaseParser {
     return records;
   }
 
-  _convertToUsageRecord(raw, projectDir, fallbackSessionId = '') {
-    return createUsageRecord({
+  _convertToUsageRecord(raw, projectDir, fallbackSessionId = '') {
+    // 优先将 cwd 归一到 Git 根目录，避免 monorepo 子目录会话与仓库提交失配
+    let projectName = projectDir || '';
+    if (raw.cwd) {
+      projectName = resolveGitRoot(raw.cwd) || projectName;
+    }
+    return createUsageRecord({
       timestamp: raw.timestamp || '',
       tool: 'claude',
       sessionId: raw.sessionId || fallbackSessionId || '',
@@ -147,7 +145,7 @@ export class ClaudeParser extends BaseParser {
       cacheReadTokens: raw.tokens?.cacheRead || 0,
       cacheWriteTokens: raw.tokens?.cacheCreate || 0,
       costUSD: raw.costUSD ?? null,
-      project: projectDir || '',
+      project: projectName,
       metadata: {
         type: raw.type,
         role: raw.role,
@@ -182,9 +180,9 @@ export class ClaudeParser extends BaseParser {
               if (obj.isApiErrorMessage === true) continue;
               records.push(this._normalizeRawRecord(obj));
             }
-          } catch {}
+          } catch (e) { /* JSONL 单行解析失败，跳过 */ }
         }
-      } catch {}
+      } catch (e) { console.warn(`[claude] 读取subagent文件失败: ${file}`, e.message); }
     }
 
     for (const r of records) {
@@ -220,7 +218,7 @@ export class ClaudeParser extends BaseParser {
           sessionId: entry.sessionId,
           cwd: entry.projectPath || '',
           gitBranch: entry.gitBranch || '',
-          project: '',
+          project: projName || '',
           tokens: { input: 0, output: 0, cacheCreate: 0, cacheRead: 0 },
           isSidechain: false,
           isSubagent: false,
@@ -242,7 +240,7 @@ export class ClaudeParser extends BaseParser {
             sessionId: entry.sessionId,
             cwd: entry.projectPath || '',
             gitBranch: entry.gitBranch || '',
-            project: '',
+            project: projName || '',
             tokens: { input: 0, output: 0, cacheCreate: 0, cacheRead: 0 },
             isSidechain: false,
             isSubagent: false,
@@ -255,7 +253,7 @@ export class ClaudeParser extends BaseParser {
           });
         }
       }
-    } catch {}
+    } catch (e) { console.warn(`[claude] 解析sessions-index失败: ${projPath}`, e.message); }
     return records;
   }
 

package/lib/parsers/codex.js

@@ -6,6 +6,7 @@ import { createUsageRecord } from '../models/usage-record.js';
 // 文件级解析缓存：基于 mtime
 const _codexFileCache = new Map();
 const CODEX_CACHE_MAX = 200;
+const CODEX_MAX_FILE_SIZE = 100 * 1024 * 1024; // 100MB
 
 function getCachedCodexParse(filePath, parseFn) {
   try {
@@ -97,22 +98,23 @@ export class CodexParser extends BaseParser {
       if (statSync(sessionsDir).isDirectory()) {
         files.push(...this._walkDir(sessionsDir));
       }
-    } catch {}
+    } catch (e) { console.warn("[codex] parse error", e.message); }
 
     const archivedDir = join(dir, 'archived_sessions');
     try {
-      if (statSync(archivedDir).isDirectory()) {
+      if (existsSync(archivedDir) && statSync(archivedDir).isDirectory()) {
         const archived = readdirSync(archivedDir).filter(f => f.endsWith('.jsonl'));
         for (const f of archived) {
           files.push(join(archivedDir, f));
         }
       }
-    } catch {}
+    } catch (e) { console.warn("[codex] parse error", e.message); }
 
     return files;
   }
 
-  _walkDir(dir) {
+  _walkDir(dir, depth = 0) {
+    if (depth > 10) return [];
     const results = [];
     try {
       const entries = readdirSync(dir);
@@ -121,13 +123,13 @@ export class CodexParser extends BaseParser {
         try {
           const stat = statSync(fullPath);
           if (stat.isDirectory()) {
-            results.push(...this._walkDir(fullPath));
+            results.push(...this._walkDir(fullPath, depth + 1));
           } else if (entry.endsWith('.jsonl')) {
             results.push(fullPath);
           }
-        } catch {}
+        } catch (e) { console.warn("[codex] parse error", e.message); }
       }
-    } catch {}
+    } catch (e) { console.warn("[codex] parse error", e.message); }
     return results;
   }
 
@@ -160,6 +162,11 @@ export class CodexParser extends BaseParser {
   }
 
   _parseFile(filePath) {
+    const { size } = statSync(filePath);
+    if (size > CODEX_MAX_FILE_SIZE) {
+      console.warn(`[codex] 文件过大 (${(size / 1024 / 1024).toFixed(0)}MB)，跳过: ${filePath}`);
+      return [];
+    }
     const content = readFileSync(filePath, 'utf-8');
     const lines = content.split('\n').filter(l => l.trim());
 
@@ -254,7 +261,7 @@ export class CodexParser extends BaseParser {
             }));
           }
         }
-      } catch {}
+      } catch (e) { console.warn("[codex] parse error", e.message); }
     }
 
     return records;
@@ -294,6 +301,11 @@ export class CodexParser extends BaseParser {
       let rows = useCache ? _codexStateCache.rows : null;
 
       if (!rows) {
+        const dbStat = statSync(dbPath);
+        if (dbStat.size > CODEX_MAX_FILE_SIZE) {
+          console.warn(`[codex] state.db 过大 (${(dbStat.size / 1024 / 1024).toFixed(0)}MB)，跳过`);
+          return records;
+        }
         const initSqlJs = (await import('sql.js')).default;
         const SQL = await initSqlJs();
         const dbBuf = readFileSync(dbPath);
@@ -343,7 +355,7 @@ export class CodexParser extends BaseParser {
           }));
         }
       }
-    } catch {}
+    } catch (e) { console.warn("[codex] parse error", e.message); }
     return records;
   }