job51-gitlab-cr-node-skill-prompt-optimize 1.5.0 → 1.5.2

package/index.js

@@ -78,6 +78,7 @@ class GitLabCodeReviewer {
 
 
           // 提取REPORT标签内容并返回
+          // 提取 REPORT 标签和 LINE_INFO 标签内容并返回对象
           return extractReportContent(claudeResult);
         } else {
           debugLog(`AI审核结果不包含"🤖 AI 代码审查结果" (尝试 ${attempts})，将重试...`);
@@ -85,7 +86,8 @@ class GitLabCodeReviewer {
             debugLog(`已达到最大重试次数 ${maxAttempts}，返回最后一次结果，${claudeResult}`);
 
             // 提取REPORT标签内容并返回
-            return extractReportContent(claudeResult);
+            // 提取 REPORT 标签和 LINE_INFO 标签内容并返回对象
+          return extractReportContent(claudeResult);
           }
         }
       } catch (error) {
@@ -138,7 +140,7 @@ ${diffObject.diff}`;
         const blockObj = { ...diffObject, review_result, temp_file_path: tmpFileName };
 
         // 检查审查结果中是否包含严重问题，只有包含严重问题才发布评论
-        if (blockObj.review_result && blockObj.review_result.includes('🔴 严重问题')) {
+        if (blockObj.review_result && blockObj.review_result.reportContent && blockObj.review_result.reportContent.includes('🔴 严重问题')) {
           // 立即发布评论
           await this.postSingleCommentToGitLab(projectId, mergeRequestIid, {
             diff_info: blockObj,
@@ -235,6 +237,7 @@ ${diffObject.diff}`;
           debugLog(`AI审核成功，包含"🤖 AI 代码审查结果" (尝试 ${attempts})`);
 
           // 提取REPORT标签内容并返回
+          // 提取 REPORT 标签和 LINE_INFO 标签内容并返回对象
           return extractReportContent(claudeResult);
         } else {
           debugLog(`AI审核结果不包含"🤖 AI 代码审查结果" (尝试 ${attempts})，将重试...`);
@@ -242,7 +245,8 @@ ${diffObject.diff}`;
             debugLog(`已达到最大重试次数 ${maxAttempts}，返回最后一次结果，${claudeResult}`);
 
             // 提取REPORT标签内容并返回
-            return extractReportContent(claudeResult);
+            // 提取 REPORT 标签和 LINE_INFO 标签内容并返回对象
+          return extractReportContent(claudeResult);
           }
         }
       } catch (error) {
@@ -359,55 +363,49 @@ ${diffObject.diff}`;
   }
 
   /**
-   * 从 LINE_INFO 标签中解析行号信息
-   * @param {string} reviewResult 审查结果文本
+   * 从 LINE_INFO 标签字符串中解析行号信息
+   * @param {string} lineInfoTag LINE_INFO 标签字符串，如 "<LINE_INFO>[...]</LINE_INFO>"
    * @returns {Object|null} 行号信息对象 {new_path, new_line, old_path, old_line} 或 null
    */
-  parseLineInfoFromReviewResult(reviewResult) {
-    if (!reviewResult) return null;
+  parseLineInfoFromReviewResult(lineInfoTag) {
+    if (!lineInfoTag) return null;
 
-    // 解析<LINE_INFO>[{"new_path":"xxx","new_line":87,"old_path":"yyy","old_line":85}]</LINE_INFO>格式
-    const lineInfoRegex = /<LINE_INFO>\s*([\s\S]*?)\s*<\/LINE_INFO>/;
-    const match = reviewResult.match(lineInfoRegex);
+    try {
+      // 从标签中提取 JSON 内容：<LINE_INFO>[{...}]</LINE_INFO>
+      const jsonContent = lineInfoTag.replace(/<LINE_INFO>\s*/g, '').replace(/\s*<\/LINE_INFO>/g, '').trim();
 
-    if (match) {
-      try {
-        // 提取 JSON 内容并去除首尾空白字符
-        const lineInfoJson = match[1].trim();
+      debugLog(`解析 LINE_INFO 原始内容：${lineInfoTag}`);
+      debugLog(`解析 LINE_INFO JSON 内容：${jsonContent}`);
 
-        debugLog(`解析 LINE_INFO 原始内容：${match[1]}`);
-        debugLog(`解析 LINE_INFO 处理后内容：${lineInfoJson}`);
+      // 如果是空数组，返回 null 使用后备方案
+      if (jsonContent === '[]') {
+        debugLog('LINE_INFO 为空数组，使用 diff 块起始行号作为后备方案');
+        return null;
+      }
 
-        // 如果是空数组，返回 null 使用后备方案
-        if (lineInfoJson === '[]') {
-          debugLog('LINE_INFO 为空数组，使用 diff 块起始行号作为后备方案');
-          return null;
+      const lineInfoArray = JSON.parse(jsonContent);
+      debugLog(`解析 LINE_INFO JSON 成功：${JSON.stringify(lineInfoArray)}`);
+
+      if (Array.isArray(lineInfoArray) && lineInfoArray.length > 0) {
+        debugLog(`从 LINE_INFO 中解析出行号信息：${JSON.stringify(lineInfoArray)}`);
+        // 返回第一个问题的行号信息（后续可扩展为支持多个问题分别评论）
+        const lineInfo = lineInfoArray[0];
+        // 构建符合 GitLab API 的 position 对象
+        const position = {
+          new_path: lineInfo.new_path,
+          new_line: lineInfo.new_line
+        };
+        // 可选字段：如果存在 old_path 和 old_line 也加入
+        if (lineInfo.old_path) {
+          position.old_path = lineInfo.old_path;
         }
-
-        const lineInfoArray = JSON.parse(lineInfoJson);
-        debugLog(`解析 LINE_INFO JSON 成功：${JSON.stringify(lineInfoArray)}`);
-
-        if (Array.isArray(lineInfoArray) && lineInfoArray.length > 0) {
-          debugLog(`从 LINE_INFO 中解析出行号信息：${JSON.stringify(lineInfoArray)}`);
-          // 返回第一个问题的行号信息（后续可扩展为支持多个问题分别评论）
-          const lineInfo = lineInfoArray[0];
-          // 构建符合 GitLab API 的 position 对象
-          const position = {
-            new_path: lineInfo.new_path,
-            new_line: lineInfo.new_line
-          };
-          // 可选字段：如果存在 old_path 和 old_line 也加入
-          if (lineInfo.old_path) {
-            position.old_path = lineInfo.old_path;
-          }
-          if (lineInfo.old_line) {
-            position.old_line = lineInfo.old_line;
-          }
-          return position;
+        if (lineInfo.old_line) {
+          position.old_line = lineInfo.old_line;
         }
-      } catch (error) {
-        debugLog(`解析 LINE_INFO JSON 失败：${error.message}`);
+        return position;
       }
+    } catch (error) {
+      debugLog(`解析 LINE_INFO JSON 失败：${error.message}`);
     }
 
     debugLog('无法从 LINE_INFO 中解析行号，将使用 diff 块起始行号作为后备方案');
@@ -442,6 +440,9 @@ ${diffObject.diff}`;
   async postSingleCommentToGitLab(projectId, mergeRequestIid, result) {
     try {
       const { diff_info, review_result, block_index } = result;
+      // review_result 现在是对象：{ reportContent, lineInfo }
+      const reviewContent = review_result?.reportContent || '';
+      const lineInfoTag = review_result?.lineInfo || null;
       const file_path = diff_info.new_path || diff_info.old_path;
       const file_path_with_line = `${file_path}#L${block_index}`;
 
@@ -461,9 +462,9 @@ ${diffObject.diff}`;
       // 直接使用diff_info中的line_info
       const lineInfo = diff_info.line_info;
 
-      if (!lineInfo) {
+      if (!lineInfo && !lineInfoTag) {
         // 如果没有行号信息，创建一般讨论
-        await this.createGeneralDiscussion(projectId, mergeRequestIid, file_path_with_line, review_result);
+        await this.createGeneralDiscussion(projectId, mergeRequestIid, file_path_with_line, reviewContent);
         debugLog(`评论已发布到文件 ${file_path_with_line} (无法解析行号)`);
         return;
       }
@@ -476,7 +477,7 @@ ${diffObject.diff}`;
           : { new_line: lineInfo.new_start, new_path: diff_info.new_path, old_line: lineInfo.old_start, old_path: diff_info.old_path };
 
       // 尝试从审查结果中解析更精确的行号信息（从 LINE_INFO 标签）
-      const parsedLineInfo = this.parseLineInfoFromReviewResult(review_result);
+      const parsedLineInfo = lineInfoTag ? this.parseLineInfoFromReviewResult(lineInfoTag) : null;
       if (parsedLineInfo) {
         debugLog(`从 LINE_INFO 中解析出行号成功，使用解析后的行号覆盖 diff 块起始行号`);
         targetLine = parsedLineInfo;
@@ -488,7 +489,7 @@ ${diffObject.diff}`;
       if (targetLine) {
         // 创建diff评论
         const payload = {
-          body: review_result,
+          body: reviewContent,
           position: {
             position_type: 'text',
             base_sha: baseSha,
@@ -503,12 +504,12 @@ ${diffObject.diff}`;
           debugLog(`评论已发布到文件 ${file_path_with_line} 的相关变更区域`);
         } catch (error) {
           console.error(`发布评论到文件 ${file_path_with_line} 的变更区域失败，改用一般讨论:`, error.message);
-          await this.createGeneralDiscussion(projectId, mergeRequestIid, file_path_with_line, review_result);
+          await this.createGeneralDiscussion(projectId, mergeRequestIid, file_path_with_line, reviewContent);
           debugLog(`评论已发布到文件 ${file_path_with_line} (作为一般讨论)`);
         }
       } else {
         // 如果没有找到任何行号，创建一般讨论
-        await this.createGeneralDiscussion(projectId, mergeRequestIid, file_path_with_line, review_result);
+        await this.createGeneralDiscussion(projectId, mergeRequestIid, file_path_with_line, reviewContent);
         debugLog(`评论已发布到文件 ${file_path_with_line} (无特定行号)`);
       }
     } catch (error) {

package/package.json

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

package/utils.js

@@ -1,67 +1,74 @@
-/**
- * 工具函数集合
- */
-
-const axios = require('axios');
-
-// 调试日志函数
-function debugLog(message) {
-  console.log('[DEBUG]', new Date().toISOString(), message);
-}
-
-/**
- * 提取REPORT标签之间的内容
- * @param {string} text 包含REPORT标签的文本
- * @returns {string} 提取后的内容
- */
-function extractReportContent(text) {
-  const reportRegex = /<REPORT>([\s\S]*?)<\/REPORT>/;
-  const match = text.match(reportRegex);
-  return match ? match[1].trim() : text;
-}
-
-// 创建一个可配置的GitLab API客户端
-class GitLabAPIClient {
-  constructor(gitlabToken, gitlabUrl = null) {
-    this.gitlabToken = gitlabToken;
-    this.gitlabUrl = gitlabUrl || 'https://gitdev.51job.com';
-    this.axiosInstance = axios.create({
-      headers: {
-        'PRIVATE-TOKEN': this.gitlabToken,
-      },
-    });
-  }
-
-  /**
-   * 通用的GitLab API调用函数
-   * @param {string} endpoint API端点
-   * @param {Object} options 额外选项（method, data等）
-   * @returns {Promise} API调用结果
-   */
-  async callGitLabAPI(endpoint, options = {}) {
-    const { method = 'GET', data = null, headers = {} } = options;
-
-    try {
-      const response = await this.axiosInstance({
-        method,
-        url: `${this.gitlabUrl}${endpoint}`,
-        headers: {
-          'Content-Type': 'application/json',
-          ...headers
-        },
-        data
-      });
-
-      return response.data;
-    } catch (error) {
-      console.error(`GitLab API调用失败: ${method} ${endpoint}`, error.message);
-      throw error;
-    }
-  }
-}
-
-module.exports = {
-  GitLabAPIClient,
-  debugLog,
-  extractReportContent
-};
+/**
+ * 工具函数集合
+ */
+
+const axios = require('axios');
+
+// 调试日志函数
+function debugLog(message) {
+  console.log('[DEBUG]', new Date().toISOString(), message);
+}
+
+/**
+ * 提取 REPORT 标签和 LINE_INFO 标签的内容
+ * @param {string} text 包含 REPORT 和 LINE_INFO 标签的文本
+ * @returns {{reportContent: string, lineInfo: string|null}} 包含 REPORT 内容和 LINE_INFO 标签的对象
+ */
+function extractReportContent(text) {
+  const reportRegex = /<REPORT>([\s\S]*?)<\/REPORT>/;
+  const lineInfoRegex = /<LINE_INFO>[\s\S]*?<\/LINE_INFO>/;
+
+  const reportMatch = text.match(reportRegex);
+  const lineInfoMatch = text.match(lineInfoRegex);
+
+  const reportContent = reportMatch ? reportMatch[1].trim() : text;
+  const lineInfo = lineInfoMatch ? lineInfoMatch[0] : null;
+
+  return { reportContent, lineInfo };
+}
+
+// 创建一个可配置的 GitLab API 客户端
+class GitLabAPIClient {
+  constructor(gitlabToken, gitlabUrl = null) {
+    this.gitlabToken = gitlabToken;
+    this.gitlabUrl = gitlabUrl || 'https://gitdev.51job.com';
+    this.axiosInstance = axios.create({
+      headers: {
+        'PRIVATE-TOKEN': this.gitlabToken,
+      },
+    });
+  }
+
+  /**
+   * 通用的 GitLab API 调用函数
+   * @param {string} endpoint API 端点
+   * @param {Object} options 额外选项（method, data 等）
+   * @returns {Promise} API 调用结果
+   */
+  async callGitLabAPI(endpoint, options = {}) {
+    const { method = 'GET', data = null, headers = {} } = options;
+
+    try {
+      const response = await this.axiosInstance({
+        method,
+        url: `${this.gitlabUrl}${endpoint}`,
+        headers: {
+          'Content-Type': 'application/json',
+          ...headers
+        },
+        data
+      });
+
+      return response.data;
+    } catch (error) {
+      console.error(`GitLab API 调用失败：${method} ${endpoint}`, error.message);
+      throw error;
+    }
+  }
+}
+
+module.exports = {
+  GitLabAPIClient,
+  debugLog,
+  extractReportContent
+};