@spaceflow/review-summary 0.20.0 → 0.22.0

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## [0.21.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review-summary@0.20.0...@spaceflow/review-summary@0.21.0) (2026-03-02)
+
+### 修复BUG
+
+* **core:** 重构配置 Schema 生成逻辑，使用 SpaceflowConfigSchema 作为基础 ([c73eb1c](https://github.com/Lydanne/spaceflow/commit/c73eb1ce5b6f212b8a932a15224db7e63822f8d0))
+
+### 测试用例
+
+* **review:** 增强 AI 评论识别和过滤功能的测试覆盖 ([bda706b](https://github.com/Lydanne/spaceflow/commit/bda706b99aab113521afe6bcd386a590811e20a6))
+
+### 其他修改
+
+* **core:** released version 0.19.0 [no ci] ([c8bfe6b](https://github.com/Lydanne/spaceflow/commit/c8bfe6ba20893e2c3cd383ed7e7d3217b0492eb6))
+* **publish:** released version 0.43.0 [no ci] ([1074b9c](https://github.com/Lydanne/spaceflow/commit/1074b9c5fb21a447093ef23300c451d790710b33))
+* **review:** released version 0.51.0 [no ci] ([c93be78](https://github.com/Lydanne/spaceflow/commit/c93be78f6f1df9cb5e3515cee58cda65cad1b00f))
+* **review:** released version 0.52.0 [no ci] ([c86406f](https://github.com/Lydanne/spaceflow/commit/c86406f6934d5de4f198eadff66ee6c3f7cfbe0d))
+* **review:** released version 0.53.0 [no ci] ([5a6af03](https://github.com/Lydanne/spaceflow/commit/5a6af03c260060ac1b1901bb7273f501ca0037c7))
+* **review:** 移除 .spaceflow 目录及其配置文件 ([64b310d](https://github.com/Lydanne/spaceflow/commit/64b310d8a77614a259a8d7588a09169626efb3ae))
+* **scripts:** released version 0.20.0 [no ci] ([e1fac49](https://github.com/Lydanne/spaceflow/commit/e1fac49257bf4a5902c5884ec0e054384a7859d6))
+* **shell:** released version 0.20.0 [no ci] ([8b69b53](https://github.com/Lydanne/spaceflow/commit/8b69b5340fe99973add2bea3e7d53f2082d0da54))
+
+## [0.20.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review-summary@0.19.0...@spaceflow/review-summary@0.20.0) (2026-02-27)
+
+### 新特性
+
+* **core:** 为 Gitea 和 GitHub 适配器完善已解决评论列表功能 ([7134c83](https://github.com/Lydanne/spaceflow/commit/7134c83b0b440bdfb688d93e86c9552302bf45b2))
+* **review:** 增强已解决问题同步功能，支持记录解决者 ([2c74996](https://github.com/Lydanne/spaceflow/commit/2c74996471e003f8666f8ccec715590f0f64c017))
+
+### 其他修改
+
+* **core:** released version 0.18.0 [no ci] ([7d931eb](https://github.com/Lydanne/spaceflow/commit/7d931eba98a172cf6ad365f09b780251ad35b212))
+* **publish:** released version 0.42.0 [no ci] ([61ac6b2](https://github.com/Lydanne/spaceflow/commit/61ac6b233564550d35e84759eff60a9e04181c46))
+* **review:** released version 0.50.0 [no ci] ([cff42fa](https://github.com/Lydanne/spaceflow/commit/cff42fafcc588d0c497d9e0e4750620262adcfec))
+* **scripts:** released version 0.19.0 [no ci] ([e198652](https://github.com/Lydanne/spaceflow/commit/e198652a1dcbd137dcd0fe4d7a2f404e12a991bc))
+* **shell:** released version 0.19.0 [no ci] ([2dc2597](https://github.com/Lydanne/spaceflow/commit/2dc25974cfeac9c80d03a601e722133bccb25086))
+
 ## [0.19.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review-summary@0.18.0...@spaceflow/review-summary@0.19.0) (2026-02-27)
 
 ### 修复BUG

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spaceflow/review-summary",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "description": "Spaceflow 审查统计命令，根据时间范围统计 PR 贡献情况，按人员汇总并排序",
   "license": "MIT",
   "author": "Lydanne",
@@ -14,12 +14,15 @@
   },
   "type": "module",
   "main": "./dist/index.js",
+  "dependencies": {
+    "@spaceflow/review": "0.57.0"
+  },
   "devDependencies": {
     "@types/node": "^22.15.0",
     "@spaceflow/cli": "0.38.0"
   },
   "peerDependencies": {
-    "@spaceflow/core": "0.18.0"
+    "@spaceflow/core": "0.20.0"
   },
   "spaceflow": {
     "type": "flow",

package/src/review-summary.service.ts

@@ -1,6 +1,7 @@
 import { GitProviderService, shouldLog, normalizeVerbose } from "@spaceflow/core";
 import type { IConfigReader } from "@spaceflow/core";
 import type { PullRequest, Issue, CiConfig } from "@spaceflow/core";
+import { MarkdownFormatter, type ReviewIssue } from "@spaceflow/review";
 import { writeFileSync } from "fs";
 import { join } from "path";
 import type {
@@ -11,24 +12,32 @@ import type {
   UserStats,
   OutputTarget,
   TimePreset,
+  WeightedScoreWeights,
+  CommitBasedWeights,
+  ReviewSummaryConfig,
+  ScoreStrategy,
 } from "./types";
 
-/** 分数权重配置 */
-const SCORE_WEIGHTS = {
-  /** 每个 PR 的基础分 */
+/** 加权模式默认权重 */
+const DEFAULT_WEIGHTED_WEIGHTS: Required<WeightedScoreWeights> = {
   prBase: 10,
-  /** 每 100 行新增代码的分数 */
   additionsPer100: 2,
-  /** 每 100 行删除代码的分数 */
   deletionsPer100: 1,
-  /** 每个变更文件的分数 */
   changedFile: 0.5,
-  /** 每个未修复问题的扣分 */
   issueDeduction: 3,
-  /** 每个已修复问题的加分 */
   fixedBonus: 1,
 };
 
+/** 分数累计模式默认权重 */
+const DEFAULT_COMMIT_BASED_WEIGHTS: Required<CommitBasedWeights> = {
+  validCommit: 5,
+  errorDeduction: 2,
+  warnDeduction: 1,
+  errorFixedBonus: 1,
+  warnFixedBonus: 0.5,
+  minCommitLines: 5,
+};
+
 /**
  * 周期统计服务
  */
@@ -140,7 +149,8 @@ export class PeriodSummaryService {
     } catch {
       // 如果获取文件失败，使用默认值
     }
-    const { issueCount, fixedCount } = await this.extractIssueStats(owner, repo, pr.number!);
+    const issueStats = await this.extractIssueStats(owner, repo, pr.number!);
+    const validCommitCount = await this.countValidCommits(owner, repo, pr.number!);
     return {
       number: pr.number!,
       title: pr.title ?? "",
@@ -149,8 +159,8 @@ export class PeriodSummaryService {
       additions,
       deletions,
       changedFiles,
-      issueCount,
-      fixedCount,
+      ...issueStats,
+      validCommitCount,
       description: this.extractDescription(pr),
     };
   }
@@ -162,31 +172,125 @@ export class PeriodSummaryService {
     owner: string,
     repo: string,
     prNumber: number,
-  ): Promise<{ issueCount: number; fixedCount: number }> {
+  ): Promise<{
+    issueCount: number;
+    fixedCount: number;
+    errorCount: number;
+    warnCount: number;
+    fixedErrors: number;
+    fixedWarns: number;
+  }> {
+    const empty = { issueCount: 0, fixedCount: 0, errorCount: 0, warnCount: 0, fixedErrors: 0, fixedWarns: 0 };
     try {
       const comments = await this.gitProvider.listIssueComments(owner, repo, prNumber);
-      let issueCount = 0;
-      let fixedCount = 0;
+      // 优先从 review 模块嵌入的结构化数据中精确提取
+      const formatter = new MarkdownFormatter();
       for (const comment of comments) {
         const body = comment.body ?? "";
-        const issueMatch = body.match(/发现\s*(\d+)\s*个问题/);
-        if (issueMatch) {
-          issueCount = Math.max(issueCount, parseInt(issueMatch[1], 10));
-        }
-        const fixedMatch = body.match(/已修复[：:]\s*(\d+)/);
-        if (fixedMatch) {
-          fixedCount = Math.max(fixedCount, parseInt(fixedMatch[1], 10));
+        const parsed = formatter.parse(body);
+        if (parsed?.result?.issues) {
+          return this.computeIssueStatsFromReviewIssues(parsed.result.issues);
         }
-        const statsMatch = body.match(/🔴\s*(\d+).*🟡\s*(\d+)/);
-        if (statsMatch) {
-          const errorCount = parseInt(statsMatch[1], 10);
-          const warnCount = parseInt(statsMatch[2], 10);
-          issueCount = Math.max(issueCount, errorCount + warnCount);
+      }
+      // 回退：没有结构化数据时，从评论文本正则提取（兼容旧数据）
+      return this.extractIssueStatsFromText(comments);
+    } catch {
+      return empty;
+    }
+  }
+
+  /**
+   * 从 ReviewIssue 列表中精确计算各类问题统计
+   */
+  protected computeIssueStatsFromReviewIssues(issues: ReviewIssue[]): {
+    issueCount: number;
+    fixedCount: number;
+    errorCount: number;
+    warnCount: number;
+    fixedErrors: number;
+    fixedWarns: number;
+  } {
+    const errorCount = issues.filter((i) => i.severity === "error").length;
+    const warnCount = issues.filter((i) => i.severity === "warn").length;
+    const fixedErrors = issues.filter((i) => i.severity === "error" && i.fixed).length;
+    const fixedWarns = issues.filter((i) => i.severity === "warn" && i.fixed).length;
+    return {
+      issueCount: issues.length,
+      fixedCount: fixedErrors + fixedWarns,
+      errorCount,
+      warnCount,
+      fixedErrors,
+      fixedWarns,
+    };
+  }
+
+  /**
+   * 回退：从评论文本正则提取问题统计（兼容无结构化数据的旧评论）
+   */
+  protected extractIssueStatsFromText(
+    comments: { body?: string }[],
+  ): {
+    issueCount: number;
+    fixedCount: number;
+    errorCount: number;
+    warnCount: number;
+    fixedErrors: number;
+    fixedWarns: number;
+  } {
+    let issueCount = 0;
+    let fixedCount = 0;
+    let errorCount = 0;
+    let warnCount = 0;
+    for (const comment of comments) {
+      const body = comment.body ?? "";
+      const issueMatch = body.match(/发现\s*(\d+)\s*个问题/);
+      if (issueMatch) {
+        issueCount = Math.max(issueCount, parseInt(issueMatch[1], 10));
+      }
+      const fixedMatch = body.match(/已修复[：:]\s*(\d+)/);
+      if (fixedMatch) {
+        fixedCount = Math.max(fixedCount, parseInt(fixedMatch[1], 10));
+      }
+      const statsMatch = body.match(/🔴\s*(\d+).*🟡\s*(\d+)/);
+      if (statsMatch) {
+        errorCount = Math.max(errorCount, parseInt(statsMatch[1], 10));
+        warnCount = Math.max(warnCount, parseInt(statsMatch[2], 10));
+        issueCount = Math.max(issueCount, errorCount + warnCount);
+      }
+    }
+    // 文本模式无法区分修复类型，统一设为 0
+    return { issueCount, fixedCount, errorCount, warnCount, fixedErrors: 0, fixedWarns: 0 };
+  }
+
+  /**
+   * 统计 PR 中有效 commit 数量（逐 commit 获取行数判断）
+   */
+  protected async countValidCommits(owner: string, repo: string, prNumber: number): Promise<number> {
+    const config = this.getStrategyConfig();
+    const minLines = config.commitBasedWeights?.minCommitLines ?? DEFAULT_COMMIT_BASED_WEIGHTS.minCommitLines;
+    try {
+      const commits = await this.gitProvider.getPullRequestCommits(owner, repo, prNumber);
+      let validCount = 0;
+      for (const commit of commits) {
+        if (!commit.sha) continue;
+        // 跳过 merge commit（commit message 以 "Merge" 开头）
+        if (commit.commit?.message?.startsWith("Merge")) continue;
+        try {
+          const commitInfo = await this.gitProvider.getCommit(owner, repo, commit.sha);
+          const totalLines = (commitInfo.files ?? []).reduce(
+            (sum, file) => sum + (file.additions ?? 0) + (file.deletions ?? 0),
+            0,
+          );
+          if (totalLines >= minLines) {
+            validCount++;
+          }
+        } catch {
+          // 获取单个 commit 失败，跳过
         }
       }
-      return { issueCount, fixedCount };
+      return validCount;
     } catch {
-      return { issueCount: 0, fixedCount: 0 };
+      return 0;
     }
   }
 
@@ -216,6 +320,11 @@ export class PeriodSummaryService {
           totalChangedFiles: 0,
           totalIssues: 0,
           totalFixed: 0,
+          totalErrors: 0,
+          totalWarns: 0,
+          totalFixedErrors: 0,
+          totalFixedWarns: 0,
+          totalValidCommits: 0,
           score: 0,
           features: [],
           prs: [],
@@ -228,33 +337,82 @@ export class PeriodSummaryService {
       userStats.totalChangedFiles += pr.changedFiles;
       userStats.totalIssues += pr.issueCount;
       userStats.totalFixed += pr.fixedCount;
+      userStats.totalErrors += pr.errorCount;
+      userStats.totalWarns += pr.warnCount;
+      userStats.totalFixedErrors += pr.fixedErrors;
+      userStats.totalFixedWarns += pr.fixedWarns;
+      userStats.totalValidCommits += pr.validCommitCount;
       if (pr.description) {
         userStats.features.push(pr.description);
       }
       userStats.prs.push(pr);
     }
+    this.applyScoreStrategy(userMap);
+    return userMap;
+  }
+
+  /**
+   * 获取当前评分策略配置
+   */
+  protected getStrategyConfig(): ReviewSummaryConfig {
+    try {
+      return this.config.get<ReviewSummaryConfig>("review-summary") ?? {};
+    } catch {
+      return {};
+    }
+  }
+
+  /**
+   * 根据配置的策略计算所有用户的分数
+   */
+  protected applyScoreStrategy(userMap: Map<string, UserStats>): void {
+    const config = this.getStrategyConfig();
+    const strategy: ScoreStrategy = config.strategy ?? "weighted";
     for (const userStats of userMap.values()) {
-      userStats.score = this.calculateScore(userStats);
+      switch (strategy) {
+        case "commit-based":
+          userStats.score = this.calculateCommitBasedScore(userStats, config);
+          break;
+        case "weighted":
+        default:
+          userStats.score = this.calculateWeightedScore(userStats, config);
+          break;
+      }
     }
-    return userMap;
   }
 
   /**
-   * 计算用户综合分数
+   * 加权模式：计算用户综合分数
    */
-  protected calculateScore(stats: UserStats): number {
-    const prScore = stats.prCount * SCORE_WEIGHTS.prBase;
-    const additionsScore = (stats.totalAdditions / 100) * SCORE_WEIGHTS.additionsPer100;
-    const deletionsScore = (stats.totalDeletions / 100) * SCORE_WEIGHTS.deletionsPer100;
-    const filesScore = stats.totalChangedFiles * SCORE_WEIGHTS.changedFile;
+  protected calculateWeightedScore(stats: UserStats, config: ReviewSummaryConfig): number {
+    const weights = { ...DEFAULT_WEIGHTED_WEIGHTS, ...config.scoreWeights };
+    const prScore = stats.prCount * weights.prBase;
+    const additionsScore = (stats.totalAdditions / 100) * weights.additionsPer100;
+    const deletionsScore = (stats.totalDeletions / 100) * weights.deletionsPer100;
+    const filesScore = stats.totalChangedFiles * weights.changedFile;
     const unfixedIssues = stats.totalIssues - stats.totalFixed;
-    const issueDeduction = unfixedIssues * SCORE_WEIGHTS.issueDeduction;
-    const fixedBonus = stats.totalFixed * SCORE_WEIGHTS.fixedBonus;
+    const issueDeduction = unfixedIssues * weights.issueDeduction;
+    const fixedBonus = stats.totalFixed * weights.fixedBonus;
     const totalScore =
       prScore + additionsScore + deletionsScore + filesScore - issueDeduction + fixedBonus;
     return Math.max(0, Math.round(totalScore * 10) / 10);
   }
 
+  /**
+   * 分数累计模式：按有效 commit 加分，按 error/warn 扣分
+   */
+  protected calculateCommitBasedScore(stats: UserStats, config: ReviewSummaryConfig): number {
+    const weights = { ...DEFAULT_COMMIT_BASED_WEIGHTS, ...config.commitBasedWeights };
+    const commitScore = stats.totalValidCommits * weights.validCommit;
+    const errorDeduction = stats.totalErrors * weights.errorDeduction;
+    const warnDeduction = stats.totalWarns * weights.warnDeduction;
+    const fixedBonus =
+      stats.totalFixedErrors * weights.errorFixedBonus +
+      stats.totalFixedWarns * weights.warnFixedBonus;
+    const totalScore = commitScore - errorDeduction - warnDeduction + fixedBonus;
+    return Math.max(0, Math.round(totalScore * 10) / 10);
+  }
+
   /**
    * 按分数排序用户统计
    */
@@ -497,9 +655,12 @@ export class PeriodSummaryService {
     content: string,
   ): Promise<{ type: OutputTarget; location: string }> {
     const title = `📊 周期统计报告: ${result.period.since} ~ ${result.period.until}`;
+    const config = this.getStrategyConfig();
+    const labelName = config.issueLabel ?? "report";
     const issue: Issue = await this.gitProvider.createIssue(context.owner, context.repo, {
       title,
       body: content,
+      labels: [labelName],
     });
     const location = issue.html_url ?? `#${issue.number}`;
     if (shouldLog(context.verbose, 1)) {

package/src/types.ts

@@ -71,6 +71,16 @@ export interface PrStats {
   issueCount: number;
   /** 已修复的问题数 */
   fixedCount: number;
+  /** error 级别问题数 */
+  errorCount: number;
+  /** warn 级别问题数 */
+  warnCount: number;
+  /** 已修复的 error 问题数 */
+  fixedErrors: number;
+  /** 已修复的 warn 问题数 */
+  fixedWarns: number;
+  /** 有效 commit 数（单个 commit 新增+删除 >= minCommitLines 行） */
+  validCommitCount: number;
   /** PR 描述/功能摘要 */
   description: string;
 }
@@ -91,6 +101,16 @@ export interface UserStats {
   totalIssues: number;
   /** 总已修复问题数 */
   totalFixed: number;
+  /** 总 error 级别问题数 */
+  totalErrors: number;
+  /** 总 warn 级别问题数 */
+  totalWarns: number;
+  /** 总已修复 error 数 */
+  totalFixedErrors: number;
+  /** 总已修复 warn 数 */
+  totalFixedWarns: number;
+  /** 总有效 commit 数 */
+  totalValidCommits: number;
   /** 综合分数 */
   score: number;
   /** 功能摘要列表 */
@@ -99,6 +119,56 @@ export interface UserStats {
   prs: PrStats[];
 }
 
+/** 评分策略类型 */
+export type ScoreStrategy = "weighted" | "commit-based";
+
+/** 加权模式权重配置 */
+export interface WeightedScoreWeights {
+  /** 每个 PR 的基础分，默认 10 */
+  prBase?: number;
+  /** 每 100 行新增代码的分数，默认 2 */
+  additionsPer100?: number;
+  /** 每 100 行删除代码的分数，默认 1 */
+  deletionsPer100?: number;
+  /** 每个变更文件的分数，默认 0.5 */
+  changedFile?: number;
+  /** 每个未修复问题的扣分，默认 3 */
+  issueDeduction?: number;
+  /** 每个已修复问题的加分，默认 1 */
+  fixedBonus?: number;
+}
+
+/** 分数累计模式权重配置 */
+export interface CommitBasedWeights {
+  /** 每个有效 commit 的加分，默认 5 */
+  validCommit?: number;
+  /** 每个 error 问题的扣分，默认 2 */
+  errorDeduction?: number;
+  /** 每个 warn 问题的扣分，默认 1 */
+  warnDeduction?: number;
+  /** 修复一个 error 问题的加分，默认为 errorDeduction 的一半（1） */
+  errorFixedBonus?: number;
+  /** 修复一个 warn 问题的加分，默认为 warnDeduction 的一半（0.5） */
+  warnFixedBonus?: number;
+  /** 有效 commit 的最低代码行数（新增+删除），默认 5 */
+  minCommitLines?: number;
+}
+
+/** @deprecated 使用 WeightedScoreWeights 代替 */
+export type ScoreWeights = WeightedScoreWeights;
+
+/** review-summary 扩展配置 */
+export interface ReviewSummaryConfig {
+  /** 评分策略，默认 "weighted" */
+  strategy?: ScoreStrategy;
+  /** 加权模式权重配置（strategy 为 "weighted" 时生效） */
+  scoreWeights?: WeightedScoreWeights;
+  /** 分数累计模式权重配置（strategy 为 "commit-based" 时生效） */
+  commitBasedWeights?: CommitBasedWeights;
+  /** 创建 Issue 时添加的标签名称，默认 "report" */
+  issueLabel?: string;
+}
+
 /** 周期统计结果 */
 export interface PeriodSummaryResult {
   /** 统计周期 */