lumencode 1.2.0 → 1.3.0

package/lib/aggregate.js

@@ -20,7 +20,7 @@ function getProjectBaseName(projectPath) {
   return parts[parts.length - 1] || '';
 }
 
-function encodeProjectPath(projectPath) {
+export function encodeProjectPath(projectPath) {
   return projectPath
     .replace(/:[\\/]/, '--')        // D:/ → D--
     .replace(/[\\/]/g, '-');        // 剩余 / 或 \ → -
@@ -47,7 +47,7 @@ export function collectAllRecords(claudeDir, excludeProjects = [], includeProjec
 
   for (const projDir of dirs) {
     const projPath = join(projectsDir, projDir);
-    const projName = decodeProjectName(projDir);
+    const projName = getProjectDisplayName(projDir);
 
     if (encodedIncludes) {
       if (!encodedIncludes.has(projDir)) {
@@ -74,7 +74,7 @@ export function collectAllRecords(claudeDir, excludeProjects = [], includeProjec
         const sessionRecords = records.filter(r => r.sessionId);
         sessionRecords.forEach(r => projSessions.add(r.sessionId));
         projRequests += records.filter(r => isAssistantRecord(r)).length;
-      } catch {}
+      } catch (e) { console.warn(`[aggregate] 读取文件记录失败: ${filePath}`, e.message); }
 
       // 解析子 agent 日志
       try {
@@ -87,7 +87,7 @@ export function collectAllRecords(claudeDir, excludeProjects = [], includeProjec
         }
         projRequests += subRecords.filter(r => isAssistantRecord(r)).length;
         subRecords.filter(r => r.sessionId).forEach(r => projSessions.add(r.sessionId));
-      } catch {}
+      } catch (e) { console.warn(`[aggregate] 解析子agent失败: ${filePath}`, e.message); }
     }
 
     // 当无主 JSONL 文件时，扫描 sessions-index.json 和 UUID 子目录
@@ -127,7 +127,7 @@ export function collectAllRecords(claudeDir, excludeProjects = [], includeProjec
               projRequests++;
             }
           }
-        } catch {}
+        } catch (e) { console.warn(`[aggregate] 解析sessions-index失败: ${indexPath}`, e.message); }
       }
 
       // 扫描 UUID 子目录中的 subagent 文件
@@ -146,7 +146,7 @@ export function collectAllRecords(claudeDir, excludeProjects = [], includeProjec
           }
           projRequests += subRecords.filter(r => isAssistantRecord(r)).length;
           subRecords.filter(r => r.sessionId).forEach(r => projSessions.add(r.sessionId));
-        } catch {}
+        } catch (e) { console.warn(`[aggregate] 扫描UUID子目录失败: ${uuidDir}`, e.message); }
       }
     }
 
@@ -187,7 +187,10 @@ export function deduplicateRecords(records) {
   return deduped;
 }
 
-function decodeProjectName(dirName) {
+// 有损解码：encode 中 / 和 \ 都映射为 -，decode 无法区分 - 是路径分隔符还是项目名原字符
+// 因此 decode 结果可能不准确（如 ccusage-report → ccusage/report）
+// 内部匹配用原始目录名，此函数仅用于展示
+export function decodeProjectName(dirName) {
   let decoded = dirName
     .replace(/^([A-Z])-/, '$1:/')
     .replace(/--/g, '/')
@@ -197,7 +200,6 @@ function decodeProjectName(dirName) {
     decoded = '.../' + decoded.slice(3);
   }
 
-  // 去掉尾部多余斜杠
   decoded = decoded.replace(/\/+$/, '');
 
   if (/^[A-Z]:$/.test(decoded)) {
@@ -207,6 +209,13 @@ function decodeProjectName(dirName) {
   return decoded || '[未知项目]';
 }
 
+// 从有损 decode 结果中提取项目显示名：取最后一个路径段
+export function getProjectDisplayName(dirName) {
+  const decoded = decodeProjectName(dirName);
+  const segments = decoded.replace(/\\/g, '/').replace(/\/+$/, '').split('/');
+  return segments[segments.length - 1] || decoded || '[未知项目]';
+}
+
 export function computeUsageStats(records, scenarioKeywords, costMode = 'auto') {
   const stats = {
     sessionCount: new Set(records.filter(r => !(r.metadata?.isSubagent || r.isSubagent)).map(r => r.sessionId).filter(Boolean)).size,
@@ -404,7 +413,16 @@ export function computeUsageStats(records, scenarioKeywords, costMode = 'auto')
 }
 
 export function filterRecordsByPeriod(records, period, refDate, options = {}) {
-  const d = new Date(refDate);
+  // 字符串日期 "2026-05-26" 被 new Date() 解析为 UTC 午夜，
+  // formatDate 用本地时间，UTC- 时区下日期会偏移一天。
+  // 修复：将 YYYY-MM-DD 字符串按本地时间解析
+  let d;
+  if (typeof refDate === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(refDate)) {
+    const [y, m, day] = refDate.split('-').map(Number);
+    d = new Date(y, m - 1, day);
+  } else {
+    d = new Date(refDate);
+  }
   let start, end;
 
   switch (period) {

package/lib/attribution.js

@@ -22,6 +22,19 @@ export function classifyAttribution(input = {}) {
     ...evidence.map(e => e.tool),
   ]);
 
+  // Step blame: confirmed by line-level tracking
+  if (input.lineBlame?.source === 'step_blame') {
+    return {
+      commitHash: input.commitHash || null,
+      classification: 'confirmed_ai',
+      primaryTool: input.primaryTool || null,
+      tools: unique([...(Array.isArray(input.tools) ? input.tools : []), input.primaryTool].filter(Boolean)),
+      evidence: [...(input.evidence || []), 'step_blame'],
+      source: 'auto',
+      reason: 'step_blame',
+    };
+  }
+
   if (override?.classification) {
     const classification = normalizeClassification(override.classification);
     return {

package/lib/capture-recorder.js

@@ -0,0 +1,141 @@
+import { closeSync, existsSync, openSync, statSync, unlinkSync } from 'fs';
+import { isAbsolute, join, resolve } from 'path';
+import { StepTracker } from './step-tracker.js';
+
+export const ORIGINS = Object.freeze({
+  CLAUDE_CODE: 'claude_code',
+  CODEX_CLI: 'codex_cli',
+  OPENCODE: 'opencode',
+});
+
+function sleep(ms) {
+  return new Promise(resolveSleep => setTimeout(resolveSleep, ms));
+}
+
+async function withDbLock(dbPath, fn) {
+  const lockPath = `${dbPath}.lock`;
+  const deadline = Date.now() + 2_000;
+  let fd = null;
+
+  while (Date.now() < deadline) {
+    try {
+      fd = openSync(lockPath, 'wx');
+      break;
+    } catch {
+      try {
+        if (Date.now() - statSync(lockPath).mtimeMs > 10_000) unlinkSync(lockPath);
+      } catch {}
+      await sleep(50);
+    }
+  }
+
+  if (fd === null) return null;
+
+  try {
+    return await fn();
+  } finally {
+    try { closeSync(fd); } catch {}
+    try { unlinkSync(lockPath); } catch {}
+  }
+}
+
+export function normalizeOriginSessionId(origin, sessionId) {
+  const normalizedOrigin = origin || ORIGINS.CLAUDE_CODE;
+  const rawSessionId = String(sessionId || 'unknown');
+  const prefix = `${normalizedOrigin}:`;
+  return rawSessionId.startsWith(prefix) ? rawSessionId : `${prefix}${rawSessionId}`;
+}
+
+export async function recordToolUse(payload = {}) {
+  const cwd = resolve(payload.cwd || process.cwd());
+  const dbPath = payload.dbPath
+    ? (isAbsolute(payload.dbPath) ? payload.dbPath : join(cwd, payload.dbPath))
+    : join(cwd, '.ccusage', 'steps.db');
+
+  if (!existsSync(dbPath)) {
+    return { recorded: false, reason: 'not_initialized' };
+  }
+
+  const origin = payload.origin || ORIGINS.CLAUDE_CODE;
+  const sessionId = normalizeOriginSessionId(origin, payload.sessionId);
+
+  const result = await withDbLock(dbPath, async () => {
+    const tracker = new StepTracker(cwd, { dbPath });
+    try {
+      await tracker.open();
+      const stepId = await tracker.recordStep({
+        origin,
+        sessionId,
+        toolUseId: payload.toolUseId,
+        toolName: payload.toolName,
+        toolInput: payload.toolInput,
+        toolResponse: payload.toolResponse,
+        cwd,
+        timestamp: payload.timestamp || new Date().toISOString(),
+      });
+      return stepId
+        ? { recorded: true, stepId, sessionId, origin }
+        : { recorded: false, reason: 'no_target_files', sessionId, origin };
+    } finally {
+      tracker.close();
+    }
+  });
+
+  return result || { recorded: false, reason: 'lock_timeout', sessionId, origin };
+}
+
+function normalizeToolCall(call = {}) {
+  const tool = call.tool || {};
+  return {
+    toolUseId: call.toolUseId || call.tool_use_id || call.id || call.call_id || call.callId,
+    toolName: call.toolName || call.tool_name || call.name || tool.name,
+    toolInput: call.toolInput || call.tool_input || call.input || call.args || tool.input || {},
+    toolResponse: call.toolResponse || call.tool_response || call.output || call.response || tool.output,
+  };
+}
+
+export async function recordToolBatch(payload = {}) {
+  const cwd = resolve(payload.cwd || process.cwd());
+  const dbPath = payload.dbPath
+    ? (isAbsolute(payload.dbPath) ? payload.dbPath : join(cwd, payload.dbPath))
+    : join(cwd, '.ccusage', 'steps.db');
+
+  if (!existsSync(dbPath)) {
+    return { recorded: false, reason: 'not_initialized' };
+  }
+
+  const origin = payload.origin || ORIGINS.CLAUDE_CODE;
+  const sessionId = normalizeOriginSessionId(origin, payload.sessionId);
+  const toolCalls = Array.isArray(payload.toolCalls) ? payload.toolCalls.map(normalizeToolCall) : [];
+  if (toolCalls.length === 0) {
+    return { recorded: false, reason: 'empty_batch', sessionId, origin };
+  }
+
+  const batchId = payload.batchId || toolCalls
+    .map(call => call.toolUseId || `${call.toolName || 'tool'}:${JSON.stringify(call.toolInput || {})}`)
+    .join(',');
+
+  const result = await withDbLock(dbPath, async () => {
+    const tracker = new StepTracker(cwd, { dbPath });
+    try {
+      await tracker.open();
+      const stepId = await tracker.recordStep({
+        origin,
+        sessionId,
+        toolUseId: `batch:${batchId}`,
+        toolName: 'ToolBatch',
+        toolInput: { toolCalls },
+        toolCalls,
+        cwd,
+        timestamp: payload.timestamp || new Date().toISOString(),
+      });
+      return stepId
+        ? { recorded: true, stepId, sessionId, origin, toolCallCount: toolCalls.length }
+        : { recorded: false, reason: 'no_target_files', sessionId, origin, toolCallCount: toolCalls.length };
+    } finally {
+      tracker.close();
+    }
+  });
+
+  return result || { recorded: false, reason: 'lock_timeout', sessionId, origin };
+}

package/lib/config.js

@@ -1,6 +1,7 @@
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
 import { join, dirname } from 'path';
 import { homedir } from 'os';
+import { DEFAULT_ATTRIBUTION_OPTIONS } from './git-attribution-options.js';
 
 const CONFIG_LOCATIONS = [
   join(homedir(), '.lumencode.json'),
@@ -25,8 +26,31 @@ const DEFAULT_CONFIG = {
     review: ['review', '审查', '检查', '代码审查', '/review'],
     planning: ['计划', 'plan', '设计', '架构', '方案', 'design', 'architect'],
   },
+  aiAttribution: DEFAULT_ATTRIBUTION_OPTIONS,
+  stepTracking: {
+    enabled: true,
+    dbPath: '.ccusage/steps.db',
+    maxFileSize: 10 * 1024 * 1024,
+    ignorePatterns: ['node_modules/', '.git/', 'dist/', 'build/', '.next/', '.cache/'],
+  },
 };
 
+// 深合并：对嵌套对象和数组做合并而非覆盖
+function deepMerge(target, source) {
+  const result = { ...target };
+  for (const key of Object.keys(source)) {
+    const sv = source[key];
+    const tv = target[key];
+    if (sv && typeof sv === 'object' && !Array.isArray(sv) &&
+        tv && typeof tv === 'object' && !Array.isArray(tv)) {
+      result[key] = deepMerge(tv, sv);
+    } else {
+      result[key] = sv;
+    }
+  }
+  return result;
+}
+
 export function loadConfig(configPath) {
   let config = { ...DEFAULT_CONFIG };
 
@@ -35,7 +59,7 @@ export function loadConfig(configPath) {
     if (existsSync(configPath)) {
       try {
         const userConfig = JSON.parse(readFileSync(configPath, 'utf-8'));
-        config = { ...config, ...userConfig };
+        config = deepMerge(config, userConfig);
         return config;
       } catch (e) {
         console.error(`配置文件读取失败: ${configPath}`, e.message);
@@ -50,7 +74,7 @@ export function loadConfig(configPath) {
     if (existsSync(p)) {
       try {
         const userConfig = JSON.parse(readFileSync(p, 'utf-8'));
-        config = { ...config, ...userConfig };
+        config = deepMerge(config, userConfig);
         return config;
       } catch (e) {
         console.error(`配置文件读取失败: ${p}`, e.message);

package/lib/git-attribution-candidates.js

@@ -0,0 +1,37 @@
+export function scoreSessionCandidate(commit, session, context = {}) {
+  const distanceMs = context.distanceMs ?? Number.MAX_SAFE_INTEGER;
+  const fileOverlapRatio = context.fileOverlapRatio ?? 0;
+  const matchedFiles = context.matchedFiles ?? [];
+  let score = 0;
+  const reasons = [];
+
+  if (context.hasStrongBashMatch) {
+    score += 100;
+    reasons.push('bash_git_commit');
+  }
+  if (context.projectMatches) {
+    score += 40;
+    reasons.push('project_match');
+  }
+  if (fileOverlapRatio > 0) {
+    score += Math.round(fileOverlapRatio * 35);
+    reasons.push('file_overlap');
+  }
+  if (Number.isFinite(distanceMs)) {
+    score += Math.max(0, 20 - Math.floor(distanceMs / 60000));
+    reasons.push('time_proximity');
+  }
+  if (session.primaryTool) {
+    score += 5;
+    reasons.push('primary_tool');
+  }
+
+  return {
+    sessionId: session.id,
+    score,
+    reasons,
+    distanceMs,
+    fileOverlapRatio,
+    matchedFiles,
+  };
+}

package/lib/git-attribution-options.js

@@ -0,0 +1,105 @@
+export const DEFAULT_ATTRIBUTION_OPTIONS = {
+  windows: {
+    weakWindowMinutes: 30,
+    crossDayWindowDays: 3,
+  },
+  confidenceThresholds: {
+    high: 0.75,
+    medium: 0.45,
+    low: 0.20,
+  },
+  confidenceWeights: {
+    high: 1.0,
+    medium: 0.7,
+    low: 0.2,
+    none: 0,
+  },
+  scoreWeights: {
+    explicitSignature: 0.85,
+    explicitAuthor: 0.80,
+    genericAISignature: 0.70,
+    sessionStrong: 0.40,
+    sessionCrossDay: 0.25,
+    sessionWeak: 0.15,
+    sessionCrossDayWeak: 0.10,
+    fileOverlap: 0.30,
+    styleBulletList: 0.15,
+    styleConventionalScope: 0.05,
+    styleImperativeMood: 0.10,
+    styleLongStructuredBody: 0.05,
+    baselineDeviationHigh: 0.15,
+    baselineDeviationMedium: 0.08,
+    negativeMergeCommit: -0.50,
+    negativeInformal: -0.20,
+    negativeSmallScope: -0.15,
+    negativeWIP: -0.15,
+    humanBaselineMatch: -0.10,
+  },
+  explicitSignalPolicy: {
+    coAuthor: 'strong',
+    generatedWith: 'strong',
+    assistedBy: 'strong',
+    robotEmoji: 'medium',
+    genericAIKeywords: 'medium',
+  },
+};
+
+function finiteNumber(value) {
+  return typeof value === 'number' && Number.isFinite(value);
+}
+
+function positiveNumber(value, fallback) {
+  return finiteNumber(value) && value > 0 ? value : fallback;
+}
+
+function ratioNumber(value, fallback) {
+  return finiteNumber(value) && value >= 0 && value <= 1 ? value : fallback;
+}
+
+function normalizeThresholds(input = {}, defaults) {
+  let high = ratioNumber(input.high, defaults.high);
+  let medium = ratioNumber(input.medium, defaults.medium);
+  let low = ratioNumber(input.low, defaults.low);
+
+  if (high < medium) high = defaults.high;
+  if (medium < low) medium = defaults.medium;
+  if (high < medium) medium = defaults.medium;
+  if (medium < low) low = defaults.low;
+
+  return { high, medium, low };
+}
+
+function normalizeWeights(input = {}, defaults) {
+  return {
+    high: ratioNumber(input.high, defaults.high),
+    medium: ratioNumber(input.medium, defaults.medium),
+    low: ratioNumber(input.low, defaults.low),
+    none: ratioNumber(input.none, defaults.none),
+  };
+}
+
+function scoreWeight(value, fallback) {
+  return finiteNumber(value) && value >= -1 && value <= 1 ? value : fallback;
+}
+
+function normalizeScoreWeights(input = {}, defaults) {
+  const result = {};
+  for (const [key, fallback] of Object.entries(defaults)) {
+    result[key] = scoreWeight(input[key], fallback);
+  }
+  return result;
+}
+
+export function resolveAttributionOptions(input = {}) {
+  const defaults = DEFAULT_ATTRIBUTION_OPTIONS;
+  return {
+    windows: {
+      weakWindowMinutes: positiveNumber(input.windows?.weakWindowMinutes, defaults.windows.weakWindowMinutes),
+      crossDayWindowDays: positiveNumber(input.windows?.crossDayWindowDays, defaults.windows.crossDayWindowDays),
+    },
+    confidenceThresholds: normalizeThresholds(input.confidenceThresholds, defaults.confidenceThresholds),
+    confidenceWeights: normalizeWeights(input.confidenceWeights, defaults.confidenceWeights),
+    scoreWeights: normalizeScoreWeights(input.scoreWeights, defaults.scoreWeights),
+    explicitSignalPolicy: { ...defaults.explicitSignalPolicy, ...(input.explicitSignalPolicy || {}) },
+  };
+}

package/lib/git-paths.js

@@ -0,0 +1,41 @@
+export function normalizePathForGit(value) {
+  if (!value) return '';
+  return String(value).replace(/\\/g, '/').replace(/\/+/g, '/').replace(/\/$/, '').toLowerCase();
+}
+
+export function normalizeCommitFilePath(value) {
+  return normalizePathForGit(value).replace(/^\.?\//, '');
+}
+
+export function toRepoRelativePath(filePath, repoPath) {
+  const file = normalizePathForGit(filePath);
+  const repo = normalizePathForGit(repoPath);
+  if (!file) return '';
+  if (!repo || !file.includes('/')) return normalizeCommitFilePath(file.replace(/^[a-z]:\//i, ''));
+  if (file === repo) return '';
+  if (file.startsWith(repo + '/')) return normalizeCommitFilePath(file.slice(repo.length + 1));
+  return normalizeCommitFilePath(file);
+}
+
+export function projectKey(value) {
+  return normalizePathForGit(value);
+}
+
+function pathContains(parent, child) {
+  return parent === child || child.startsWith(parent + '/');
+}
+
+export function projectMatches(commitRepo, sessionProject) {
+  const a = projectKey(commitRepo);
+  const b = projectKey(sessionProject);
+  if (!a || !b) return true;
+  if (pathContains(a, b) || pathContains(b, a)) return true;
+  if (!a.includes('/') || !b.includes('/')) {
+    return a.split('/').pop() === b.split('/').pop();
+  }
+  return false;
+}
+
+export function filePathMatches(a, b) {
+  return normalizeCommitFilePath(a) === normalizeCommitFilePath(b);
+}