@spaceflow/review 0.80.0 → 0.82.0

package/src/review-llm.ts

@@ -1,6 +1,5 @@
 import {
   PullRequestCommit,
-  ChangedFile,
   type LLMMode,
   LlmProxyService,
   logStreamEvent,
@@ -23,6 +22,7 @@ import { dirname, extname } from "path";
 import micromatch from "micromatch";
 import type { FileReviewPrompt, ReviewPrompt, LLMReviewOptions } from "./types/review-llm";
 import { buildLinesWithNumbers, buildCommitsSection, extractCodeBlocks } from "./utils/review-llm";
+import { ChangedFileCollection } from "./changed-file-collection";
 import { extractCodeBlockTypes, extractGlobsFromIncludes } from "./review-includes-filter";
 import {
   REVIEW_SCHEMA,
@@ -89,7 +89,7 @@ export class ReviewLlmProcessor {
 
   async buildReviewPrompt(
     specs: ReviewSpec[],
-    changedFiles: ChangedFile[],
+    changedFiles: ChangedFileCollection,
     fileContents: FileContentsMap,
     commits: PullRequestCommit[],
     existingResult?: ReviewResult | null,
@@ -99,25 +99,23 @@ export class ReviewLlmProcessor {
   ): Promise<ReviewPrompt> {
     const round = (existingResult?.round ?? 0) + 1;
     const { staticIssues, skippedFiles } = applyStaticRules(
-      changedFiles,
+      changedFiles.toArray(),
       fileContents,
       systemRules,
       round,
       verbose,
     );
 
-    const fileDataList = changedFiles
-      .filter((f) => f.status !== "deleted" && f.filename)
-      .map((file) => {
-        const filename = file.filename!;
-        if (skippedFiles.has(filename)) return null;
-        const contentLines = fileContents.get(filename);
-        if (!contentLines) {
-          return { filename, file, contentLines: null, commitsSection: "- 无相关 commits" };
-        }
-        const commitsSection = buildCommitsSection(contentLines, commits);
-        return { filename, file, contentLines, commitsSection };
-      });
+    const fileDataList = changedFiles.nonDeletedFiles().map((file) => {
+      const filename = file.filename!;
+      if (skippedFiles.has(filename)) return null;
+      const contentLines = fileContents.get(filename);
+      if (!contentLines) {
+        return { filename, file, contentLines: null, commitsSection: "- 无相关 commits" };
+      }
+      const commitsSection = buildCommitsSection(contentLines, commits);
+      return { filename, file, contentLines, commitsSection };
+    });
 
     const filePrompts: (FileReviewPrompt | null)[] = await Promise.all(
       fileDataList
@@ -438,14 +436,14 @@ export class ReviewLlmProcessor {
    */
   async generatePrDescription(
     commits: PullRequestCommit[],
-    changedFiles: ChangedFile[],
+    changedFiles: ChangedFileCollection,
     llmMode: LLMMode,
     fileContents?: FileContentsMap,
     verbose?: VerboseLevel,
   ): Promise<{ title: string; description: string }> {
     const { userPrompt } = buildPrDescriptionPrompt({
       commits,
-      changedFiles,
+      changedFiles: changedFiles.toArray(),
       fileContents,
     });
 
@@ -479,9 +477,9 @@ export class ReviewLlmProcessor {
    */
   async generatePrTitle(
     commits: PullRequestCommit[],
-    changedFiles: ChangedFile[],
+    changedFiles: ChangedFileCollection,
   ): Promise<string> {
-    const { userPrompt } = buildPrTitlePrompt({ commits, changedFiles });
+    const { userPrompt } = buildPrTitlePrompt({ commits, changedFiles: changedFiles.toArray() });
 
     try {
       const stream = this.llmProxyService.chatStream([{ role: "user", content: userPrompt }], {
@@ -514,7 +512,7 @@ export class ReviewLlmProcessor {
    */
   async buildBasicDescription(
     commits: PullRequestCommit[],
-    changedFiles: ChangedFile[],
+    changedFiles: ChangedFileCollection,
   ): Promise<{ title: string; description: string }> {
     const parts: string[] = [];
     // 使用 LLM 生成标题
@@ -529,9 +527,7 @@ export class ReviewLlmProcessor {
       }
     }
     if (changedFiles.length > 0) {
-      const added = changedFiles.filter((f) => f.status === "added").length;
-      const modified = changedFiles.filter((f) => f.status === "modified").length;
-      const deleted = changedFiles.filter((f) => f.status === "deleted").length;
+      const { added, modified, deleted } = changedFiles.countByStatus();
       const stats: string[] = [];
       if (added > 0) stats.push(`新增 ${added}`);
       if (modified > 0) stats.push(`修改 ${modified}`);

package/src/review-report/formatters/markdown.formatter.ts

@@ -348,13 +348,12 @@ export class MarkdownFormatter implements ReviewReportFormatter, ReviewReportPar
   formatStats(stats: ReviewStats, prNumber?: number): string {
     const title = prNumber ? `PR #${prNumber} Review 状态统计` : "Review 状态统计";
     const lines = [`## 📊 ${title}\n`, `| 指标 | 数量 |`, `|------|------|`];
-    lines.push(`| 总问题数 | ${stats.total} |`);
-    lines.push(`| 🟢 已修复 | ${stats.fixed} |`);
-    lines.push(`| ⚪ 已解决 | ${stats.resolved} |`);
-    lines.push(`| ❌ 无效 | ${stats.invalid} |`);
-    lines.push(`| ⚠️ 待处理 | ${stats.pending} |`);
-    lines.push(`| 修复率 | ${stats.fixRate}% |`);
-    lines.push(`| 解决率 | ${stats.resolveRate}% |`);
+    lines.push(
+      `| 有效问题 | ${stats.validTotal} (🟢已验收 ${stats.fixed}, ⚪已解决 ${stats.resolved}, ⚠️待处理 ${stats.pending}) |`,
+    );
+    lines.push(`| ❌ 无效问题 | ${stats.invalid} |`);
+    lines.push(`| 验收率 | ${stats.fixRate}% (${stats.fixed}/${stats.validTotal}) |`);
+    lines.push(`| 解决率 | ${stats.resolveRate}% (${stats.resolved}/${stats.validTotal}) |`);
     return lines.join("\n");
   }
 }

package/src/review-result-model.spec.ts

@@ -391,7 +391,7 @@ describe("ReviewResultModel", () => {
       const consoleSpy = vi.spyOn(console, "log").mockImplementation(() => {});
       const issues = [{ file: "a.ts", line: "1" }] as any[];
       const model = ReviewResultModel.create(createPr(gitProvider), createResult({ issues }), deps);
-      await model.invalidateChangedFiles(undefined, 1);
+      await model.invalidateChangedFiles(undefined, undefined, 1);
       expect(issues[0].valid).toBeUndefined();
       expect(consoleSpy).toHaveBeenCalledWith("   ⚠️ 无法获取 PR head SHA，跳过变更文件检查");
       consoleSpy.mockRestore();
@@ -402,7 +402,7 @@ describe("ReviewResultModel", () => {
       gitProvider.getCommitDiff.mockResolvedValue("");
       const issues = [{ file: "a.ts", line: "1" }] as any[];
       const model = ReviewResultModel.create(createPr(gitProvider), createResult({ issues }), deps);
-      await model.invalidateChangedFiles("abc123", 1);
+      await model.invalidateChangedFiles("abc123", undefined, 1);
       expect(issues[0].valid).toBeUndefined();
       consoleSpy.mockRestore();
     });
@@ -417,7 +417,7 @@ describe("ReviewResultModel", () => {
         { file: "unchanged.ts", line: "2", ruleId: "R2" },
       ] as any[];
       const model = ReviewResultModel.create(createPr(gitProvider), createResult({ issues }), deps);
-      await model.invalidateChangedFiles("abc123", 1);
+      await model.invalidateChangedFiles("abc123", undefined, 1);
       expect(model.issues[0].valid).toBe("false");
       expect(model.issues[1].valid).toBeUndefined();
       consoleSpy.mockRestore();
@@ -445,10 +445,41 @@ describe("ReviewResultModel", () => {
       gitProvider.getCommitDiff.mockRejectedValue(new Error("diff fail"));
       const issues = [{ file: "a.ts", line: "1" }] as any[];
       const model = ReviewResultModel.create(createPr(gitProvider), createResult({ issues }), deps);
-      await model.invalidateChangedFiles("abc123", 1);
+      await model.invalidateChangedFiles("abc123", undefined, 1);
       expect(consoleSpy).toHaveBeenCalled();
       consoleSpy.mockRestore();
     });
+
+    it("should preserve resolved issue when current code differs from issue.code", async () => {
+      gitProvider.getCommitDiff.mockResolvedValue(
+        "diff --git a/changed.ts b/changed.ts\n--- a/changed.ts\n+++ b/changed.ts\n@@ -1,1 +1,2 @@\n line1\n+new",
+      );
+      const issues = [
+        { file: "changed.ts", line: "1", ruleId: "R1", resolved: "2024-01-01", code: "old code" },
+      ] as any[];
+      const model = ReviewResultModel.create(createPr(gitProvider), createResult({ issues }), deps);
+      const fileContents: Map<string, [string, string][]> = new Map([
+        ["changed.ts", [["abc1234", "new code"]]],
+      ]);
+      await model.invalidateChangedFiles("abc123", fileContents);
+      expect(model.issues[0].valid).toBeUndefined();
+      expect(model.issues[0].resolved).toBe("2024-01-01");
+    });
+
+    it("should invalidate resolved issue when current code matches issue.code", async () => {
+      gitProvider.getCommitDiff.mockResolvedValue(
+        "diff --git a/changed.ts b/changed.ts\n--- a/changed.ts\n+++ b/changed.ts\n@@ -1,1 +1,2 @@\n old code\n+new",
+      );
+      const issues = [
+        { file: "changed.ts", line: "1", ruleId: "R1", resolved: "2024-01-01", code: "old code" },
+      ] as any[];
+      const model = ReviewResultModel.create(createPr(gitProvider), createResult({ issues }), deps);
+      const fileContents: Map<string, [string, string][]> = new Map([
+        ["changed.ts", [["abc1234", "old code"]]],
+      ]);
+      await model.invalidateChangedFiles("abc123", fileContents);
+      expect(model.issues[0].valid).toBe("false");
+    });
   });
 
   // ─── deleteOldReviews ─────────────────────────────────

package/src/review-result-model.ts

@@ -9,7 +9,13 @@ import {
 import type { IConfigReader } from "@spaceflow/core";
 import { PullRequestModel } from "./pull-request-model";
 import { type ReviewConfig } from "./review.config";
-import { ReviewSpecService, ReviewIssue, ReviewResult, ReviewStats } from "./review-spec";
+import {
+  ReviewSpecService,
+  ReviewIssue,
+  ReviewResult,
+  ReviewStats,
+  FileContentsMap,
+} from "./review-spec";
 import { ReviewReportService, type ReportFormat } from "./review-report";
 import { extname } from "path";
 import {
@@ -143,11 +149,16 @@ export class ReviewResultModel {
    * - 合并历史 issues（this.issues）+ newIssues
    * - 复制 newResult 的元信息（title/description/deletionImpact 等）
    *
-   * 调用方应在调用前完成对历史 issues 的预处理（syncResolved、invalidateChangedFiles、verifyFixes、去重等）。
+   * 调用方应在调用前完成对历史 issues 的预处理（syncResolved、invalidateChangedFiles、verifyFixes 等）。
    */
   nextRound(newResult: ReviewResult): ReviewResultModel {
     const nextRoundNum = this._result.round + 1;
-    const taggedNewIssues = newResult.issues.map((issue) => ({ ...issue, round: nextRoundNum }));
+
+    // 去重：过滤掉已存在于历史 issues 中的新问题（含 valid:false 的都参与去重）
+    const existingKeys = new Set(this._result.issues.map((i) => generateIssueKey(i)));
+    const dedupedNewIssues = newResult.issues.filter((i) => !existingKeys.has(generateIssueKey(i)));
+
+    const taggedNewIssues = dedupedNewIssues.map((issue) => ({ ...issue, round: nextRoundNum }));
     const mergedResult: ReviewResult = {
       ...newResult,
       round: nextRoundNum,
@@ -415,9 +426,14 @@ export class ReviewResultModel {
 
   /**
    * 将有变更文件的历史 issue 标记为无效。
-   * 简化策略：如果文件在最新 commit 中有变更，则将该文件的所有历史问题标记为无效。
+   * 策略：如果文件在最新 commit 中有变更，则将该文件的历史问题标记为无效，但以下情况保留：
+   * - issue 已被用户手动 resolved 且当前代码行内容与 issue.code 不同（说明用户 resolve 后代码已变，应保留其 resolve 状态）
    */
-  async invalidateChangedFiles(headSha: string | undefined, verbose?: VerboseLevel): Promise<void> {
+  async invalidateChangedFiles(
+    headSha: string | undefined,
+    fileContents?: FileContentsMap,
+    verbose?: VerboseLevel,
+  ): Promise<void> {
     if (!headSha) {
       if (shouldLog(verbose, 1)) {
         console.log(`   ⚠️ 无法获取 PR head SHA，跳过变更文件检查`);
@@ -449,14 +465,43 @@ export class ReviewResultModel {
 
       // 将变更文件的历史 issue 标记为无效
       let invalidatedCount = 0;
+      let preservedCount = 0;
       this._result.issues = this._result.issues.map((issue) => {
-        // 如果 issue 已修复、已解决或已无效，不需要处理
-        if (issue.fixed || issue.resolved || issue.valid === "false") {
+        // 如果 issue 已修复或已无效，不需要处理
+        if (issue.fixed || issue.valid === "false") {
           return issue;
         }
 
-        // 如果 issue 所在文件有变更，标记为无效
+        // 如果 issue 所在文件有变更
         if (changedFileSet.has(issue.file)) {
+          // 已 resolved 的 issue：检查当前代码行是否与 issue.code 不同
+          // 不同说明用户 resolve 后代码确实变了，保留其 resolve 状态
+          if (issue.resolved && issue.code && fileContents) {
+            const contentLines = fileContents.get(issue.file);
+            if (contentLines) {
+              const lineNums = issue.line
+                .split("-")
+                .map(Number)
+                .filter((n) => !isNaN(n));
+              const startLine = lineNums[0];
+              const endLine = lineNums[lineNums.length - 1];
+              const currentCode = contentLines
+                .slice(startLine - 1, endLine)
+                .map(([, line]) => line)
+                .join("\n")
+                .trim();
+              if (currentCode !== issue.code) {
+                preservedCount++;
+                if (shouldLog(verbose, 1)) {
+                  console.log(
+                    `   ✅ Issue ${issue.file}:${issue.line} 已 resolved 且代码已变更，保留`,
+                  );
+                }
+                return issue;
+              }
+            }
+          }
+
           invalidatedCount++;
           if (shouldLog(verbose, 1)) {
             console.log(`   🗑️ Issue ${issue.file}:${issue.line} 所在文件有变更，标记为无效`);
@@ -467,8 +512,11 @@ export class ReviewResultModel {
         return issue;
       });
 
-      if (invalidatedCount > 0 && shouldLog(verbose, 1)) {
-        console.log(`   📊 共标记 ${invalidatedCount} 个历史问题为无效（文件有变更）`);
+      if ((invalidatedCount > 0 || preservedCount > 0) && shouldLog(verbose, 1)) {
+        const parts: string[] = [];
+        if (invalidatedCount > 0) parts.push(`标记 ${invalidatedCount} 个无效`);
+        if (preservedCount > 0) parts.push(`保留 ${preservedCount} 个已 resolved`);
+        console.log(`   📊 Issue 处理: ${parts.join("，")}`);
       }
     } catch (error) {
       if (shouldLog(verbose, 1)) {