@spaceflow/review 0.77.0 → 0.78.0

package/src/review.service.ts

@@ -23,6 +23,7 @@ import { filterFilesByIncludes, extractGlobsFromIncludes } from "./review-includ
 import { ReviewLlmProcessor } from "./review-llm";
 import { PullRequestModel } from "./pull-request-model";
 import { ReviewResultModel, type ReviewResultModelDeps } from "./review-result-model";
+import { REVIEW_COMMENT_MARKER, REVIEW_LINE_COMMENTS_MARKER } from "./utils/review-pr-comment";
 
 export type { ReviewContext } from "./review-context";
 export type { FileReviewPrompt, ReviewPrompt, LLMReviewOptions } from "./review-llm";
@@ -100,6 +101,14 @@ export class ReviewService {
     // 2. 规则匹配
     const specs = await this.issueFilter.loadSpecs(specSources, verbose);
     const applicableSpecs = this.reviewSpecService.filterApplicableSpecs(specs, changedFiles);
+    if (shouldLog(verbose, 2)) {
+      console.log(
+        `[execute] loadSpecs: loaded ${specs.length} specs from sources: ${JSON.stringify(specSources)}`,
+      );
+      console.log(
+        `[execute] filterApplicableSpecs: ${applicableSpecs.length} applicable out of ${specs.length}, changedFiles=${JSON.stringify(changedFiles.map((f) => f.filename))}`,
+      );
+    }
     if (shouldLog(verbose, 1)) {
       console.log(`   适用的规则文件: ${applicableSpecs.length}`);
     }
@@ -138,6 +147,9 @@ export class ReviewService {
       fileContents,
       commits,
       existingResultModel?.result ?? null,
+      context.whenModifiedCode,
+      verbose,
+      context.systemRules,
     );
     const result = await this.runLLMReview(llmMode, reviewPrompt, {
       verbose,
@@ -166,6 +178,14 @@ export class ReviewService {
       isDirectFileMode,
       context,
     });
+
+    // 静态规则产生的系统问题直接合并，不经过过滤管道
+    if (reviewPrompt.staticIssues?.length) {
+      result.issues = [...reviewPrompt.staticIssues, ...result.issues];
+      if (shouldLog(verbose, 1)) {
+        console.log(`⚙️  追加 ${reviewPrompt.staticIssues.length} 个静态规则系统问题`);
+      }
+    }
     if (shouldLog(verbose, 1)) {
       console.log(`📝 最终发现 ${result.issues.length} 个问题`);
     }
@@ -211,7 +231,7 @@ export class ReviewService {
       files,
       commits: filterCommits,
       localMode,
-      skipDuplicateWorkflow,
+      duplicateWorkflowResolved,
     } = context;
 
     const isDirectFileMode = !!(files && files.length > 0 && baseRef === headRef);
@@ -290,9 +310,14 @@ export class ReviewService {
       }
 
       // 检查是否有其他同名 review workflow 正在运行中
-      if (skipDuplicateWorkflow && ci && prInfo?.head?.sha) {
-        const skipResult = await this.checkDuplicateWorkflow(prModel, prInfo.head.sha, verbose);
-        if (skipResult) {
+      if (duplicateWorkflowResolved !== "off" && ci && prInfo?.head?.sha) {
+        const duplicateResult = await this.checkDuplicateWorkflow(
+          prModel,
+          prInfo.head.sha,
+          duplicateWorkflowResolved,
+          verbose,
+        );
+        if (duplicateResult) {
           return {
             prModel,
             commits,
@@ -300,7 +325,7 @@ export class ReviewService {
             headSha: prInfo.head.sha,
             isLocalMode,
             isDirectFileMode,
-            earlyReturn: skipResult,
+            earlyReturn: duplicateResult,
           };
         }
       }
@@ -382,10 +407,20 @@ export class ReviewService {
     // 3. 使用 includes 过滤文件和 commits（支持 added|/modified|/deleted| 前缀语法）
     if (includes && includes.length > 0) {
       const beforeFiles = changedFiles.length;
+      if (shouldLog(verbose, 2)) {
+        console.log(
+          `[resolveSourceData] filterFilesByIncludes: before=${JSON.stringify(changedFiles.map((f) => ({ filename: f.filename, status: f.status })))}, includes=${JSON.stringify(includes)}`,
+        );
+      }
       changedFiles = filterFilesByIncludes(changedFiles, includes);
       if (shouldLog(verbose, 1)) {
         console.log(`   Includes 过滤文件: ${beforeFiles} -> ${changedFiles.length} 个文件`);
       }
+      if (shouldLog(verbose, 2)) {
+        console.log(
+          `[resolveSourceData] filterFilesByIncludes: after=${JSON.stringify(changedFiles.map((f) => f.filename))}`,
+        );
+      }
 
       const globs = extractGlobsFromIncludes(includes);
       const beforeCommits = commits.length;
@@ -843,10 +878,12 @@ export class ReviewService {
 
   /**
    * 检查是否有其他同名 review workflow 正在运行中
+   * 根据 duplicateWorkflowResolved 配置决定是跳过还是删除旧评论
    */
   private async checkDuplicateWorkflow(
     prModel: PullRequestModel,
     headSha: string,
+    mode: "skip" | "delete",
     verbose?: VerboseLevel,
   ): Promise<ReviewResult | null> {
     const ref = process.env.GITHUB_REF || process.env.GITEA_REF || "";
@@ -866,6 +903,19 @@ export class ReviewService {
           (!currentRunId || String(w.id) !== currentRunId),
       );
       if (duplicateReviewRuns.length > 0) {
+        if (mode === "delete") {
+          // 删除模式：清理旧的 AI Review 评论和 PR Review
+          if (shouldLog(verbose, 1)) {
+            console.log(
+              `🗑️ 检测到 ${duplicateReviewRuns.length} 个同名 workflow，清理旧的 AI Review 评论...`,
+            );
+          }
+          await this.cleanupDuplicateAiReviews(prModel, verbose);
+          // 清理后继续执行当前审查
+          return null;
+        }
+
+        // 跳过模式（默认）
         if (shouldLog(verbose, 1)) {
           console.log(
             `⏭️ 跳过审查: 当前 PR #${currentPrNumber} 有 ${duplicateReviewRuns.length} 个同名 workflow 正在运行中`,
@@ -890,6 +940,56 @@ export class ReviewService {
     return null;
   }
 
+  /**
+   * 清理重复的 AI Review 评论（Issue Comments 和 PR Reviews）
+   */
+  private async cleanupDuplicateAiReviews(
+    prModel: PullRequestModel,
+    verbose?: VerboseLevel,
+  ): Promise<void> {
+    try {
+      // 删除 Issue Comments（主评论）
+      const comments = await prModel.getComments();
+      const aiComments = comments.filter((c) => c.body?.includes(REVIEW_COMMENT_MARKER));
+      let deletedComments = 0;
+      for (const comment of aiComments) {
+        if (comment.id) {
+          try {
+            await prModel.deleteComment(comment.id);
+            deletedComments++;
+          } catch {
+            // 忽略删除失败
+          }
+        }
+      }
+      if (deletedComments > 0 && shouldLog(verbose, 1)) {
+        console.log(`   已删除 ${deletedComments} 个重复的 AI Review 主评论`);
+      }
+
+      // 删除 PR Reviews（行级评论）
+      const reviews = await prModel.getReviews();
+      const aiReviews = reviews.filter((r) => r.body?.includes(REVIEW_LINE_COMMENTS_MARKER));
+      let deletedReviews = 0;
+      for (const review of aiReviews) {
+        if (review.id) {
+          try {
+            await prModel.deleteReview(review.id);
+            deletedReviews++;
+          } catch {
+            // 已提交的 review 无法删除，忽略
+          }
+        }
+      }
+      if (deletedReviews > 0 && shouldLog(verbose, 1)) {
+        console.log(`   已删除 ${deletedReviews} 个重复的 AI Review PR Review`);
+      }
+    } catch (error) {
+      if (shouldLog(verbose, 1)) {
+        console.warn(`⚠️ 清理旧评论失败:`, error instanceof Error ? error.message : error);
+      }
+    }
+  }
+
   // --- Delegation methods for backward compatibility with tests ---
 
   protected async fillIssueAuthors(...args: Parameters<ReviewContextBuilder["fillIssueAuthors"]>) {

package/src/system-rules/index.ts

@@ -0,0 +1,48 @@
+import type { ChangedFile, VerboseLevel } from "@spaceflow/core";
+import type { ReviewIssue, FileContentsMap } from "../review-spec";
+import type { SystemRules } from "../review.config";
+import { checkMaxLinesPerFile } from "./max-lines-per-file";
+
+export {
+  RULE_ID as SYSTEM_RULE_MAX_LINES,
+  SPEC_FILE as SYSTEM_SPEC_FILE,
+} from "./max-lines-per-file";
+
+export interface ApplyStaticRulesResult {
+  staticIssues: ReviewIssue[];
+  /** 被静态规则排除的文件名集合，不应再进入 LLM 审查 */
+  skippedFiles: Set<string>;
+}
+
+/**
+ * 对变更文件执行所有已启用的静态规则检查。
+ * 返回系统问题列表和需要跳过 LLM 审查的文件集合。
+ */
+export function applyStaticRules(
+  changedFiles: ChangedFile[],
+  fileContents: FileContentsMap,
+  staticRules: SystemRules | undefined,
+  round: number,
+  verbose?: VerboseLevel,
+): ApplyStaticRulesResult {
+  const staticIssues: ReviewIssue[] = [];
+  const skippedFiles = new Set<string>();
+
+  if (!staticRules) {
+    return { staticIssues, skippedFiles };
+  }
+
+  if (staticRules.maxLinesPerFile) {
+    const result = checkMaxLinesPerFile(
+      changedFiles,
+      fileContents,
+      staticRules.maxLinesPerFile,
+      round,
+      verbose,
+    );
+    staticIssues.push(...result.staticIssues);
+    result.skippedFiles.forEach((f) => skippedFiles.add(f));
+  }
+
+  return { staticIssues, skippedFiles };
+}

package/src/system-rules/max-lines-per-file.ts

@@ -0,0 +1,57 @@
+import type { ChangedFile, VerboseLevel } from "@spaceflow/core";
+import { shouldLog } from "@spaceflow/core";
+import type { ReviewIssue, FileContentsMap } from "../review-spec";
+import type { Severity } from "../review.config";
+
+export const RULE_ID = "system:max-lines-per-file";
+export const SPEC_FILE = "__system__";
+
+export interface MaxLinesPerFileResult {
+  staticIssues: ReviewIssue[];
+  /** 超限文件名集合，需从 LLM 审查中排除 */
+  skippedFiles: Set<string>;
+}
+
+export function checkMaxLinesPerFile(
+  changedFiles: ChangedFile[],
+  fileContents: FileContentsMap,
+  rule: [number, Severity],
+  round: number,
+  verbose?: VerboseLevel,
+): MaxLinesPerFileResult {
+  const [maxLine, severity] = rule;
+  const staticIssues: ReviewIssue[] = [];
+  const skippedFiles = new Set<string>();
+
+  if (maxLine <= 0) {
+    return { staticIssues, skippedFiles };
+  }
+
+  for (const file of changedFiles) {
+    if (file.status === "deleted" || !file.filename) continue;
+    const filename = file.filename;
+    const contentLines = fileContents.get(filename);
+    if (!contentLines || contentLines.length <= maxLine) continue;
+
+    if (shouldLog(verbose, 1)) {
+      console.log(
+        `⚠️  [system-rules/maxLinesPerFile] ${filename}: ${contentLines.length} 行超过限制 ${maxLine} 行，跳过 LLM 审查`,
+      );
+    }
+
+    skippedFiles.add(filename);
+    staticIssues.push({
+      file: filename,
+      line: "1",
+      code: "",
+      ruleId: RULE_ID,
+      specFile: SPEC_FILE,
+      reason: `文件共 ${contentLines.length} 行，超过静态规则限制 ${maxLine} 行，已跳过 LLM 审查。请考虑拆分文件或调大 staticRules.maxLinesPerFile 配置。`,
+      severity,
+      round,
+      date: new Date().toISOString(),
+    });
+  }
+
+  return { staticIssues, skippedFiles };
+}

package/src/types/review-llm.ts

@@ -8,6 +8,8 @@ export interface FileReviewPrompt {
 
 export interface ReviewPrompt {
   filePrompts: FileReviewPrompt[];
+  /** 静态规则检查产生的系统问题，不经过 LLM 过滤管道，直接写入结果 */
+  staticIssues?: import("../review-spec").ReviewIssue[];
 }
 
 export interface LLMReviewOptions {

package/src/utils/review-llm.spec.ts

@@ -0,0 +1,277 @@
+import { describe, it, expect } from "vitest";
+import { buildLinesWithNumbers, buildCommitsSection, extractCodeBlocks } from "./review-llm";
+
+describe("utils/review-llm", () => {
+  describe("buildLinesWithNumbers", () => {
+    const lines: [string, string][] = [
+      ["abc1234", "line one"],
+      ["-------", "line two"],
+      ["abc1234", "line three"],
+    ];
+
+    it("无 visibleRanges 时输出全部行，带行号和 hash", () => {
+      expect(buildLinesWithNumbers(lines)).toBe(
+        "abc1234 1| line one\n------- 2| line two\nabc1234 3| line three",
+      );
+    });
+
+    it("行号宽度按总行数自动 pad（10 行时个位行号前有空格）", () => {
+      const tenLines: [string, string][] = Array.from({ length: 10 }, (_, i) => [
+        "abc1234",
+        `line ${i + 1}`,
+      ]);
+      const result = buildLinesWithNumbers(tenLines);
+      expect(result.split("\n")[0]).toContain(" 1|");
+      expect(result.split("\n")[9]).toContain("10|");
+    });
+
+    it("visibleRanges 为空数组时等价于无 visibleRanges，输出全部行", () => {
+      expect(buildLinesWithNumbers(lines, [])).toBe(buildLinesWithNumbers(lines));
+    });
+
+    it("只指定首行时，末尾被忽略区间产生 ignore 占位", () => {
+      const result = buildLinesWithNumbers(lines, [[1, 1]]);
+      expect(result).toBe("abc1234 1| line one\n....... ignore 2-3 line .......");
+    });
+
+    it("只指定末行时，开头被忽略区间产生 ignore 占位", () => {
+      const result = buildLinesWithNumbers(lines, [[3, 3]]);
+      expect(result).toBe("....... ignore 1-2 line .......\nabc1234 3| line three");
+    });
+
+    it("只指定中间行时，前后均产生 ignore 占位", () => {
+      const result = buildLinesWithNumbers(lines, [[2, 2]]);
+      expect(result).toBe(
+        "....... ignore 1-1 line .......\n------- 2| line two\n....... ignore 3-3 line .......",
+      );
+    });
+
+    it("多个不相邻范围各自产生 ignore 占位", () => {
+      const fiveLines: [string, string][] = [
+        ["abc1234", "a"],
+        ["-------", "b"],
+        ["abc1234", "c"],
+        ["-------", "d"],
+        ["abc1234", "e"],
+      ];
+      const result = buildLinesWithNumbers(fiveLines, [
+        [1, 1],
+        [5, 5],
+      ]);
+      expect(result).toBe("abc1234 1| a\n....... ignore 2-4 line .......\nabc1234 5| e");
+    });
+
+    it("重叠的 visibleRanges 合并后不产生 ignore 占位", () => {
+      const result = buildLinesWithNumbers(lines, [
+        [1, 2],
+        [2, 3],
+      ]);
+      expect(result).not.toContain("ignore");
+      expect(result.split("\n")).toHaveLength(3);
+    });
+
+    it("visibleRanges 超出文件范围时自动裁剪，不产生 ignore 占位", () => {
+      const result = buildLinesWithNumbers(lines, [[0, 100]]);
+      expect(result).not.toContain("ignore");
+      expect(result.split("\n")).toHaveLength(3);
+    });
+
+    it("visibleRanges 无序时按起始行号排序后正常输出", () => {
+      const result = buildLinesWithNumbers(lines, [
+        [3, 3],
+        [1, 1],
+      ]);
+      expect(result).toBe(
+        "abc1234 1| line one\n....... ignore 2-2 line .......\nabc1234 3| line three",
+      );
+    });
+  });
+
+  describe("extractCodeBlocks", () => {
+    it("types 为空时返回空数组", () => {
+      expect(extractCodeBlocks([["abc1234", "function foo() {}"]], [])).toEqual([]);
+    });
+
+    it("空 contentLines 返回空数组", () => {
+      expect(extractCodeBlocks([], ["function"])).toEqual([]);
+    });
+
+    it("全为上下文行时返回空数组", () => {
+      const lines: [string, string][] = [
+        ["-------", "function foo() { }"],
+        ["-------", "class Bar { }"],
+      ];
+      expect(extractCodeBlocks(lines, ["function", "class"])).toEqual([]);
+    });
+
+    it("提取新增的单行 function", () => {
+      expect(
+        extractCodeBlocks([["abc1234", "function foo() { return 1; }"]], ["function"]),
+      ).toEqual([[1, 1]]);
+    });
+
+    it("提取新增的多行 function", () => {
+      const lines: [string, string][] = [
+        ["abc1234", "function foo() {"],
+        ["abc1234", "  return 1;"],
+        ["abc1234", "}"],
+      ];
+      expect(extractCodeBlocks(lines, ["function"])).toEqual([[1, 3]]);
+    });
+
+    it("提取 export function", () => {
+      expect(extractCodeBlocks([["abc1234", "export function hello() { }"]], ["function"])).toEqual(
+        [[1, 1]],
+      );
+    });
+
+    it("提取 async function", () => {
+      expect(extractCodeBlocks([["abc1234", "async function load() { }"]], ["function"])).toEqual([
+        [1, 1],
+      ]);
+    });
+
+    it("上下文行中的 function 不被提取，只提取新增行中的", () => {
+      const lines: [string, string][] = [
+        ["-------", "function foo() {"],
+        ["-------", "  return 1;"],
+        ["-------", "}"],
+        ["abc1234", "function bar() { return 2; }"],
+      ];
+      expect(extractCodeBlocks(lines, ["function"])).toEqual([[4, 4]]);
+    });
+
+    it("提取多行 class 代码块", () => {
+      const lines: [string, string][] = [
+        ["abc1234", "class Foo {"],
+        ["abc1234", "  bar() {}"],
+        ["abc1234", "}"],
+      ];
+      expect(extractCodeBlocks(lines, ["class"])).toEqual([[1, 3]]);
+    });
+
+    it("提取 export class", () => {
+      expect(extractCodeBlocks([["abc1234", "export class Bar { }"]], ["class"])).toEqual([[1, 1]]);
+    });
+
+    it("提取多行 interface", () => {
+      const lines: [string, string][] = [
+        ["abc1234", "export interface IFoo {"],
+        ["abc1234", "  name: string;"],
+        ["abc1234", "}"],
+      ];
+      expect(extractCodeBlocks(lines, ["interface"])).toEqual([[1, 3]]);
+    });
+
+    it("提取 type 别名（含 =）", () => {
+      expect(
+        extractCodeBlocks([["abc1234", "export type MyType = string | number;"]], ["type"]),
+      ).toEqual([[1, 1]]);
+    });
+
+    it("提取泛型 type（含 <）", () => {
+      expect(extractCodeBlocks([["abc1234", "type Result<T> = { data: T };"]], ["type"])).toEqual([
+        [1, 1],
+      ]);
+    });
+
+    it("同时提取 function 和 class，中间上下文行不影响结果", () => {
+      const lines: [string, string][] = [
+        ["abc1234", "function foo() { }"],
+        ["-------", "const x = 1;"],
+        ["abc1234", "class Bar { }"],
+      ];
+      expect(extractCodeBlocks(lines, ["function", "class"])).toEqual([
+        [1, 1],
+        [3, 3],
+      ]);
+    });
+
+    it("相邻代码块合并为一个范围", () => {
+      const lines: [string, string][] = [
+        ["abc1234", "function a() {"],
+        ["abc1234", "}"],
+        ["abc1234", "function b() {"],
+        ["abc1234", "}"],
+      ];
+      expect(extractCodeBlocks(lines, ["function"])).toEqual([[1, 4]]);
+    });
+
+    it("嵌套括号时找到最外层封闭括号作为结尾", () => {
+      const lines: [string, string][] = [
+        ["abc1234", "function outer() {"],
+        ["abc1234", "  if (true) {"],
+        ["abc1234", "    inner();"],
+        ["abc1234", "  }"],
+        ["abc1234", "}"],
+      ];
+      expect(extractCodeBlocks(lines, ["function"])).toEqual([[1, 5]]);
+    });
+
+    it("method：public 修饰的方法识别为完整代码块", () => {
+      const lines: [string, string][] = [
+        ["abc1234", "  public getName() {"],
+        ["abc1234", "    return this.name;"],
+        ["abc1234", "  }"],
+      ];
+      expect(extractCodeBlocks(lines, ["method"])).toEqual([[1, 3]]);
+    });
+
+    it("method：async 方法识别为完整代码块", () => {
+      const lines: [string, string][] = [
+        ["abc1234", "  async fetchData() {"],
+        ["abc1234", "    return await api();"],
+        ["abc1234", "  }"],
+      ];
+      expect(extractCodeBlocks(lines, ["method"])).toHaveLength(1);
+    });
+  });
+
+  describe("buildCommitsSection", () => {
+    const lines: [string, string][] = [
+      ["abc1234", "const x = 1;"],
+      ["-------", "const y = 2;"],
+      ["def5678", "const z = 3;"],
+    ];
+
+    it("有匹配 commit 时返回 markdown 列表（- `hash` 首行消息）", () => {
+      const commits = [
+        { sha: "abc1234abcdef", commit: { message: "feat: add x\n详细说明" } },
+        { sha: "def5678abcdef", commit: { message: "fix: fix z" } },
+      ] as any;
+      const result = buildCommitsSection(lines, commits);
+      expect(result).toContain("- `abc1234` feat: add x");
+      expect(result).toContain("- `def5678` fix: fix z");
+    });
+
+    it("commit 消息只取第一行，忽略后续内容", () => {
+      const commits = [
+        { sha: "abc1234abc", commit: { message: "first line\nsecond line\nthird line" } },
+      ] as any;
+      expect(buildCommitsSection(lines, commits)).toBe("- `abc1234` first line");
+    });
+
+    it("没有匹配 commit 时返回默认文案", () => {
+      const commits = [{ sha: "xxxxxxxxxxxxxxx", commit: { message: "unrelated" } }] as any;
+      expect(buildCommitsSection(lines, commits)).toBe("- 无相关 commits");
+    });
+
+    it("commits 为空数组时返回默认文案", () => {
+      expect(buildCommitsSection(lines, [])).toBe("- 无相关 commits");
+    });
+
+    it("contentLines 全为上下文行时返回默认文案", () => {
+      const ctxLines: [string, string][] = [
+        ["-------", "line 1"],
+        ["-------", "line 2"],
+      ];
+      const commits = [{ sha: "abc1234abc", commit: { message: "msg" } }] as any;
+      expect(buildCommitsSection(ctxLines, commits)).toBe("- 无相关 commits");
+    });
+
+    it("commit sha 为 undefined 时不崩溃，返回默认文案", () => {
+      const commits = [{ sha: undefined, commit: { message: "msg" } }] as any;
+      expect(buildCommitsSection(lines, commits)).toBe("- 无相关 commits");
+    });
+  });
+});