@spaceflow/review 0.82.0 → 0.83.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [0.82.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review@0.81.0...@spaceflow/review@0.82.0) (2026-04-09)
+
+### 代码重构
+
+* **review:** 优化 ChangedFileCollection 的防御性编程,确保数据不可变性和类型安全 ([4ce2dc8](https://github.com/Lydanne/spaceflow/commit/4ce2dc82e54df8684832bc210fe03b31a24961ea))
+* **review:** 优化变更文件失效逻辑,在代码已变更时保留已 resolved 问题的状态 ([0fd947b](https://github.com/Lydanne/spaceflow/commit/0fd947b0e774aac52149fadcdbbc70f4091402f2))
+* **review:** 优化统计表格格式,将有效问题细分状态合并为单行,并在修复率和解决率中显示分数详情 ([6b3fdac](https://github.com/Lydanne/spaceflow/commit/6b3fdacdae9d55557ca68b3cb2dd347ca8a0e848))
+* **review:** 在 commits 为空时退化为变更行模式,并调整日志文案统一使用"变更行过滤"术语 ([fca208b](https://github.com/Lydanne/spaceflow/commit/fca208bf87fb80167700b10fecfe2a436b4dedf5))
+* **review:** 将 getFileContents 方法从 ReviewIssueFilter 迁移至 ReviewSourceResolver,并在 resolve 阶段预加载文件内容 ([f861b17](https://github.com/Lydanne/spaceflow/commit/f861b17fb12a788f595229605eee1e5bfe735d27))
+* **review:** 将统计表格中的"修复"术语统一改为"验收",提升状态语义准确性 ([e9782ac](https://github.com/Lydanne/spaceflow/commit/e9782ac89ef6cdc6f60d9683cb3c1cff0078644a))
+* **review:** 提取 buildReviewResult 方法,将 LLM 审查和问题过滤逻辑从 execute 方法中分离 ([f981512](https://github.com/Lydanne/spaceflow/commit/f981512be9c3e8b0659eca201f67d673cd320745))
+* **review:** 提取 ReviewSourceResolver 类,将源数据解析和前置过滤逻辑从 ReviewService 中分离 ([d40f23f](https://github.com/Lydanne/spaceflow/commit/d40f23f9f9c039d07e49f0248c974877c3c3fa68))
+* **review:** 新增 ChangedFileCollection 类,封装变更文件集合并提供常用访问器,统一文件操作接口 ([22020f4](https://github.com/Lydanne/spaceflow/commit/22020f4c1c21ddd3adc422990e9ac3bc846ba593))
+* **review:** 新增 git blame 支持,在分支比较模式下按实际 commit hash 过滤问题,并在 commits 为空时退化为变更行模式 ([ef5ba45](https://github.com/Lydanne/spaceflow/commit/ef5ba45c741ee94aa20ca18adb2836eba6692abe))
+* **review:** 移除行号自动更新机制,改为在验证提示中提供原始代码片段辅助定位,并将去重逻辑从 ReviewService 上移至 ReviewResultModel.nextRound ([174b924](https://github.com/Lydanne/spaceflow/commit/174b924931c0f09e3714462a466f8844097a2af6))
+* **review:** 简化规则过滤逻辑,移除冗余的 applicableSpecs 变量,统一使用 specs 表示已过滤的适用规则 ([571ad26](https://github.com/Lydanne/spaceflow/commit/571ad2656e743a091017384f31533ac67b3499d3))
+
+### 文档更新
+
+* **review:** 移除 buildLineCommitMap 方法及相关文档和注释 ([92e78d2](https://github.com/Lydanne/spaceflow/commit/92e78d2905f206bbb04e6a4873cd6a25c79b3882))
+
+### 测试用例
+
+* **review:** 新增 ReviewContextBuilder 和 ReviewIssueFilter 单元测试,覆盖上下文构建、问题过滤和文件内容获取等核心功能 ([432cc60](https://github.com/Lydanne/spaceflow/commit/432cc60c95a44bc6060a09be3a47f2c23aa8cd9d))
+
+### 其他修改
+
+* **core:** released version 0.31.0 [no ci] ([aed2199](https://github.com/Lydanne/spaceflow/commit/aed2199c5df44a0dca6f2e992c39b040571aaf49))
+* **publish:** released version 0.56.0 [no ci] ([91a3da8](https://github.com/Lydanne/spaceflow/commit/91a3da86f91e1085c1b2d9affd72ace03ebd8e93))
+* **review-summary:** released version 0.50.0 [no ci] ([1e1fc71](https://github.com/Lydanne/spaceflow/commit/1e1fc71842b06732e5132c26ec91e2f4fde32542))
+* **scripts:** released version 0.33.0 [no ci] ([515099f](https://github.com/Lydanne/spaceflow/commit/515099f1dd6eda61cea9494750e5a73db4f6696a))
+* **shell:** released version 0.33.0 [no ci] ([c9f6615](https://github.com/Lydanne/spaceflow/commit/c9f66152b33ab14343c9060b6d8bb30552262a61))
+
 ## [0.81.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review@0.80.0...@spaceflow/review@0.81.0) (2026-04-09)
 
 ### 新特性

package/dist/index.js

@@ -5293,7 +5293,7 @@ class ReviewLlmProcessor {
         ({ commits, changedFiles } = await this.applyPreFilters(context, commits, changedFiles, isDirectFileMode));
         const headSha = prModel ? await prModel.getHeadSha() : context.headRef || "HEAD";
         const collectedFiles = ChangedFileCollection.from(changedFiles);
-        const fileContents = await this.getFileContents(context.owner, context.repo, collectedFiles.toArray(), commits, headSha, context.prNumber, isLocalMode, context.verbose);
+        const fileContents = await this.getFileContents(context.owner, context.repo, collectedFiles.toArray(), commits, headSha, context.prNumber, isLocalMode, context.showAll, context.verbose);
         return {
             prModel,
             commits,
@@ -5435,18 +5435,20 @@ class ReviewLlmProcessor {
    *   2. --commits — 仅保留用户指定的 commit 及其涉及的文件
    *   3. --includes — glob 模式过滤文件和 commits（支持 status| 前缀语法）
    */ async applyPreFilters(context, commits, rawChangedFiles, isDirectFileMode) {
-        const { owner, repo, prNumber, verbose, includes, files, commits: filterCommits } = context;
+        const { owner, repo, prNumber, verbose, includes, files, commits: filterCommits, showAll } = context;
         let changedFiles = ChangedFileCollection.from(rawChangedFiles);
-        // 0. 过滤掉 merge commit
-        {
+        // 0. 过滤掉 merge commit（showAll=false 时启用）
+        if (!showAll) {
             const before = commits.length;
             commits = commits.filter((c)=>{
                 const message = c.commit?.message || "";
-                return !message.startsWith("Merge ");
+                return !/^merge\b/i.test(message);
             });
             if (before !== commits.length && shouldLog(verbose, 1)) {
                 console.log(`   跳过 Merge Commits: ${before} -> ${commits.length} 个`);
             }
+        } else if (shouldLog(verbose, 2)) {
+            console.log(`   showAll=true，跳过 Merge Commit 过滤`);
         }
         // 1. 按指定的 files 过滤
         if (files && files.length > 0) {
@@ -5520,9 +5522,11 @@ class ReviewLlmProcessor {
     /**
    * 获取文件内容并构建行号到 commit hash 的映射
    * 返回 Map<filename, Array<[commitHash, lineCode]>>
-   */ async getFileContents(owner, repo, changedFiles, commits, ref, prNumber, isLocalMode, verbose) {
+   */ async getFileContents(owner, repo, changedFiles, commits, ref, prNumber, isLocalMode, showAll, verbose) {
         const contents = new Map();
         const latestCommitHash = commits[commits.length - 1]?.sha?.slice(0, 7) || "+local+";
+        const validCommitHashes = new Set(commits.map((c)=>c.sha?.slice(0, 7)).filter(Boolean));
+        const shouldMaskUnknownChangedLines = !showAll && validCommitHashes.size > 0;
         if (shouldLog(verbose, 1)) {
             console.log(`📊 正在构建行号到变更的映射...`);
         }
@@ -5577,6 +5581,12 @@ class ReviewLlmProcessor {
                             ];
                         }
                         const hash = blameMap?.get(lineNum) ?? latestCommitHash;
+                        if (shouldMaskUnknownChangedLines && !validCommitHashes.has(hash)) {
+                            return [
+                                "-------",
+                                line
+                            ];
+                        }
                         return [
                             hash,
                             line
@@ -6014,7 +6024,11 @@ class ReviewService {
             console.log(`📋 找到 ${resultModel.issues.length} 个历史问题`);
         }
         // 2. 获取 commits 并填充 author 信息
-        const commits = await prModel.getCommits();
+        const allCommits = await prModel.getCommits();
+        const commits = context.showAll ? allCommits : allCommits.filter((c)=>!/^merge\b/i.test(c.commit?.message || ""));
+        if (allCommits.length !== commits.length && shouldLog(verbose, 1)) {
+            console.log(`   跳过 Merge Commits: ${allCommits.length} -> ${commits.length} 个`);
+        }
         resultModel.issues = await this.contextBuilder.fillIssueAuthors(resultModel.issues, commits, owner, repo, verbose);
         // 3. 同步已解决的评论状态
         await resultModel.syncResolved();
@@ -6026,7 +6040,7 @@ class ReviewService {
                 const changedFiles = await prModel.getFiles();
                 const headSha = await prModel.getHeadSha();
                 const verifySpecs = await this.issueFilter.loadSpecs(context.specSources, verbose);
-                const verifyFileContents = await this.sourceResolver.getFileContents(owner, repo, changedFiles, commits, headSha, prNumber, false, verbose);
+                const verifyFileContents = await this.sourceResolver.getFileContents(owner, repo, changedFiles, commits, headSha, prNumber, false, context.showAll, verbose);
                 resultModel.issues = await this.issueFilter.verifyAndUpdateIssues(context, resultModel.issues, commits, {
                     specs: verifySpecs,
                     fileContents: verifyFileContents

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spaceflow/review",
-  "version": "0.82.0",
+  "version": "0.83.0",
   "description": "Spaceflow 代码审查插件，使用 LLM 对 PR 代码进行自动审查",
   "license": "MIT",
   "author": "Lydanne",

package/src/review-issue-filter.spec.ts

@@ -86,6 +86,7 @@ describe("ReviewIssueFilter", () => {
       getCommitsBetweenRefs: vi.fn().mockResolvedValue([]),
       getDiffBetweenRefs: vi.fn().mockResolvedValue([]),
       getFileContent: vi.fn().mockResolvedValue(""),
+      getFileBlame: vi.fn().mockResolvedValue(new Map()),
       getFilesForCommit: vi.fn().mockResolvedValue([]),
       getWorkingFileContent: vi.fn().mockReturnValue(""),
       getCommitDiff: vi.fn().mockReturnValue([]),
@@ -264,6 +265,7 @@ describe("ReviewIssueFilter", () => {
         "abc",
         1,
         false,
+        undefined,
         3,
       );
       expect(result.has("test.ts")).toBe(true);
@@ -279,6 +281,56 @@ describe("ReviewIssueFilter", () => {
       expect(lines![0][0]).toBe("abc1234");
       expect(lines![1][0]).toBe("abc1234");
     });
+
+    it("should mask merge commit line hash when showAll is false", async () => {
+      gitProvider.getFileContent.mockResolvedValue("line1\nnew line");
+      mockGitSdkService.getFileBlame.mockResolvedValue(new Map([[2, "merge12"]]));
+      const changedFiles = [
+        { filename: "test.ts", status: "modified", patch: "@@ -1,1 +1,2 @@\n line1\n+new line" },
+      ];
+      const commits = [{ sha: "abc1234567890", commit: { message: "feat: add line" } }];
+
+      const result = await resolver.getFileContents(
+        "o",
+        "r",
+        changedFiles,
+        commits,
+        "abc",
+        1,
+        false,
+        false,
+        undefined,
+      );
+
+      const lines = result.get("test.ts");
+      expect(lines).toBeDefined();
+      expect(lines![1][0]).toBe("-------");
+    });
+
+    it("should keep merge commit line hash when showAll is true", async () => {
+      gitProvider.getFileContent.mockResolvedValue("line1\nnew line");
+      mockGitSdkService.getFileBlame.mockResolvedValue(new Map([[2, "merge12"]]));
+      const changedFiles = [
+        { filename: "test.ts", status: "modified", patch: "@@ -1,1 +1,2 @@\n line1\n+new line" },
+      ];
+      const commits = [{ sha: "abc1234567890", commit: { message: "feat: add line" } }];
+
+      const result = await resolver.getFileContents(
+        "o",
+        "r",
+        changedFiles,
+        commits,
+        "abc",
+        1,
+        false,
+        true,
+        undefined,
+      );
+
+      const lines = result.get("test.ts");
+      expect(lines).toBeDefined();
+      expect(lines![1][0]).toBe("merge12");
+    });
   });
 
   describe("getChangedFilesBetweenRefs", () => {

package/src/review-source-resolver.ts

@@ -150,6 +150,7 @@ export class ReviewSourceResolver {
       headSha,
       context.prNumber,
       isLocalMode,
+      context.showAll,
       context.verbose,
     );
     return {
@@ -313,19 +314,30 @@ export class ReviewSourceResolver {
     rawChangedFiles: ChangedFile[],
     isDirectFileMode: boolean,
   ): Promise<CommitsAndFiles> {
-    const { owner, repo, prNumber, verbose, includes, files, commits: filterCommits } = context;
+    const {
+      owner,
+      repo,
+      prNumber,
+      verbose,
+      includes,
+      files,
+      commits: filterCommits,
+      showAll,
+    } = context;
     let changedFiles = ChangedFileCollection.from(rawChangedFiles);
 
-    // 0. 过滤掉 merge commit
-    {
+    // 0. 过滤掉 merge commit（showAll=false 时启用）
+    if (!showAll) {
       const before = commits.length;
       commits = commits.filter((c) => {
         const message = c.commit?.message || "";
-        return !message.startsWith("Merge ");
+        return !/^merge\b/i.test(message);
       });
       if (before !== commits.length && shouldLog(verbose, 1)) {
         console.log(`   跳过 Merge Commits: ${before} -> ${commits.length} 个`);
       }
+    } else if (shouldLog(verbose, 2)) {
+      console.log(`   showAll=true，跳过 Merge Commit 过滤`);
     }
 
     // 1. 按指定的 files 过滤
@@ -426,10 +438,13 @@ export class ReviewSourceResolver {
     ref: string,
     prNumber?: number,
     isLocalMode?: boolean,
+    showAll?: boolean,
     verbose?: VerboseLevel,
   ): Promise<FileContentsMap> {
     const contents: FileContentsMap = new Map();
     const latestCommitHash = commits[commits.length - 1]?.sha?.slice(0, 7) || "+local+";
+    const validCommitHashes = new Set(commits.map((c) => c.sha?.slice(0, 7)).filter(Boolean));
+    const shouldMaskUnknownChangedLines = !showAll && validCommitHashes.size > 0;
 
     if (shouldLog(verbose, 1)) {
       console.log(`📊 正在构建行号到变更的映射...`);
@@ -503,6 +518,9 @@ export class ReviewSourceResolver {
               return ["-------", line];
             }
             const hash = blameMap?.get(lineNum) ?? latestCommitHash;
+            if (shouldMaskUnknownChangedLines && !validCommitHashes.has(hash)) {
+              return ["-------", line];
+            }
             return [hash, line];
           });
           contents.set(file.filename, contentLines);

package/src/review.service.spec.ts

@@ -650,6 +650,50 @@ describe("ReviewService", () => {
       expect(result.issues).toHaveLength(1);
       expect(result.stats).toBeDefined();
     });
+
+    it("should filter merge commits before getFileContents when verifyFixes enabled", async () => {
+      const existingResult = { issues: [{ file: "a.ts", line: "1", ruleId: "R1" }], summary: [] };
+      service._reviewReportService.formatStatsTerminal = vi.fn().mockReturnValue("stats") as any;
+      gitProvider.listPullReviews.mockResolvedValue([] as any);
+      gitProvider.listPullReviewComments.mockResolvedValue([] as any);
+      gitProvider.getPullRequest.mockResolvedValue({ head: { sha: "head1234" } } as any);
+      gitProvider.getPullRequestFiles.mockResolvedValue([
+        { filename: "a.ts", status: "modified" },
+      ] as any);
+      gitProvider.getPullRequestCommits.mockResolvedValue([
+        { sha: "merge1111", commit: { message: "Merge branch 'main' into feature" } },
+        { sha: "feat22222", commit: { message: "feat: add logic" } },
+      ] as any);
+
+      vi.spyOn(ReviewResultModel, "loadFromPr").mockResolvedValue(
+        ReviewResultModel.create(
+          new PullRequestModel(gitProvider as any, "o", "r", 1),
+          existingResult as any,
+          service._resultModelDeps,
+        ),
+      );
+      const getFileContentsSpy = vi
+        .spyOn(service._sourceResolver, "getFileContents")
+        .mockResolvedValue(new Map() as any);
+
+      const context = {
+        owner: "o",
+        repo: "r",
+        prNumber: 1,
+        ci: false,
+        dryRun: false,
+        verifyFixes: true,
+        specSources: ["/spec/dir"],
+        showAll: false,
+      };
+
+      await service.executeCollectOnly(context);
+
+      expect(getFileContentsSpy).toHaveBeenCalled();
+      const passedCommits = getFileContentsSpy.mock.calls[0][3] as any[];
+      expect(passedCommits).toHaveLength(1);
+      expect(passedCommits[0].sha).toBe("feat22222");
+    });
   });
 
   describe("ReviewService.execute - flush mode", () => {

package/src/review.service.ts

@@ -496,7 +496,13 @@ export class ReviewService {
     }
 
     // 2. 获取 commits 并填充 author 信息
-    const commits = await prModel.getCommits();
+    const allCommits = await prModel.getCommits();
+    const commits = context.showAll
+      ? allCommits
+      : allCommits.filter((c) => !/^merge\b/i.test(c.commit?.message || ""));
+    if (allCommits.length !== commits.length && shouldLog(verbose, 1)) {
+      console.log(`   跳过 Merge Commits: ${allCommits.length} -> ${commits.length} 个`);
+    }
     resultModel.issues = await this.contextBuilder.fillIssueAuthors(
       resultModel.issues,
       commits,
@@ -525,6 +531,7 @@ export class ReviewService {
           headSha,
           prNumber,
           false,
+          context.showAll,
           verbose,
         );
         resultModel.issues = await this.issueFilter.verifyAndUpdateIssues(