openspec-stat 1.0.0 → 1.2.0

package/README.md

@@ -3,12 +3,15 @@
 [![NPM version](https://img.shields.io/npm/v/openspec-stat.svg?style=flat)](https://npmjs.com/package/openspec-stat)
 [![NPM downloads](http://img.shields.io/npm/dm/openspec-stat.svg?style=flat)](https://npmjs.com/package/openspec-stat)
 
+English | [简体中文](./README.zh-CN.md)
+
 A CLI tool for tracking team members' OpenSpec proposals and code changes in Git repositories.
 
 ## Features
 
 - ✅ Track Git commits within specified time ranges
 - ✅ Identify commits containing both OpenSpec proposals and code changes
+- ✅ **Proposal-based statistics summary** - Aggregate statistics by proposal to avoid merge commit bias
 - ✅ Group statistics by author (commits, proposals, code changes)
 - ✅ Support multiple branches and wildcard filtering
 - ✅ Author name mapping (handle multiple Git accounts for the same person)
@@ -161,6 +164,11 @@ Statistics include:
 - **Deletions**: Lines of code deleted
 - **Net Changes**: Additions - Deletions
 
+The tool provides two perspectives:
+
+1. **Proposal Summary**: Aggregates statistics by proposal, showing total code changes per proposal and all contributors. This avoids statistical bias from merge commits.
+2. **Author Summary**: Groups statistics by contributor, showing individual author contributions.
+
 ## Output Formats
 
 ### Table Format (Default)
@@ -171,6 +179,16 @@ Time Range: 2024-01-01 00:00:00 ~ 2024-01-31 23:59:59
 Branches: origin/master
 Total Commits: 15
 
+📋 Proposal Summary (by proposal)
+┌──────────────┬─────────┬──────────────────┬────────────┬───────────┬───────────┬─────────────┐
+│ Proposal     │ Commits │ Contributors     │ Code Files │ Additions │ Deletions │ Net Changes │
+├──────────────┼─────────┼──────────────────┼────────────┼───────────┼───────────┼─────────────┤
+│ feature-123  │ 5       │ John Doe, Jane S.│ 30         │ +890      │ -234      │ +656        │
+│ feature-456  │ 3       │ John Doe         │ 15         │ +344      │ -100      │ +244        │
+└──────────────┴─────────┴──────────────────┴────────────┴───────────┴───────────┴─────────────┘
+  📊 Total: 2 proposals | 8 commits | 45 files | +1234/-334 lines (net: +900)
+
+👥 Author Summary (by contributor)
 ┌──────────┬─────────┬──────────────────┬────────────┬───────────┬───────────┬─────────────┐
 │ Author   │ Commits │ OpenSpec Proposals│ Code Files │ Additions │ Deletions │ Net Changes │
 ├──────────┼─────────┼──────────────────┼────────────┼───────────┼───────────┼─────────────┤

package/README.zh-CN.md

@@ -11,6 +11,7 @@
 
 - ✅ 追踪指定时间范围内的 Git 提交
 - ✅ 识别同时包含 OpenSpec 提案和代码变更的提交
+- ✅ **提案维度统计汇总** - 按提案聚合统计，避免 merge commit 导致的统计偏差
 - ✅ 按作者分组统计（提交数、提案数、代码变更）
 - ✅ 支持多分支和通配符过滤
 - ✅ 作者名称映射（处理同一人的多个 Git 账号）
@@ -163,6 +164,11 @@ openspec-stat --lang zh-CN --verbose
 - **删除行数**：删除的代码行数
 - **净变更**：新增行数 - 删除行数
 
+工具提供两个统计视角：
+
+1. **提案汇总**：按提案聚合统计，显示每个提案的总代码变更量和所有贡献者，避免 merge commit 导致的统计偏差
+2. **作者汇总**：按贡献者分组统计，显示各个作者的个人贡献情况
+
 ## 输出格式
 
 ### 表格格式（默认）
@@ -173,6 +179,16 @@ openspec-stat --lang zh-CN --verbose
 分支：origin/master
 总提交数：15
 
+📋 提案汇总（按提案统计）
+┌──────────────┬─────────┬──────────────────┬────────────┬───────────┬───────────┬─────────────┐
+│ 提案         │ 提交数  │ 贡献者           │ 代码文件   │ 新增行数  │ 删除行数  │ 净变更      │
+├──────────────┼─────────┼──────────────────┼────────────┼───────────┼───────────┼─────────────┤
+│ feature-123  │ 5       │ 张三, 李四       │ 30         │ +890      │ -234      │ +656        │
+│ feature-456  │ 3       │ 张三             │ 15         │ +344      │ -100      │ +244        │
+└──────────────┴─────────┴──────────────────┴────────────┴───────────┴───────────┴─────────────┘
+  📊 总计：2 个提案 | 8 次提交 | 45 个文件 | +1234/-334 行（净变更：+900）
+
+👥 作者汇总（按贡献者统计）
 ┌──────────┬─────────┬──────────────────┬────────────┬───────────┬───────────┬─────────────┐
 │ 作者     │ 提交数  │ 提案数           │ 代码文件   │ 新增行数  │ 删除行数  │ 净变更      │
 ├──────────┼─────────┼──────────────────┼────────────┼───────────┼───────────┼─────────────┤

package/dist/cjs/cli.js

@@ -41,19 +41,10 @@ program.name("openspec-stat").description("Track team members' OpenSpec proposal
     let since;
     let until;
     if (options.since || options.until) {
-      since = options.since ? (0, import_time_utils.parseDateTime)(options.since) : (0, import_time_utils.getDefaultTimeRange)(
-        config.defaultSinceHours,
-        config.defaultUntilHours
-      ).since;
-      until = options.until ? (0, import_time_utils.parseDateTime)(options.until) : (0, import_time_utils.getDefaultTimeRange)(
-        config.defaultSinceHours,
-        config.defaultUntilHours
-      ).until;
+      since = options.since ? (0, import_time_utils.parseDateTime)(options.since) : (0, import_time_utils.getDefaultTimeRange)(config.defaultSinceHours, config.defaultUntilHours).since;
+      until = options.until ? (0, import_time_utils.parseDateTime)(options.until) : (0, import_time_utils.getDefaultTimeRange)(config.defaultSinceHours, config.defaultUntilHours).until;
     } else {
-      const defaultRange = (0, import_time_utils.getDefaultTimeRange)(
-        config.defaultSinceHours,
-        config.defaultUntilHours
-      );
+      const defaultRange = (0, import_time_utils.getDefaultTimeRange)(config.defaultSinceHours, config.defaultUntilHours);
       since = defaultRange.since;
       until = defaultRange.until;
     }
@@ -73,14 +64,16 @@ program.name("openspec-stat").description("Track team members' OpenSpec proposal
         })
       )
     );
-    console.log(import_chalk.default.blue((0, import_i18n.t)("info.branches", {
-      branches: branches.join(", ") || (0, import_i18n.t)("info.allBranches")
-    })));
+    console.log(
+      import_chalk.default.blue(
+        (0, import_i18n.t)("info.branches", {
+          branches: branches.join(", ") || (0, import_i18n.t)("info.allBranches")
+        })
+      )
+    );
     const analyzer = new import_git_analyzer.GitAnalyzer(options.repo, config);
     console.log(import_chalk.default.blue((0, import_i18n.t)("loading.activeUsers")));
-    const activeAuthors = await analyzer.getActiveAuthors(
-      config.activeUserWeeks || 2
-    );
+    const activeAuthors = await analyzer.getActiveAuthors(config.activeUserWeeks || 2);
     if (options.verbose) {
       console.log(
         import_chalk.default.gray(
@@ -103,10 +96,12 @@ program.name("openspec-stat").description("Track team members' OpenSpec proposal
       const commit = commits[i];
       if (options.verbose && i % 10 === 0) {
         console.log(
-          import_chalk.default.gray((0, import_i18n.t)("info.analysisProgress", {
-            current: String(i + 1),
-            total: String(commits.length)
-          }))
+          import_chalk.default.gray(
+            (0, import_i18n.t)("info.analysisProgress", {
+              current: String(i + 1),
+              total: String(commits.length)
+            })
+          )
         );
       }
       const analysis = await analyzer.analyzeCommit(commit);
@@ -115,24 +110,12 @@ program.name("openspec-stat").description("Track team members' OpenSpec proposal
       }
     }
     if (analyses.length === 0) {
-      console.log(
-        import_chalk.default.yellow((0, import_i18n.t)("warning.noQualifyingCommits"))
-      );
+      console.log(import_chalk.default.yellow((0, import_i18n.t)("warning.noQualifyingCommits")));
       return;
     }
-    console.log(
-      import_chalk.default.blue(
-        (0, import_i18n.t)("info.qualifyingCommits", { count: String(analyses.length) })
-      )
-    );
+    console.log(import_chalk.default.blue((0, import_i18n.t)("info.qualifyingCommits", { count: String(analyses.length) })));
     const aggregator = new import_stats_aggregator.StatsAggregator(config, activeAuthors);
-    const result = aggregator.aggregate(
-      analyses,
-      since,
-      until,
-      branches,
-      options.author
-    );
+    const result = aggregator.aggregate(analyses, since, until, branches, options.author);
     const formatter = new import_formatters.OutputFormatter();
     if (options.json) {
       console.log(formatter.formatJSON(result));

package/dist/cjs/formatters.js

@@ -47,9 +47,60 @@ var OutputFormatter = class {
     );
     output += import_chalk.default.gray((0, import_i18n.t)("output.branches", { branches: result.branches.join(", ") }));
     output += import_chalk.default.gray((0, import_i18n.t)("output.totalCommits", { count: String(result.totalCommits) }));
-    const sortedAuthors = Array.from(result.authors.values()).sort(
-      (a, b) => b.commits - a.commits
-    );
+    if (result.proposals.size > 0) {
+      output += import_chalk.default.bold.magenta(`
+${(0, import_i18n.t)("output.proposalSummary")}
+`);
+      const proposalTable = new import_cli_table3.default({
+        head: [
+          import_chalk.default.magenta((0, import_i18n.t)("table.proposal")),
+          import_chalk.default.magenta((0, import_i18n.t)("table.commits")),
+          import_chalk.default.magenta((0, import_i18n.t)("table.contributors")),
+          import_chalk.default.magenta((0, import_i18n.t)("table.codeFiles")),
+          import_chalk.default.magenta((0, import_i18n.t)("table.additions")),
+          import_chalk.default.magenta((0, import_i18n.t)("table.deletions")),
+          import_chalk.default.magenta((0, import_i18n.t)("table.netChanges"))
+        ],
+        style: {
+          head: [],
+          border: []
+        }
+      });
+      const sortedProposals = Array.from(result.proposals.values()).sort((a, b) => b.netChanges - a.netChanges);
+      for (const proposalStats of sortedProposals) {
+        const contributors = Array.from(proposalStats.contributors).join(", ");
+        proposalTable.push([
+          proposalStats.proposal,
+          proposalStats.commits.toString(),
+          contributors,
+          proposalStats.codeFilesChanged.toString(),
+          import_chalk.default.green(`+${proposalStats.additions}`),
+          import_chalk.default.red(`-${proposalStats.deletions}`),
+          proposalStats.netChanges >= 0 ? import_chalk.default.green(`+${proposalStats.netChanges}`) : import_chalk.default.red(`${proposalStats.netChanges}`)
+        ]);
+      }
+      output += proposalTable.toString() + "\n";
+      const totalProposals = result.proposals.size;
+      const totalProposalCommits = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.commits, 0);
+      const totalProposalFiles = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.codeFilesChanged, 0);
+      const totalProposalAdditions = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.additions, 0);
+      const totalProposalDeletions = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.deletions, 0);
+      const totalProposalNetChanges = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.netChanges, 0);
+      output += import_chalk.default.gray(
+        (0, import_i18n.t)("output.proposalTotal", {
+          count: totalProposals.toString(),
+          commits: totalProposalCommits.toString(),
+          files: totalProposalFiles.toString(),
+          additions: totalProposalAdditions.toString(),
+          deletions: totalProposalDeletions.toString(),
+          netChanges: totalProposalNetChanges.toString()
+        })
+      );
+    }
+    output += import_chalk.default.bold.cyan(`
+${(0, import_i18n.t)("output.authorSummary")}
+`);
+    const sortedAuthors = Array.from(result.authors.values()).sort((a, b) => b.commits - a.commits);
     for (const stats of sortedAuthors) {
       output += import_chalk.default.bold.cyan(`
 ${stats.author}
@@ -70,9 +121,7 @@ ${stats.author}
             border: []
           }
         });
-        const sortedBranches = Array.from(stats.branchStats.values()).sort(
-          (a, b) => b.commits - a.commits
-        );
+        const sortedBranches = Array.from(stats.branchStats.values()).sort((a, b) => b.commits - a.commits);
         for (const branchStat of sortedBranches) {
           branchTable.push([
             branchStat.branch,
@@ -135,6 +184,26 @@ ${stats.author}
       },
       branches: result.branches,
       totalCommits: result.totalCommits,
+      proposals: {
+        items: Array.from(result.proposals.values()).map((stats) => ({
+          proposal: stats.proposal,
+          commits: stats.commits,
+          contributors: Array.from(stats.contributors),
+          contributorCount: stats.contributors.size,
+          codeFilesChanged: stats.codeFilesChanged,
+          additions: stats.additions,
+          deletions: stats.deletions,
+          netChanges: stats.netChanges
+        })),
+        summary: {
+          totalProposals: result.proposals.size,
+          totalCommits: Array.from(result.proposals.values()).reduce((sum, p) => sum + p.commits, 0),
+          totalCodeFiles: Array.from(result.proposals.values()).reduce((sum, p) => sum + p.codeFilesChanged, 0),
+          totalAdditions: Array.from(result.proposals.values()).reduce((sum, p) => sum + p.additions, 0),
+          totalDeletions: Array.from(result.proposals.values()).reduce((sum, p) => sum + p.deletions, 0),
+          totalNetChanges: Array.from(result.proposals.values()).reduce((sum, p) => sum + p.netChanges, 0)
+        }
+      },
       authors: Array.from(result.authors.values()).map((stats) => {
         var _a;
         return {
@@ -155,12 +224,46 @@ ${stats.author}
   formatCSV(result) {
     var _a;
     const rows = [];
+    rows.push(`
+# ${(0, import_i18n.t)("output.proposalSummary")}`);
     rows.push(
-      `${(0, import_i18n.t)("table.author")},${(0, import_i18n.t)("table.period")},${(0, import_i18n.t)("table.commits")},${(0, import_i18n.t)("table.proposalsCount")},${(0, import_i18n.t)("table.proposalsList")},${(0, import_i18n.t)("table.codeFiles")},${(0, import_i18n.t)("table.additions")},${(0, import_i18n.t)("table.deletions")},${(0, import_i18n.t)("table.netChanges")},${(0, import_i18n.t)("table.lastCommitDate")}`
+      `${(0, import_i18n.t)("table.proposal")},${(0, import_i18n.t)("table.commits")},${(0, import_i18n.t)("table.contributors")},${(0, import_i18n.t)("table.codeFiles")},${(0, import_i18n.t)("table.additions")},${(0, import_i18n.t)("table.deletions")},${(0, import_i18n.t)("table.netChanges")}`
     );
-    const sortedAuthors = Array.from(result.authors.values()).sort(
-      (a, b) => b.commits - a.commits
+    const sortedProposals = Array.from(result.proposals.values()).sort((a, b) => b.netChanges - a.netChanges);
+    for (const stats of sortedProposals) {
+      const contributors = Array.from(stats.contributors).join(";");
+      rows.push(
+        [
+          stats.proposal,
+          stats.commits,
+          `"${contributors}"`,
+          stats.codeFilesChanged,
+          stats.additions,
+          stats.deletions,
+          stats.netChanges
+        ].join(",")
+      );
+    }
+    const totalProposals = result.proposals.size;
+    const totalProposalCommits = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.commits, 0);
+    const totalProposalFiles = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.codeFilesChanged, 0);
+    const totalProposalAdditions = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.additions, 0);
+    const totalProposalDeletions = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.deletions, 0);
+    const totalProposalNetChanges = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.netChanges, 0);
+    rows.push("");
+    rows.push(`# ${(0, import_i18n.t)("output.proposalTotalLabel")}`);
+    rows.push(`${(0, import_i18n.t)("table.proposals")},${totalProposals}`);
+    rows.push(`${(0, import_i18n.t)("table.commits")},${totalProposalCommits}`);
+    rows.push(`${(0, import_i18n.t)("table.codeFiles")},${totalProposalFiles}`);
+    rows.push(`${(0, import_i18n.t)("table.additions")},${totalProposalAdditions}`);
+    rows.push(`${(0, import_i18n.t)("table.deletions")},${totalProposalDeletions}`);
+    rows.push(`${(0, import_i18n.t)("table.netChanges")},${totalProposalNetChanges}`);
+    rows.push(`
+# ${(0, import_i18n.t)("output.authorSummary")}`);
+    rows.push(
+      `${(0, import_i18n.t)("table.author")},${(0, import_i18n.t)("table.period")},${(0, import_i18n.t)("table.commits")},${(0, import_i18n.t)("table.proposalsCount")},${(0, import_i18n.t)("table.proposalsList")},${(0, import_i18n.t)("table.codeFiles")},${(0, import_i18n.t)("table.additions")},${(0, import_i18n.t)("table.deletions")},${(0, import_i18n.t)("table.netChanges")},${(0, import_i18n.t)("table.lastCommitDate")}`
     );
+    const sortedAuthors = Array.from(result.authors.values()).sort((a, b) => b.commits - a.commits);
     for (const stats of sortedAuthors) {
       const proposals = Array.from(stats.openspecProposals).join(";");
       rows.push(
@@ -189,13 +292,48 @@ ${stats.author}
     });
     md += (0, import_i18n.t)("markdown.branches", { branches: result.branches.join(", ") });
     md += (0, import_i18n.t)("markdown.totalCommits", { count: String(result.totalCommits) });
-    md += (0, import_i18n.t)("markdown.statistics");
+    md += `
+## ${(0, import_i18n.t)("output.proposalSummary")}
+
+`;
+    md += `| ${(0, import_i18n.t)("table.proposal")} | ${(0, import_i18n.t)("table.commits")} | ${(0, import_i18n.t)("table.contributors")} | ${(0, import_i18n.t)("table.codeFiles")} | ${(0, import_i18n.t)("table.additions")} | ${(0, import_i18n.t)("table.deletions")} | ${(0, import_i18n.t)("table.netChanges")} |
+`;
+    md += "|--------|---------|-------------|------------|-----------|-----------|-------------|\n";
+    const sortedProposals = Array.from(result.proposals.values()).sort((a, b) => b.netChanges - a.netChanges);
+    for (const stats of sortedProposals) {
+      const contributors = Array.from(stats.contributors).join(", ");
+      md += `| ${stats.proposal} | ${stats.commits} | ${contributors} | ${stats.codeFilesChanged} | +${stats.additions} | -${stats.deletions} | ${stats.netChanges >= 0 ? "+" : ""}${stats.netChanges} |
+`;
+    }
+    const totalProposals = result.proposals.size;
+    const totalProposalCommits = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.commits, 0);
+    const totalProposalFiles = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.codeFilesChanged, 0);
+    const totalProposalAdditions = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.additions, 0);
+    const totalProposalDeletions = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.deletions, 0);
+    const totalProposalNetChanges = Array.from(result.proposals.values()).reduce((sum, p) => sum + p.netChanges, 0);
+    md += `
+**${(0, import_i18n.t)("output.proposalTotalLabel")}**
+`;
+    md += `- ${(0, import_i18n.t)("table.proposals")}: ${totalProposals}
+`;
+    md += `- ${(0, import_i18n.t)("table.commits")}: ${totalProposalCommits}
+`;
+    md += `- ${(0, import_i18n.t)("table.codeFiles")}: ${totalProposalFiles}
+`;
+    md += `- ${(0, import_i18n.t)("table.additions")}: +${totalProposalAdditions}
+`;
+    md += `- ${(0, import_i18n.t)("table.deletions")}: -${totalProposalDeletions}
+`;
+    md += `- ${(0, import_i18n.t)("table.netChanges")}: ${totalProposalNetChanges >= 0 ? "+" : ""}${totalProposalNetChanges}
+`;
+    md += `
+## ${(0, import_i18n.t)("output.authorSummary")}
+
+`;
     md += `| ${(0, import_i18n.t)("table.author")} | ${(0, import_i18n.t)("table.period")} | ${(0, import_i18n.t)("table.commits")} | ${(0, import_i18n.t)("table.proposals")} | ${(0, import_i18n.t)("table.codeFiles")} | ${(0, import_i18n.t)("table.additions")} | ${(0, import_i18n.t)("table.deletions")} | ${(0, import_i18n.t)("table.netChanges")} |
 `;
     md += "|--------|--------|---------|-----------|------------|-----------|-----------|-------------|\n";
-    const sortedAuthors = Array.from(result.authors.values()).sort(
-      (a, b) => b.commits - a.commits
-    );
+    const sortedAuthors = Array.from(result.authors.values()).sort((a, b) => b.commits - a.commits);
     for (const stats of sortedAuthors) {
       md += `| ${stats.author} | ${stats.statisticsPeriod || "-"} | ${stats.commits} | ${stats.openspecProposals.size} | ${stats.codeFilesChanged} | +${stats.additions} | -${stats.deletions} | ${stats.netChanges >= 0 ? "+" : ""}${stats.netChanges} |
 `;

package/dist/cjs/git-analyzer.js

@@ -44,13 +44,15 @@ var GitAnalyzer = class {
     const untilStr = until.toISOString();
     const logOptions = {
       "--since": sinceStr,
-      "--until": untilStr,
-      "--all": null
+      "--until": untilStr
     };
     if (branches.length > 0) {
+      delete logOptions["--all"];
       for (const branch of branches) {
-        logOptions[`--remotes=${branch}`] = null;
+        logOptions[branch] = null;
       }
+    } else {
+      logOptions["--all"] = null;
     }
     const log = await this.git.log(logOptions);
     const commits = [];
@@ -83,11 +85,7 @@ var GitAnalyzer = class {
   }
   async analyzeCommit(commit) {
     try {
-      const show = await this.git.show([
-        "--numstat",
-        "--format=",
-        commit.hash
-      ]);
+      const show = await this.git.show(["--numstat", "--format=", commit.hash]);
       const lines = show.split("\n").filter((line) => line.trim());
       const fileChanges = [];
       const openspecProposals = /* @__PURE__ */ new Set();
@@ -103,9 +101,7 @@ var GitAnalyzer = class {
         const additions = addStr === "-" ? 0 : parseInt(addStr, 10);
         const deletions = delStr === "-" ? 0 : parseInt(delStr, 10);
         if (path.startsWith(openspecDir)) {
-          const proposalMatch = path.match(
-            new RegExp(`^${openspecDir}changes/([^/]+)`)
-          );
+          const proposalMatch = path.match(new RegExp(`^${openspecDir}changes/([^/]+)`));
           if (proposalMatch) {
             openspecProposals.add(proposalMatch[1]);
           }
@@ -123,14 +119,8 @@ var GitAnalyzer = class {
         }
       }
       if (openspecProposals.size > 0 && hasCodeChanges) {
-        const totalAdditions = fileChanges.reduce(
-          (sum, f) => sum + f.additions,
-          0
-        );
-        const totalDeletions = fileChanges.reduce(
-          (sum, f) => sum + f.deletions,
-          0
-        );
+        const totalAdditions = fileChanges.reduce((sum, f) => sum + f.additions, 0);
+        const totalDeletions = fileChanges.reduce((sum, f) => sum + f.deletions, 0);
         return {
           commit,
           openspecProposals,
@@ -155,10 +145,7 @@ var GitAnalyzer = class {
     });
     const authors = /* @__PURE__ */ new Set();
     for (const commit of log.all) {
-      const normalizedAuthor = (0, import_config.normalizeAuthor)(
-        commit.author_name,
-        this.config.authorMapping
-      );
+      const normalizedAuthor = (0, import_config.normalizeAuthor)(commit.author_name, this.config.authorMapping);
       authors.add(normalizedAuthor);
     }
     return authors;

package/dist/cjs/i18n/index.js

@@ -33,7 +33,7 @@ var __filename = (0, import_url.fileURLToPath)(import_meta.url);
 var __dirname = (0, import_path.dirname)(__filename);
 var currentLanguage = "en";
 var translations = {
-  "en": {},
+  en: {},
   "zh-CN": {}
 };
 function loadTranslations() {

package/dist/cjs/i18n/locales/en.json

@@ -12,11 +12,11 @@
   "cli.option.config": "Configuration file path",
   "cli.option.verbose": "Verbose output mode",
   "cli.option.lang": "Language for output (en, zh-CN)",
-  
+
   "loading.config": "🔍 Loading configuration...",
   "loading.activeUsers": "🔍 Fetching active users...",
   "loading.analyzing": "🔍 Analyzing commit history...",
-  
+
   "info.timeRange": "📅 Time Range: {{since}} ~ {{until}}",
   "info.branches": "🌿 Branches: {{branches}}",
   "info.allBranches": "All branches",
@@ -24,13 +24,13 @@
   "info.foundCommits": "📝 Found {{count}} commits, analyzing...",
   "info.analysisProgress": "   Analysis progress: {{current}}/{{total}}",
   "info.qualifyingCommits": "✅ Found {{count}} qualifying commits (containing OpenSpec proposals and code changes)",
-  
+
   "warning.noCommits": "⚠️  No commits found matching the criteria",
   "warning.noQualifyingCommits": "⚠️  No commits found containing both OpenSpec proposals and code changes",
   "warning.noBranches": "⚠️  No remote branches found",
-  
+
   "error.prefix": "❌ Error:",
-  
+
   "branch.fetching": "\n🔍 Fetching active branches...",
   "branch.selectMode": "How would you like to select branches?",
   "branch.mode.select": "Select from active branches",
@@ -42,17 +42,23 @@
   "branch.customSeparator": "--- Custom input ---",
   "branch.selected": "\n✓ Selected branches:",
   "branch.lastCommit": "last commit: {{date}}",
-  
+
   "output.title": "\n📊 OpenSpec Statistics Report\n",
   "output.timeRange": "Time Range: {{since}} ~ {{until}}\n",
   "output.branches": "Branches: {{branches}}\n",
   "output.totalCommits": "Total Commits: {{count}}\n\n",
   "output.proposals": "  Proposals: {{proposals}}\n",
-  
+  "output.proposalSummary": "📋 Proposal Summary (by proposal)",
+  "output.proposalTotal": "  📊 Total: {{count}} proposals | {{commits}} commits | {{files}} files | +{{additions}}/-{{deletions}} lines (net: {{netChanges}})\n",
+  "output.proposalTotalLabel": "Proposal Summary Total",
+  "output.authorSummary": "👥 Author Summary (by contributor)",
+
   "table.branch": "Branch",
   "table.period": "Period",
   "table.commits": "Commits",
   "table.proposals": "Proposals",
+  "table.proposal": "Proposal",
+  "table.contributors": "Contributors",
   "table.codeFiles": "Code Files",
   "table.additions": "Additions",
   "table.deletions": "Deletions",
@@ -62,7 +68,7 @@
   "table.proposalsList": "Proposals List",
   "table.proposalsCount": "Proposals Count",
   "table.totalDeduplicated": "TOTAL (Deduplicated)",
-  
+
   "markdown.title": "# OpenSpec Statistics Report\n\n",
   "markdown.timeRange": "**Time Range**: {{since}} ~ {{until}}\n\n",
   "markdown.branches": "**Branches**: {{branches}}\n\n",

package/dist/cjs/i18n/locales/zh-CN.json

@@ -12,11 +12,11 @@
   "cli.option.config": "配置文件路径",
   "cli.option.verbose": "详细输出模式",
   "cli.option.lang": "输出语言（en, zh-CN）",
-  
+
   "loading.config": "🔍 正在加载配置...",
   "loading.activeUsers": "🔍 正在获取活跃用户...",
   "loading.analyzing": "🔍 正在分析提交历史...",
-  
+
   "info.timeRange": "📅 时间范围：{{since}} ~ {{until}}",
   "info.branches": "🌿 分支：{{branches}}",
   "info.allBranches": "所有分支",
@@ -24,13 +24,13 @@
   "info.foundCommits": "📝 找到 {{count}} 个提交，正在分析...",
   "info.analysisProgress": "   分析进度：{{current}}/{{total}}",
   "info.qualifyingCommits": "✅ 找到 {{count}} 个符合条件的提交（包含 OpenSpec 提案和代码变更）",
-  
+
   "warning.noCommits": "⚠️  未找到符合条件的提交",
   "warning.noQualifyingCommits": "⚠️  未找到同时包含 OpenSpec 提案和代码变更的提交",
   "warning.noBranches": "⚠️  未找到远程分支",
-  
+
   "error.prefix": "❌ 错误：",
-  
+
   "branch.fetching": "\n🔍 正在获取活跃分支...",
   "branch.selectMode": "您想如何选择分支？",
   "branch.mode.select": "从活跃分支中选择",
@@ -42,17 +42,23 @@
   "branch.customSeparator": "--- 自定义输入 ---",
   "branch.selected": "\n✓ 已选择的分支：",
   "branch.lastCommit": "最后提交：{{date}}",
-  
+
   "output.title": "\n📊 OpenSpec 统计报告\n",
   "output.timeRange": "时间范围：{{since}} ~ {{until}}\n",
   "output.branches": "分支：{{branches}}\n",
   "output.totalCommits": "总提交数：{{count}}\n\n",
   "output.proposals": "  提案：{{proposals}}\n",
-  
+  "output.proposalSummary": "📋 提案汇总（按提案统计）",
+  "output.proposalTotal": "  📊 总计：{{count}} 个提案 | {{commits}} 次提交 | {{files}} 个文件 | +{{additions}}/-{{deletions}} 行（净变更：{{netChanges}}）\n",
+  "output.proposalTotalLabel": "提案汇总总计",
+  "output.authorSummary": "👥 作者汇总（按贡献者统计）",
+
   "table.branch": "分支",
   "table.period": "周期",
   "table.commits": "提交数",
   "table.proposals": "提案数",
+  "table.proposal": "提案",
+  "table.contributors": "贡献者",
   "table.codeFiles": "代码文件",
   "table.additions": "新增行数",
   "table.deletions": "删除行数",
@@ -62,7 +68,7 @@
   "table.proposalsList": "提案列表",
   "table.proposalsCount": "提案数量",
   "table.totalDeduplicated": "总计（去重）",
-  
+
   "markdown.title": "# OpenSpec 统计报告\n\n",
   "markdown.timeRange": "**时间范围**：{{since}} ~ {{until}}\n\n",
   "markdown.branches": "**分支**：{{branches}}\n\n",

package/dist/cjs/stats-aggregator.js

@@ -30,11 +30,9 @@ var StatsAggregator = class {
   }
   aggregate(analyses, since, until, branches, filterAuthor) {
     const authorStatsMap = /* @__PURE__ */ new Map();
+    const proposalStatsMap = /* @__PURE__ */ new Map();
     for (const analysis of analyses) {
-      const normalizedAuthor = (0, import_config.normalizeAuthor)(
-        analysis.commit.author,
-        this.config.authorMapping
-      );
+      const normalizedAuthor = (0, import_config.normalizeAuthor)(analysis.commit.author, this.config.authorMapping);
       if (this.activeAuthors && !this.activeAuthors.has(normalizedAuthor)) {
         continue;
       }
@@ -62,6 +60,29 @@ var StatsAggregator = class {
       stats.codeFilesChanged += analysis.codeFiles.length;
       for (const proposal of analysis.openspecProposals) {
         stats.openspecProposals.add(proposal);
+        let proposalStats = proposalStatsMap.get(proposal);
+        if (!proposalStats) {
+          proposalStats = {
+            proposal,
+            commits: 0,
+            contributors: /* @__PURE__ */ new Set(),
+            codeFilesChanged: 0,
+            additions: 0,
+            deletions: 0,
+            netChanges: 0,
+            commitHashes: /* @__PURE__ */ new Set()
+          };
+          proposalStatsMap.set(proposal, proposalStats);
+        }
+        if (!proposalStats.commitHashes.has(analysis.commit.hash)) {
+          proposalStats.commitHashes.add(analysis.commit.hash);
+          proposalStats.commits++;
+          proposalStats.contributors.add(normalizedAuthor);
+          proposalStats.codeFilesChanged += analysis.codeFiles.length;
+          proposalStats.additions += analysis.totalAdditions;
+          proposalStats.deletions += analysis.totalDeletions;
+          proposalStats.netChanges += analysis.netChanges;
+        }
       }
       if (!stats.lastCommitDate || analysis.commit.date > stats.lastCommitDate) {
         stats.lastCommitDate = analysis.commit.date;
@@ -103,10 +124,19 @@ var StatsAggregator = class {
         stats.statisticsPeriod = days === 0 ? "1 day" : `${days + 1} days`;
       }
     }
+    const actualBranches = /* @__PURE__ */ new Set();
+    for (const stats of authorStatsMap.values()) {
+      if (stats.branchStats) {
+        for (const branch of stats.branchStats.keys()) {
+          actualBranches.add(branch);
+        }
+      }
+    }
     return {
       timeRange: { since, until },
-      branches,
+      branches: actualBranches.size > 0 ? Array.from(actualBranches) : branches,
       authors: authorStatsMap,
+      proposals: proposalStatsMap,
       totalCommits: analyses.length
     };
   }