@spaceflow/review 0.81.0 → 0.83.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { LlmJsonPut, REVIEW_STATE, addLocaleResources, calculateNewLineNumber, createStreamLoggerState, defineExtension, logStreamEvent, normalizeVerbose, parallel, parseChangedLinesFromPatch, parseDiffText, parseHunksFromPatch, parseRepoUrl, parseVerbose, shouldLog, t, z } from "@spaceflow/core";
+import { LlmJsonPut, REVIEW_STATE, addLocaleResources, createStreamLoggerState, defineExtension, logStreamEvent, normalizeVerbose, parallel, parseChangedLinesFromPatch, parseDiffText, parseRepoUrl, parseVerbose, shouldLog, t, z } from "@spaceflow/core";
 import { access, mkdir, readFile, readdir, unlink, writeFile } from "fs/promises";
 import { basename, dirname, extname, isAbsolute, join, normalize, relative } from "path";
 import { homedir } from "os";
@@ -378,15 +378,7 @@ class ReviewSpecService {
    * 根据变更文件的扩展名过滤适用的规则文件
    * 只按扩展名过滤，includes 和 override 在 LLM 审查后处理
    */ filterApplicableSpecs(specs, changedFiles) {
-        const changedExtensions = new Set();
-        for (const file of changedFiles){
-            if (file.filename) {
-                const ext = extname(file.filename).slice(1).toLowerCase();
-                if (ext) {
-                    changedExtensions.add(ext);
-                }
-            }
-        }
+        const changedExtensions = changedFiles.extensions();
         console.log(`[filterApplicableSpecs] changedExtensions=${JSON.stringify([
             ...changedExtensions
         ])}, specs count=${specs.length}`);
@@ -1714,13 +1706,10 @@ class MarkdownFormatter {
             `| 指标 | 数量 |`,
             `|------|------|`
         ];
-        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");
     }
 }
@@ -2370,10 +2359,13 @@ function generateIssueKey(issue) {
    * - 合并历史 issues（this.issues）+ newIssues
    * - 复制 newResult 的元信息（title/description/deletionImpact 等）
    *
-   * 调用方应在调用前完成对历史 issues 的预处理（syncResolved、invalidateChangedFiles、verifyFixes、去重等）。
+   * 调用方应在调用前完成对历史 issues 的预处理（syncResolved、invalidateChangedFiles、verifyFixes 等）。
    */ nextRound(newResult) {
         const nextRoundNum = this._result.round + 1;
-        const taggedNewIssues = newResult.issues.map((issue)=>({
+        // 去重：过滤掉已存在于历史 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
             }));
@@ -2598,8 +2590,9 @@ function generateIssueKey(issue) {
     }
     /**
    * 将有变更文件的历史 issue 标记为无效。
-   * 简化策略：如果文件在最新 commit 中有变更，则将该文件的所有历史问题标记为无效。
-   */ async invalidateChangedFiles(headSha, verbose) {
+   * 策略：如果文件在最新 commit 中有变更，则将该文件的历史问题标记为无效，但以下情况保留：
+   * - issue 已被用户手动 resolved 且当前代码行内容与 issue.code 不同（说明用户 resolve 后代码已变，应保留其 resolve 状态）
+   */ async invalidateChangedFiles(headSha, fileContents, verbose) {
         if (!headSha) {
             if (shouldLog(verbose, 1)) {
                 console.log(`   ⚠️ 无法获取 PR head SHA，跳过变更文件检查`);
@@ -2628,13 +2621,32 @@ function generateIssueKey(issue) {
             }
             // 将变更文件的历史 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} 所在文件有变更，标记为无效`);
@@ -2647,8 +2659,11 @@ function generateIssueKey(issue) {
                 }
                 return issue;
             });
-            if (invalidatedCount > 0 && shouldLog(verbose, 1)) {
-                console.log(`   📊 共标记 ${invalidatedCount} 个历史问题为无效（文件有变更）`);
+            if ((invalidatedCount > 0 || preservedCount > 0) && shouldLog(verbose, 1)) {
+                const parts = [];
+                if (invalidatedCount > 0) parts.push(`标记 ${invalidatedCount} 个无效`);
+                if (preservedCount > 0) parts.push(`保留 ${preservedCount} 个已 resolved`);
+                console.log(`   📊 Issue 处理: ${parts.join("，")}`);
             }
         } catch (error) {
             if (shouldLog(verbose, 1)) {
@@ -3200,6 +3215,80 @@ function generateIssueKey(issue) {
         }).optional()
     });
 
+;// CONCATENATED MODULE: ./src/changed-file-collection.ts
+
+/**
+ * 变更文件集合，封装 ChangedFile[] 并提供常用访问器。
+ */ class ChangedFileCollection {
+    _files;
+    constructor(files){
+        this._files = files;
+    }
+    static from(files) {
+        return new ChangedFileCollection(files);
+    }
+    static empty() {
+        return new ChangedFileCollection([]);
+    }
+    get length() {
+        return this._files.length;
+    }
+    toArray() {
+        return [
+            ...this._files
+        ];
+    }
+    [Symbol.iterator]() {
+        return this._files[Symbol.iterator]();
+    }
+    filenames() {
+        return this._files.map((f)=>f.filename ?? "").filter(Boolean);
+    }
+    extensions() {
+        const exts = new Set();
+        for (const f of this._files){
+            if (f.filename) {
+                const ext = extname(f.filename).replace(/^\./, "").toLowerCase();
+                if (ext) exts.add(ext);
+            }
+        }
+        return exts;
+    }
+    has(filename) {
+        return this._files.some((f)=>f.filename === filename);
+    }
+    filter(predicate) {
+        return new ChangedFileCollection(this._files.filter(predicate));
+    }
+    map(fn) {
+        return this._files.map(fn);
+    }
+    countByStatus() {
+        let added = 0, modified = 0, deleted = 0;
+        for (const f of this._files){
+            if (f.status === "added") added++;
+            else if (f.status === "modified") modified++;
+            else if (f.status === "deleted") deleted++;
+        }
+        return {
+            added,
+            modified,
+            deleted
+        };
+    }
+    nonDeletedFiles() {
+        return this.filter((f)=>f.status !== "deleted" && !!f.filename);
+    }
+    filterByFilenames(names) {
+        const nameSet = new Set(names);
+        return this.filter((f)=>!!f.filename && nameSet.has(f.filename));
+    }
+    filterByCommitFiles(commitFilenames) {
+        const nameSet = new Set(commitFilenames);
+        return this.filter((f)=>!!f.filename && nameSet.has(f.filename));
+    }
+}
+
 ;// CONCATENATED MODULE: ./src/parse-title-options.ts
 
 /**
@@ -3763,9 +3852,8 @@ class ReviewIssueFilter {
     }
     /**
    * LLM 验证历史问题是否已修复
-   * 如果传入 preloaded（specs/fileContents），直接使用；否则从 PR 获取
-   */ async verifyAndUpdateIssues(context, issues, commits, preloaded, pr) {
-        const { llmMode, specSources, verbose } = context;
+   */ async verifyAndUpdateIssues(context, issues, commits, preloaded) {
+        const { llmMode, verbose } = context;
         const unfixedIssues = issues.filter((i)=>i.valid !== "false" && !i.fixed);
         if (unfixedIssues.length === 0) {
             return issues;
@@ -3776,26 +3864,10 @@ class ReviewIssueFilter {
             }
             return issues;
         }
-        if (!preloaded && (!specSources?.length || !pr)) {
-            if (shouldLog(verbose, 1)) {
-                console.log(`   ⏭️  跳过 LLM 验证（缺少 specSources 或 pr）`);
-            }
-            return issues;
-        }
         if (shouldLog(verbose, 1)) {
             console.log(`\n🔍 开始 LLM 验证 ${unfixedIssues.length} 个未修复问题...`);
         }
-        let specs;
-        let fileContents;
-        if (preloaded) {
-            specs = preloaded.specs;
-            fileContents = preloaded.fileContents;
-        } else {
-            const changedFiles = await pr.getFiles();
-            const headSha = await pr.getHeadSha();
-            specs = await this.loadSpecs(specSources, verbose);
-            fileContents = await this.getFileContents(pr.owner, pr.repo, changedFiles, commits, headSha, pr.number, verbose);
-        }
+        const { specs, fileContents } = preloaded;
         return await this.issueVerifyService.verifyIssueFixes(issues, fileContents, specs, llmMode, verbose, context.verifyConcurrency);
     }
     async getChangedFilesBetweenRefs(_owner, _repo, baseRef, headRef) {
@@ -3832,77 +3904,6 @@ class ReviewIssueFilter {
             return this.gitSdk.getFilesForCommit(sha);
         }
     }
-    /**
-   * 获取文件内容并构建行号到 commit hash 的映射
-   * 返回 Map<filename, Array<[commitHash, lineCode]>>
-   */ async getFileContents(owner, repo, changedFiles, commits, ref, prNumber, verbose, isLocalMode) {
-        const contents = new Map();
-        const latestCommitHash = commits[commits.length - 1]?.sha?.slice(0, 7) || "+local+";
-        // 优先使用 changedFiles 中的 patch 字段（来自 PR 的整体 diff base...head）
-        // 这样行号是相对于最终文件的，而不是每个 commit 的父 commit
-        // buildLineCommitMap 遍历每个 commit 的 diff，行号可能与最终文件不一致
-        if (shouldLog(verbose, 1)) {
-            console.log(`📊 正在构建行号到变更的映射...`);
-        }
-        for (const file of changedFiles){
-            if (file.filename && file.status !== "deleted") {
-                try {
-                    let rawContent;
-                    if (isLocalMode) {
-                        // 本地模式：读取工作区文件的当前内容
-                        rawContent = this.gitSdk.getWorkingFileContent(file.filename);
-                    } else if (prNumber) {
-                        rawContent = await this.gitProvider.getFileContent(owner, repo, file.filename, ref);
-                    } else {
-                        rawContent = await this.gitSdk.getFileContent(ref, file.filename);
-                    }
-                    const lines = rawContent.split("\n");
-                    // 优先使用 file.patch（PR 整体 diff），这是相对于最终文件的行号
-                    let changedLines = parseChangedLinesFromPatch(file.patch);
-                    // 如果 changedLines 为空，需要判断是否应该将所有行标记为变更
-                    // 情况1: 文件是新增的（status 为 added/A）
-                    // 情况2: patch 为空但文件有 additions（部分 Git Provider API 可能不返回完整 patch）
-                    const isNewFile = file.status === "added" || file.status === "A" || file.additions && file.additions > 0 && file.deletions === 0 && !file.patch;
-                    if (changedLines.size === 0 && isNewFile) {
-                        changedLines = new Set(lines.map((_, i)=>i + 1));
-                        if (shouldLog(verbose, 2)) {
-                            console.log(`   ℹ️ ${file.filename}: 新增文件无 patch，将所有 ${lines.length} 行标记为变更`);
-                        }
-                    }
-                    if (shouldLog(verbose, 3)) {
-                        console.log(`   📄 ${file.filename}: ${lines.length} 行, ${changedLines.size} 行变更`);
-                        console.log(`      latestCommitHash: ${latestCommitHash}`);
-                        if (changedLines.size > 0 && changedLines.size <= 20) {
-                            console.log(`      变更行号: ${Array.from(changedLines).sort((a, b)=>a - b).join(", ")}`);
-                        } else if (changedLines.size > 20) {
-                            console.log(`      变更行号: (共 ${changedLines.size} 行，省略详情)`);
-                        }
-                        if (!file.patch) {
-                            console.log(`      ⚠️ 该文件没有 patch 信息 (status=${file.status}, additions=${file.additions}, deletions=${file.deletions})`);
-                        } else {
-                            console.log(`      patch 前 200 字符: ${file.patch.slice(0, 200).replace(/\n/g, "\\n")}`);
-                        }
-                    }
-                    const contentLines = lines.map((line, index)=>{
-                        const lineNum = index + 1;
-                        // 如果该行在 PR 的整体 diff 中被标记为变更，则使用最新 commit hash
-                        const hash = changedLines.has(lineNum) ? latestCommitHash : "-------";
-                        return [
-                            hash,
-                            line
-                        ];
-                    });
-                    contents.set(file.filename, contentLines);
-                } catch (error) {
-                    console.warn(`警告: 无法获取文件内容: ${file.filename}`, error);
-                }
-            }
-        }
-        if (shouldLog(verbose, 1)) {
-            console.log(`📊 映射构建完成，共 ${contents.size} 个文件`);
-        }
-        return contents;
-    }
     async fillIssueCode(issues, fileContents) {
         return issues.map((issue)=>{
             const contentLines = fileContents.get(issue.file);
@@ -3927,85 +3928,18 @@ class ReviewIssueFilter {
         });
     }
     /**
-   * 根据代码变更更新历史 issue 的行号
-   * 当代码发生变化时，之前发现的 issue 行号可能已经不准确
-   * 此方法通过分析 diff 来计算新的行号
-   */ updateIssueLineNumbers(issues, filePatchMap, verbose) {
-        let updatedCount = 0;
-        let invalidatedCount = 0;
-        const updatedIssues = issues.map((issue)=>{
-            // 如果 issue 已修复、已解决或无效，不需要更新行号
-            if (issue.fixed || issue.resolved || issue.valid === "false") {
-                return issue;
-            }
-            const patch = filePatchMap.get(issue.file);
-            if (!patch) {
-                // 文件没有变更，行号不变
-                return issue;
-            }
-            const lines = this.reviewSpecService.parseLineRange(issue.line);
-            if (lines.length === 0) {
-                return issue;
-            }
-            const startLine = lines[0];
-            const endLine = lines[lines.length - 1];
-            const hunks = parseHunksFromPatch(patch);
-            // 计算新的起始行号
-            const newStartLine = calculateNewLineNumber(startLine, hunks);
-            if (newStartLine === null) {
-                // 起始行被删除，直接标记为无效问题
-                invalidatedCount++;
-                if (shouldLog(verbose, 1)) {
-                    console.log(`📍 Issue ${issue.file}:${issue.line} 对应的代码已被删除，标记为无效`);
-                }
-                return {
-                    ...issue,
-                    valid: "false",
-                    originalLine: issue.originalLine ?? issue.line
-                };
-            }
-            // 如果是范围行号，计算新的结束行号
-            let newLine;
-            if (startLine === endLine) {
-                newLine = String(newStartLine);
-            } else {
-                const newEndLine = calculateNewLineNumber(endLine, hunks);
-                if (newEndLine === null || newEndLine === newStartLine) {
-                    // 结束行被删除或范围缩小为单行，使用起始行
-                    newLine = String(newStartLine);
-                } else {
-                    newLine = `${newStartLine}-${newEndLine}`;
-                }
-            }
-            // 如果行号发生变化，更新 issue
-            if (newLine !== issue.line) {
-                updatedCount++;
-                if (shouldLog(verbose, 1)) {
-                    console.log(`📍 Issue 行号更新: ${issue.file}:${issue.line} -> ${issue.file}:${newLine}`);
-                }
-                return {
-                    ...issue,
-                    line: newLine,
-                    originalLine: issue.originalLine ?? issue.line
-                };
-            }
-            return issue;
-        });
-        if ((updatedCount > 0 || invalidatedCount > 0) && shouldLog(verbose, 1)) {
-            const parts = [];
-            if (updatedCount > 0) parts.push(`更新 ${updatedCount} 个行号`);
-            if (invalidatedCount > 0) parts.push(`标记 ${invalidatedCount} 个无效`);
-            console.log(`📊 Issue 行号处理: ${parts.join("，")}`);
-        }
-        return updatedIssues;
-    }
-    /**
    * 过滤掉不属于本次 PR commits 的问题（排除 merge commit 引入的代码）
    * 根据 fileContents 中问题行的实际 commit hash 进行验证，而不是依赖 LLM 填写的 commit
    */ filterIssuesByValidCommits(issues, commits, fileContents, verbose) {
         const validCommitHashes = new Set(commits.map((c)=>c.sha?.slice(0, 7)).filter(Boolean));
+        // commits 为空时（如分支比较模式本地无 commit 信息），退化为"行是否在 diff 变更范围内"模式
+        const useChangedLinesMode = validCommitHashes.size === 0;
         if (shouldLog(verbose, 3)) {
-            console.log(`   🔍 有效 commit hashes: ${Array.from(validCommitHashes).join(", ")}`);
+            if (useChangedLinesMode) {
+                console.log(`   🔍 commits 为空，使用变更行模式过滤`);
+            } else {
+                console.log(`   🔍 有效 commit hashes: ${Array.from(validCommitHashes).join(", ")}`);
+            }
         }
         const beforeCount = issues.length;
         const filtered = issues.filter((issue)=>{
@@ -4024,12 +3958,14 @@ class ReviewIssueFilter {
                 }
                 return true;
             }
-            // 检查问题行范围内是否有任意一行属于本次 PR 的有效 commits
+            // 检查问题行范围内是否有任意一行属于本次变更（diff 范围）
             for (const lineNum of lineNums){
                 const lineData = contentLines[lineNum - 1];
                 if (lineData) {
                     const [actualHash] = lineData;
-                    if (actualHash !== "-------" && validCommitHashes.has(actualHash)) {
+                    const isChangedLine = actualHash !== "-------";
+                    const isValid = useChangedLinesMode ? isChangedLine : isChangedLine && validCommitHashes.has(actualHash);
+                    if (isValid) {
                         if (shouldLog(verbose, 3)) {
                             console.log(`   ✅ Issue ${issue.file}:${issue.line} - 行 ${lineNum} hash=${actualHash} 匹配，保留`);
                         }
@@ -4037,9 +3973,9 @@ class ReviewIssueFilter {
                     }
                 }
             }
-            // 问题行都不属于本次 PR 的有效 commits
+            // 问题行都不属于本次变更范围
             if (shouldLog(verbose, 2)) {
-                console.log(`   Issue ${issue.file}:${issue.line} 不在本次 PR 变更行范围内，跳过`);
+                console.log(`   Issue ${issue.file}:${issue.line} 不在本次变更行范围内，跳过`);
             }
             if (shouldLog(verbose, 3)) {
                 const hashes = lineNums.map((ln)=>{
@@ -4051,7 +3987,7 @@ class ReviewIssueFilter {
             return false;
         });
         if (beforeCount !== filtered.length && shouldLog(verbose, 1)) {
-            console.log(`   过滤非本次 PR commits 问题后: ${beforeCount} -> ${filtered.length} 个问题`);
+            console.log(`   变更行过滤后: ${beforeCount} -> ${filtered.length} 个问题`);
         }
         return filtered;
     }
@@ -4071,43 +4007,6 @@ class ReviewIssueFilter {
     generateIssueKey(issue) {
         return generateIssueKey(issue);
     }
-    /**
-   * 构建文件行号到 commit hash 的映射
-   * 遍历每个 commit，获取其修改的文件和行号
-   * 优先使用 API，失败时回退到 git 命令
-   */ async buildLineCommitMap(owner, repo, commits, verbose) {
-        // Map<filename, Map<lineNumber, commitHash>>
-        const fileLineMap = new Map();
-        // 按时间顺序遍历 commits（早的在前），后面的 commit 会覆盖前面的
-        for (const commit of commits){
-            if (!commit.sha) continue;
-            const shortHash = commit.sha.slice(0, 7);
-            let files = [];
-            // 优先使用 getCommitDiff API 获取 diff 文本
-            try {
-                const diffText = await this.gitProvider.getCommitDiff(owner, repo, commit.sha);
-                files = parseDiffText(diffText);
-            } catch  {
-                // API 失败，回退到 git 命令
-                files = this.gitSdk.getCommitDiff(commit.sha);
-            }
-            if (shouldLog(verbose, 2)) console.log(`   commit ${shortHash}: ${files.length} 个文件变更`);
-            for (const file of files){
-                // 解析这个 commit 修改的行号
-                const changedLines = parseChangedLinesFromPatch(file.patch);
-                // 获取或创建文件的行号映射
-                if (!fileLineMap.has(file.filename)) {
-                    fileLineMap.set(file.filename, new Map());
-                }
-                const lineMap = fileLineMap.get(file.filename);
-                // 记录每行对应的 commit hash
-                for (const lineNum of changedLines){
-                    lineMap.set(lineNum, shortHash);
-                }
-            }
-        }
-        return fileLineMap;
-    }
 }
 
 ;// CONCATENATED MODULE: ./src/utils/review-llm.ts
@@ -4738,6 +4637,7 @@ const buildDeletionImpactAgentPrompt = (ctx)=>{
         const { spec, rule } = ctx.ruleInfo;
         ruleSection = `### ${spec.filename} (${spec.type})\n\n${spec.content.slice(0, 200)}...\n\n#### 规则\n- ${rule.id}: ${rule.title}\n  ${rule.description}`;
     }
+    const originalCodeSection = ctx.issue.code ? `\n## 问题发现时的原始代码（用于对比）\n\n\`\`\`\n${ctx.issue.code}\n\`\`\`\n` : "";
     const userPrompt = `## 规则定义
 
 ${ruleSection}
@@ -4745,18 +4645,19 @@ ${ruleSection}
 ## 之前发现的问题
 
 - **文件**: ${ctx.issue.file}
-- **行号**: ${ctx.issue.line}
+- **行号**: ${ctx.issue.line}（问题发现时的行号，可能因代码变更而偏移）
 - **规则**: ${ctx.issue.ruleId} (来自 ${ctx.issue.specFile})
 - **问题描述**: ${ctx.issue.reason}
 ${ctx.issue.suggestion ? `- **原建议**: ${ctx.issue.suggestion}` : ""}
-
+${originalCodeSection}
 ## 当前文件内容
 
 \`\`\`
 ${linesWithNumbers}
 \`\`\`
 
-请判断这个问题是否有效，以及是否已经被修复。`;
+请判断这个问题是否有效，以及是否已经被修复。
+**注意**：如果提供了"问题发现时的原始代码"，请优先通过搜索该代码片段来定位问题位置，而不是仅依赖行号（行号可能因代码变更已经偏移）。`;
     return {
         systemPrompt,
         userPrompt
@@ -4908,8 +4809,8 @@ class ReviewLlmProcessor {
     }
     async buildReviewPrompt(specs, changedFiles, fileContents, commits, existingResult, whenModifiedCode, verbose, systemRules) {
         const round = (existingResult?.round ?? 0) + 1;
-        const { staticIssues, skippedFiles } = applyStaticRules(changedFiles, fileContents, systemRules, round, verbose);
-        const fileDataList = changedFiles.filter((f)=>f.status !== "deleted" && f.filename).map((file)=>{
+        const { staticIssues, skippedFiles } = applyStaticRules(changedFiles.toArray(), fileContents, systemRules, round, verbose);
+        const fileDataList = changedFiles.nonDeletedFiles().map((file)=>{
             const filename = file.filename;
             if (skippedFiles.has(filename)) return null;
             const contentLines = fileContents.get(filename);
@@ -5190,7 +5091,7 @@ class ReviewLlmProcessor {
    */ async generatePrDescription(commits, changedFiles, llmMode, fileContents, verbose) {
         const { userPrompt } = buildPrDescriptionPrompt({
             commits,
-            changedFiles,
+            changedFiles: changedFiles.toArray(),
             fileContents
         });
         try {
@@ -5230,7 +5131,7 @@ class ReviewLlmProcessor {
    */ async generatePrTitle(commits, changedFiles) {
         const { userPrompt } = buildPrTitlePrompt({
             commits,
-            changedFiles
+            changedFiles: changedFiles.toArray()
         });
         try {
             const stream = this.llmProxyService.chatStream([
@@ -5273,9 +5174,7 @@ 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 = [];
             if (added > 0) stats.push(`新增 ${added}`);
             if (modified > 0) stats.push(`修改 ${modified}`);
@@ -5289,200 +5188,153 @@ class ReviewLlmProcessor {
     }
 }
 
-;// CONCATENATED MODULE: ./src/review.service.ts
-
-
-
+;// CONCATENATED MODULE: ./src/review-source-resolver.ts
 
 
 
 
 
 
-
-
-class ReviewService {
+/**
+ * 审查源数据解析器：根据审查模式（本地/PR/分支比较）获取 commits、changedFiles 等输入数据，
+ * 并应用前置过滤管道（merge commit、files、commits、includes）。
+ *
+ * 从 ReviewService 中提取，职责单一化：只负责"获取和过滤源数据"，不涉及 LLM 审查、报告生成等。
+ */ class ReviewSourceResolver {
     gitProvider;
-    config;
-    reviewSpecService;
-    llmProxyService;
-    reviewReportService;
-    issueVerifyService;
-    deletionImpactService;
     gitSdk;
-    contextBuilder;
     issueFilter;
-    llmProcessor;
-    resultModelDeps;
-    constructor(gitProvider, config, reviewSpecService, llmProxyService, reviewReportService, issueVerifyService, deletionImpactService, gitSdk){
+    constructor(gitProvider, gitSdk, issueFilter){
         this.gitProvider = gitProvider;
-        this.config = config;
-        this.reviewSpecService = reviewSpecService;
-        this.llmProxyService = llmProxyService;
-        this.reviewReportService = reviewReportService;
-        this.issueVerifyService = issueVerifyService;
-        this.deletionImpactService = deletionImpactService;
         this.gitSdk = gitSdk;
-        this.contextBuilder = new ReviewContextBuilder(gitProvider, config, gitSdk);
-        this.issueFilter = new ReviewIssueFilter(gitProvider, config, reviewSpecService, issueVerifyService, gitSdk);
-        this.llmProcessor = new ReviewLlmProcessor(llmProxyService, reviewSpecService);
-        this.resultModelDeps = {
-            gitProvider,
-            config,
-            reviewSpecService,
-            reviewReportService
-        };
-    }
-    async getContextFromEnv(options) {
-        return this.contextBuilder.getContextFromEnv(options);
+        this.issueFilter = issueFilter;
     }
     /**
-   * 执行代码审查的主方法
-   * 该方法负责协调整个审查流程，包括：
-   * 1. 加载审查规范（specs）
-   * 2. 获取 PR/分支的变更文件和提交记录
-   * 3. 调用 LLM 进行代码审查
-   * 4. 处理历史 issue（更新行号、验证修复状态）
-   * 5. 生成并发布审查报告
+   * 解析输入数据：根据模式（本地/PR/分支比较）获取 commits、changedFiles 等。
+   * 包含前置过滤（merge commit、files、commits、includes）。
+   * 如果需要提前返回（如同分支、重复 workflow），通过 earlyReturn 字段传递。
    *
-   * @param context 审查上下文，包含 owner、repo、prNumber 等信息
-   * @returns 审查结果，包含发现的问题列表和统计信息
-   */ async execute(context) {
-        const { specSources, verbose, llmMode, deletionOnly } = context;
-        if (shouldLog(verbose, 1)) {
-            console.log(`🔍 Review 启动`);
-            console.log(`   DRY-RUN mode: ${context.dryRun ? "enabled" : "disabled"}`);
-            console.log(`   CI mode: ${context.ci ? "enabled" : "disabled"}`);
-            if (context.localMode) console.log(`   Local mode: ${context.localMode}`);
-            console.log(`   Verbose: ${verbose}`);
-        }
-        // 早期分流
-        if (deletionOnly) return this.executeDeletionOnly(context);
-        if (context.eventAction === "closed" || context.flush) return this.executeCollectOnly(context);
-        // 1. 解析输入数据（本地/PR/分支模式 + 前置过滤）
-        const source = await this.resolveSourceData(context);
-        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 过滤`);
+   * 数据获取流程：
+   *   1. 本地模式 → resolveLocalFiles（暂存区/未提交变更，无变更时回退分支比较）
+   *   2. 直接文件模式（-f）→ 构造 changedFiles
+   *   3. PR 模式 → resolvePrData（含重复 workflow 检查）
+   *   4. 分支比较模式 → resolveBranchCompareData
+   *
+   * 前置过滤管道（applyPreFilters）：
+   *   0. merge commit 过滤
+   *   1. --files 过滤
+   *   2. --commits 过滤
+   *   3. --includes 过滤（支持 status| 前缀语法）
+   */ async resolve(context) {
+        const { prNumber, verbose, files, localMode } = context;
+        const isDirectFileMode = !!(files && files.length > 0 && !prNumber);
+        let isLocalMode = !!localMode;
+        let effectiveBaseRef = context.baseRef;
+        let effectiveHeadRef = context.headRef;
+        let prModel;
+        let commits = [];
+        let changedFiles = [];
+        // ── 阶段 1：按模式获取 commits + changedFiles ──────────
+        if (isLocalMode) {
+            const local = this.resolveLocalFiles(localMode, verbose);
+            if (local.earlyReturn) return {
+                ...local.earlyReturn,
+                changedFiles: ChangedFileCollection.from(local.earlyReturn.changedFiles),
+                isDirectFileMode: false,
+                fileContents: new Map()
+            };
+            isLocalMode = local.isLocalMode;
+            changedFiles = local.changedFiles;
+            effectiveBaseRef = local.effectiveBaseRef ?? effectiveBaseRef;
+            effectiveHeadRef = local.effectiveHeadRef ?? effectiveHeadRef;
         }
-        // 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 (isDirectFileMode) {
+            // 直接文件审查模式（-f）：绕过 diff，直接按指定文件构造审查输入
+            if (shouldLog(verbose, 1)) {
+                console.log(`📥 直接审查指定文件模式 (${files.length} 个文件)`);
+            }
+            changedFiles = files.map((f)=>({
+                    filename: f,
+                    status: "modified"
+                }));
+            isLocalMode = true;
+        } else if (prNumber) {
+            const prData = await this.resolvePrData(context);
+            if (prData.earlyReturn) {
+                return {
+                    ...prData,
+                    changedFiles: ChangedFileCollection.from(prData.changedFiles),
+                    headSha: prData.headSha,
+                    isLocalMode,
+                    isDirectFileMode,
+                    fileContents: new Map()
+                };
+            }
+            prModel = prData.prModel;
+            commits = prData.commits;
+            changedFiles = prData.changedFiles;
+        } else if (effectiveBaseRef && effectiveHeadRef) {
+            if (changedFiles.length === 0) {
+                const branchData = await this.resolveBranchCompareData(context, effectiveBaseRef, effectiveHeadRef);
+                commits = branchData.commits;
+                changedFiles = branchData.changedFiles;
+            }
+        } else if (!isLocalMode) {
+            if (shouldLog(verbose, 1)) {
+                console.log(`❌ 错误: 缺少 prNumber 或 baseRef/headRef`, {
+                    prNumber,
+                    baseRef: context.baseRef,
+                    headRef: context.headRef
+                });
+            }
+            throw new Error("必须指定 PR 编号或者 base/head 分支");
         }
+        // ── 阶段 2：前置过滤管道 ─────────────────────────────
+        ({ 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.showAll, context.verbose);
+        return {
+            prModel,
+            commits,
+            changedFiles: collectedFiles,
+            headSha,
+            isLocalMode,
+            isDirectFileMode,
+            fileContents
+        };
+    }
+    // ─── 数据获取子方法 ──────────────────────────────────────
+    /**
+   * 本地模式：获取暂存区或未提交的变更文件。
+   * 如果本地无变更，自动回退到分支比较模式并检测 base/head 分支。
+   * 同分支时通过 earlyReturn 提前终止。
+   */ resolveLocalFiles(localMode, verbose) {
         if (shouldLog(verbose, 1)) {
-            console.log(`   适用的规则文件: ${applicableSpecs.length}`);
-        }
-        if (applicableSpecs.length === 0 || changedFiles.length === 0) {
-            return this.handleNoApplicableSpecs(context, applicableSpecs, changedFiles, commits);
+            console.log(`📥 本地模式: 获取${localMode === "staged" ? "暂存区" : "未提交"}的代码变更`);
         }
-        // 3. 获取文件内容 + LLM 审查
-        const fileContents = await this.getFileContents(context.owner, context.repo, changedFiles, commits, headSha, context.prNumber, verbose, source.isLocalMode);
-        if (!llmMode) throw new Error("必须指定 LLM 类型");
-        // 获取上一次的审查结果（用于提示词优化和轮次推进）
-        let existingResultModel = null;
-        if (context.ci && prModel) {
-            existingResultModel = await ReviewResultModel.loadFromPr(prModel, this.resultModelDeps);
-            if (existingResultModel && shouldLog(verbose, 1)) {
-                console.log(`📋 获取到上一次审查结果，包含 ${existingResultModel.issues.length} 个问题`);
-            }
-        }
-        if (shouldLog(verbose, 1)) {
-            console.log(`🔄 当前审查轮次: ${(existingResultModel?.round ?? 0) + 1}`);
-        }
-        const reviewPrompt = await this.buildReviewPrompt(specs, changedFiles, fileContents, commits, existingResultModel?.result ?? null, effectiveWhenModifiedCode, verbose, context.systemRules);
-        const result = await this.runLLMReview(llmMode, reviewPrompt, {
-            verbose,
-            concurrency: context.concurrency,
-            timeout: context.timeout,
-            retries: context.retries,
-            retryDelay: context.retryDelay
-        });
-        // 填充 PR 功能描述和标题
-        const prInfo = context.generateDescription ? await this.generatePrDescription(commits, changedFiles, llmMode, fileContents, verbose) : await this.buildBasicDescription(commits, changedFiles);
-        result.title = prInfo.title;
-        result.description = prInfo.description;
-        if (shouldLog(verbose, 1)) {
-            console.log(`📝 LLM 审查完成，发现 ${result.issues.length} 个问题`);
-        }
-        // 4. 过滤新 issues
-        result.issues = await this.fillIssueCode(result.issues, fileContents);
-        result.issues = this.filterNewIssues(result.issues, specs, applicableSpecs, {
-            commits,
-            fileContents,
-            changedFiles,
-            isDirectFileMode,
-            context
-        });
-        // 静态规则产生的系统问题直接合并，不经过过滤管道
-        if (reviewPrompt.staticIssues?.length) {
-            result.issues = [
-                ...reviewPrompt.staticIssues,
-                ...result.issues
-            ];
+        const localFiles = localMode === "staged" ? this.gitSdk.getStagedFiles() : this.gitSdk.getUncommittedFiles();
+        if (localFiles.length === 0) {
+            // 本地无变更，回退到分支比较模式
             if (shouldLog(verbose, 1)) {
-                console.log(`⚙️  追加 ${reviewPrompt.staticIssues.length} 个静态规则系统问题`);
+                console.log(`ℹ️  没有${localMode === "staged" ? "暂存区" : "未提交"}的代码变更，回退到分支比较模式`);
             }
-        }
-        if (shouldLog(verbose, 1)) {
-            console.log(`📝 最终发现 ${result.issues.length} 个问题`);
-        }
-        // 5. 构建最终的 ReviewResultModel
-        const finalModel = await this.buildFinalModel(context, result, {
-            prModel,
-            commits,
-            headSha,
-            specs,
-            fileContents
-        }, existingResultModel);
-        // 6. 保存 + 输出
-        await this.saveAndOutput(context, finalModel, commits);
-        return finalModel.result;
-    }
-    // ─── 提取的子方法 ──────────────────────────────────────
-    /**
-   * 解析输入数据：根据模式（本地/PR/分支比较）获取 commits、changedFiles 等。
-   * 包含前置过滤（merge commit、files、commits、includes）。
-   * 如果需要提前返回（如同分支、重复 workflow），通过 earlyReturn 字段传递。
-   */ async resolveSourceData(context) {
-        const { owner, repo, prNumber, baseRef, headRef, verbose, ci, includes, files, commits: filterCommits, localMode, duplicateWorkflowResolved } = context;
-        const isDirectFileMode = !!(files && files.length > 0 && !prNumber);
-        let isLocalMode = !!localMode;
-        let effectiveBaseRef = baseRef;
-        let effectiveHeadRef = headRef;
-        let prModel;
-        let commits = [];
-        let changedFiles = [];
-        if (isLocalMode) {
-            // 本地模式：从 git 获取未提交/暂存区的变更
+            const effectiveHeadRef = this.gitSdk.getCurrentBranch() ?? "HEAD";
+            const effectiveBaseRef = this.gitSdk.getDefaultBranch();
             if (shouldLog(verbose, 1)) {
-                console.log(`📥 本地模式: 获取${localMode === "staged" ? "暂存区" : "未提交"}的代码变更`);
+                console.log(`📌 自动检测分支: base=${effectiveBaseRef}, head=${effectiveHeadRef}`);
             }
-            const localFiles = localMode === "staged" ? this.gitSdk.getStagedFiles() : this.gitSdk.getUncommittedFiles();
-            if (localFiles.length === 0) {
-                // 本地无变更，回退到分支比较模式
-                if (shouldLog(verbose, 1)) {
-                    console.log(`ℹ️  没有${localMode === "staged" ? "暂存区" : "未提交"}的代码变更，回退到分支比较模式`);
-                }
-                isLocalMode = false;
-                effectiveHeadRef = this.gitSdk.getCurrentBranch() ?? "HEAD";
-                effectiveBaseRef = this.gitSdk.getDefaultBranch();
-                if (shouldLog(verbose, 1)) {
-                    console.log(`📌 自动检测分支: base=${effectiveBaseRef}, head=${effectiveHeadRef}`);
-                }
-                // 同分支无法比较，提前返回
-                if (effectiveBaseRef === effectiveHeadRef) {
-                    console.log(`ℹ️  当前分支 ${effectiveHeadRef} 与默认分支相同，没有可审查的代码变更`);
-                    return {
+            // 同分支无法比较，提前返回
+            if (effectiveBaseRef === effectiveHeadRef) {
+                console.log(`ℹ️  当前分支 ${effectiveHeadRef} 与默认分支相同，没有可审查的代码变更`);
+                return {
+                    changedFiles: [],
+                    isLocalMode: false,
+                    earlyReturn: {
                         commits: [],
                         changedFiles: [],
                         headSha: "HEAD",
                         isLocalMode: false,
-                        isDirectFileMode: false,
                         earlyReturn: {
                             success: true,
                             description: "",
@@ -5490,176 +5342,543 @@ class ReviewService {
                             summary: [],
                             round: 1
                         }
-                    };
-                }
-            } else {
-                // 一次性获取所有 diff，避免每个文件调用一次 git 命令
-                const localDiffs = localMode === "staged" ? this.gitSdk.getStagedDiff() : this.gitSdk.getUncommittedDiff();
-                const diffMap = new Map(localDiffs.map((d)=>[
-                        d.filename,
-                        d.patch
-                    ]));
-                changedFiles = localFiles.map((f)=>({
-                        filename: f.filename,
-                        status: f.status,
-                        patch: diffMap.get(f.filename)
-                    }));
-                if (shouldLog(verbose, 1)) {
-                    console.log(`   Changed files: ${changedFiles.length}`);
-                }
+                    }
+                };
             }
+            return {
+                changedFiles: [],
+                isLocalMode: false,
+                effectiveBaseRef,
+                effectiveHeadRef
+            };
         }
-        // 直接文件审查模式（-f）：绕过 diff，直接按指定文件构造审查输入
-        if (isDirectFileMode) {
+        // 一次性获取所有 diff，避免每个文件调用一次 git 命令
+        const localDiffs = localMode === "staged" ? this.gitSdk.getStagedDiff() : this.gitSdk.getUncommittedDiff();
+        const diffMap = new Map(localDiffs.map((d)=>[
+                d.filename,
+                d.patch
+            ]));
+        const changedFiles = localFiles.map((f)=>({
+                filename: f.filename,
+                status: f.status,
+                patch: diffMap.get(f.filename)
+            }));
+        if (shouldLog(verbose, 1)) {
+            console.log(`   Changed files: ${changedFiles.length}`);
+        }
+        return {
+            changedFiles,
+            isLocalMode: true
+        };
+    }
+    /**
+   * PR 模式：获取 PR 信息、commits、changedFiles。
+   * 同时检查是否有同名 review workflow 正在运行（防止重复审查）。
+   */ async resolvePrData(context) {
+        const { owner, repo, prNumber, verbose, ci, duplicateWorkflowResolved } = context;
+        if (shouldLog(verbose, 1)) {
+            console.log(`📥 获取 PR #${prNumber} 信息 (owner: ${owner}, repo: ${repo})`);
+        }
+        const prModel = new PullRequestModel(this.gitProvider, owner, repo, prNumber);
+        const prInfo = await prModel.getInfo();
+        const commits = await prModel.getCommits();
+        const changedFiles = await prModel.getFiles();
+        if (shouldLog(verbose, 1)) {
+            console.log(`   PR: ${prInfo?.title}`);
+            console.log(`   Commits: ${commits.length}`);
+            console.log(`   Changed files: ${changedFiles.length}`);
+        }
+        // 检查是否有其他同名 review workflow 正在运行中
+        if (duplicateWorkflowResolved !== "off" && ci && prInfo?.head?.sha) {
+            const duplicateResult = await this.checkDuplicateWorkflow(prModel, prInfo.head.sha, duplicateWorkflowResolved, verbose);
+            if (duplicateResult) {
+                return {
+                    prModel,
+                    commits,
+                    changedFiles,
+                    headSha: prInfo.head.sha,
+                    earlyReturn: duplicateResult
+                };
+            }
+        }
+        return {
+            prModel,
+            commits,
+            changedFiles
+        };
+    }
+    /**
+   * 分支比较模式：获取 base...head 之间的 changedFiles 和 commits。
+   */ async resolveBranchCompareData(context, baseRef, headRef) {
+        const { owner, repo, verbose } = context;
+        if (shouldLog(verbose, 1)) {
+            console.log(`📥 获取 ${baseRef}...${headRef} 的差异 (owner: ${owner}, repo: ${repo})`);
+        }
+        const changedFiles = await this.issueFilter.getChangedFilesBetweenRefs(owner, repo, baseRef, headRef);
+        const commits = await this.issueFilter.getCommitsBetweenRefs(baseRef, headRef);
+        if (shouldLog(verbose, 1)) {
+            console.log(`   Changed files: ${changedFiles.length}`);
+            console.log(`   Commits: ${commits.length}`);
+        }
+        return {
+            commits,
+            changedFiles
+        };
+    }
+    // ─── 前置过滤 ──────────────────────────────────────────
+    /**
+   * 前置过滤管道：对 commits 和 changedFiles 依次执行过滤。
+   *
+   * 过滤顺序：
+   *   0. merge commit — 排除以 "Merge " 开头的 commit
+   *   1. --files — 仅保留用户指定的文件
+   *   2. --commits — 仅保留用户指定的 commit 及其涉及的文件
+   *   3. --includes — glob 模式过滤文件和 commits（支持 status| 前缀语法）
+   */ async applyPreFilters(context, commits, rawChangedFiles, isDirectFileMode) {
+        const { owner, repo, prNumber, verbose, includes, files, commits: filterCommits, showAll } = context;
+        let changedFiles = ChangedFileCollection.from(rawChangedFiles);
+        // 0. 过滤掉 merge commit（showAll=false 时启用）
+        if (!showAll) {
+            const before = commits.length;
+            commits = commits.filter((c)=>{
+                const message = c.commit?.message || "";
+                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) {
+            const before = changedFiles.length;
+            changedFiles = changedFiles.filterByFilenames(files);
             if (shouldLog(verbose, 1)) {
-                console.log(`📥 直接审查指定文件模式 (${files.length} 个文件)`);
+                console.log(`   Files 过滤文件: ${before} -> ${changedFiles.length} 个文件`);
             }
-            changedFiles = files.map((f)=>({
-                    filename: f,
-                    status: "modified"
-                }));
-            isLocalMode = true;
-        } else if (prNumber) {
+        }
+        // 2. 按指定的 commits 过滤（同时过滤文件：仅保留属于匹配 commits 的文件）
+        if (filterCommits && filterCommits.length > 0) {
+            const beforeCommits = commits.length;
+            commits = commits.filter((c)=>filterCommits.some((fc)=>fc && c.sha?.startsWith(fc)));
             if (shouldLog(verbose, 1)) {
-                console.log(`📥 获取 PR #${prNumber} 信息 (owner: ${owner}, repo: ${repo})`);
+                console.log(`   Commits 过滤: ${beforeCommits} -> ${commits.length} 个`);
             }
-            prModel = new PullRequestModel(this.gitProvider, owner, repo, prNumber);
-            const prInfo = await prModel.getInfo();
-            commits = await prModel.getCommits();
-            changedFiles = await prModel.getFiles();
+            const beforeFiles = changedFiles.length;
+            const commitFilenames = new Set();
+            for (const commit of commits){
+                if (!commit.sha) continue;
+                const commitFiles = await this.issueFilter.getFilesForCommit(owner, repo, commit.sha, prNumber);
+                commitFiles.forEach((f)=>commitFilenames.add(f));
+            }
+            changedFiles = changedFiles.filterByCommitFiles(commitFilenames);
             if (shouldLog(verbose, 1)) {
-                console.log(`   PR: ${prInfo?.title}`);
-                console.log(`   Commits: ${commits.length}`);
-                console.log(`   Changed files: ${changedFiles.length}`);
-            }
-            // 检查是否有其他同名 review workflow 正在运行中
-            if (duplicateWorkflowResolved !== "off" && ci && prInfo?.head?.sha) {
-                const duplicateResult = await this.checkDuplicateWorkflow(prModel, prInfo.head.sha, duplicateWorkflowResolved, verbose);
-                if (duplicateResult) {
-                    return {
-                        prModel,
-                        commits,
-                        changedFiles,
-                        headSha: prInfo.head.sha,
-                        isLocalMode,
-                        isDirectFileMode,
-                        earlyReturn: duplicateResult
-                    };
+                console.log(`   按 Commits 过滤文件: ${beforeFiles} -> ${changedFiles.length} 个文件`);
+            }
+        }
+        // 3. 使用 includes 过滤文件和 commits（支持 added|/modified|/deleted| 前缀语法）
+        if (isDirectFileMode && includes && includes.length > 0) {
+            if (shouldLog(verbose, 1)) {
+                console.log(`ℹ️  直接文件模式下忽略 includes 过滤`);
+            }
+        } else 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 = ChangedFileCollection.from(filterFilesByIncludes(changedFiles.toArray(), 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))}`);
+            }
+            // 按 includes glob 过滤 commits：仅保留涉及匹配文件的 commits
+            const globs = extractGlobsFromIncludes(includes);
+            const beforeCommits = commits.length;
+            const filteredCommits = [];
+            for (const commit of commits){
+                if (!commit.sha) continue;
+                const commitFiles = await this.issueFilter.getFilesForCommit(owner, repo, commit.sha, prNumber);
+                if (micromatch_0.some(commitFiles, globs)) {
+                    filteredCommits.push(commit);
                 }
             }
-        } else if (effectiveBaseRef && effectiveHeadRef) {
-            if (changedFiles.length === 0) {
-                if (shouldLog(verbose, 1)) {
-                    console.log(`📥 获取 ${effectiveBaseRef}...${effectiveHeadRef} 的差异 (owner: ${owner}, repo: ${repo})`);
+            commits = filteredCommits;
+            if (shouldLog(verbose, 1)) {
+                console.log(`   Includes 过滤 Commits: ${beforeCommits} -> ${commits.length} 个`);
+            }
+        }
+        return {
+            commits,
+            changedFiles: changedFiles.toArray()
+        };
+    }
+    // ─── 文件内容 ─────────────────────────────────────────
+    /**
+   * 获取文件内容并构建行号到 commit hash 的映射
+   * 返回 Map<filename, Array<[commitHash, lineCode]>>
+   */ 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(`📊 正在构建行号到变更的映射...`);
+        }
+        for (const file of changedFiles){
+            if (file.filename && file.status !== "deleted") {
+                try {
+                    let rawContent;
+                    if (isLocalMode) {
+                        rawContent = this.gitSdk.getWorkingFileContent(file.filename);
+                    } else if (prNumber) {
+                        rawContent = await this.gitProvider.getFileContent(owner, repo, file.filename, ref);
+                    } else {
+                        rawContent = await this.gitSdk.getFileContent(ref, file.filename);
+                    }
+                    const lines = rawContent.split("\n");
+                    let changedLines = parseChangedLinesFromPatch(file.patch);
+                    const isNewFile = file.status === "added" || file.status === "A" || file.additions && file.additions > 0 && file.deletions === 0 && !file.patch;
+                    if (changedLines.size === 0 && isNewFile) {
+                        changedLines = new Set(lines.map((_, i)=>i + 1));
+                        if (shouldLog(verbose, 2)) {
+                            console.log(`   ℹ️ ${file.filename}: 新增文件无 patch，将所有 ${lines.length} 行标记为变更`);
+                        }
+                    }
+                    let blameMap;
+                    if (!isLocalMode) {
+                        try {
+                            blameMap = await this.gitSdk.getFileBlame(ref, file.filename);
+                        } catch  {
+                        // blame 失败时回退到 latestCommitHash
+                        }
+                    }
+                    if (shouldLog(verbose, 3)) {
+                        console.log(`   📄 ${file.filename}: ${lines.length} 行, ${changedLines.size} 行变更`);
+                        console.log(`      blame: ${blameMap ? `${blameMap.size} 行` : `不可用，回退到 ${latestCommitHash}`}`);
+                        if (changedLines.size > 0 && changedLines.size <= 20) {
+                            console.log(`      变更行号: ${Array.from(changedLines).sort((a, b)=>a - b).join(", ")}`);
+                        } else if (changedLines.size > 20) {
+                            console.log(`      变更行号: (共 ${changedLines.size} 行，省略详情)`);
+                        }
+                        if (!file.patch) {
+                            console.log(`      ⚠️ 该文件没有 patch 信息 (status=${file.status}, additions=${file.additions}, deletions=${file.deletions})`);
+                        } else {
+                            console.log(`      patch 前 200 字符: ${file.patch.slice(0, 200).replace(/\n/g, "\\n")}`);
+                        }
+                    }
+                    const contentLines = lines.map((line, index)=>{
+                        const lineNum = index + 1;
+                        if (!changedLines.has(lineNum)) {
+                            return [
+                                "-------",
+                                line
+                            ];
+                        }
+                        const hash = blameMap?.get(lineNum) ?? latestCommitHash;
+                        if (shouldMaskUnknownChangedLines && !validCommitHashes.has(hash)) {
+                            return [
+                                "-------",
+                                line
+                            ];
+                        }
+                        return [
+                            hash,
+                            line
+                        ];
+                    });
+                    contents.set(file.filename, contentLines);
+                } catch (error) {
+                    console.warn(`警告: 无法获取文件内容: ${file.filename}`, error);
+                }
+            }
+        }
+        if (shouldLog(verbose, 1)) {
+            console.log(`📊 映射构建完成，共 ${contents.size} 个文件`);
+        }
+        return contents;
+    }
+    // ─── 重复 workflow 检查 ──────────────────────────────────
+    /**
+   * 检查是否有其他同名 review workflow 正在运行中。
+   * 根据 duplicateWorkflowResolved 配置决定是跳过还是删除旧评论。
+   */ async checkDuplicateWorkflow(prModel, headSha, mode, verbose) {
+        const ref = process.env.GITHUB_REF || process.env.GITEA_REF || "";
+        const prMatch = ref.match(/refs\/pull\/(\d+)/);
+        const currentPrNumber = prMatch ? parseInt(prMatch[1], 10) : prModel.number;
+        try {
+            const runningWorkflows = await prModel.listWorkflowRuns({
+                status: "in_progress"
+            });
+            const currentWorkflowName = process.env.GITHUB_WORKFLOW || process.env.GITEA_WORKFLOW;
+            const currentRunId = process.env.GITHUB_RUN_ID || process.env.GITEA_RUN_ID;
+            const duplicateReviewRuns = runningWorkflows.filter((w)=>w.sha === headSha && w.name === currentWorkflowName && (!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;
                 }
-                changedFiles = await this.getChangedFilesBetweenRefs(owner, repo, effectiveBaseRef, effectiveHeadRef);
-                commits = await this.getCommitsBetweenRefs(effectiveBaseRef, effectiveHeadRef);
+                // 跳过模式（默认）
                 if (shouldLog(verbose, 1)) {
-                    console.log(`   Changed files: ${changedFiles.length}`);
-                    console.log(`   Commits: ${commits.length}`);
+                    console.log(`⏭️ 跳过审查: 当前 PR #${currentPrNumber} 有 ${duplicateReviewRuns.length} 个同名 workflow 正在运行中`);
                 }
+                return {
+                    success: true,
+                    description: `跳过审查: PR #${currentPrNumber} 有 ${duplicateReviewRuns.length} 个同名 workflow 正在运行中，等待完成后重新审查`,
+                    issues: [],
+                    summary: [],
+                    round: 1
+                };
             }
-        } else if (!isLocalMode) {
+        } catch (error) {
             if (shouldLog(verbose, 1)) {
-                console.log(`❌ 错误: 缺少 prNumber 或 baseRef/headRef`, {
-                    prNumber,
-                    baseRef,
-                    headRef
-                });
+                console.warn(`⚠️ 无法检查重复 workflow（可能缺少 repo owner 权限），跳过此检查:`, error instanceof Error ? error.message : error);
             }
-            throw new Error("必须指定 PR 编号或者 base/head 分支");
         }
-        // ── 前置过滤 ──────────────────────────────────────────
-        // 0. 过滤掉 merge commit
-        {
-            const before = commits.length;
-            commits = commits.filter((c)=>{
-                const message = c.commit?.message || "";
-                return !message.startsWith("Merge ");
-            });
-            if (before !== commits.length && shouldLog(verbose, 1)) {
-                console.log(`   跳过 Merge Commits: ${before} -> ${commits.length} 个`);
-            }
+        return null;
+    }
+    /**
+   * 清理重复的 AI Review 评论（Issue Comments 和 PR Reviews）
+   */ async cleanupDuplicateAiReviews(prModel, verbose) {
+        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);
+            }
+        }
+    }
+}
+
+;// CONCATENATED MODULE: ./src/review.service.ts
+
+
+
+
+
+
+
+
+
+
+
+class ReviewService {
+    gitProvider;
+    config;
+    reviewSpecService;
+    llmProxyService;
+    reviewReportService;
+    issueVerifyService;
+    deletionImpactService;
+    gitSdk;
+    contextBuilder;
+    issueFilter;
+    llmProcessor;
+    resultModelDeps;
+    sourceResolver;
+    constructor(gitProvider, config, reviewSpecService, llmProxyService, reviewReportService, issueVerifyService, deletionImpactService, gitSdk){
+        this.gitProvider = gitProvider;
+        this.config = config;
+        this.reviewSpecService = reviewSpecService;
+        this.llmProxyService = llmProxyService;
+        this.reviewReportService = reviewReportService;
+        this.issueVerifyService = issueVerifyService;
+        this.deletionImpactService = deletionImpactService;
+        this.gitSdk = gitSdk;
+        this.contextBuilder = new ReviewContextBuilder(gitProvider, config, gitSdk);
+        this.issueFilter = new ReviewIssueFilter(gitProvider, config, reviewSpecService, issueVerifyService, gitSdk);
+        this.llmProcessor = new ReviewLlmProcessor(llmProxyService, reviewSpecService);
+        this.sourceResolver = new ReviewSourceResolver(gitProvider, gitSdk, this.issueFilter);
+        this.resultModelDeps = {
+            gitProvider,
+            config,
+            reviewSpecService,
+            reviewReportService
+        };
+    }
+    async getContextFromEnv(options) {
+        return this.contextBuilder.getContextFromEnv(options);
+    }
+    /**
+   * 执行代码审查的主方法
+   * 该方法负责协调整个审查流程，包括：
+   * 1. 加载审查规范（specs）
+   * 2. 获取 PR/分支的变更文件和提交记录
+   * 3. 调用 LLM 进行代码审查
+   * 4. 处理历史 issue（更新行号、验证修复状态）
+   * 5. 生成并发布审查报告
+   *
+   * @param context 审查上下文，包含 owner、repo、prNumber 等信息
+   * @returns 审查结果，包含发现的问题列表和统计信息
+   */ async execute(context) {
+        const { specSources, verbose, llmMode, deletionOnly } = context;
+        if (shouldLog(verbose, 1)) {
+            console.log(`🔍 Review 启动`);
+            console.log(`   DRY-RUN mode: ${context.dryRun ? "enabled" : "disabled"}`);
+            console.log(`   CI mode: ${context.ci ? "enabled" : "disabled"}`);
+            if (context.localMode) console.log(`   Local mode: ${context.localMode}`);
+            console.log(`   Verbose: ${verbose}`);
+        }
+        // 早期分流
+        if (deletionOnly) return this.executeDeletionOnly(context);
+        if (context.eventAction === "closed" || context.flush) return this.executeCollectOnly(context);
+        // 1. 解析输入数据（本地/PR/分支模式 + 前置过滤）
+        const source = await this.resolveSourceData(context);
+        if (source.earlyReturn) return source.earlyReturn;
+        const effectiveWhenModifiedCode = source.isDirectFileMode ? undefined : context.whenModifiedCode;
+        if (source.isDirectFileMode && context.whenModifiedCode?.length && shouldLog(verbose, 1)) {
+            console.log(`ℹ️  直接文件模式下忽略 whenModifiedCode 过滤`);
         }
-        // 1. 按指定的 files 过滤
-        if (files && files.length > 0) {
-            const before = changedFiles.length;
-            changedFiles = changedFiles.filter((f)=>files.includes(f.filename || ""));
-            if (shouldLog(verbose, 1)) {
-                console.log(`   Files 过滤文件: ${before} -> ${changedFiles.length} 个文件`);
-            }
+        // 2. 规则匹配
+        const allSpecs = await this.issueFilter.loadSpecs(specSources, verbose);
+        const specs = this.reviewSpecService.filterApplicableSpecs(allSpecs, source.changedFiles);
+        if (shouldLog(verbose, 2)) {
+            console.log(`[execute] loadSpecs: loaded ${specs.length} specs from sources: ${JSON.stringify(specSources)}`);
+            console.log(`[execute] filterApplicableSpecs: ${specs.length} applicable out of ${allSpecs.length}, changedFiles=${JSON.stringify(source.changedFiles.filenames())}`);
         }
-        // 2. 按指定的 commits 过滤
-        if (filterCommits && filterCommits.length > 0) {
-            const beforeCommits = commits.length;
-            commits = commits.filter((c)=>filterCommits.some((fc)=>fc && c.sha?.startsWith(fc)));
-            if (shouldLog(verbose, 1)) {
-                console.log(`   Commits 过滤: ${beforeCommits} -> ${commits.length} 个`);
-            }
-            const beforeFiles = changedFiles.length;
-            const commitFilenames = new Set();
-            for (const commit of commits){
-                if (!commit.sha) continue;
-                const commitFiles = await this.getFilesForCommit(owner, repo, commit.sha, prNumber);
-                commitFiles.forEach((f)=>commitFilenames.add(f));
-            }
-            changedFiles = changedFiles.filter((f)=>commitFilenames.has(f.filename || ""));
-            if (shouldLog(verbose, 1)) {
-                console.log(`   按 Commits 过滤文件: ${beforeFiles} -> ${changedFiles.length} 个文件`);
-            }
+        if (shouldLog(verbose, 1)) {
+            console.log(`   适用的规则文件: ${specs.length}`);
         }
-        // 3. 使用 includes 过滤文件和 commits（支持 added|/modified|/deleted| 前缀语法）
-        if (isDirectFileMode && includes && includes.length > 0) {
-            if (shouldLog(verbose, 1)) {
-                console.log(`ℹ️  直接文件模式下忽略 includes 过滤`);
-            }
-        } else 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;
-            const filteredCommits = [];
-            for (const commit of commits){
-                if (!commit.sha) continue;
-                const commitFiles = await this.getFilesForCommit(owner, repo, commit.sha, prNumber);
-                if (micromatch_0.some(commitFiles, globs)) {
-                    filteredCommits.push(commit);
-                }
-            }
-            commits = filteredCommits;
-            if (shouldLog(verbose, 1)) {
-                console.log(`   Includes 过滤 Commits: ${beforeCommits} -> ${commits.length} 个`);
+        if (specs.length === 0 || source.changedFiles.length === 0) {
+            return this.handleNoApplicableSpecs(context, specs, source.changedFiles, source.commits);
+        }
+        // 3. LLM 审查
+        const { fileContents } = source;
+        if (!llmMode) throw new Error("必须指定 LLM 类型");
+        // 获取上一次的审查结果（用于提示词优化和轮次推进）
+        let existingResultModel = null;
+        if (context.ci && source.prModel) {
+            existingResultModel = await ReviewResultModel.loadFromPr(source.prModel, this.resultModelDeps);
+            if (existingResultModel && shouldLog(verbose, 1)) {
+                console.log(`📋 获取到上一次审查结果，包含 ${existingResultModel.issues.length} 个问题`);
             }
         }
-        const headSha = prModel ? await prModel.getHeadSha() : headRef || "HEAD";
-        return {
-            prModel,
+        if (shouldLog(verbose, 1)) {
+            console.log(`🔄 当前审查轮次: ${(existingResultModel?.round ?? 0) + 1}`);
+        }
+        const reviewPrompt = await this.llmProcessor.buildReviewPrompt(specs, source.changedFiles, fileContents, source.commits, existingResultModel?.result ?? null, effectiveWhenModifiedCode, verbose, context.systemRules);
+        // 4. 运行 LLM 审查 + 过滤新 issues
+        const result = await this.buildReviewResult(context, reviewPrompt, llmMode, {
+            specs,
+            fileContents,
+            changedFiles: source.changedFiles,
+            commits: source.commits,
+            isDirectFileMode: source.isDirectFileMode
+        });
+        // 5. 构建最终的 ReviewResultModel
+        const finalModel = await this.buildFinalModel(context, result, {
+            prModel: source.prModel,
+            commits: source.commits,
+            headSha: source.headSha,
+            specs,
+            fileContents
+        }, existingResultModel);
+        // 6. 保存 + 输出
+        await this.saveAndOutput(context, finalModel, source.commits);
+        return finalModel.result;
+    }
+    /**
+   * 运行 LLM 审查并构建过滤后的 ReviewResult：
+   * - 调用 LLM 生成问题列表
+   * - 填充 PR 标题/描述
+   * - 过滤新 issues（去重、commit 范围等）
+   * - 合并静态规则问题
+   */ async buildReviewResult(context, reviewPrompt, llmMode, source) {
+        const { verbose } = context;
+        const { specs, fileContents, changedFiles, commits, isDirectFileMode } = source;
+        const result = await this.llmProcessor.runLLMReview(llmMode, reviewPrompt, {
+            verbose,
+            concurrency: context.concurrency,
+            timeout: context.timeout,
+            retries: context.retries,
+            retryDelay: context.retryDelay
+        });
+        // 填充 PR 功能描述和标题
+        const prInfo = context.generateDescription ? await this.llmProcessor.generatePrDescription(commits, changedFiles, llmMode, fileContents, verbose) : await this.llmProcessor.buildBasicDescription(commits, changedFiles);
+        result.title = prInfo.title;
+        result.description = prInfo.description;
+        if (shouldLog(verbose, 1)) {
+            console.log(`📝 LLM 审查完成，发现 ${result.issues.length} 个问题`);
+        }
+        result.issues = await this.issueFilter.fillIssueCode(result.issues, fileContents);
+        result.issues = this.filterNewIssues(result.issues, specs, {
             commits,
+            fileContents,
             changedFiles,
-            headSha,
-            isLocalMode,
-            isDirectFileMode
-        };
+            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} 个问题`);
+        }
+        return result;
+    }
+    /**
+   * 解析输入数据：委托给 ReviewSourceResolver。
+   * @see ReviewSourceResolver#resolve
+   */ async resolveSourceData(context) {
+        return this.sourceResolver.resolve(context);
     }
     /**
    * LLM 审查后的 issue 过滤管道：
    * includes → 规则存在性 → overrides → 变更行过滤 → 格式化
-   */ filterNewIssues(issues, specs, applicableSpecs, opts) {
+   */ filterNewIssues(issues, specs, opts) {
         const { commits, fileContents, changedFiles, isDirectFileMode, context } = opts;
         const { verbose } = context;
-        let filtered = this.reviewSpecService.filterIssuesByIncludes(issues, applicableSpecs);
+        let filtered = this.reviewSpecService.filterIssuesByIncludes(issues, specs);
         if (shouldLog(verbose, 1)) {
             console.log(`   应用 includes 过滤后: ${filtered.length} 个问题`);
         }
@@ -5667,26 +5886,26 @@ class ReviewService {
         if (shouldLog(verbose, 1)) {
             console.log(`   应用规则存在性过滤后: ${filtered.length} 个问题`);
         }
-        filtered = this.reviewSpecService.filterIssuesByOverrides(filtered, applicableSpecs, verbose);
+        filtered = this.reviewSpecService.filterIssuesByOverrides(filtered, specs, verbose);
         // 变更行过滤
         if (shouldLog(verbose, 3)) {
             console.log(`   🔍 变更行过滤条件检查:`);
             console.log(`      showAll=${context.showAll}, isDirectFileMode=${isDirectFileMode}, commits.length=${commits.length}`);
         }
-        if (!context.showAll && !isDirectFileMode && commits.length > 0) {
+        if (!context.showAll && !isDirectFileMode) {
             if (shouldLog(verbose, 2)) {
                 console.log(`   🔍 开始变更行过滤，当前 ${filtered.length} 个问题`);
             }
-            filtered = this.filterIssuesByValidCommits(filtered, commits, fileContents, verbose);
+            filtered = this.issueFilter.filterIssuesByValidCommits(filtered, commits, fileContents, verbose);
             if (shouldLog(verbose, 2)) {
                 console.log(`   🔍 变更行过滤完成，剩余 ${filtered.length} 个问题`);
             }
         } else if (shouldLog(verbose, 1)) {
-            console.log(`   跳过变更行过滤 (${context.showAll ? "showAll=true" : isDirectFileMode ? "直接审查文件模式" : "commits.length=0"})`);
+            console.log(`   跳过变更行过滤 (${context.showAll ? "showAll=true" : "直接审查文件模式"})`);
         }
         filtered = this.reviewSpecService.formatIssues(filtered, {
             specs,
-            changedFiles
+            changedFiles: changedFiles.toArray()
         });
         if (shouldLog(verbose, 1)) {
             console.log(`   应用格式化后: ${filtered.length} 个问题`);
@@ -5698,6 +5917,7 @@ class ReviewService {
    */ async buildFinalModel(context, result, source, existingResultModel) {
         const { prModel, commits, headSha, specs, fileContents } = source;
         const { verbose, ci } = context;
+        result.headSha = headSha;
         if (ci && prModel && existingResultModel && existingResultModel.issues.length > 0) {
             if (shouldLog(verbose, 1)) {
                 console.log(`📋 已有评论中存在 ${existingResultModel.issues.length} 个问题`);
@@ -5707,32 +5927,24 @@ class ReviewService {
             // 如果文件有变更，将该文件的历史问题标记为无效
             const reviewConf = this.config.getPluginConfig("review");
             if (reviewConf.invalidateChangedFiles !== "off" && reviewConf.invalidateChangedFiles !== "keep") {
-                await existingResultModel.invalidateChangedFiles(headSha, verbose);
+                await existingResultModel.invalidateChangedFiles(headSha, fileContents, verbose);
             }
             // 验证历史问题是否已修复
             if (context.verifyFixes) {
                 existingResultModel.issues = await this.issueFilter.verifyAndUpdateIssues(context, existingResultModel.issues, commits, {
                     specs,
                     fileContents
-                }, prModel);
+                });
             } else {
                 if (shouldLog(verbose, 1)) {
                     console.log(`   ⏭️  跳过历史问题验证 (verifyFixes=false)`);
                 }
             }
-            // 去重：与所有历史 issues 去重
-            const { filteredIssues: newIssues, skippedCount } = this.filterDuplicateIssues(result.issues, existingResultModel.issues);
-            if (skippedCount > 0 && shouldLog(verbose, 1)) {
-                console.log(`   跳过 ${skippedCount} 个重复问题，新增 ${newIssues.length} 个问题`);
-            }
-            result.issues = newIssues;
-            result.headSha = headSha;
-            // 自动 round 递增 + issues 合并
+            // 自动 round 递增 + 去重 + issues 合并
             return existingResultModel.nextRound(result);
         }
         // 首次审查或无历史结果
         result.round = 1;
-        result.headSha = headSha;
         result.issues = result.issues.map((issue)=>({
                 ...issue,
                 round: 1
@@ -5746,7 +5958,7 @@ class ReviewService {
         const prModel = finalModel.pr.number > 0 ? finalModel.pr : undefined;
         // 填充 author 信息
         if (commits.length > 0) {
-            finalModel.issues = await this.fillIssueAuthors(finalModel.issues, commits, owner, repo, verbose);
+            finalModel.issues = await this.contextBuilder.fillIssueAuthors(finalModel.issues, commits, owner, repo, verbose);
         }
         // 删除代码影响分析（在 save 之前完成，避免多次 save 产生重复的 Round 评论）
         if (context.analyzeDeletions && llmMode) {
@@ -5812,17 +6024,32 @@ class ReviewService {
             console.log(`📋 找到 ${resultModel.issues.length} 个历史问题`);
         }
         // 2. 获取 commits 并填充 author 信息
-        const commits = await prModel.getCommits();
-        resultModel.issues = await this.fillIssueAuthors(resultModel.issues, commits, owner, repo, verbose);
+        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();
         // 4. 同步评论 reactions（👍/👎/☹️）
         await resultModel.syncReactions(verbose);
         // 5. LLM 验证历史问题是否已修复
-        try {
-            resultModel.issues = await this.issueFilter.verifyAndUpdateIssues(context, resultModel.issues, commits, undefined, prModel);
-        } catch (error) {
-            console.warn("⚠️ LLM 验证修复状态失败，跳过:", error);
+        if (context.verifyFixes && context.specSources?.length) {
+            try {
+                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, context.showAll, verbose);
+                resultModel.issues = await this.issueFilter.verifyAndUpdateIssues(context, resultModel.issues, commits, {
+                    specs: verifySpecs,
+                    fileContents: verifyFileContents
+                });
+            } catch (error) {
+                console.warn("⚠️ LLM 验证修复状态失败，跳过:", error);
+            }
+        } else if (!context.verifyFixes && shouldLog(verbose, 1)) {
+            console.log(`   ⏭️  跳过历史问题验证 (verifyFixes=false)`);
         }
         // 6. 统计问题状态并设置到 result
         const stats = resultModel.updateStats();
@@ -5865,20 +6092,20 @@ class ReviewService {
         // 获取 commits 和 changedFiles 用于生成描述
         let prModel;
         let commits = [];
-        let changedFiles = [];
+        let changedFiles = ChangedFileCollection.empty();
         if (prNumber) {
             prModel = new PullRequestModel(this.gitProvider, owner, repo, prNumber);
             commits = await prModel.getCommits();
-            changedFiles = await prModel.getFiles();
+            changedFiles = ChangedFileCollection.from(await prModel.getFiles());
         } else if (baseRef && headRef) {
-            changedFiles = await this.getChangedFilesBetweenRefs(owner, repo, baseRef, headRef);
-            commits = await this.getCommitsBetweenRefs(baseRef, headRef);
+            changedFiles = ChangedFileCollection.from(await this.issueFilter.getChangedFilesBetweenRefs(owner, repo, baseRef, headRef));
+            commits = await this.issueFilter.getCommitsBetweenRefs(baseRef, headRef);
         }
         // 使用 includes 过滤文件（支持 added|/modified|/deleted| 前缀语法）
         if (context.includes && context.includes.length > 0) {
-            changedFiles = filterFilesByIncludes(changedFiles, context.includes);
+            changedFiles = ChangedFileCollection.from(filterFilesByIncludes(changedFiles.toArray(), context.includes));
         }
-        const prDesc = context.generateDescription ? await this.generatePrDescription(commits, changedFiles, llmMode, undefined, verbose) : await this.buildBasicDescription(commits, changedFiles);
+        const prDesc = context.generateDescription ? await this.llmProcessor.generatePrDescription(commits, changedFiles, llmMode, undefined, verbose) : await this.llmProcessor.buildBasicDescription(commits, changedFiles);
         const result = {
             success: true,
             title: prDesc.title,
@@ -5926,13 +6153,13 @@ class ReviewService {
         }
         const currentRound = (existingResultModel?.round ?? 0) + 1;
         // 即使没有适用的规则，也为每个变更文件生成摘要
-        const summary = changedFiles.filter((f)=>f.filename && f.status !== "deleted").map((f)=>({
+        const summary = changedFiles.nonDeletedFiles().map((f)=>({
                 file: f.filename,
                 resolved: 0,
                 unresolved: 0,
                 summary: applicableSpecs.length === 0 ? "无适用的审查规则" : "已跳过"
             }));
-        const prDesc = context.generateDescription && llmMode ? await this.generatePrDescription(commits, changedFiles, llmMode, undefined, verbose) : await this.buildBasicDescription(commits, changedFiles);
+        const prDesc = context.generateDescription && llmMode ? await this.llmProcessor.generatePrDescription(commits, changedFiles, llmMode, undefined, verbose) : await this.llmProcessor.buildBasicDescription(commits, changedFiles);
         const result = {
             success: true,
             title: prDesc.title,
@@ -5958,139 +6185,6 @@ class ReviewService {
         return result;
     }
     /**
-   * 检查是否有其他同名 review workflow 正在运行中
-   * 根据 duplicateWorkflowResolved 配置决定是跳过还是删除旧评论
-   */ async checkDuplicateWorkflow(prModel, headSha, mode, verbose) {
-        const ref = process.env.GITHUB_REF || process.env.GITEA_REF || "";
-        const prMatch = ref.match(/refs\/pull\/(\d+)/);
-        const currentPrNumber = prMatch ? parseInt(prMatch[1], 10) : prModel.number;
-        try {
-            const runningWorkflows = await prModel.listWorkflowRuns({
-                status: "in_progress"
-            });
-            const currentWorkflowName = process.env.GITHUB_WORKFLOW || process.env.GITEA_WORKFLOW;
-            const currentRunId = process.env.GITHUB_RUN_ID || process.env.GITEA_RUN_ID;
-            const duplicateReviewRuns = runningWorkflows.filter((w)=>w.sha === headSha && w.name === currentWorkflowName && (!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 正在运行中`);
-                }
-                return {
-                    success: true,
-                    description: `跳过审查: PR #${currentPrNumber} 有 ${duplicateReviewRuns.length} 个同名 workflow 正在运行中，等待完成后重新审查`,
-                    issues: [],
-                    summary: [],
-                    round: 1
-                };
-            }
-        } catch (error) {
-            if (shouldLog(verbose, 1)) {
-                console.warn(`⚠️ 无法检查重复 workflow（可能缺少 repo owner 权限），跳过此检查:`, error instanceof Error ? error.message : error);
-            }
-        }
-        return null;
-    }
-    /**
-   * 清理重复的 AI Review 评论（Issue Comments 和 PR Reviews）
-   */ async cleanupDuplicateAiReviews(prModel, verbose) {
-        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 ---
-    async fillIssueAuthors(...args) {
-        return this.contextBuilder.fillIssueAuthors(...args);
-    }
-    async getFileContents(...args) {
-        return this.issueFilter.getFileContents(...args);
-    }
-    async getFilesForCommit(...args) {
-        return this.issueFilter.getFilesForCommit(...args);
-    }
-    async getChangedFilesBetweenRefs(...args) {
-        return this.issueFilter.getChangedFilesBetweenRefs(...args);
-    }
-    async getCommitsBetweenRefs(...args) {
-        return this.issueFilter.getCommitsBetweenRefs(...args);
-    }
-    filterIssuesByValidCommits(...args) {
-        return this.issueFilter.filterIssuesByValidCommits(...args);
-    }
-    filterDuplicateIssues(...args) {
-        return this.issueFilter.filterDuplicateIssues(...args);
-    }
-    async fillIssueCode(...args) {
-        return this.issueFilter.fillIssueCode(...args);
-    }
-    async runLLMReview(...args) {
-        return this.llmProcessor.runLLMReview(...args);
-    }
-    async buildReviewPrompt(...args) {
-        return this.llmProcessor.buildReviewPrompt(...args);
-    }
-    async generatePrDescription(...args) {
-        return this.llmProcessor.generatePrDescription(...args);
-    }
-    async buildBasicDescription(...args) {
-        return this.llmProcessor.buildBasicDescription(...args);
-    }
-    normalizeFilePaths(...args) {
-        return this.contextBuilder.normalizeFilePaths(...args);
-    }
-    resolveAnalyzeDeletions(...args) {
-        return this.contextBuilder.resolveAnalyzeDeletions(...args);
-    }
-    async getPrNumberFromEvent(...args) {
-        return this.contextBuilder.getPrNumberFromEvent(...args);
-    }
-    /**
    * 确保 Claude CLI 已安装
    */ async ensureClaudeCli(ci) {
         try {
@@ -6971,6 +7065,7 @@ class DeletionImpactService {
 
 
 
+
 /** MCP 工具输入 schema */ const listRulesInputSchema = z.object({});
 const getRulesForFileInputSchema = z.object({
     filePath: z.string().describe(t("review:mcp.dto.filePath")),
@@ -7067,11 +7162,11 @@ const tools = [
             const workDir = ctx.cwd;
             const allSpecs = await loadAllSpecs(workDir, ctx);
             const specService = new ReviewSpecService();
-            const applicableSpecs = specService.filterApplicableSpecs(allSpecs, [
+            const applicableSpecs = specService.filterApplicableSpecs(allSpecs, ChangedFileCollection.from([
                 {
                     filename: filePath
                 }
-            ]);
+            ]));
             const micromatchModule = await __webpack_require__.e(/* import() */ "551").then(__webpack_require__.bind(__webpack_require__, 946));
             const micromatch = micromatchModule.default || micromatchModule;
             const rules = applicableSpecs.flatMap((spec)=>spec.rules.filter((rule)=>{