@spaceflow/review 0.54.0 → 0.56.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [0.55.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review@0.54.0...@spaceflow/review@0.55.0) (2026-03-02)
+
+### 新特性
+
+* **review:** 保留历史行级评论，为每轮 Review 生成独立评论并添加上轮回顾 ([de431a0](https://github.com/Lydanne/spaceflow/commit/de431a09b4e3b5e1ada9ee5f1ee65786d22b6ff9))
+* **review:** 支持用户手动 resolve 评论并在报告中区分 AI 修复与手动解决 ([c968b65](https://github.com/Lydanne/spaceflow/commit/c968b65c850bc68de3f4409aa3b5294e5a0311ff))
+
+### 修复BUG
+
+* **review:** 修复率计算仅统计 AI 修复的问题，排除手动解决的问题 ([12b3415](https://github.com/Lydanne/spaceflow/commit/12b3415749c9d8523e8b23365fbb39fc7657ff1d))
+
+## [0.54.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review@0.53.0...@spaceflow/review@0.54.0) (2026-03-02)
+
+### 新特性
+
+* **review:** 为行级评论 Review 添加统计信息摘要 ([58d5b37](https://github.com/Lydanne/spaceflow/commit/58d5b37ba54daa24bd2f8396318fedc87f388c74))
+
+### 其他修改
+
+* **review-summary:** released version 0.21.0 [no ci] ([11379c4](https://github.com/Lydanne/spaceflow/commit/11379c478859a12dd0340a78b1578487d9a24b31))
+* **scripts:** released version 0.21.0 [no ci] ([1f0a213](https://github.com/Lydanne/spaceflow/commit/1f0a2139d155807451dc968de8213bafe2e4edb8))
+* **shell:** released version 0.21.0 [no ci] ([b619af7](https://github.com/Lydanne/spaceflow/commit/b619af741e16053868a2eedd41f56d50134954d8))
+
 ## [0.53.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review@0.52.0...@spaceflow/review@0.53.0) (2026-03-02)
 
 ### 修复BUG

package/dist/index.js

@@ -143,9 +143,9 @@ __webpack_require__.d(__webpack_exports__, {
 ;// CONCATENATED MODULE: external "@spaceflow/core"
 
 ;// CONCATENATED MODULE: ./src/locales/zh-cn/review.json
-var review_namespaceObject = JSON.parse('{"description":"代码审查命令，使用 LLM 对 PR 代码进行自动审查","options.dryRun":"仅打印将要执行的操作，不实际提交评论","options.prNumber":"PR 编号，如果不指定则从环境变量获取","options.base":"基准分支/tag，用于比较差异","options.head":"目标分支/tag，用于比较差异","options.includes":"要审查的文件 glob 模式，如 *.ts *.js（可多次指定）","options.llmMode":"使用的 LLM 模式: claude-code, openai, gemini","options.files":"仅审查指定的文件（空格分隔）","options.commits":"仅审查指定的 commits（空格分隔）","options.verifyFixes":"是否验证历史问题是否已修复（默认从配置文件读取）","options.noVerifyFixes":"禁用历史问题验证","options.verifyConcurrency":"验证历史问题的并发数（默认 10）","options.analyzeDeletions":"分析删除代码可能带来的影响 (true, false, ci, pr, terminal)","options.deletionAnalysisMode":"删除代码分析模式: openai (标准模式) 或 claude-code (Agent 模式，可使用工具)","options.deletionOnly":"仅执行删除代码分析，跳过常规代码审查","options.outputFormat":"输出格式: markdown, terminal, json。不指定则智能选择（PR 用 markdown，终端用 terminal）","options.generateDescription":"使用 AI 生成 PR 功能描述","options.showAll":"显示所有发现的问题，不过滤非变更行的问题","options.flush":"仅刷新状态（同步 reactions、resolved conversations、replies），不执行 LLM 审查","options.eventAction":"PR 事件类型（opened, synchronize, closed 等），closed 时仅收集统计不进行 AI 审查","extensionDescription":"代码审查命令，使用 LLM 对 PR 代码进行自动审查","mcp.serverDescription":"代码审查规则查询服务","mcp.listRules":"获取当前项目的所有代码审查规则，返回规则列表包含 ID、标题、描述、适用的文件扩展名等信息","mcp.getRulesForFile":"获取某个文件应该使用的代码审查规则，根据文件扩展名和 includes 配置过滤","mcp.getRuleDetail":"获取某个规则的完整详情，包括描述、示例代码等","mcp.ruleNotFound":"规则 {{ruleId}} 不存在","mcp.dto.cwd":"项目根目录路径，默认为当前工作目录","mcp.dto.filePath":"文件路径，可以是相对路径或绝对路径","mcp.dto.includeExamples":"是否包含规则示例代码，默认 false","mcp.dto.ruleId":"规则 ID，如 JsTs.Naming.FileName"}')
+var review_namespaceObject = JSON.parse('{"description":"代码审查命令，使用 LLM 对 PR 代码进行自动审查","options.dryRun":"仅打印将要执行的操作，不实际提交评论","options.prNumber":"PR 编号，如果不指定则从环境变量获取","options.base":"基准分支/tag，用于比较差异","options.head":"目标分支/tag，用于比较差异","options.includes":"要审查的文件 glob 模式，如 *.ts *.js（可多次指定）","options.llmMode":"使用的 LLM 模式: claude-code, openai, gemini","options.files":"仅审查指定的文件（空格分隔）","options.commits":"仅审查指定的 commits（空格分隔）","options.verifyFixes":"是否验证历史问题是否已修复（默认从配置文件读取）","options.noVerifyFixes":"禁用历史问题验证","options.verifyConcurrency":"验证历史问题的并发数（默认 10）","options.analyzeDeletions":"分析删除代码可能带来的影响 (true, false, ci, pr, terminal)","options.deletionAnalysisMode":"删除代码分析模式: openai (标准模式) 或 claude-code (Agent 模式，可使用工具)","options.deletionOnly":"仅执行删除代码分析，跳过常规代码审查","options.outputFormat":"输出格式: markdown, terminal, json。不指定则智能选择（PR 用 markdown，终端用 terminal）","options.generateDescription":"使用 AI 生成 PR 功能描述","options.showAll":"显示所有发现的问题，不过滤非变更行的问题","options.flush":"仅刷新状态（同步 reactions、resolved conversations、replies），不执行 LLM 审查","options.eventAction":"PR 事件类型（opened, synchronize, closed 等），closed 时仅收集统计不进行 AI 审查","extensionDescription":"代码审查命令，使用 LLM 对 PR 代码进行自动审查","mcp.serverDescription":"代码审查规则查询服务","mcp.listRules":"获取当前项目的所有代码审查规则，返回规则列表包含 ID、标题、描述、适用的文件扩展名等信息","mcp.getRulesForFile":"获取某个文件应该使用的代码审查规则，根据文件扩展名和 includes 配置过滤","mcp.getRuleDetail":"获取某个规则的完整详情，包括描述、示例代码等","mcp.ruleNotFound":"规则 {{ruleId}} 不存在","mcp.dto.cwd":"项目根目录路径，默认为当前工作目录","mcp.dto.filePath":"文件路径，可以是相对路径或绝对路径","mcp.dto.includeExamples":"是否包含规则示例代码，默认 false","mcp.dto.ruleId":"规则 ID，如 JsTs.Naming.FileName","mcp.getRulesFromDir":"从指定目录加载代码审查规则。读取目录下所有 .md 文件，解析为规则并按规则 ID 去重（后加载的覆盖先加载的）","mcp.dto.dirPath":"包含规则 .md 文件的目录路径，可以是相对路径或绝对路径"}')
 ;// CONCATENATED MODULE: ./src/locales/en/review.json
-var en_review_namespaceObject = JSON.parse('{"description":"Code review command using LLM for automated PR review","options.dryRun":"Only print actions without posting comments","options.prNumber":"PR number, auto-detected from env if not specified","options.base":"Base branch/tag for diff comparison","options.head":"Head branch/tag for diff comparison","options.includes":"File glob patterns to review, e.g. *.ts *.js (can be specified multiple times)","options.llmMode":"LLM mode: claude-code, openai, gemini","options.files":"Only review specified files (space-separated)","options.commits":"Only review specified commits (space-separated)","options.verifyFixes":"Verify if historical issues are fixed (default from config)","options.noVerifyFixes":"Disable historical issue verification","options.verifyConcurrency":"Concurrency for verifying historical issues (default 10)","options.analyzeDeletions":"Analyze impact of deleted code (true, false, ci, pr, terminal)","options.deletionAnalysisMode":"Deletion analysis mode: openai (standard) or claude-code (Agent mode with tools)","options.deletionOnly":"Only run deletion analysis, skip regular code review","options.outputFormat":"Output format: markdown, terminal, json. Auto-selected if not specified (markdown for PR, terminal for CLI)","options.generateDescription":"Generate PR description using AI","options.showAll":"Show all issues found, including those on unchanged lines","options.flush":"Only sync status (reactions, resolved conversations, replies), skip LLM review","options.eventAction":"PR event type (opened, synchronize, closed, etc.), closed only collects stats without AI review","extensionDescription":"Code review command using LLM for automated PR review","mcp.serverDescription":"Code review rules query service","mcp.listRules":"List all code review rules for the current project, returning rule list with ID, title, description, applicable file extensions, etc.","mcp.getRulesForFile":"Get applicable code review rules for a specific file, filtered by file extension and includes configuration","mcp.getRuleDetail":"Get full details of a specific rule, including description, example code, etc.","mcp.ruleNotFound":"Rule {{ruleId}} not found","mcp.dto.cwd":"Project root directory path, defaults to current working directory","mcp.dto.filePath":"File path, can be relative or absolute","mcp.dto.includeExamples":"Whether to include rule example code, defaults to false","mcp.dto.ruleId":"Rule ID, e.g. JsTs.Naming.FileName"}')
+var en_review_namespaceObject = JSON.parse('{"description":"Code review command using LLM for automated PR review","options.dryRun":"Only print actions without posting comments","options.prNumber":"PR number, auto-detected from env if not specified","options.base":"Base branch/tag for diff comparison","options.head":"Head branch/tag for diff comparison","options.includes":"File glob patterns to review, e.g. *.ts *.js (can be specified multiple times)","options.llmMode":"LLM mode: claude-code, openai, gemini","options.files":"Only review specified files (space-separated)","options.commits":"Only review specified commits (space-separated)","options.verifyFixes":"Verify if historical issues are fixed (default from config)","options.noVerifyFixes":"Disable historical issue verification","options.verifyConcurrency":"Concurrency for verifying historical issues (default 10)","options.analyzeDeletions":"Analyze impact of deleted code (true, false, ci, pr, terminal)","options.deletionAnalysisMode":"Deletion analysis mode: openai (standard) or claude-code (Agent mode with tools)","options.deletionOnly":"Only run deletion analysis, skip regular code review","options.outputFormat":"Output format: markdown, terminal, json. Auto-selected if not specified (markdown for PR, terminal for CLI)","options.generateDescription":"Generate PR description using AI","options.showAll":"Show all issues found, including those on unchanged lines","options.flush":"Only sync status (reactions, resolved conversations, replies), skip LLM review","options.eventAction":"PR event type (opened, synchronize, closed, etc.), closed only collects stats without AI review","extensionDescription":"Code review command using LLM for automated PR review","mcp.serverDescription":"Code review rules query service","mcp.listRules":"List all code review rules for the current project, returning rule list with ID, title, description, applicable file extensions, etc.","mcp.getRulesForFile":"Get applicable code review rules for a specific file, filtered by file extension and includes configuration","mcp.getRuleDetail":"Get full details of a specific rule, including description, example code, etc.","mcp.ruleNotFound":"Rule {{ruleId}} not found","mcp.dto.cwd":"Project root directory path, defaults to current working directory","mcp.dto.filePath":"File path, can be relative or absolute","mcp.dto.includeExamples":"Whether to include rule example code, defaults to false","mcp.dto.ruleId":"Rule ID, e.g. JsTs.Naming.FileName","mcp.getRulesFromDir":"Load code review rules from a specific directory. Reads all .md files in the directory, parses them into rules, and deduplicates by rule ID (later rules override earlier ones)","mcp.dto.dirPath":"Directory path containing rule .md files, can be relative or absolute"}')
 ;// CONCATENATED MODULE: ./src/locales/index.ts
 
 
@@ -363,6 +363,10 @@ class MarkdownFormatter {
                 const fixedByStr = issue.fixedBy?.login ? ` (by @${issue.fixedBy.login})` : "";
                 lines.push(`- **修复时间**: ${formatDateToUTC8(issue.fixed)}${fixedByStr}`);
             }
+            if (issue.resolved) {
+                const resolvedByStr = issue.resolvedBy?.login ? ` (by @${issue.resolvedBy.login})` : "";
+                lines.push(`- **解决时间**: ${formatDateToUTC8(issue.resolved)}${resolvedByStr}`);
+            }
             if (issue.suggestion) {
                 const ext = extname(issue.file).slice(1) || "";
                 const cleanSuggestion = issue.suggestion.replace(/```/g, "//").trim();
@@ -568,6 +572,7 @@ 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}% |`);
@@ -687,6 +692,7 @@ class TerminalFormatter {
         ];
         lines.push(`   总问题数: ${stats.total}`);
         lines.push(`   ${GREEN}✅ 已修复: ${stats.fixed}${RESET}`);
+        lines.push(`   ${GREEN}🟢 已解决: ${stats.resolved}${RESET}`);
         lines.push(`   ${RED}❌ 无效: ${stats.invalid}${RESET}`);
         lines.push(`   ${YELLOW}⚠️  待处理: ${stats.pending}${RESET}`);
         lines.push(`   修复率: ${stats.fixRate}%`);
@@ -1611,12 +1617,14 @@ class ReviewService {
    */ calculateIssueStats(issues) {
         const total = issues.length;
         const fixed = issues.filter((i)=>i.fixed).length;
+        const resolved = issues.filter((i)=>i.resolved && !i.fixed).length;
         const invalid = issues.filter((i)=>i.valid === "false").length;
-        const pending = total - fixed - invalid;
+        const pending = total - fixed - resolved - invalid;
         const fixRate = total > 0 ? Math.round(fixed / total * 100 * 10) / 10 : 0;
         return {
             total,
             fixed,
+            resolved,
             invalid,
             pending,
             fixRate
@@ -2474,45 +2482,15 @@ ${fileChanges || "无"}`;
         } catch (error) {
             console.warn("⚠️ 发布/更新 AI Review 评论失败:", error);
         }
-        // 2. 删除旧的行级评论（逐条删除 PR Review Comment）
-        try {
-            const reviews = await this.gitProvider.listPullReviews(owner, repo, prNumber);
-            const oldLineReviews = reviews.filter((r)=>r.body?.includes(REVIEW_LINE_COMMENTS_MARKER));
-            for (const review of oldLineReviews){
-                if (review.id) {
-                    const reviewComments = await this.gitProvider.listPullReviewComments(owner, repo, prNumber, review.id);
-                    for (const comment of reviewComments){
-                        if (comment.id) {
-                            try {
-                                await this.gitProvider.deletePullReviewComment(owner, repo, comment.id);
-                            } catch  {
-                            // 删除失败忽略
-                            }
-                        }
-                    }
-                    // 评论删除后尝试删除 review 本身
-                    try {
-                        await this.gitProvider.deletePullReview(owner, repo, prNumber, review.id);
-                    } catch  {
-                    // 已提交的 review 无法删除，忽略
-                    }
-                }
-            }
-            if (oldLineReviews.length > 0) {
-                console.log(`🗑️ 已清理 ${oldLineReviews.length} 个旧的行级评论 review`);
-            }
-        } catch (error) {
-            console.warn("⚠️ 清理旧行级评论失败:", error);
-        }
-        // 3. 发布新的行级评论（使用 PR Review API）
+        // 2. 发布本轮新发现的行级评论（使用 PR Review API，不删除旧的 review，保留历史）
         let lineIssues = [];
         let comments = [];
         if (reviewConf.lineComments) {
-            lineIssues = result.issues.filter((issue)=>!issue.fixed && issue.valid !== "false");
+            lineIssues = result.issues.filter((issue)=>issue.round === result.round && !issue.fixed && !issue.resolved && issue.valid !== "false");
             comments = lineIssues.map((issue)=>this.issueToReviewComment(issue)).filter((comment)=>comment !== null);
         }
         if (comments.length > 0) {
-            const reviewBody = this.buildLineReviewBody(lineIssues);
+            const reviewBody = this.buildLineReviewBody(lineIssues, result.round, result.issues);
             try {
                 await this.gitProvider.createPullReview(owner, repo, prNumber, {
                     event: REVIEW_STATE.COMMENT,
@@ -2571,7 +2549,8 @@ ${fileChanges || "无"}`;
         }
     }
     /**
-   * 从 PR 的所有 resolved review threads 中同步 fixed 状态到 result.issues
+   * 从 PR 的所有 resolved review threads 中同步 resolved 状态到 result.issues
+   * 用户手动点击 resolve 的记录写入 resolved/resolvedBy 字段（区别于 AI 验证的 fixed/fixedBy）
    * 优先通过评论 body 中的 issue key 精确匹配，回退到 path+line 匹配
    */ async syncResolvedComments(owner, repo, prNumber, result) {
         try {
@@ -2599,10 +2578,10 @@ ${fileChanges || "无"}`;
                 if (!matchedIssue) {
                     matchedIssue = result.issues.find((issue)=>issue.file === thread.path && this.lineMatchesPosition(issue.line, thread.line));
                 }
-                if (matchedIssue && !matchedIssue.fixed) {
-                    matchedIssue.fixed = now;
+                if (matchedIssue && !matchedIssue.resolved) {
+                    matchedIssue.resolved = now;
                     if (thread.resolvedBy) {
-                        matchedIssue.fixedBy = {
+                        matchedIssue.resolvedBy = {
                             id: thread.resolvedBy.id?.toString(),
                             login: thread.resolvedBy.login
                         };
@@ -2872,19 +2851,38 @@ ${fileChanges || "无"}`;
         }
     }
     /**
-   * 构建行级评论 Review 的 body（marker + 本轮统计信息）
-   */ buildLineReviewBody(issues) {
+   * 构建行级评论 Review 的 body（marker + 本轮统计 + 上轮回顾）
+   */ buildLineReviewBody(issues, round, allIssues) {
         const errorCount = issues.filter((i)=>i.severity === "error").length;
         const warnCount = issues.filter((i)=>i.severity === "warn").length;
         const fileCount = new Set(issues.map((i)=>i.file)).size;
+        const badges = [];
+        if (errorCount > 0) badges.push(`🔴 ${errorCount}`);
+        if (warnCount > 0) badges.push(`🟡 ${warnCount}`);
         const parts = [
             REVIEW_LINE_COMMENTS_MARKER
         ];
-        parts.push(`**Spaceflow Review** — ${issues.length} 个问题，涉及 ${fileCount} 个文件`);
-        const badges = [];
-        if (errorCount > 0) badges.push(`🔴 ${errorCount} error`);
-        if (warnCount > 0) badges.push(`🟡 ${warnCount} warn`);
-        if (badges.length > 0) parts.push(badges.join("  "));
+        parts.push(`### � Spaceflow Review · Round ${round}`);
+        parts.push(`> **${issues.length}** 个新问题 · **${fileCount}** 个文件${badges.length > 0 ? " · " + badges.join(" ") : ""}`);
+        // 上轮回顾
+        if (round > 1) {
+            const prevIssues = allIssues.filter((i)=>i.round === round - 1);
+            if (prevIssues.length > 0) {
+                const prevFixed = prevIssues.filter((i)=>i.fixed).length;
+                const prevResolved = prevIssues.filter((i)=>i.resolved && !i.fixed).length;
+                const prevInvalid = prevIssues.filter((i)=>i.valid === "false").length;
+                const prevPending = prevIssues.length - prevFixed - prevResolved - prevInvalid;
+                parts.push("");
+                parts.push(`<details><summary>📊 Round ${round - 1} 回顾 (${prevIssues.length} 个问题)</summary>\n`);
+                parts.push(`| 状态 | 数量 |`);
+                parts.push(`|------|------|`);
+                if (prevFixed > 0) parts.push(`| ✅ 已修复 | ${prevFixed} |`);
+                if (prevResolved > 0) parts.push(`| 🟢 已解决 | ${prevResolved} |`);
+                if (prevInvalid > 0) parts.push(`| ❌ 无效 | ${prevInvalid} |`);
+                if (prevPending > 0) parts.push(`| ⚠️ 待处理 | ${prevPending} |`);
+                parts.push(`\n</details>`);
+            }
+        }
         return parts.join("\n");
     }
     /**
@@ -5040,6 +5038,10 @@ const getRulesForFileInputSchema = z.object({
 const getRuleDetailInputSchema = z.object({
     ruleId: z.string().describe(t("review:mcp.dto.ruleId"))
 });
+const getRulesFromDirInputSchema = z.object({
+    dirPath: z.string().describe(t("review:mcp.dto.dirPath")),
+    includeExamples: z.boolean().optional().describe(t("review:mcp.dto.includeExamples"))
+});
 /**
  * 获取 GitProviderService（可选）
  */ function getGitProvider(ctx) {
@@ -5192,6 +5194,49 @@ const tools = [
                     }))
             };
         }
+    },
+    {
+        name: "get_rules_from_dir",
+        description: t("review:mcp.getRulesFromDir"),
+        inputSchema: getRulesFromDirInputSchema,
+        handler: async (input, ctx)=>{
+            const { dirPath, includeExamples } = input;
+            const workDir = ctx.cwd;
+            const resolvedDir = dirPath.startsWith("/") ? dirPath : join(workDir, dirPath);
+            if (!existsSync(resolvedDir)) {
+                return {
+                    error: `Directory not found: ${resolvedDir}`
+                };
+            }
+            const gitProvider = getGitProvider(ctx);
+            const specService = new ReviewSpecService(gitProvider);
+            const specs = await specService.loadReviewSpecs(resolvedDir);
+            const dedupedSpecs = specService.deduplicateSpecs(specs);
+            const rules = dedupedSpecs.flatMap((spec)=>spec.rules.map((rule)=>({
+                        id: rule.id,
+                        title: rule.title,
+                        description: includeExamples ? rule.description : rule.description.slice(0, 200) + (rule.description.length > 200 ? "..." : ""),
+                        severity: rule.severity || spec.severity,
+                        extensions: spec.extensions,
+                        specFile: spec.filename,
+                        includes: spec.includes,
+                        ...includeExamples && rule.examples.length > 0 ? {
+                            examples: rule.examples.map((ex)=>({
+                                    type: ex.type,
+                                    lang: ex.lang,
+                                    code: ex.code
+                                }))
+                        } : {
+                            hasExamples: rule.examples.length > 0
+                        }
+                    })));
+            return {
+                dir: resolvedDir,
+                specFiles: dedupedSpecs.length,
+                total: rules.length,
+                rules
+            };
+        }
     }
 ];
 

package/package.json

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

package/src/locales/en/review.json

@@ -28,5 +28,7 @@
   "mcp.dto.cwd": "Project root directory path, defaults to current working directory",
   "mcp.dto.filePath": "File path, can be relative or absolute",
   "mcp.dto.includeExamples": "Whether to include rule example code, defaults to false",
-  "mcp.dto.ruleId": "Rule ID, e.g. JsTs.Naming.FileName"
+  "mcp.dto.ruleId": "Rule ID, e.g. JsTs.Naming.FileName",
+  "mcp.getRulesFromDir": "Load code review rules from a specific directory. Reads all .md files in the directory, parses them into rules, and deduplicates by rule ID (later rules override earlier ones)",
+  "mcp.dto.dirPath": "Directory path containing rule .md files, can be relative or absolute"
 }

package/src/locales/zh-cn/review.json

@@ -28,5 +28,7 @@
   "mcp.dto.cwd": "项目根目录路径，默认为当前工作目录",
   "mcp.dto.filePath": "文件路径，可以是相对路径或绝对路径",
   "mcp.dto.includeExamples": "是否包含规则示例代码，默认 false",
-  "mcp.dto.ruleId": "规则 ID，如 JsTs.Naming.FileName"
+  "mcp.dto.ruleId": "规则 ID，如 JsTs.Naming.FileName",
+  "mcp.getRulesFromDir": "从指定目录加载代码审查规则。读取目录下所有 .md 文件，解析为规则并按规则 ID 去重（后加载的覆盖先加载的）",
+  "mcp.dto.dirPath": "包含规则 .md 文件的目录路径，可以是相对路径或绝对路径"
 }

package/src/mcp/index.ts

@@ -16,6 +16,11 @@ export const getRuleDetailInputSchema = z.object({
   ruleId: z.string().describe(t("review:mcp.dto.ruleId")),
 });
 
+export const getRulesFromDirInputSchema = z.object({
+  dirPath: z.string().describe(t("review:mcp.dto.dirPath")),
+  includeExamples: z.boolean().optional().describe(t("review:mcp.dto.includeExamples")),
+});
+
 /**
  * 获取 GitProviderService（可选）
  */
@@ -165,4 +170,53 @@ export const tools = [
       };
     },
   },
+  {
+    name: "get_rules_from_dir",
+    description: t("review:mcp.getRulesFromDir"),
+    inputSchema: getRulesFromDirInputSchema,
+    handler: async (input, ctx) => {
+      const { dirPath, includeExamples } = input as z.infer<typeof getRulesFromDirInputSchema>;
+      const workDir = ctx.cwd;
+      const resolvedDir = dirPath.startsWith("/") ? dirPath : join(workDir, dirPath);
+
+      if (!existsSync(resolvedDir)) {
+        return { error: `Directory not found: ${resolvedDir}` };
+      }
+
+      const gitProvider = getGitProvider(ctx);
+      const specService = new ReviewSpecService(gitProvider);
+      const specs = await specService.loadReviewSpecs(resolvedDir);
+      const dedupedSpecs = specService.deduplicateSpecs(specs);
+
+      const rules = dedupedSpecs.flatMap((spec) =>
+        spec.rules.map((rule) => ({
+          id: rule.id,
+          title: rule.title,
+          description: includeExamples
+            ? rule.description
+            : rule.description.slice(0, 200) + (rule.description.length > 200 ? "..." : ""),
+          severity: rule.severity || spec.severity,
+          extensions: spec.extensions,
+          specFile: spec.filename,
+          includes: spec.includes,
+          ...(includeExamples && rule.examples.length > 0
+            ? {
+                examples: rule.examples.map((ex) => ({
+                  type: ex.type,
+                  lang: ex.lang,
+                  code: ex.code,
+                })),
+              }
+            : { hasExamples: rule.examples.length > 0 }),
+        })),
+      );
+
+      return {
+        dir: resolvedDir,
+        specFiles: dedupedSpecs.length,
+        total: rules.length,
+        rules,
+      };
+    },
+  },
 ];

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

@@ -53,6 +53,10 @@ export class MarkdownFormatter implements ReviewReportFormatter, ReviewReportPar
         const fixedByStr = issue.fixedBy?.login ? ` (by @${issue.fixedBy.login})` : "";
         lines.push(`- **修复时间**: ${formatDateToUTC8(issue.fixed)}${fixedByStr}`);
       }
+      if (issue.resolved) {
+        const resolvedByStr = issue.resolvedBy?.login ? ` (by @${issue.resolvedBy.login})` : "";
+        lines.push(`- **解决时间**: ${formatDateToUTC8(issue.resolved)}${resolvedByStr}`);
+      }
       if (issue.suggestion) {
         const ext = extname(issue.file).slice(1) || "";
         const cleanSuggestion = issue.suggestion.replace(/```/g, "//").trim();
@@ -284,6 +288,7 @@ export class MarkdownFormatter implements ReviewReportFormatter, ReviewReportPar
     const lines = [`## 📊 ${title}\n`, `| 指标 | 数量 |`, `|------|------|`];
     lines.push(`| 总问题数 | ${stats.total} |`);
     lines.push(`| ✅ 已修复 | ${stats.fixed} |`);
+    lines.push(`| 🟢 已解决 | ${stats.resolved} |`);
     lines.push(`| ❌ 无效 | ${stats.invalid} |`);
     lines.push(`| ⚠️ 待处理 | ${stats.pending} |`);
     lines.push(`| 修复率 | ${stats.fixRate}% |`);

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

@@ -122,6 +122,7 @@ export class TerminalFormatter implements ReviewReportFormatter {
     const lines = [`\n${BOLD}${CYAN}📊 ${title}:${RESET}`];
     lines.push(`   总问题数: ${stats.total}`);
     lines.push(`   ${GREEN}✅ 已修复: ${stats.fixed}${RESET}`);
+    lines.push(`   ${GREEN}🟢 已解决: ${stats.resolved}${RESET}`);
     lines.push(`   ${RED}❌ 无效: ${stats.invalid}${RESET}`);
     lines.push(`   ${YELLOW}⚠️  待处理: ${stats.pending}${RESET}`);
     lines.push(`   修复率: ${stats.fixRate}%`);

package/src/review-spec/types.ts

@@ -73,8 +73,10 @@ export interface ReviewIssue {
   specFile: string;
   reason: string;
   date?: string; // 发现问题的时间
-  fixed?: string; // 修复时间
-  fixedBy?: UserInfo; // 解决者
+  fixed?: string; // AI 验证修复时间
+  fixedBy?: UserInfo; // AI 验证修复者
+  resolved?: string; // 用户手动点击 resolve 的时间
+  resolvedBy?: UserInfo; // 手动 resolve 的操作者
   valid?: string; // 问题是否有效
   suggestion?: string;
   commit?: string;
@@ -115,8 +117,10 @@ export interface DeletionImpactResult {
 export interface ReviewStats {
   /** 总问题数 */
   total: number;
-  /** 已修复数 */
+  /** AI 验证已修复数 */
   fixed: number;
+  /** 用户手动 resolve 数 */
+  resolved: number;
   /** 无效问题数 */
   invalid: number;
   /** 待处理数 */

package/src/review.service.spec.ts

@@ -1226,17 +1226,32 @@ describe("ReviewService", () => {
   describe("ReviewService.calculateIssueStats", () => {
     it("should calculate stats for empty array", () => {
       const stats = (service as any).calculateIssueStats([]);
-      expect(stats).toEqual({ total: 0, fixed: 0, invalid: 0, pending: 0, fixRate: 0 });
+      expect(stats).toEqual({
+        total: 0,
+        fixed: 0,
+        resolved: 0,
+        invalid: 0,
+        pending: 0,
+        fixRate: 0,
+      });
     });
 
     it("should calculate stats correctly", () => {
-      const issues = [{ fixed: "2024-01-01" }, { fixed: "2024-01-02" }, { valid: "false" }, {}, {}];
+      const issues = [
+        { fixed: "2024-01-01" },
+        { fixed: "2024-01-02" },
+        { resolved: "2024-01-03" },
+        { valid: "false" },
+        {},
+        {},
+      ];
       const stats = (service as any).calculateIssueStats(issues);
-      expect(stats.total).toBe(5);
+      expect(stats.total).toBe(6);
       expect(stats.fixed).toBe(2);
+      expect(stats.resolved).toBe(1);
       expect(stats.invalid).toBe(1);
       expect(stats.pending).toBe(2);
-      expect(stats.fixRate).toBe(40);
+      expect(stats.fixRate).toBe(33.3);
     });
   });
 
@@ -1807,6 +1822,7 @@ describe("ReviewService", () => {
             specFile: "s.md",
             reason: "r",
             severity: "error",
+            round: 1,
           },
         ],
         summary: [],
@@ -1820,18 +1836,18 @@ describe("ReviewService", () => {
   });
 
   describe("ReviewService.syncResolvedComments", () => {
-    it("should mark matched issues as fixed via path:line fallback", async () => {
+    it("should mark matched issues as resolved via path:line fallback", async () => {
       mockReviewSpecService.parseLineRange = vi.fn().mockReturnValue([10]);
       gitProvider.listResolvedThreads.mockResolvedValue([
         { path: "test.ts", line: 10, resolvedBy: { login: "user1" } },
       ] as any);
       const result = { issues: [{ file: "test.ts", line: "10", ruleId: "Rule1" }] };
       await (service as any).syncResolvedComments("o", "r", 1, result);
-      expect((result.issues[0] as any).fixed).toBeDefined();
-      expect((result.issues[0] as any).fixedBy).toEqual({ id: undefined, login: "user1" });
+      expect((result.issues[0] as any).resolved).toBeDefined();
+      expect((result.issues[0] as any).resolvedBy).toEqual({ id: undefined, login: "user1" });
     });
 
-    it("should mark matched issues as fixed via issue key in body", async () => {
+    it("should mark matched issues as resolved via issue key in body", async () => {
       mockReviewSpecService.parseLineRange = vi.fn().mockReturnValue([10]);
       gitProvider.listResolvedThreads.mockResolvedValue([
         {
@@ -1845,8 +1861,8 @@ describe("ReviewService", () => {
         issues: [{ file: "test.ts", line: "10", ruleId: "RuleA" }],
       };
       await (service as any).syncResolvedComments("o", "r", 1, result);
-      expect((result.issues[0] as any).fixed).toBeDefined();
-      expect((result.issues[0] as any).fixedBy).toEqual({ id: undefined, login: "user1" });
+      expect((result.issues[0] as any).resolved).toBeDefined();
+      expect((result.issues[0] as any).resolvedBy).toEqual({ id: undefined, login: "user1" });
     });
 
     it("should match correct issue by issue key when multiple issues at same position", async () => {
@@ -1866,17 +1882,17 @@ describe("ReviewService", () => {
         ],
       };
       await (service as any).syncResolvedComments("o", "r", 1, result);
-      expect(result.issues[0].fixed).toBeUndefined(); // RuleA 未解决
-      expect(result.issues[0].fixedBy).toBeUndefined();
-      expect(result.issues[1].fixed).toBeDefined(); // RuleB 已解决
-      expect(result.issues[1].fixedBy).toEqual({ id: undefined, login: "user1" });
+      expect(result.issues[0].resolved).toBeUndefined(); // RuleA 未解决
+      expect(result.issues[0].resolvedBy).toBeUndefined();
+      expect(result.issues[1].resolved).toBeDefined(); // RuleB 已解决
+      expect(result.issues[1].resolvedBy).toEqual({ id: undefined, login: "user1" });
     });
 
     it("should skip when no resolved threads", async () => {
       gitProvider.listResolvedThreads.mockResolvedValue([] as any);
       const result = { issues: [{ file: "test.ts", line: "10", ruleId: "Rule1" }] };
       await (service as any).syncResolvedComments("o", "r", 1, result);
-      expect((result.issues[0] as any).fixed).toBeUndefined();
+      expect((result.issues[0] as any).resolved).toBeUndefined();
     });
 
     it("should skip threads without path", async () => {
@@ -1885,7 +1901,7 @@ describe("ReviewService", () => {
       ] as any);
       const result = { issues: [{ file: "test.ts", line: "10", ruleId: "Rule1" }] };
       await (service as any).syncResolvedComments("o", "r", 1, result);
-      expect((result.issues[0] as any).fixed).toBeUndefined();
+      expect((result.issues[0] as any).resolved).toBeUndefined();
     });
 
     it("should handle error gracefully", async () => {

package/src/review.service.ts

@@ -900,10 +900,11 @@ export class ReviewService {
   protected calculateIssueStats(issues: ReviewIssue[]): ReviewStats {
     const total = issues.length;
     const fixed = issues.filter((i) => i.fixed).length;
+    const resolved = issues.filter((i) => i.resolved && !i.fixed).length;
     const invalid = issues.filter((i) => i.valid === "false").length;
-    const pending = total - fixed - invalid;
+    const pending = total - fixed - resolved - invalid;
     const fixRate = total > 0 ? Math.round((fixed / total) * 100 * 10) / 10 : 0;
-    return { total, fixed, invalid, pending, fixRate };
+    return { total, fixed, resolved, invalid, pending, fixRate };
   }
 
   /**
@@ -1933,52 +1934,23 @@ ${fileChanges || "无"}`;
       console.warn("⚠️ 发布/更新 AI Review 评论失败:", error);
     }
 
-    // 2. 删除旧的行级评论（逐条删除 PR Review Comment）
-    try {
-      const reviews = await this.gitProvider.listPullReviews(owner, repo, prNumber);
-      const oldLineReviews = reviews.filter((r) => r.body?.includes(REVIEW_LINE_COMMENTS_MARKER));
-      for (const review of oldLineReviews) {
-        if (review.id) {
-          const reviewComments = await this.gitProvider.listPullReviewComments(
-            owner,
-            repo,
-            prNumber,
-            review.id,
-          );
-          for (const comment of reviewComments) {
-            if (comment.id) {
-              try {
-                await this.gitProvider.deletePullReviewComment(owner, repo, comment.id);
-              } catch {
-                // 删除失败忽略
-              }
-            }
-          }
-          // 评论删除后尝试删除 review 本身
-          try {
-            await this.gitProvider.deletePullReview(owner, repo, prNumber, review.id);
-          } catch {
-            // 已提交的 review 无法删除，忽略
-          }
-        }
-      }
-      if (oldLineReviews.length > 0) {
-        console.log(`🗑️ 已清理 ${oldLineReviews.length} 个旧的行级评论 review`);
-      }
-    } catch (error) {
-      console.warn("⚠️ 清理旧行级评论失败:", error);
-    }
-    // 3. 发布新的行级评论（使用 PR Review API）
+    // 2. 发布本轮新发现的行级评论（使用 PR Review API，不删除旧的 review，保留历史）
     let lineIssues: ReviewIssue[] = [];
     let comments: CreatePullReviewComment[] = [];
     if (reviewConf.lineComments) {
-      lineIssues = result.issues.filter((issue) => !issue.fixed && issue.valid !== "false");
+      lineIssues = result.issues.filter(
+        (issue) =>
+          issue.round === result.round &&
+          !issue.fixed &&
+          !issue.resolved &&
+          issue.valid !== "false",
+      );
       comments = lineIssues
         .map((issue) => this.issueToReviewComment(issue))
         .filter((comment): comment is CreatePullReviewComment => comment !== null);
     }
     if (comments.length > 0) {
-      const reviewBody = this.buildLineReviewBody(lineIssues);
+      const reviewBody = this.buildLineReviewBody(lineIssues, result.round, result.issues);
       try {
         await this.gitProvider.createPullReview(owner, repo, prNumber, {
           event: REVIEW_STATE.COMMENT,
@@ -2047,7 +2019,8 @@ ${fileChanges || "无"}`;
   }
 
   /**
-   * 从 PR 的所有 resolved review threads 中同步 fixed 状态到 result.issues
+   * 从 PR 的所有 resolved review threads 中同步 resolved 状态到 result.issues
+   * 用户手动点击 resolve 的记录写入 resolved/resolvedBy 字段（区别于 AI 验证的 fixed/fixedBy）
    * 优先通过评论 body 中的 issue key 精确匹配，回退到 path+line 匹配
    */
   protected async syncResolvedComments(
@@ -2084,10 +2057,10 @@ ${fileChanges || "无"}`;
               issue.file === thread.path && this.lineMatchesPosition(issue.line, thread.line),
           );
         }
-        if (matchedIssue && !matchedIssue.fixed) {
-          matchedIssue.fixed = now;
+        if (matchedIssue && !matchedIssue.resolved) {
+          matchedIssue.resolved = now;
           if (thread.resolvedBy) {
-            matchedIssue.fixedBy = {
+            matchedIssue.resolvedBy = {
               id: thread.resolvedBy.id?.toString(),
               login: thread.resolvedBy.login,
             };
@@ -2430,19 +2403,44 @@ ${fileChanges || "无"}`;
   }
 
   /**
-   * 构建行级评论 Review 的 body（marker + 本轮统计信息）
+   * 构建行级评论 Review 的 body（marker + 本轮统计 + 上轮回顾）
    */
-  protected buildLineReviewBody(issues: ReviewIssue[]): string {
+  protected buildLineReviewBody(
+    issues: ReviewIssue[],
+    round: number,
+    allIssues: ReviewIssue[],
+  ): string {
     const errorCount = issues.filter((i) => i.severity === "error").length;
     const warnCount = issues.filter((i) => i.severity === "warn").length;
     const fileCount = new Set(issues.map((i) => i.file)).size;
 
-    const parts: string[] = [REVIEW_LINE_COMMENTS_MARKER];
-    parts.push(`**Spaceflow Review** — ${issues.length} 个问题，涉及 ${fileCount} 个文件`);
     const badges: string[] = [];
-    if (errorCount > 0) badges.push(`🔴 ${errorCount} error`);
-    if (warnCount > 0) badges.push(`🟡 ${warnCount} warn`);
-    if (badges.length > 0) parts.push(badges.join("  "));
+    if (errorCount > 0) badges.push(`🔴 ${errorCount}`);
+    if (warnCount > 0) badges.push(`🟡 ${warnCount}`);
+
+    const parts: string[] = [REVIEW_LINE_COMMENTS_MARKER];
+    parts.push(`### � Spaceflow Review · Round ${round}`);
+    parts.push(`> **${issues.length}** 个新问题 · **${fileCount}** 个文件${badges.length > 0 ? " · " + badges.join(" ") : ""}`);
+
+    // 上轮回顾
+    if (round > 1) {
+      const prevIssues = allIssues.filter((i) => i.round === round - 1);
+      if (prevIssues.length > 0) {
+        const prevFixed = prevIssues.filter((i) => i.fixed).length;
+        const prevResolved = prevIssues.filter((i) => i.resolved && !i.fixed).length;
+        const prevInvalid = prevIssues.filter((i) => i.valid === "false").length;
+        const prevPending = prevIssues.length - prevFixed - prevResolved - prevInvalid;
+        parts.push("");
+        parts.push(`<details><summary>📊 Round ${round - 1} 回顾 (${prevIssues.length} 个问题)</summary>\n`);
+        parts.push(`| 状态 | 数量 |`);
+        parts.push(`|------|------|`);
+        if (prevFixed > 0) parts.push(`| ✅ 已修复 | ${prevFixed} |`);
+        if (prevResolved > 0) parts.push(`| 🟢 已解决 | ${prevResolved} |`);
+        if (prevInvalid > 0) parts.push(`| ❌ 无效 | ${prevInvalid} |`);
+        if (prevPending > 0) parts.push(`| ⚠️ 待处理 | ${prevPending} |`);
+        parts.push(`\n</details>`);
+      }
+    }
 
     return parts.join("\n");
   }