job51-gitlab-cr-node-jt-1 2.4.2 → 2.4.4

package/.claude/skills/simple-code-review/SKILL.md

@@ -1,4 +1,4 @@
----
+---
 name: simple-code-review
 description: 代码审查技能，审查变更代码并输出 REPORT 和 LINE_INFO
 ---
@@ -37,9 +37,16 @@ description: 代码审查技能，审查变更代码并输出 REPORT 和 LINE_IN
 
 ### 🔴 严重问题
 
-[带圈数字序号][问题描述]<br/>
-**文件及行号**：[文件路径:行号，如：51job-dev-boot-bbs/src/main/java/com/job51/dev/bbs/service/impl/ForumCategoryForumServiceImpl.java:40]<br/>
+---
+[问题描述]<br/>
+**文件及行号**：[文件路径：行号]<br/>
+**修改建议**：[正确示例代码]
+---
+
+[问题描述]<br/>
+**文件及行号**：[文件路径：行号]<br/>
 **修改建议**：[正确示例代码]
+---
 
 </REPORT>
 
@@ -49,4 +56,5 @@ description: 代码审查技能，审查变更代码并输出 REPORT 和 LINE_IN
 
 **说明**：
 - 无问题时省略对应标题，但 `<LINE_INFO>` 必须输出（空数组：`[]`）
-- 行号格式参考 @.claude/rules/code-review-rules.md 第 19 条
+- 每个问题用 `---` 分割线分隔，方便切分
+- 行号格式参考 @.claude/rules/code-review-rules.md 第 19 条

package/index.js

@@ -512,30 +512,32 @@ ${diffObject.diff}`;
    */
   extractSingleProblemReport(fullReport, problemIndex) {
     const lines = fullReport.split('\n');
-    // 匹配带圈数字序号（1️⃣、2️⃣、3️⃣等）或普通数字
-    const problemRegex = new RegExp(`^\\s*${problemIndex}[️⃣\\d\\.\\)]`);
-
-    let startIndex = -1;
-    let endIndex = lines.length;
-
-    for (let i = 0; i < lines.length; i++) {
-      if (problemRegex.test(lines[i])) {
-        startIndex = i;
-        // 查找下一个问题的开始
-        const nextProblemRegex = new RegExp(`^\\s*(${problemIndex + 1}|\\d+)[️⃣\\.\\)]`);
-        for (let j = i + 1; j < lines.length; j++) {
-          if (nextProblemRegex.test(lines[j])) {
-            endIndex = j;
-            break;
+    // 使用 --- 分割线来切分问题
+    const problemBlocks = [];
+    let currentBlock = [];
+    let inBlock = false;
+
+    for (const line of lines) {
+      if (line.trim() === '---') {
+        if (inBlock) {
+          // 块结束
+          if (currentBlock.length > 0) {
+            problemBlocks.push(currentBlock.join('\n'));
+            currentBlock = [];
           }
+          inBlock = false;
+        } else {
+          // 块开始
+          inBlock = true;
         }
-        break;
+      } else if (inBlock) {
+        currentBlock.push(line);
       }
     }
 
-    if (startIndex !== -1) {
-      const problemLines = lines.slice(startIndex, endIndex);
-      return problemLines.join('\n');
+    // 返回第 problemIndex 个问题（索引从 1 开始）
+    if (problemIndex >= 1 && problemIndex <= problemBlocks.length) {
+      return problemBlocks[problemIndex - 1];
     }
 
     // 如果无法提取，返回完整报告（降级处理）
@@ -583,6 +585,13 @@ ${diffObject.diff}`;
       const headSha = versionInfo.head_commit_sha;
       const startSha = versionInfo.start_commit_sha;
       debugLog(`获取到版本信息 - base: ${baseSha}, head: ${headSha}, start: ${startSha}`);
+
+      // 解析 diff 头信息，计算有效行号范围
+      const newStart = diff_info.new_start || 1;
+      const newCount = diff_info.new_count || 1;
+      const maxValidLine = newStart + newCount - 1;
+      debugLog(`Diff 块行号范围：[${newStart}, ${maxValidLine}]，共 ${newCount} 行`);
+
       const allLineInfo = this.parseAllLineInfoFromReviewResult(lineInfoTag);
       debugLog(`解析到 ${allLineInfo.length} 个问题的行号信息`);
       if (allLineInfo.length === 0) {
@@ -594,16 +603,39 @@ ${diffObject.diff}`;
         const problemInfo = allLineInfo[i];
         debugLog(`处理第 ${i + 1}/${allLineInfo.length} 个问题：文件=${problemInfo.new_path}, 行号=${problemInfo.new_line}`);
         const singleProblemContent = this.extractSingleProblemReport(fullReportContent, i + 1);
-        let targetLine = {
-          new_path: problemInfo.new_path,
-          new_line: problemInfo.new_line
-        };
+
+        // 行号有效性验证和修正
+        let targetLine;
+        let originalLine = problemInfo.new_line;
+        let needsGeneralDiscussion = false;
+
         if (problemInfo.old_line && !problemInfo.new_line) {
+          // 删除代码，使用 old_line
           targetLine = {
             old_path: problemInfo.old_path,
             old_line: problemInfo.old_line
           };
+        } else if (problemInfo.new_line) {
+          // 验证新行号是否在有效范围内
+          if (problemInfo.new_line < newStart || problemInfo.new_line > maxValidLine) {
+            debugLog(`⚠️ 行号 ${problemInfo.new_line} 超出有效范围 [${newStart}, ${maxValidLine}]，改用一般讨论`);
+            needsGeneralDiscussion = true;
+          } else {
+            targetLine = {
+              new_path: problemInfo.new_path,
+              new_line: problemInfo.new_line
+            };
+          }
         }
+
+        if (needsGeneralDiscussion) {
+          // 行号无效，改用一般讨论
+          debugLog(`第 ${i + 1} 个问题的行号 ${originalLine} 无效，发布为一般讨论`);
+          await this.createGeneralDiscussion(projectId, mergeRequestIid, file_path_with_line, singleProblemContent);
+          debugLog(`第 ${i + 1} 个问题的评论已发布 (作为一般讨论，行号无效)`);
+          continue;
+        }
+
         debugLog(`第 ${i + 1} 个问题的 targetLine: ${JSON.stringify(targetLine)}`);
         const payload = {
           body: singleProblemContent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "job51-gitlab-cr-node-jt-1",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "GitLab merge request code review tool with AI-powered analysis and project context support",
   "main": "index.js",
   "bin": {