lumencode 1.3.1 → 1.3.2

package/lib/aggregate.js

@@ -238,6 +238,8 @@ export function computeUsageStats(records, scenarioKeywords, costMode = 'auto')
     projects: {},
     dailyStats: {},
     toolBreakdown: {}, // 新增：各工具数据分布
+    skills: {},
+    mcpTools: {},
   };
 
   for (const r of records) {
@@ -308,10 +310,51 @@ export function computeUsageStats(records, scenarioKeywords, costMode = 'auto')
       }
     }
 
-    // Tools (toolCalls) - 保持现有逻辑
+    // Tools (toolCalls) - calls: 总调用次数, uses: 使用次数（同一 record 内同名工具只算一次）
     const toolCalls = r.metadata?.toolCalls || r.toolCalls || [];
     for (const tc of toolCalls) {
-      stats.tools[tc.name] = (stats.tools[tc.name] || 0) + 1;
+      if (!stats.tools[tc.name]) stats.tools[tc.name] = { calls: 0, uses: 0 };
+      stats.tools[tc.name].calls++;
+      if (projectName && stats.projects[projectName]) {
+        if (!stats.projects[projectName].tools) stats.projects[projectName].tools = {};
+        if (!stats.projects[projectName].tools[tc.name]) stats.projects[projectName].tools[tc.name] = { calls: 0, uses: 0 };
+        stats.projects[projectName].tools[tc.name].calls++;
+      }
+      // Skill 细分采集
+      if (tc.name === 'Skill' && tc.input?.skill) {
+        const sk = tc.input.skill;
+        if (!stats.skills[sk]) stats.skills[sk] = { calls: 0, uses: 0 };
+        stats.skills[sk].calls++;
+      }
+      // MCP 细分采集
+      if (tc.name.startsWith('mcp__')) {
+        if (!stats.mcpTools[tc.name]) stats.mcpTools[tc.name] = { calls: 0, uses: 0 };
+        stats.mcpTools[tc.name].calls++;
+      }
+    }
+    const uniqueToolNames = new Set(toolCalls.map(tc => tc.name));
+    for (const name of uniqueToolNames) {
+      if (!stats.tools[name]) stats.tools[name] = { calls: 0, uses: 0 };
+      stats.tools[name].uses++;
+      if (projectName && stats.projects[projectName] && stats.projects[projectName].tools[name]) {
+        stats.projects[projectName].tools[name].uses++;
+      }
+      // 同步更新 skills / mcpTools 的 uses
+      if (name === 'Skill') {
+        const skillNames = new Set(
+          toolCalls
+            .filter(tc => tc.name === 'Skill' && tc.input?.skill)
+            .map(tc => tc.input.skill)
+        );
+        for (const sk of skillNames) {
+          if (!stats.skills[sk]) stats.skills[sk] = { calls: 0, uses: 0 };
+          stats.skills[sk].uses++;
+        }
+      }
+      if (name.startsWith('mcp__')) {
+        if (!stats.mcpTools[name]) stats.mcpTools[name] = { calls: 0, uses: 0 };
+        stats.mcpTools[name].uses++;
+      }
     }
 
     // Daily stats
@@ -406,6 +449,7 @@ export function computeUsageStats(records, scenarioKeywords, costMode = 'auto')
       cacheCreate: p.cacheCreate || 0,
       estimatedCost: p.estimatedCost || 0,
       models: p.models || {},
+      tools: p.tools || {},
     };
   }
 
@@ -488,12 +532,23 @@ export function computeTrendData(allRecords, period, refDate) {
     if (!r.timestamp) continue;
     const date = r.timestamp.slice(0, 10);
     if (date < trendStart || date > trendEnd) continue;
-    if (!dailyStats[date]) dailyStats[date] = { requests: 0, inputTokens: 0, outputTokens: 0 };
+    if (!dailyStats[date]) dailyStats[date] = { requests: 0, inputTokens: 0, outputTokens: 0, tools: {} };
     if (isAssistantRecord(r)) {
       dailyStats[date].requests++;
       dailyStats[date].inputTokens += getInputTokens(r);
       dailyStats[date].outputTokens += getOutputTokens(r);
     }
+    const toolCalls = r.metadata?.toolCalls || r.toolCalls || [];
+    for (const tc of toolCalls) {
+      if (tc.name === 'Skill' || tc.name?.startsWith('mcp__')) continue;
+      if (!dailyStats[date].tools[tc.name]) dailyStats[date].tools[tc.name] = { calls: 0, uses: 0 };
+      dailyStats[date].tools[tc.name].calls++;
+    }
+    const uniqueNames = new Set(toolCalls.map(tc => tc.name).filter(n => n !== 'Skill' && !n?.startsWith('mcp__')));
+    for (const name of uniqueNames) {
+      if (!dailyStats[date].tools[name]) dailyStats[date].tools[name] = { calls: 0, uses: 0 };
+      dailyStats[date].tools[name].uses++;
+    }
   }
 
   return { dailyStats, start: trendStart, end: trendEnd };

package/lib/config.js

@@ -2,6 +2,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';
+import { parseRepoPaths } from './path-utils.js';
 
 const CONFIG_LOCATIONS = [
   join(homedir(), '.lumencode.json'),
@@ -19,12 +20,13 @@ const DEFAULT_CONFIG = {
   blockQuota: null, // 5h 计费窗口 token 上限（Max Pro=1000000, Max=450000 等），null=不限
   costMode: 'auto', // 'auto' | 'calculate' | 'display'
   scenarioKeywords: {
-    coding: ['实现', '功能', '开发', '添加', '修改代码', 'implement', 'feature', 'add', 'refactor', '重构', '组件'],
-    testing: ['测试', 'test', 'spec', '覆盖率', 'coverage', '单元测试', 'unit test', 'jest', 'vitest', 'mocha'],
-    debugging: ['修复', 'bug', 'debug', 'fix', '报错', '错误', '异常', 'error', 'issue', '问题', '排查', '堆栈'],
-    documentation: ['文档', 'doc', 'readme', 'md', '注释', 'comment', '说明', '指南', 'guide'],
-    review: ['review', '审查', '检查', '代码审查', '/review'],
-    planning: ['计划', 'plan', '设计', '架构', '方案', 'design', 'architect'],
+    coding: ['实现', '功能', '开发', '添加', '修改代码', 'implement', 'feature', '组件', 'component', '编写', 'write code'],
+    testing: ['测试', 'test', 'spec', '覆盖率', 'coverage', '单元测试', 'unit test', 'jest', 'vitest', 'mocha', 'cypress', 'playwright'],
+    debugging: ['修复', 'bug', 'debug', 'fix', '报错', '错误', '异常', 'error', '排查', '堆栈', 'trace', 'stack trace', 'crash'],
+    documentation: ['文档', 'readme.md', '注释', '说明', '指南', 'guide', 'wiki', '手册', 'api doc'],
+    review: ['review', '审查', '代码审查', '/review', 'pr', 'pull request', 'approve', 'approval', 'reject', '走查', '代码走查'],
+    planning: ['计划', 'plan', '设计', '架构', '方案', 'design', 'architect', 'roadmap', '规划'],
+    refactoring: ['重构', 'refactor', '重写', 'rewrite', '清理代码', 'clean up', '简化', 'simplify', '提取', 'extract'],
   },
   aiAttribution: DEFAULT_ATTRIBUTION_OPTIONS,
   stepTracking: {
@@ -51,6 +53,17 @@ function deepMerge(target, source) {
   return result;
 }
 
+function normalizeConfig(config) {
+  // 支持 repos / excludeProjects 为字符串（逗号或换行分隔）
+  if (config.repos !== undefined) {
+    config.repos = parseRepoPaths(config.repos);
+  }
+  if (config.excludeProjects !== undefined) {
+    config.excludeProjects = parseRepoPaths(config.excludeProjects);
+  }
+  return config;
+}
+
 export function loadConfig(configPath) {
   let config = { ...DEFAULT_CONFIG };
 
@@ -60,7 +73,7 @@ export function loadConfig(configPath) {
       try {
         const userConfig = JSON.parse(readFileSync(configPath, 'utf-8'));
         config = deepMerge(config, userConfig);
-        return config;
+        return normalizeConfig(config);
       } catch (e) {
         console.error(`配置文件读取失败: ${configPath}`, e.message);
         // 文件存在但解析失败，返回默认值
@@ -75,7 +88,7 @@ export function loadConfig(configPath) {
       try {
         const userConfig = JSON.parse(readFileSync(p, 'utf-8'));
         config = deepMerge(config, userConfig);
-        return config;
+        return normalizeConfig(config);
       } catch (e) {
         console.error(`配置文件读取失败: ${p}`, e.message);
       }

package/lib/path-utils.js

@@ -0,0 +1,18 @@
+/**
+ * 解析仓库路径字符串，支持多种分隔符：
+ * - 英文逗号 ,
+ * - 中文逗号 ，
+ * - 换行 \n / \r\n
+ * - 多余空白自动 trim
+ *
+ * @param {string|Array} input - 路径字符串或已解析的数组
+ * @returns {string[]} 解析后的路径数组
+ */
+export function parseRepoPaths(input) {
+  if (Array.isArray(input)) return input.map(s => String(s || '').trim()).filter(Boolean);
+  if (typeof input !== 'string') return [];
+  return input
+    .split(/[,，\n\r]+/)
+    .map(s => s.trim())
+    .filter(Boolean);
+}