gitlab-ai-review 4.0.0 → 4.0.1

package/index.js

@@ -205,19 +205,53 @@ export class GitLabAIReview {
         // 调用 AI 一次性审查整个文件的所有变更（按文件批量）
         const fileReview = await this.reviewFileChanges(change, meaningfulChanges);
         
+        // 智能合并修改块的评论
+        const mergedReviews = this.mergeModificationReviews(fileReview.reviews, meaningfulChanges);
+        
         // 根据 AI 返回的结果，只对有问题的行添加评论
-        for (const review of fileReview.reviews) {
+        for (const review of mergedReviews) {
           if (review.hasIssue) {
             try {
+              // 找到对应的变更
+              const relatedChange = meaningfulChanges.find(c => 
+                c.lineNumber === review.lineNumber || 
+                c.lineNumber === review.oldLine ||
+                c.lineNumber === review.newLine
+              );
+              
+              // 构建评论位置参数
+              const positionParams = {
+                filePath: fileName,
+                oldPath: change.old_path,
+              };
+              
+              // 优先使用 hunk 的起始行（让评论定位到 diff 块的开头）
+              if (relatedChange && relatedChange.hunkRange) {
+                const isDeletion = relatedChange.type === 'deletion';
+                if (isDeletion) {
+                  positionParams.oldLine = relatedChange.hunkRange.oldStart;
+                } else {
+                  positionParams.newLine = relatedChange.hunkRange.newStart;
+                }
+              } else if (review.oldLine && review.newLine) {
+                // 修改块：同时指定两个行号
+                positionParams.oldLine = review.oldLine;
+                positionParams.newLine = review.newLine;
+              } else if (review.lineNumber) {
+                // 单独的删除或新增（fallback）
+                const isDeletion = relatedChange && relatedChange.type === 'deletion';
+                if (isDeletion) {
+                  positionParams.oldLine = review.lineNumber;
+                } else {
+                  positionParams.newLine = review.lineNumber;
+                }
+              }
+              
               const commentResult = await this.gitlabClient.createLineComment(
                 this.config.project.projectId,
                 this.config.project.mergeRequestIid,
                 `🤖 **AI 代码审查**\n\n${review.comment}`,
-                {
-                  filePath: fileName,
-                  oldPath: change.old_path,
-                  newLine: review.lineNumber,
-                }
+                positionParams
               );
 
               results.push({
@@ -464,36 +498,27 @@ export class GitLabAIReview {
         for (const review of mergedReviews) {
           if (review.hasIssue) {
             try {
-              // 找到对应的变更，获取 hunk 范围
+              // 找到对应的变更
               const relatedChange = meaningfulChanges.find(c => 
                 c.lineNumber === review.lineNumber || 
                 c.lineNumber === review.oldLine ||
                 c.lineNumber === review.newLine
               );
               
-              // 构建评论位置参数，包含整个 hunk 的范围
+              // 构建评论位置参数
               const positionParams = {
                 filePath: fileName,
                 oldPath: change.old_path,
               };
               
-              // 使用 hunk 的完整范围而不是单行
+              // 优先使用 hunk 的起始行（让评论定位到 diff 块的开头）
               if (relatedChange && relatedChange.hunkRange) {
-                positionParams.oldLine = relatedChange.hunkRange.oldStart;
-                positionParams.newLine = relatedChange.hunkRange.newStart;
-                // 添加范围信息（GitLab 支持 line_range）
-                positionParams.lineRange = {
-                  start: {
-                    line_code: `${relatedChange.hunkRange.oldStart}_${relatedChange.hunkRange.oldStart}`,
-                    type: 'old',
-                    old_line: relatedChange.hunkRange.oldStart,
-                  },
-                  end: {
-                    line_code: `${relatedChange.hunkRange.newEnd}_${relatedChange.hunkRange.newEnd}`,
-                    type: 'new',
-                    new_line: relatedChange.hunkRange.newEnd,
-                  },
-                };
+                const isDeletion = relatedChange.type === 'deletion';
+                if (isDeletion) {
+                  positionParams.oldLine = relatedChange.hunkRange.oldStart;
+                } else {
+                  positionParams.newLine = relatedChange.hunkRange.newStart;
+                }
               } else if (review.oldLine && review.newLine) {
                 // 修改块：同时指定两个行号
                 positionParams.oldLine = review.oldLine;

package/lib/gitlab-client.js

@@ -92,18 +92,13 @@ export class GitLabClient {
       old_path: lineInfo.oldPath || lineInfo.filePath,
     };
 
-    // 设置行号或行范围
+    // 设置行号（只能设置其中一个，或者两个都设置表示修改块）
     if (lineInfo.newLine !== undefined) {
       position.new_line = lineInfo.newLine;
     }
     if (lineInfo.oldLine !== undefined) {
       position.old_line = lineInfo.oldLine;
     }
-    
-    // 如果提供了范围信息，使用范围评论
-    if (lineInfo.lineRange) {
-      position.line_range = lineInfo.lineRange;
-    }
 
     return this.request(
       `/projects/${encodeURIComponent(projectId)}/merge_requests/${mergeRequestIid}/discussions`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab-ai-review",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "GitLab AI Review SDK with Impact Analysis - 支持影响分析、删除符号检测、注释代码识别、文件内部冲突检查、智能文件过滤的智能代码审查工具",
   "main": "index.js",
   "type": "module",