openspec-stat 1.1.0 → 1.2.0

package/README.md

@@ -11,6 +11,7 @@ A CLI tool for tracking team members' OpenSpec proposals and code changes in Git
 
 - ✅ 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)
@@ -163,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)
@@ -173,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/formatters.js

@@ -47,6 +47,59 @@ 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) }));
+    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(`
@@ -131,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 {
@@ -151,6 +224,42 @@ ${stats.author}
   formatCSV(result) {
     var _a;
     const rows = [];
+    rows.push(`
+# ${(0, import_i18n.t)("output.proposalSummary")}`);
+    rows.push(
+      `${(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 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")}`
     );
@@ -183,7 +292,44 @@ ${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";

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

@@ -48,11 +48,17 @@
   "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",

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

@@ -48,11 +48,17 @@
   "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": "删除行数",

package/dist/cjs/stats-aggregator.js

@@ -30,6 +30,7 @@ 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);
       if (this.activeAuthors && !this.activeAuthors.has(normalizedAuthor)) {
@@ -59,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;
@@ -112,6 +136,7 @@ var StatsAggregator = class {
       timeRange: { since, until },
       branches: actualBranches.size > 0 ? Array.from(actualBranches) : branches,
       authors: authorStatsMap,
+      proposals: proposalStatsMap,
       totalCommits: analyses.length
     };
   }

package/dist/cjs/types.d.ts

@@ -66,6 +66,16 @@ export interface BranchStats {
     deletions: number;
     netChanges: number;
 }
+export interface ProposalStats {
+    proposal: string;
+    commits: number;
+    contributors: Set<string>;
+    codeFilesChanged: number;
+    additions: number;
+    deletions: number;
+    netChanges: number;
+    commitHashes: Set<string>;
+}
 export interface StatsResult {
     timeRange: {
         since: Date;
@@ -73,5 +83,6 @@ export interface StatsResult {
     };
     branches: string[];
     authors: Map<string, AuthorStats>;
+    proposals: Map<string, ProposalStats>;
     totalCommits: number;
 }

package/dist/esm/formatters.js

@@ -34,14 +34,70 @@ export var OutputFormatter = /*#__PURE__*/function () {
       output += chalk.gray(t('output.totalCommits', {
         count: String(result.totalCommits)
       }));
+
+      // Proposal Summary Table
+      if (result.proposals.size > 0) {
+        output += chalk.bold.magenta("\n".concat(t('output.proposalSummary'), "\n"));
+        var proposalTable = new Table({
+          head: [chalk.magenta(t('table.proposal')), chalk.magenta(t('table.commits')), chalk.magenta(t('table.contributors')), chalk.magenta(t('table.codeFiles')), chalk.magenta(t('table.additions')), chalk.magenta(t('table.deletions')), chalk.magenta(t('table.netChanges'))],
+          style: {
+            head: [],
+            border: []
+          }
+        });
+        var sortedProposals = Array.from(result.proposals.values()).sort(function (a, b) {
+          return b.netChanges - a.netChanges;
+        });
+        var _iterator = _createForOfIteratorHelper(sortedProposals),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var proposalStats = _step.value;
+            var contributors = Array.from(proposalStats.contributors).join(', ');
+            proposalTable.push([proposalStats.proposal, proposalStats.commits.toString(), contributors, proposalStats.codeFilesChanged.toString(), chalk.green("+".concat(proposalStats.additions)), chalk.red("-".concat(proposalStats.deletions)), proposalStats.netChanges >= 0 ? chalk.green("+".concat(proposalStats.netChanges)) : chalk.red("".concat(proposalStats.netChanges))]);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+        output += proposalTable.toString() + '\n';
+
+        // Proposal summary totals
+        var totalProposals = result.proposals.size;
+        var totalProposalCommits = Array.from(result.proposals.values()).reduce(function (sum, p) {
+          return sum + p.commits;
+        }, 0);
+        var totalProposalFiles = Array.from(result.proposals.values()).reduce(function (sum, p) {
+          return sum + p.codeFilesChanged;
+        }, 0);
+        var totalProposalAdditions = Array.from(result.proposals.values()).reduce(function (sum, p) {
+          return sum + p.additions;
+        }, 0);
+        var totalProposalDeletions = Array.from(result.proposals.values()).reduce(function (sum, p) {
+          return sum + p.deletions;
+        }, 0);
+        var totalProposalNetChanges = Array.from(result.proposals.values()).reduce(function (sum, p) {
+          return sum + p.netChanges;
+        }, 0);
+        output += chalk.gray(t('output.proposalTotal', {
+          count: totalProposals.toString(),
+          commits: totalProposalCommits.toString(),
+          files: totalProposalFiles.toString(),
+          additions: totalProposalAdditions.toString(),
+          deletions: totalProposalDeletions.toString(),
+          netChanges: totalProposalNetChanges.toString()
+        }));
+      }
+      output += chalk.bold.cyan("\n".concat(t('output.authorSummary'), "\n"));
       var sortedAuthors = Array.from(result.authors.values()).sort(function (a, b) {
         return b.commits - a.commits;
       });
-      var _iterator = _createForOfIteratorHelper(sortedAuthors),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(sortedAuthors),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var stats = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var stats = _step2.value;
           output += chalk.bold.cyan("\n".concat(stats.author, "\n"));
           if (stats.branchStats && stats.branchStats.size > 0) {
             var branchTable = new Table({
@@ -54,17 +110,17 @@ export var OutputFormatter = /*#__PURE__*/function () {
             var sortedBranches = Array.from(stats.branchStats.values()).sort(function (a, b) {
               return b.commits - a.commits;
             });
-            var _iterator2 = _createForOfIteratorHelper(sortedBranches),
-              _step2;
+            var _iterator3 = _createForOfIteratorHelper(sortedBranches),
+              _step3;
             try {
-              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                var branchStat = _step2.value;
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                var branchStat = _step3.value;
                 branchTable.push([branchStat.branch, branchStat.commits.toString(), branchStat.openspecProposals.size.toString(), branchStat.codeFilesChanged.toString(), chalk.green("+".concat(branchStat.additions)), chalk.red("-".concat(branchStat.deletions)), branchStat.netChanges >= 0 ? chalk.green("+".concat(branchStat.netChanges)) : chalk.red("".concat(branchStat.netChanges))]);
               }
             } catch (err) {
-              _iterator2.e(err);
+              _iterator3.e(err);
             } finally {
-              _iterator2.f();
+              _iterator3.f();
             }
             branchTable.push([chalk.bold.yellow(t('table.totalDeduplicated')), chalk.bold(stats.commits.toString()), chalk.bold(stats.openspecProposals.size.toString()), chalk.bold(stats.codeFilesChanged.toString()), chalk.bold.green("+".concat(stats.additions)), chalk.bold.red("-".concat(stats.deletions)), stats.netChanges >= 0 ? chalk.bold.green("+".concat(stats.netChanges)) : chalk.bold.red("".concat(stats.netChanges))]);
             output += branchTable.toString() + '\n';
@@ -86,9 +142,9 @@ export var OutputFormatter = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
       return output;
     }
@@ -102,6 +158,38 @@ export var OutputFormatter = /*#__PURE__*/function () {
         },
         branches: result.branches,
         totalCommits: result.totalCommits,
+        proposals: {
+          items: Array.from(result.proposals.values()).map(function (stats) {
+            return {
+              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(function (sum, p) {
+              return sum + p.commits;
+            }, 0),
+            totalCodeFiles: Array.from(result.proposals.values()).reduce(function (sum, p) {
+              return sum + p.codeFilesChanged;
+            }, 0),
+            totalAdditions: Array.from(result.proposals.values()).reduce(function (sum, p) {
+              return sum + p.additions;
+            }, 0),
+            totalDeletions: Array.from(result.proposals.values()).reduce(function (sum, p) {
+              return sum + p.deletions;
+            }, 0),
+            totalNetChanges: Array.from(result.proposals.values()).reduce(function (sum, p) {
+              return sum + p.netChanges;
+            }, 0)
+          }
+        },
         authors: Array.from(result.authors.values()).map(function (stats) {
           var _stats$lastCommitDate;
           return {
@@ -123,23 +211,72 @@ export var OutputFormatter = /*#__PURE__*/function () {
     key: "formatCSV",
     value: function formatCSV(result) {
       var rows = [];
+
+      // Proposal summary section
+      rows.push("\n# ".concat(t('output.proposalSummary')));
+      rows.push("".concat(t('table.proposal'), ",").concat(t('table.commits'), ",").concat(t('table.contributors'), ",").concat(t('table.codeFiles'), ",").concat(t('table.additions'), ",").concat(t('table.deletions'), ",").concat(t('table.netChanges')));
+      var sortedProposals = Array.from(result.proposals.values()).sort(function (a, b) {
+        return b.netChanges - a.netChanges;
+      });
+      var _iterator4 = _createForOfIteratorHelper(sortedProposals),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var stats = _step4.value;
+          var contributors = Array.from(stats.contributors).join(';');
+          rows.push([stats.proposal, stats.commits, "\"".concat(contributors, "\""), stats.codeFilesChanged, stats.additions, stats.deletions, stats.netChanges].join(','));
+        }
+
+        // Proposal totals
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+      var totalProposals = result.proposals.size;
+      var totalProposalCommits = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.commits;
+      }, 0);
+      var totalProposalFiles = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.codeFilesChanged;
+      }, 0);
+      var totalProposalAdditions = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.additions;
+      }, 0);
+      var totalProposalDeletions = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.deletions;
+      }, 0);
+      var totalProposalNetChanges = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.netChanges;
+      }, 0);
+      rows.push('');
+      rows.push("# ".concat(t('output.proposalTotalLabel')));
+      rows.push("".concat(t('table.proposals'), ",").concat(totalProposals));
+      rows.push("".concat(t('table.commits'), ",").concat(totalProposalCommits));
+      rows.push("".concat(t('table.codeFiles'), ",").concat(totalProposalFiles));
+      rows.push("".concat(t('table.additions'), ",").concat(totalProposalAdditions));
+      rows.push("".concat(t('table.deletions'), ",").concat(totalProposalDeletions));
+      rows.push("".concat(t('table.netChanges'), ",").concat(totalProposalNetChanges));
+
+      // Author summary section
+      rows.push("\n# ".concat(t('output.authorSummary')));
       rows.push("".concat(t('table.author'), ",").concat(t('table.period'), ",").concat(t('table.commits'), ",").concat(t('table.proposalsCount'), ",").concat(t('table.proposalsList'), ",").concat(t('table.codeFiles'), ",").concat(t('table.additions'), ",").concat(t('table.deletions'), ",").concat(t('table.netChanges'), ",").concat(t('table.lastCommitDate')));
       var sortedAuthors = Array.from(result.authors.values()).sort(function (a, b) {
         return b.commits - a.commits;
       });
-      var _iterator3 = _createForOfIteratorHelper(sortedAuthors),
-        _step3;
+      var _iterator5 = _createForOfIteratorHelper(sortedAuthors),
+        _step5;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
           var _stats$lastCommitDate2;
-          var stats = _step3.value;
-          var proposals = Array.from(stats.openspecProposals).join(';');
-          rows.push([stats.author, stats.statisticsPeriod || '-', stats.commits, stats.openspecProposals.size, "\"".concat(proposals, "\""), stats.codeFilesChanged, stats.additions, stats.deletions, stats.netChanges, ((_stats$lastCommitDate2 = stats.lastCommitDate) === null || _stats$lastCommitDate2 === void 0 ? void 0 : _stats$lastCommitDate2.toISOString()) || ''].join(','));
+          var _stats = _step5.value;
+          var proposals = Array.from(_stats.openspecProposals).join(';');
+          rows.push([_stats.author, _stats.statisticsPeriod || '-', _stats.commits, _stats.openspecProposals.size, "\"".concat(proposals, "\""), _stats.codeFilesChanged, _stats.additions, _stats.deletions, _stats.netChanges, ((_stats$lastCommitDate2 = _stats.lastCommitDate) === null || _stats$lastCommitDate2 === void 0 ? void 0 : _stats$lastCommitDate2.toISOString()) || ''].join(','));
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator3.f();
+        _iterator5.f();
       }
       return rows.join('\n');
     }
@@ -162,33 +299,81 @@ export var OutputFormatter = /*#__PURE__*/function () {
       md += t('markdown.totalCommits', {
         count: String(result.totalCommits)
       });
-      md += t('markdown.statistics');
+
+      // Proposal summary
+      md += "\n## ".concat(t('output.proposalSummary'), "\n\n");
+      md += "| ".concat(t('table.proposal'), " | ").concat(t('table.commits'), " | ").concat(t('table.contributors'), " | ").concat(t('table.codeFiles'), " | ").concat(t('table.additions'), " | ").concat(t('table.deletions'), " | ").concat(t('table.netChanges'), " |\n");
+      md += '|--------|---------|-------------|------------|-----------|-----------|-------------|\n';
+      var sortedProposals = Array.from(result.proposals.values()).sort(function (a, b) {
+        return b.netChanges - a.netChanges;
+      });
+      var _iterator6 = _createForOfIteratorHelper(sortedProposals),
+        _step6;
+      try {
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var stats = _step6.value;
+          var contributors = Array.from(stats.contributors).join(', ');
+          md += "| ".concat(stats.proposal, " | ").concat(stats.commits, " | ").concat(contributors, " | ").concat(stats.codeFilesChanged, " | +").concat(stats.additions, " | -").concat(stats.deletions, " | ").concat(stats.netChanges >= 0 ? '+' : '').concat(stats.netChanges, " |\n");
+        }
+
+        // Proposal totals
+      } catch (err) {
+        _iterator6.e(err);
+      } finally {
+        _iterator6.f();
+      }
+      var totalProposals = result.proposals.size;
+      var totalProposalCommits = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.commits;
+      }, 0);
+      var totalProposalFiles = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.codeFilesChanged;
+      }, 0);
+      var totalProposalAdditions = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.additions;
+      }, 0);
+      var totalProposalDeletions = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.deletions;
+      }, 0);
+      var totalProposalNetChanges = Array.from(result.proposals.values()).reduce(function (sum, p) {
+        return sum + p.netChanges;
+      }, 0);
+      md += "\n**".concat(t('output.proposalTotalLabel'), "**\n");
+      md += "- ".concat(t('table.proposals'), ": ").concat(totalProposals, "\n");
+      md += "- ".concat(t('table.commits'), ": ").concat(totalProposalCommits, "\n");
+      md += "- ".concat(t('table.codeFiles'), ": ").concat(totalProposalFiles, "\n");
+      md += "- ".concat(t('table.additions'), ": +").concat(totalProposalAdditions, "\n");
+      md += "- ".concat(t('table.deletions'), ": -").concat(totalProposalDeletions, "\n");
+      md += "- ".concat(t('table.netChanges'), ": ").concat(totalProposalNetChanges >= 0 ? '+' : '').concat(totalProposalNetChanges, "\n");
+
+      // Author summary
+      md += "\n## ".concat(t('output.authorSummary'), "\n\n");
       md += "| ".concat(t('table.author'), " | ").concat(t('table.period'), " | ").concat(t('table.commits'), " | ").concat(t('table.proposals'), " | ").concat(t('table.codeFiles'), " | ").concat(t('table.additions'), " | ").concat(t('table.deletions'), " | ").concat(t('table.netChanges'), " |\n");
       md += '|--------|--------|---------|-----------|------------|-----------|-----------|-------------|\n';
       var sortedAuthors = Array.from(result.authors.values()).sort(function (a, b) {
         return b.commits - a.commits;
       });
-      var _iterator4 = _createForOfIteratorHelper(sortedAuthors),
-        _step4;
+      var _iterator7 = _createForOfIteratorHelper(sortedAuthors),
+        _step7;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var stats = _step4.value;
-          md += "| ".concat(stats.author, " | ").concat(stats.statisticsPeriod || '-', " | ").concat(stats.commits, " | ").concat(stats.openspecProposals.size, " | ").concat(stats.codeFilesChanged, " | +").concat(stats.additions, " | -").concat(stats.deletions, " | ").concat(stats.netChanges >= 0 ? '+' : '').concat(stats.netChanges, " |\n");
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var _stats2 = _step7.value;
+          md += "| ".concat(_stats2.author, " | ").concat(_stats2.statisticsPeriod || '-', " | ").concat(_stats2.commits, " | ").concat(_stats2.openspecProposals.size, " | ").concat(_stats2.codeFilesChanged, " | +").concat(_stats2.additions, " | -").concat(_stats2.deletions, " | ").concat(_stats2.netChanges >= 0 ? '+' : '').concat(_stats2.netChanges, " |\n");
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator4.f();
+        _iterator7.f();
       }
       md += t('markdown.proposalDetails');
-      var _iterator5 = _createForOfIteratorHelper(sortedAuthors),
-        _step5;
+      var _iterator8 = _createForOfIteratorHelper(sortedAuthors),
+        _step8;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var _stats = _step5.value;
-          if (_stats.openspecProposals.size > 0) {
-            md += "### ".concat(_stats.author, "\n\n");
-            for (var _i = 0, _Array$from = Array.from(_stats.openspecProposals); _i < _Array$from.length; _i++) {
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var _stats3 = _step8.value;
+          if (_stats3.openspecProposals.size > 0) {
+            md += "### ".concat(_stats3.author, "\n\n");
+            for (var _i = 0, _Array$from = Array.from(_stats3.openspecProposals); _i < _Array$from.length; _i++) {
               var proposal = _Array$from[_i];
               md += "- ".concat(proposal, "\n");
             }
@@ -196,9 +381,9 @@ export var OutputFormatter = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator5.f();
+        _iterator8.f();
       }
       return md;
     }

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

@@ -48,11 +48,17 @@
   "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",

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

@@ -48,11 +48,17 @@
   "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": "删除行数",

package/dist/esm/stats-aggregator.js

@@ -21,6 +21,7 @@ export var StatsAggregator = /*#__PURE__*/function () {
     key: "aggregate",
     value: function aggregate(analyses, since, until, branches, filterAuthor) {
       var authorStatsMap = new Map();
+      var proposalStatsMap = new Map();
       var _iterator = _createForOfIteratorHelper(analyses),
         _step;
       try {
@@ -58,6 +59,33 @@ export var StatsAggregator = /*#__PURE__*/function () {
             for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
               var _proposal = _step4.value;
               stats.openspecProposals.add(_proposal);
+
+              // Aggregate by proposal
+              var proposalStats = proposalStatsMap.get(_proposal);
+              if (!proposalStats) {
+                proposalStats = {
+                  proposal: _proposal,
+                  commits: 0,
+                  contributors: new Set(),
+                  codeFilesChanged: 0,
+                  additions: 0,
+                  deletions: 0,
+                  netChanges: 0,
+                  commitHashes: new Set()
+                };
+                proposalStatsMap.set(_proposal, proposalStats);
+              }
+
+              // Only count each commit once per proposal
+              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;
+              }
             }
           } catch (err) {
             _iterator4.e(err);
@@ -167,6 +195,7 @@ export var StatsAggregator = /*#__PURE__*/function () {
         },
         branches: actualBranches.size > 0 ? Array.from(actualBranches) : branches,
         authors: authorStatsMap,
+        proposals: proposalStatsMap,
         totalCommits: analyses.length
       };
     }

package/dist/esm/types.d.ts

@@ -66,6 +66,16 @@ export interface BranchStats {
     deletions: number;
     netChanges: number;
 }
+export interface ProposalStats {
+    proposal: string;
+    commits: number;
+    contributors: Set<string>;
+    codeFilesChanged: number;
+    additions: number;
+    deletions: number;
+    netChanges: number;
+    commitHashes: Set<string>;
+}
 export interface StatsResult {
     timeRange: {
         since: Date;
@@ -73,5 +83,6 @@ export interface StatsResult {
     };
     branches: string[];
     authors: Map<string, AuthorStats>;
+    proposals: Map<string, ProposalStats>;
     totalCommits: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openspec-stat",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Track team members' OpenSpec proposals and code changes in Git repositories",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",