@spaceflow/review 0.49.0 → 0.50.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.49.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review@0.48.0...@spaceflow/review@0.49.0) (2026-02-27)
+
+### 修复BUG
+
+* **review:** 修复重复 AI 评论问题，改进评论查找和清理逻辑 ([5ec3757](https://github.com/Lydanne/spaceflow/commit/5ec3757533f618aa6210ccebecabf411b2dae9a4))
+* **review:** 修改 generateDescription 选项处理逻辑，仅在明确指定时设置为 true ([48e710a](https://github.com/Lydanne/spaceflow/commit/48e710ade62e0aeaf2effa3db58dbcb2b2a0983e))
+
+### 其他修改
+
+* **core:** released version 0.17.0 [no ci] ([4e8f807](https://github.com/Lydanne/spaceflow/commit/4e8f8074fa9d174995e97c9466c379ba81227f9f))
+* **publish:** released version 0.41.0 [no ci] ([e96a488](https://github.com/Lydanne/spaceflow/commit/e96a48824bbb305142b78afa989e3473eec0c1c2))
+* **review-summary:** released version 0.18.0 [no ci] ([164fb64](https://github.com/Lydanne/spaceflow/commit/164fb64c511d93466585cb5d6df7cd6be0922c8c))
+* **scripts:** released version 0.18.0 [no ci] ([289be06](https://github.com/Lydanne/spaceflow/commit/289be06674264d98ab9e1da908d088fff4e1cf7e))
+* **shell:** released version 0.18.0 [no ci] ([88bf217](https://github.com/Lydanne/spaceflow/commit/88bf2178e3361516871c887fda75f7a0086ed55f))
+
 ## [0.48.0](https://github.com/Lydanne/spaceflow/compare/@spaceflow/review@0.47.0...@spaceflow/review@0.48.0) (2026-02-27)
 
 ### 新特性

package/dist/index.js

@@ -360,7 +360,8 @@ class MarkdownFormatter {
                 lines.push(`- **发现时间**: ${formatDateToUTC8(issue.date)}`);
             }
             if (issue.fixed) {
-                lines.push(`- **修复时间**: ${formatDateToUTC8(issue.fixed)}`);
+                const fixedByStr = issue.fixedBy?.login ? ` (by @${issue.fixedBy.login})` : "";
+                lines.push(`- **修复时间**: ${formatDateToUTC8(issue.fixed)}${fixedByStr}`);
             }
             if (issue.suggestion) {
                 const ext = extname(issue.file).slice(1) || "";
@@ -2568,20 +2569,42 @@ ${fileChanges || "无"}`;
     }
     /**
    * 从 PR 的所有 resolved review threads 中同步 fixed 状态到 result.issues
-   * 直接通过 GraphQL 查询所有 resolved threads 的 path+line，匹配 issues
+   * 优先通过评论 body 中的 issue key 精确匹配，回退到 path+line 匹配
    */ async syncResolvedComments(owner, repo, prNumber, result) {
         try {
             const resolvedThreads = await this.gitProvider.listResolvedThreads(owner, repo, prNumber);
             if (resolvedThreads.length === 0) {
                 return;
             }
+            // 构建 issue key → issue 的映射，用于精确匹配
+            const issueByKey = new Map();
+            for (const issue of result.issues){
+                issueByKey.set(this.generateIssueKey(issue), issue);
+            }
             const now = new Date().toISOString();
             for (const thread of resolvedThreads){
                 if (!thread.path) continue;
-                const matchedIssue = result.issues.find((issue)=>issue.file === thread.path && this.lineMatchesPosition(issue.line, thread.line));
+                // 优先通过 issue key 精确匹配
+                let matchedIssue;
+                if (thread.body) {
+                    const issueKey = this.extractIssueKeyFromBody(thread.body);
+                    if (issueKey) {
+                        matchedIssue = issueByKey.get(issueKey);
+                    }
+                }
+                // 回退：path:line 匹配
+                if (!matchedIssue) {
+                    matchedIssue = result.issues.find((issue)=>issue.file === thread.path && this.lineMatchesPosition(issue.line, thread.line));
+                }
                 if (matchedIssue && !matchedIssue.fixed) {
                     matchedIssue.fixed = now;
-                    console.log(`🟢 问题已标记为已解决: ${matchedIssue.file}:${matchedIssue.line}`);
+                    if (thread.resolvedBy) {
+                        matchedIssue.fixedBy = {
+                            id: thread.resolvedBy.id?.toString(),
+                            login: thread.resolvedBy.login
+                        };
+                    }
+                    console.log(`🟢 问题已标记为已解决: ${matchedIssue.file}:${matchedIssue.line}` + (thread.resolvedBy?.login ? ` (by @${thread.resolvedBy.login})` : ""));
                 }
             }
         } catch (error) {
@@ -2711,11 +2734,28 @@ ${fileChanges || "无"}`;
         }
     }
     /**
+   * 从评论 body 中提取 issue key（AI 行级评论末尾的 HTML 注释标记）
+   * 格式：`<!-- issue-key: file:line:ruleId -->`
+   * 返回 null 表示非 AI 评论（即用户真实回复）
+   */ extractIssueKeyFromBody(body) {
+        const match = body.match(/<!-- issue-key: (.+?) -->/);
+        return match ? match[1] : null;
+    }
+    /**
    * 同步评论回复到对应的 issues
    * review 评论回复是通过同一个 review 下的后续评论实现的
+   *
+   * 通过 AI 评论 body 中嵌入的 issue key（`<!-- issue-key: file:line:ruleId -->`）精确匹配 issue：
+   * - 含 issue key 的评论是 AI 自身评论，过滤掉不作为回复
+   * - 不含 issue key 的评论是用户真实回复，归到其前面最近的 AI 评论对应的 issue
    */ async syncRepliesToIssues(_owner, _repo, _prNumber, reviewComments, result) {
         try {
-            // 按文件路径和行号分组评论，第一条是原始评论，后续是回复
+            // 构建 issue key → issue 的映射，用于快速查找
+            const issueByKey = new Map();
+            for (const issue of result.issues){
+                issueByKey.set(this.generateIssueKey(issue), issue);
+            }
+            // 按文件路径和行号分组评论
             const commentsByLocation = new Map();
             for (const comment of reviewComments){
                 if (!comment.path || !comment.position) continue;
@@ -2724,7 +2764,7 @@ ${fileChanges || "无"}`;
                 comments.push(comment);
                 commentsByLocation.set(key, comments);
             }
-            // 遍历每个位置的评论，将非第一条评论作为回复
+            // 遍历每个位置的评论
             for (const [, comments] of commentsByLocation){
                 if (comments.length <= 1) continue;
                 // 按创建时间排序
@@ -2733,20 +2773,35 @@ ${fileChanges || "无"}`;
                     const timeB = b.created_at ? new Date(b.created_at).getTime() : 0;
                     return timeA - timeB;
                 });
-                const firstComment = comments[0];
-                // 找到对应的 issue
-                const matchedIssue = result.issues.find((issue)=>issue.file === firstComment.path && this.lineMatchesPosition(issue.line, firstComment.position));
-                if (!matchedIssue) continue;
-                // 后续评论作为回复
-                const replies = comments.slice(1).map((c)=>({
+                // 遍历评论，用 issue key 精确匹配
+                let lastIssueKey = null;
+                for (const comment of comments){
+                    const issueKey = this.extractIssueKeyFromBody(comment.body || "");
+                    if (issueKey) {
+                        // AI 自身评论，记录 issue key 但不作为回复
+                        lastIssueKey = issueKey;
+                        continue;
+                    }
+                    // 用户真实回复，通过前面最近的 AI 评论的 issue key 精确匹配
+                    let matchedIssue = lastIssueKey ? issueByKey.get(lastIssueKey) ?? null : null;
+                    // 回退：如果 issue key 匹配失败，使用 path:position 匹配
+                    if (!matchedIssue) {
+                        matchedIssue = result.issues.find((issue)=>issue.file === comment.path && this.lineMatchesPosition(issue.line, comment.position)) ?? null;
+                    }
+                    if (!matchedIssue) continue;
+                    // 追加回复（而非覆盖，同一 issue 可能有多条用户回复）
+                    if (!matchedIssue.replies) {
+                        matchedIssue.replies = [];
+                    }
+                    matchedIssue.replies.push({
                         user: {
-                            id: c.user?.id?.toString(),
-                            login: c.user?.login || "unknown"
+                            id: comment.user?.id?.toString(),
+                            login: comment.user?.login || "unknown"
                         },
-                        body: c.body || "",
-                        createdAt: c.created_at || ""
-                    }));
-                matchedIssue.replies = replies;
+                        body: comment.body || "",
+                        createdAt: comment.created_at || ""
+                    });
+                }
             }
         } catch (error) {
             console.warn("⚠️ 同步评论回复失败:", error);
@@ -2814,6 +2869,7 @@ ${fileChanges || "无"}`;
             lines.push(`- **Commit**: ${issue.commit}`);
         }
         lines.push(`- **开发人员**: ${issue.author ? "@" + issue.author.login : "未知"}`);
+        lines.push(`<!-- issue-key: ${this.generateIssueKey(issue)} -->`);
         if (issue.suggestion) {
             const ext = extname(issue.file).slice(1) || "";
             const cleanSuggestion = issue.suggestion.replace(/```/g, "//").trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spaceflow/review",
-  "version": "0.49.0",
+  "version": "0.50.0",
   "description": "Spaceflow 代码审查插件，使用 LLM 对 PR 代码进行自动审查",
   "license": "MIT",
   "author": "Lydanne",
@@ -28,7 +28,7 @@
     "@spaceflow/cli": "0.38.0"
   },
   "peerDependencies": {
-    "@spaceflow/core": "0.17.0"
+    "@spaceflow/core": "0.18.0"
   },
   "spaceflow": {
     "type": "flow",

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

@@ -50,7 +50,8 @@ export class MarkdownFormatter implements ReviewReportFormatter, ReviewReportPar
         lines.push(`- **发现时间**: ${formatDateToUTC8(issue.date)}`);
       }
       if (issue.fixed) {
-        lines.push(`- **修复时间**: ${formatDateToUTC8(issue.fixed)}`);
+        const fixedByStr = issue.fixedBy?.login ? ` (by @${issue.fixedBy.login})` : "";
+        lines.push(`- **修复时间**: ${formatDateToUTC8(issue.fixed)}${fixedByStr}`);
       }
       if (issue.suggestion) {
         const ext = extname(issue.file).slice(1) || "";

package/src/review-spec/types.ts

@@ -74,6 +74,7 @@ export interface ReviewIssue {
   reason: string;
   date?: string; // 发现问题的时间
   fixed?: string; // 修复时间
+  fixedBy?: UserInfo; // 解决者
   valid?: string; // 问题是否有效
   suggestion?: string;
   commit?: string;

package/src/review.service.spec.ts

@@ -1751,7 +1751,7 @@ describe("ReviewService", () => {
 
   describe("ReviewService.postOrUpdateReviewComment", () => {
     it("should post review comment", async () => {
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({});
       gitProvider.listIssueComments.mockResolvedValue([] as any);
       gitProvider.listPullReviewComments.mockResolvedValue([] as any);
@@ -1763,7 +1763,7 @@ describe("ReviewService", () => {
     });
 
     it("should update PR title when autoUpdatePrTitle enabled", async () => {
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({ autoUpdatePrTitle: true });
       gitProvider.listIssueComments.mockResolvedValue([] as any);
       gitProvider.listPullReviewComments.mockResolvedValue([] as any);
@@ -1776,7 +1776,7 @@ describe("ReviewService", () => {
     });
 
     it("should handle createIssueComment error gracefully", async () => {
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({});
       gitProvider.listIssueComments.mockResolvedValue([] as any);
       gitProvider.listPullReviewComments.mockResolvedValue([] as any);
@@ -1790,7 +1790,7 @@ describe("ReviewService", () => {
     });
 
     it("should include line comments when configured", async () => {
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({ lineComments: true });
       mockReviewSpecService.parseLineRange = vi.fn().mockReturnValue([10]);
       gitProvider.listIssueComments.mockResolvedValue([] as any);
@@ -1820,19 +1820,61 @@ describe("ReviewService", () => {
   });
 
   describe("ReviewService.syncResolvedComments", () => {
-    it("should mark matched issues as fixed", async () => {
+    it("should mark matched issues as fixed 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" }] };
+      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" });
+    });
+
+    it("should mark matched issues as fixed via issue key in body", async () => {
+      mockReviewSpecService.parseLineRange = vi.fn().mockReturnValue([10]);
+      gitProvider.listResolvedThreads.mockResolvedValue([
+        {
+          path: "test.ts",
+          line: 10,
+          resolvedBy: { login: "user1" },
+          body: `🟡 **问题**\n<!-- issue-key: test.ts:10:RuleA -->`,
+        },
+      ] as any);
+      const result = {
+        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" });
+    });
+
+    it("should match correct issue by issue key when multiple issues at same position", async () => {
+      mockReviewSpecService.parseLineRange = vi.fn().mockReturnValue([10]);
+      gitProvider.listResolvedThreads.mockResolvedValue([
+        {
+          path: "test.ts",
+          line: 10,
+          resolvedBy: { login: "user1" },
+          body: `🟡 **问题B**\n<!-- issue-key: test.ts:10:RuleB -->`,
+        },
+      ] as any);
+      const result = {
+        issues: [
+          { file: "test.ts", line: "10", ruleId: "RuleA" } as any,
+          { file: "test.ts", line: "10", ruleId: "RuleB" } as any,
+        ],
+      };
+      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" });
     });
 
     it("should skip when no resolved threads", async () => {
       gitProvider.listResolvedThreads.mockResolvedValue([] as any);
-      const result = { issues: [{ file: "test.ts", line: "10" }] };
+      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();
     });
@@ -1841,7 +1883,7 @@ describe("ReviewService", () => {
       gitProvider.listResolvedThreads.mockResolvedValue([
         { path: undefined, line: 10, resolvedBy: { login: "user1" } },
       ] as any);
-      const result = { issues: [{ file: "test.ts", line: "10" }] };
+      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();
     });
@@ -1982,7 +2024,7 @@ describe("ReviewService", () => {
       gitProvider.listPullReviewComments.mockResolvedValue([] as any);
       gitProvider.getPullRequest.mockResolvedValue({ head: { sha: "abc" } } as any);
       gitProvider.createIssueComment.mockResolvedValue({} as any);
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({});
       const context = {
         owner: "o",
@@ -2017,7 +2059,7 @@ describe("ReviewService", () => {
       gitProvider.listPullReviewComments.mockResolvedValue([] as any);
       gitProvider.getPullRequest.mockResolvedValue({ head: { sha: "abc" } } as any);
       gitProvider.createIssueComment.mockResolvedValue({} as any);
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({});
       const context = {
         owner: "o",
@@ -2128,7 +2170,7 @@ describe("ReviewService", () => {
 
     it("should merge references from options and config", async () => {
       configService.get.mockReturnValue({ repository: "owner/repo", refName: "main" });
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({ references: ["config-ref"] });
       const options = { dryRun: false, ci: false, references: ["opt-ref"] };
       const context = await service.getContextFromEnv(options as any);
@@ -2445,15 +2487,27 @@ describe("ReviewService", () => {
     });
   });
 
+  describe("ReviewService.extractIssueKeyFromBody", () => {
+    it("should extract issue key from AI comment body", () => {
+      const body = `🟡 **问题描述**\n- **规则**: \`Rule1\`\n<!-- issue-key: test.ts:10:Rule1 -->`;
+      expect((service as any).extractIssueKeyFromBody(body)).toBe("test.ts:10:Rule1");
+    });
+
+    it("should return null for user reply without issue key marker", () => {
+      expect((service as any).extractIssueKeyFromBody("这个问题已经修复了")).toBeNull();
+      expect((service as any).extractIssueKeyFromBody("")).toBeNull();
+    });
+  });
+
   describe("ReviewService.syncRepliesToIssues", () => {
-    it("should sync replies to matched issues", async () => {
+    it("should sync user replies to matched issues and filter out AI comments", async () => {
       mockReviewSpecService.parseLineRange = vi.fn().mockReturnValue([10]);
       const reviewComments = [
         {
           id: 1,
           path: "test.ts",
           position: 10,
-          body: "original",
+          body: `🟡 **问题描述**\n<!-- issue-key: test.ts:10:JsTs.Base.Rule1 -->`,
           user: { id: 1, login: "bot" },
           created_at: "2024-01-01",
         },
@@ -2461,15 +2515,58 @@ describe("ReviewService", () => {
           id: 2,
           path: "test.ts",
           position: 10,
-          body: "reply",
+          body: "reply from user",
           user: { id: 2, login: "dev" },
           created_at: "2024-01-02",
         },
       ];
-      const result = { issues: [{ file: "test.ts", line: "10", replies: [] }] };
+      const result = {
+        issues: [{ file: "test.ts", line: "10", ruleId: "JsTs.Base.Rule1", replies: [] }],
+      };
       await (service as any).syncRepliesToIssues("o", "r", 1, reviewComments, result);
       expect(result.issues[0].replies).toHaveLength(1);
-      expect(result.issues[0].replies[0].body).toBe("reply");
+      expect(result.issues[0].replies[0].body).toBe("reply from user");
+      expect(result.issues[0].replies[0].user.login).toBe("dev");
+    });
+
+    it("should match user reply to correct issue by issue key when multiple issues at same position", async () => {
+      mockReviewSpecService.parseLineRange = vi.fn().mockReturnValue([10]);
+      const reviewComments = [
+        {
+          id: 1,
+          path: "test.ts",
+          position: 10,
+          body: `🔴 **问题A**\n<!-- issue-key: test.ts:10:JsTs.Base.RuleA -->`,
+          user: { id: 1, login: "bot" },
+          created_at: "2024-01-01T01:00:00Z",
+        },
+        {
+          id: 2,
+          path: "test.ts",
+          position: 10,
+          body: `🟡 **问题B**\n<!-- issue-key: test.ts:10:JsTs.Base.RuleB -->`,
+          user: { id: 1, login: "bot" },
+          created_at: "2024-01-01T02:00:00Z",
+        },
+        {
+          id: 3,
+          path: "test.ts",
+          position: 10,
+          body: "针对问题B的回复",
+          user: { id: 2, login: "dev" },
+          created_at: "2024-01-01T03:00:00Z",
+        },
+      ];
+      const result = {
+        issues: [
+          { file: "test.ts", line: "10", ruleId: "JsTs.Base.RuleA" } as any,
+          { file: "test.ts", line: "10", ruleId: "JsTs.Base.RuleB" } as any,
+        ],
+      };
+      await (service as any).syncRepliesToIssues("o", "r", 1, reviewComments, result);
+      expect(result.issues[0].replies).toBeUndefined(); // RuleA 无回复
+      expect(result.issues[1].replies).toHaveLength(1);
+      expect(result.issues[1].replies[0].body).toBe("针对问题B的回复");
     });
 
     it("should skip comments without path or position", async () => {
@@ -2493,6 +2590,34 @@ describe("ReviewService", () => {
       expect(consoleSpy).toHaveBeenCalled();
       consoleSpy.mockRestore();
     });
+
+    it("should fallback to path:position match when no issue key is available", async () => {
+      mockReviewSpecService.parseLineRange = vi.fn().mockReturnValue([10]);
+      const reviewComments = [
+        {
+          id: 1,
+          path: "test.ts",
+          position: 10,
+          body: "some comment without issue key",
+          user: { id: 1, login: "user1" },
+          created_at: "2024-01-01",
+        },
+        {
+          id: 2,
+          path: "test.ts",
+          position: 10,
+          body: "user reply",
+          user: { id: 2, login: "user2" },
+          created_at: "2024-01-02",
+        },
+      ];
+      const result = {
+        issues: [{ file: "test.ts", line: "10", ruleId: "SomeRule" } as any],
+      };
+      await (service as any).syncRepliesToIssues("o", "r", 1, reviewComments, result);
+      // 两条都不含 issue key，都会通过 fallback path:position 匹配
+      expect(result.issues[0].replies).toHaveLength(2);
+    });
   });
 
   describe("ReviewService.execute - CI with existingResult", () => {
@@ -2512,7 +2637,7 @@ describe("ReviewService", () => {
         summary: [],
         round: 1,
       });
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({});
       gitProvider.getPullRequest.mockResolvedValue({ title: "PR", head: { sha: "abc" } } as any);
       gitProvider.getPullRequestCommits.mockResolvedValue([
@@ -2546,7 +2671,7 @@ describe("ReviewService", () => {
         summary: [],
         round: 1,
       });
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({});
       gitProvider.getPullRequest.mockResolvedValue({ title: "PR", head: { sha: "abc" } } as any);
       gitProvider.getPullRequestCommits.mockResolvedValue([
@@ -2779,7 +2904,7 @@ describe("ReviewService", () => {
       gitProvider.getPullRequestCommits.mockResolvedValue([] as any);
       gitProvider.getPullRequest.mockResolvedValue({ head: { sha: "abc" } } as any);
       gitProvider.updateIssueComment.mockResolvedValue({} as any);
-      const configReader = (service as any).configReader;
+      const configReader = (service as any).config;
       configReader.getPluginConfig.mockReturnValue({});
       const context = { owner: "o", repo: "r", prNumber: 1, ci: true, dryRun: false, verbose: 1 };
       const result = await (service as any).executeCollectOnly(context);

package/src/review.service.ts

@@ -2046,7 +2046,7 @@ ${fileChanges || "无"}`;
 
   /**
    * 从 PR 的所有 resolved review threads 中同步 fixed 状态到 result.issues
-   * 直接通过 GraphQL 查询所有 resolved threads 的 path+line，匹配 issues
+   * 优先通过评论 body 中的 issue key 精确匹配，回退到 path+line 匹配
    */
   protected async syncResolvedComments(
     owner: string,
@@ -2059,16 +2059,41 @@ ${fileChanges || "无"}`;
       if (resolvedThreads.length === 0) {
         return;
       }
+      // 构建 issue key → issue 的映射，用于精确匹配
+      const issueByKey = new Map<string, ReviewResult["issues"][0]>();
+      for (const issue of result.issues) {
+        issueByKey.set(this.generateIssueKey(issue), issue);
+      }
       const now = new Date().toISOString();
       for (const thread of resolvedThreads) {
         if (!thread.path) continue;
-        const matchedIssue = result.issues.find(
-          (issue) =>
-            issue.file === thread.path && this.lineMatchesPosition(issue.line, thread.line),
-        );
+        // 优先通过 issue key 精确匹配
+        let matchedIssue: ReviewResult["issues"][0] | undefined;
+        if (thread.body) {
+          const issueKey = this.extractIssueKeyFromBody(thread.body);
+          if (issueKey) {
+            matchedIssue = issueByKey.get(issueKey);
+          }
+        }
+        // 回退：path:line 匹配
+        if (!matchedIssue) {
+          matchedIssue = result.issues.find(
+            (issue) =>
+              issue.file === thread.path && this.lineMatchesPosition(issue.line, thread.line),
+          );
+        }
         if (matchedIssue && !matchedIssue.fixed) {
           matchedIssue.fixed = now;
-          console.log(`🟢 问题已标记为已解决: ${matchedIssue.file}:${matchedIssue.line}`);
+          if (thread.resolvedBy) {
+            matchedIssue.fixedBy = {
+              id: thread.resolvedBy.id?.toString(),
+              login: thread.resolvedBy.login,
+            };
+          }
+          console.log(
+            `🟢 问题已标记为已解决: ${matchedIssue.file}:${matchedIssue.line}` +
+              (thread.resolvedBy?.login ? ` (by @${thread.resolvedBy.login})` : ""),
+          );
         }
       }
     } catch (error) {
@@ -2234,9 +2259,23 @@ ${fileChanges || "无"}`;
     }
   }
 
+  /**
+   * 从评论 body 中提取 issue key（AI 行级评论末尾的 HTML 注释标记）
+   * 格式：`<!-- issue-key: file:line:ruleId -->`
+   * 返回 null 表示非 AI 评论（即用户真实回复）
+   */
+  protected extractIssueKeyFromBody(body: string): string | null {
+    const match = body.match(/<!-- issue-key: (.+?) -->/);
+    return match ? match[1] : null;
+  }
+
   /**
    * 同步评论回复到对应的 issues
    * review 评论回复是通过同一个 review 下的后续评论实现的
+   *
+   * 通过 AI 评论 body 中嵌入的 issue key（`<!-- issue-key: file:line:ruleId -->`）精确匹配 issue：
+   * - 含 issue key 的评论是 AI 自身评论，过滤掉不作为回复
+   * - 不含 issue key 的评论是用户真实回复，归到其前面最近的 AI 评论对应的 issue
    */
   protected async syncRepliesToIssues(
     _owner: string,
@@ -2253,7 +2292,12 @@ ${fileChanges || "无"}`;
     result: ReviewResult,
   ): Promise<void> {
     try {
-      // 按文件路径和行号分组评论，第一条是原始评论，后续是回复
+      // 构建 issue key → issue 的映射，用于快速查找
+      const issueByKey = new Map<string, ReviewResult["issues"][0]>();
+      for (const issue of result.issues) {
+        issueByKey.set(this.generateIssueKey(issue), issue);
+      }
+      // 按文件路径和行号分组评论
       const commentsByLocation = new Map<string, typeof reviewComments>();
       for (const comment of reviewComments) {
         if (!comment.path || !comment.position) continue;
@@ -2262,7 +2306,7 @@ ${fileChanges || "无"}`;
         comments.push(comment);
         commentsByLocation.set(key, comments);
       }
-      // 遍历每个位置的评论，将非第一条评论作为回复
+      // 遍历每个位置的评论
       for (const [, comments] of commentsByLocation) {
         if (comments.length <= 1) continue;
         // 按创建时间排序
@@ -2271,24 +2315,40 @@ ${fileChanges || "无"}`;
           const timeB = b.created_at ? new Date(b.created_at).getTime() : 0;
           return timeA - timeB;
         });
-        const firstComment = comments[0];
-        // 找到对应的 issue
-        const matchedIssue = result.issues.find(
-          (issue) =>
-            issue.file === firstComment.path &&
-            this.lineMatchesPosition(issue.line, firstComment.position),
-        );
-        if (!matchedIssue) continue;
-        // 后续评论作为回复
-        const replies = comments.slice(1).map((c) => ({
-          user: {
-            id: c.user?.id?.toString(),
-            login: c.user?.login || "unknown",
-          },
-          body: c.body || "",
-          createdAt: c.created_at || "",
-        }));
-        matchedIssue.replies = replies;
+        // 遍历评论，用 issue key 精确匹配
+        let lastIssueKey: string | null = null;
+        for (const comment of comments) {
+          const issueKey = this.extractIssueKeyFromBody(comment.body || "");
+          if (issueKey) {
+            // AI 自身评论，记录 issue key 但不作为回复
+            lastIssueKey = issueKey;
+            continue;
+          }
+          // 用户真实回复，通过前面最近的 AI 评论的 issue key 精确匹配
+          let matchedIssue = lastIssueKey ? (issueByKey.get(lastIssueKey) ?? null) : null;
+          // 回退：如果 issue key 匹配失败，使用 path:position 匹配
+          if (!matchedIssue) {
+            matchedIssue =
+              result.issues.find(
+                (issue) =>
+                  issue.file === comment.path &&
+                  this.lineMatchesPosition(issue.line, comment.position),
+              ) ?? null;
+          }
+          if (!matchedIssue) continue;
+          // 追加回复（而非覆盖，同一 issue 可能有多条用户回复）
+          if (!matchedIssue.replies) {
+            matchedIssue.replies = [];
+          }
+          matchedIssue.replies.push({
+            user: {
+              id: comment.user?.id?.toString(),
+              login: comment.user?.login || "unknown",
+            },
+            body: comment.body || "",
+            createdAt: comment.created_at || "",
+          });
+        }
       }
     } catch (error) {
       console.warn("⚠️ 同步评论回复失败:", error);
@@ -2368,6 +2428,7 @@ ${fileChanges || "无"}`;
       lines.push(`- **Commit**: ${issue.commit}`);
     }
     lines.push(`- **开发人员**: ${issue.author ? "@" + issue.author.login : "未知"}`);
+    lines.push(`<!-- issue-key: ${this.generateIssueKey(issue)} -->`);
     if (issue.suggestion) {
       const ext = extname(issue.file).slice(1) || "";
       const cleanSuggestion = issue.suggestion.replace(/```/g, "//").trim();