@spaceflow/review 0.77.0 → 0.79.0

package/src/review.service.spec.ts

@@ -127,6 +127,10 @@ describe("ReviewService", () => {
       parseDiffText: vi.fn().mockReturnValue([]),
       getRemoteUrl: vi.fn().mockReturnValue(null),
       parseRepositoryFromRemoteUrl: vi.fn().mockReturnValue(null),
+      getUncommittedFiles: vi.fn().mockReturnValue([]),
+      getStagedFiles: vi.fn().mockReturnValue([]),
+      getUncommittedDiff: vi.fn().mockReturnValue([]),
+      getStagedDiff: vi.fn().mockReturnValue([]),
       getChangedFilesBetweenRefs: vi.fn().mockResolvedValue([]),
       getCommitsBetweenRefs: vi.fn().mockResolvedValue([]),
       getDiffBetweenRefs: vi.fn().mockResolvedValue([]),
@@ -419,6 +423,26 @@ describe("ReviewService", () => {
       expect(result.success).toBe(true);
     });
 
+    it("should ignore whenModifiedCode in direct file mode", async () => {
+      const context: ReviewContext = {
+        owner: "owner",
+        repo: "repo",
+        files: ["src/app.ts"],
+        specSources: ["/spec/dir"],
+        dryRun: true,
+        ci: false,
+        llmMode: "openai",
+        whenModifiedCode: ["function", "class"],
+      };
+      const buildReviewPromptSpy = vi.spyOn(service as any, "buildReviewPrompt");
+
+      const result = await service.execute(context);
+
+      expect(result.success).toBe(true);
+      expect(buildReviewPromptSpy).toHaveBeenCalled();
+      expect(buildReviewPromptSpy.mock.calls[0][5]).toBeUndefined();
+    });
+
     it("should filter files by includes pattern", async () => {
       const context: ReviewContext = {
         owner: "owner",
@@ -1134,13 +1158,23 @@ describe("ReviewService", () => {
       expect(result[0].author.login).toBe("GitUser");
     });
 
+    it("should mark invalid when existing author but ------- commit hash", async () => {
+      const issues = [
+        { file: "test.ts", line: "1", commit: "-------", author: { id: "1", login: "dev1" } },
+      ];
+      const result = await (service as any).fillIssueAuthors(issues, [], "o", "r");
+      expect(result[0].commit).toBeUndefined();
+      expect(result[0].valid).toBe("false");
+    });
+
     it("should handle issues with ------- commit hash", async () => {
       const issues = [{ file: "test.ts", line: "1", commit: "-------" }];
       const commits = [
         { sha: "abc1234567890", author: { id: 1, login: "dev1" }, commit: { author: {} } },
       ];
       const result = await (service as any).fillIssueAuthors(issues, commits, "o", "r");
-      expect(result[0].author.login).toBe("dev1");
+      expect(result[0].commit).toBeUndefined();
+      expect(result[0].valid).toBe("false");
     });
   });
 
@@ -1353,14 +1387,28 @@ describe("ReviewService", () => {
 
     it("should normalize absolute file paths", async () => {
       configService.get.mockReturnValue({ repository: "owner/repo", refName: "main" });
+      const absPath = `${process.cwd()}/src/file.ts`;
       const options = {
         dryRun: false,
         ci: false,
-        files: ["/absolute/path/to/file.ts", "relative.ts"],
+        files: [absPath, "./relative.ts"],
       };
       const context = await service.getContextFromEnv(options as any);
       expect(context.files).toBeDefined();
-      expect(context.files![1]).toBe("relative.ts");
+      expect(context.files).toEqual(["src/file.ts", "relative.ts"]);
+    });
+
+    it("should force direct file mode when files are specified", async () => {
+      configService.get.mockReturnValue({ repository: "owner/repo", refName: "main" });
+      const options = {
+        dryRun: false,
+        ci: false,
+        local: "uncommitted" as const,
+        files: ["./miniprogram/utils/asyncSharedUtilsLoader.js"],
+      };
+      const context = await service.getContextFromEnv(options as any);
+      expect(context.localMode).toBe(false);
+      expect(context.files).toEqual(["miniprogram/utils/asyncSharedUtilsLoader.js"]);
     });
 
     it("should auto-detect base/head with verbose logging", async () => {
@@ -1419,6 +1467,30 @@ describe("ReviewService", () => {
     });
   });
 
+  describe("ReviewService.resolveSourceData - direct file mode", () => {
+    it("should bypass local uncommitted scanning when files are specified", async () => {
+      const context: ReviewContext = {
+        owner: "o",
+        repo: "r",
+        dryRun: true,
+        ci: false,
+        specSources: ["/spec"],
+        files: ["miniprogram/utils/asyncSharedUtilsLoader.js"],
+        localMode: false,
+      };
+
+      const result = await (service as any).resolveSourceData(context);
+
+      expect(result.isDirectFileMode).toBe(true);
+      expect(result.isLocalMode).toBe(true);
+      expect(result.changedFiles).toEqual([
+        { filename: "miniprogram/utils/asyncSharedUtilsLoader.js", status: "modified" },
+      ]);
+      expect(mockGitSdkService.getUncommittedFiles).not.toHaveBeenCalled();
+      expect(mockGitSdkService.getStagedFiles).not.toHaveBeenCalled();
+    });
+  });
+
   describe("ReviewService.getFilesForCommit", () => {
     it("should return files from git sdk", async () => {
       mockGitSdkService.getFilesForCommit.mockResolvedValue([

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";
@@ -96,10 +97,22 @@ export class ReviewService {
     if (source.earlyReturn) return source.earlyReturn;
 
     const { prModel, commits, changedFiles, headSha, isDirectFileMode } = source;
+    const effectiveWhenModifiedCode = isDirectFileMode ? undefined : context.whenModifiedCode;
+    if (isDirectFileMode && context.whenModifiedCode?.length && shouldLog(verbose, 1)) {
+      console.log(`ℹ️  直接文件模式下忽略 whenModifiedCode 过滤`);
+    }
 
     // 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 +151,9 @@ export class ReviewService {
       fileContents,
       commits,
       existingResultModel?.result ?? null,
+      effectiveWhenModifiedCode,
+      verbose,
+      context.systemRules,
     );
     const result = await this.runLLMReview(llmMode, reviewPrompt, {
       verbose,
@@ -166,6 +182,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,10 +235,10 @@ export class ReviewService {
       files,
       commits: filterCommits,
       localMode,
-      skipDuplicateWorkflow,
+      duplicateWorkflowResolved,
     } = context;
 
-    const isDirectFileMode = !!(files && files.length > 0 && baseRef === headRef);
+    const isDirectFileMode = !!(files && files.length > 0 && !prNumber);
     let isLocalMode = !!localMode;
     let effectiveBaseRef = baseRef;
     let effectiveHeadRef = headRef;
@@ -274,8 +298,16 @@ export class ReviewService {
       }
     }
 
+    // 直接文件审查模式（-f）：绕过 diff，直接按指定文件构造审查输入
+    if (isDirectFileMode) {
+      if (shouldLog(verbose, 1)) {
+        console.log(`📥 直接审查指定文件模式 (${files!.length} 个文件)`);
+      }
+      changedFiles = files!.map((f) => ({ filename: f, status: "modified" as const }));
+      isLocalMode = true;
+    }
     // PR 模式、分支比较模式、或本地模式回退后的分支比较
-    if (prNumber) {
+    else if (prNumber) {
       if (shouldLog(verbose, 1)) {
         console.log(`📥 获取 PR #${prNumber} 信息 (owner: ${owner}, repo: ${repo})`);
       }
@@ -290,9 +322,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,17 +337,12 @@ export class ReviewService {
             headSha: prInfo.head.sha,
             isLocalMode,
             isDirectFileMode,
-            earlyReturn: skipResult,
+            earlyReturn: duplicateResult,
           };
         }
       }
     } else if (effectiveBaseRef && effectiveHeadRef) {
-      if (files && files.length > 0 && effectiveBaseRef === effectiveHeadRef) {
-        if (shouldLog(verbose, 1)) {
-          console.log(`📥 直接审查指定文件模式 (${files.length} 个文件)`);
-        }
-        changedFiles = files.map((f) => ({ filename: f, status: "modified" as const }));
-      } else if (changedFiles.length === 0) {
+      if (changedFiles.length === 0) {
         if (shouldLog(verbose, 1)) {
           console.log(
             `📥 获取 ${effectiveBaseRef}...${effectiveHeadRef} 的差异 (owner: ${owner}, repo: ${repo})`,
@@ -382,10 +414,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 +885,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 +910,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 +947,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 {