gitlab-ai-review 1.2.0 → 2.0.0

package/index.js

@@ -7,6 +7,7 @@ import { getConfig, validateConfig } from './lib/config.js';
 import { GitLabClient } from './lib/gitlab-client.js';
 import { AIClient } from './lib/ai-client.js';
 import * as PromptTools from './lib/prompt-tools.js';
+import * as DiffParser from './lib/diff-parser.js';
 
 /**
  * GitLab AI Review SDK 主类
@@ -14,7 +15,7 @@ import * as PromptTools from './lib/prompt-tools.js';
 export class GitLabAIReview {
   constructor(options = {}) {
     this.name = 'GitLab AI Review SDK';
-    this.version = '1.2.0';
+    this.version = '2.0.0';
 
     // 如果传入了配置，使用手动配置；否则使用自动检测
     if (options.token || options.gitlab) {
@@ -137,93 +138,89 @@ export class GitLabAIReview {
   }
 
   /**
-   * AI 审查单个文件的代码变更
+   * AI 审查特定行的变更并在该行添加评论（附带项目 prompt）
    * @param {Object} change - 代码变更对象
-   * @returns {Promise<Object>} 审查结果
+   * @param {Object} changeInfo - 具体的行变更信息
+   * @returns {Promise<Object>} 评论结果
    */
-  async reviewCodeChange(change) {
+  async reviewAndCommentOnLine(change, changeInfo) {
     const aiClient = this.getAIClient();
-    const guardConfig = this.config.ai?.guardConfig?.content || '';
+    
+    // 获取项目配置的 prompt（来自 reviewguard.md）
+    const projectPrompt = this.config.ai?.guardConfig?.content || '';
 
-    // 使用 PromptTools 构建消息
-    const messages = PromptTools.buildReviewMessages({
-      diff: change.diff,
+    // 构建针对特定行的审查消息（附带项目 prompt）
+    const messages = PromptTools.buildLineReviewMessages({
+      ...changeInfo,
       fileName: change.new_path || change.old_path,
-      guardConfig,
-    });
+    }, projectPrompt);
 
-    // 调用 AI
-    return aiClient.sendMessage(messages);
-  }
-
-  /**
-   * AI 审查 MR 的所有代码变更
-   * @returns {Promise<Array>} 审查结果数组
-   */
-  async reviewMergeRequest() {
-    const changes = await this.getMergeRequestChanges();
-    const aiClient = this.getAIClient();
-    const guardConfig = this.config.ai?.guardConfig?.content || '';
+    // 调用 AI 审查
+    const review = await aiClient.sendMessage(messages);
 
-    const reviews = [];
+    // 在该行添加评论
+    const lineInfo = {
+      filePath: change.new_path || change.old_path,
+      oldPath: change.old_path,
+      newLine: changeInfo.lineNumber,
+    };
 
-    for (const change of changes) {
-      try {
-        // 使用 PromptTools 构建消息
-        const messages = PromptTools.buildReviewMessages({
-          diff: change.diff,
-          fileName: change.new_path || change.old_path,
-          guardConfig,
-        });
-
-        // 调用 AI
-        const result = await aiClient.sendMessage(messages);
-
-        reviews.push({
-          fileName: change.new_path || change.old_path,
-          status: 'success',
-          ...result,
-        });
-      } catch (error) {
-        reviews.push({
-          fileName: change.new_path || change.old_path,
-          status: 'error',
-          error: error.message,
-        });
-      }
-    }
+    const commentResult = await this.gitlabClient.createLineComment(
+      this.config.project.projectId,
+      this.config.project.mergeRequestIid,
+      `🤖 **AI 代码审查**\n\n${review.content}`,
+      lineInfo
+    );
 
-    return reviews;
+    return {
+      review,
+      comment: commentResult,
+    };
   }
 
   /**
-   * AI 审查 MR 并自动添加评论
+   * AI 审查 MR 的所有有意义的变更并自动添加行级评论
+   * @param {Object} options - 选项
+   * @param {number} options.maxComments - 最大评论数量（避免过多评论）
+   * @returns {Promise<Array>} 评论结果数组
    */
-  async reviewAndComment() {
-    const reviews = await this.reviewMergeRequest();
-    
-    // 构建评论内容
-    let comment = '## 🤖 AI 代码审查报告\n\n';
-    
-    for (const review of reviews) {
-      if (review.status === 'error') {
-        comment += `### ❌ ${review.fileName}\n`;
-        comment += `审查失败: ${review.error}\n\n`;
-        continue;
+  async reviewAndCommentOnLines(options = {}) {
+    const { maxComments = 10 } = options;
+    const changes = await this.getMergeRequestChanges();
+    const results = [];
+
+    for (const change of changes) {
+      if (results.length >= maxComments) {
+        console.log(`已达到最大评论数量限制 (${maxComments})，停止审查`);
+        break;
       }
 
-      comment += `### 📄 ${review.fileName}\n\n`;
-      
-      if (review.reasoning) {
-        comment += `**思考过程**:\n${review.reasoning}\n\n`;
+      // 解析 diff，提取有意义的变更
+      const hunks = DiffParser.parseDiff(change.diff);
+      const meaningfulChanges = DiffParser.extractMeaningfulChanges(hunks);
+
+      // 对每个有意义的变更进行审查
+      for (const meaningfulChange of meaningfulChanges.slice(0, maxComments - results.length)) {
+        try {
+          const result = await this.reviewAndCommentOnLine(change, meaningfulChange);
+          results.push({
+            status: 'success',
+            fileName: change.new_path || change.old_path,
+            lineNumber: meaningfulChange.lineNumber,
+            ...result,
+          });
+        } catch (error) {
+          results.push({
+            status: 'error',
+            fileName: change.new_path || change.old_path,
+            lineNumber: meaningfulChange.lineNumber,
+            error: error.message,
+          });
+        }
       }
-      
-      comment += `**审查意见**:\n${review.content}\n\n`;
-      comment += `---\n\n`;
     }
 
-    // 添加评论到 MR
-    return this.addComment(comment);
+    return results;
   }
 
   /**
@@ -238,7 +235,7 @@ export class GitLabAIReview {
 export { getConfig, validateConfig } from './lib/config.js';
 export { GitLabClient } from './lib/gitlab-client.js';
 export { AIClient } from './lib/ai-client.js';
-export { PromptTools };
+export { PromptTools, DiffParser };
 
 // 默认导出
 export default GitLabAIReview;

package/lib/diff-parser.js

@@ -0,0 +1,197 @@
+/**
+ * Diff 解析工具 - 解析 Git Diff 格式
+ */
+
+/**
+ * 解析 diff 的 hunk 头部信息
+ * 例如: @@ -14,7 +14,7 @@ 
+ * @param {string} hunkHeader - hunk 头部字符串
+ * @returns {Object} 解析后的位置信息
+ */
+export function parseHunkHeader(hunkHeader) {
+  const match = hunkHeader.match(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+  
+  if (!match) {
+    return null;
+  }
+
+  return {
+    oldStart: parseInt(match[1], 10),
+    oldLines: match[2] ? parseInt(match[2], 10) : 1,
+    newStart: parseInt(match[3], 10),
+    newLines: match[4] ? parseInt(match[4], 10) : 1,
+  };
+}
+
+/**
+ * 解析完整的 diff 内容，提取所有变更位置
+ * @param {string} diff - diff 内容
+ * @returns {Array} 变更块数组
+ */
+export function parseDiff(diff) {
+  if (!diff) return [];
+
+  const lines = diff.split('\n');
+  const hunks = [];
+  let currentHunk = null;
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+
+    // 检测 hunk 头部
+    if (line.startsWith('@@')) {
+      if (currentHunk) {
+        hunks.push(currentHunk);
+      }
+
+      const hunkInfo = parseHunkHeader(line);
+      currentHunk = {
+        ...hunkInfo,
+        header: line,
+        changes: [],
+        contextBefore: [],
+        contextAfter: [],
+      };
+    } else if (currentHunk) {
+      // 收集变更行
+      if (line.startsWith('+') && !line.startsWith('+++')) {
+        currentHunk.changes.push({
+          type: 'addition',
+          content: line.substring(1),
+          line: line,
+        });
+      } else if (line.startsWith('-') && !line.startsWith('---')) {
+        currentHunk.changes.push({
+          type: 'deletion',
+          content: line.substring(1),
+          line: line,
+        });
+      } else if (line.startsWith(' ')) {
+        currentHunk.changes.push({
+          type: 'context',
+          content: line.substring(1),
+          line: line,
+        });
+      }
+    }
+  }
+
+  if (currentHunk) {
+    hunks.push(currentHunk);
+  }
+
+  return hunks;
+}
+
+/**
+ * 计算变更在新文件中的具体行号
+ * @param {Object} hunk - hunk 信息
+ * @param {number} changeIndex - 变更在 changes 数组中的索引
+ * @returns {number} 新文件中的行号
+ */
+export function calculateNewLineNumber(hunk, changeIndex) {
+  let lineNumber = hunk.newStart;
+  
+  for (let i = 0; i <= changeIndex; i++) {
+    const change = hunk.changes[i];
+    if (change.type === 'addition' || change.type === 'context') {
+      if (i === changeIndex) {
+        return lineNumber;
+      }
+      lineNumber++;
+    }
+  }
+  
+  return lineNumber;
+}
+
+/**
+ * 提取有意义的变更（忽略纯空白变更）
+ * @param {Array} hunks - hunks 数组
+ * @returns {Array} 有意义的变更数组
+ */
+export function extractMeaningfulChanges(hunks) {
+  const meaningfulChanges = [];
+
+  hunks.forEach(hunk => {
+    let currentNewLine = hunk.newStart;
+
+    hunk.changes.forEach((change, index) => {
+      if (change.type === 'addition') {
+        const content = change.content.trim();
+        
+        // 过滤空行和仅包含符号的行
+        if (content.length > 0 && !/^[{}()\[\];,]*$/.test(content)) {
+          meaningfulChanges.push({
+            type: 'addition',
+            content: change.content,
+            lineNumber: currentNewLine,
+            hunk: hunk.header,
+            context: {
+              before: hunk.changes.slice(Math.max(0, index - 2), index).map(c => c.content),
+              after: hunk.changes.slice(index + 1, index + 3).map(c => c.content),
+            },
+          });
+        }
+        currentNewLine++;
+      } else if (change.type === 'deletion') {
+        const content = change.content.trim();
+        
+        if (content.length > 0 && !/^[{}()\[\];,]*$/.test(content)) {
+          meaningfulChanges.push({
+            type: 'deletion',
+            content: change.content,
+            oldLineNumber: currentNewLine,
+            hunk: hunk.header,
+            context: {
+              before: hunk.changes.slice(Math.max(0, index - 2), index).map(c => c.content),
+              after: hunk.changes.slice(index + 1, index + 3).map(c => c.content),
+            },
+          });
+        }
+      } else if (change.type === 'context') {
+        currentNewLine++;
+      }
+    });
+  });
+
+  return meaningfulChanges;
+}
+
+/**
+ * 生成变更摘要
+ * @param {string} diff - diff 内容
+ * @returns {Object} 变更摘要
+ */
+export function generateDiffSummary(diff) {
+  if (!diff) {
+    return { additions: 0, deletions: 0, changes: 0 };
+  }
+
+  const lines = diff.split('\n');
+  let additions = 0;
+  let deletions = 0;
+
+  lines.forEach(line => {
+    if (line.startsWith('+') && !line.startsWith('+++')) {
+      additions++;
+    } else if (line.startsWith('-') && !line.startsWith('---')) {
+      deletions++;
+    }
+  });
+
+  return {
+    additions,
+    deletions,
+    changes: additions + deletions,
+  };
+}
+
+export default {
+  parseHunkHeader,
+  parseDiff,
+  calculateNewLineNumber,
+  extractMeaningfulChanges,
+  generateDiffSummary,
+};
+

package/lib/gitlab-client.js

@@ -69,9 +69,37 @@ export class GitLabClient {
   }
 
   /**
-   * 在 MR 上创建讨论（行内评论）
+   * 在 MR 的特定行上创建评论
+   * @param {string} projectId - 项目 ID
+   * @param {number} mergeRequestIid - MR IID
+   * @param {string} body - 评论内容
+   * @param {Object} lineInfo - 行信息
+   * @param {string} lineInfo.filePath - 文件路径
+   * @param {number} lineInfo.newLine - 新文件行号
+   * @param {number} lineInfo.oldLine - 旧文件行号（可选）
+   * @returns {Promise<Object>} 创建的讨论
    */
-  async createMergeRequestDiscussion(projectId, mergeRequestIid, body, position) {
+  async createLineComment(projectId, mergeRequestIid, body, lineInfo) {
+    // 先获取 MR 信息以获取 SHA
+    const mr = await this.getMergeRequest(projectId, mergeRequestIid);
+
+    const position = {
+      base_sha: mr.diff_refs.base_sha,
+      head_sha: mr.diff_refs.head_sha,
+      start_sha: mr.diff_refs.start_sha,
+      position_type: 'text',
+      new_path: lineInfo.filePath,
+      old_path: lineInfo.oldPath || lineInfo.filePath,
+    };
+
+    // 设置行号
+    if (lineInfo.newLine !== undefined) {
+      position.new_line = lineInfo.newLine;
+    }
+    if (lineInfo.oldLine !== undefined) {
+      position.old_line = lineInfo.oldLine;
+    }
+
     return this.request(
       `/projects/${encodeURIComponent(projectId)}/merge_requests/${mergeRequestIid}/discussions`,
       {
@@ -83,5 +111,39 @@ export class GitLabClient {
       }
     );
   }
+
+  /**
+   * 批量创建行级评论
+   * @param {string} projectId - 项目 ID
+   * @param {number} mergeRequestIid - MR IID
+   * @param {Array} comments - 评论数组
+   * @returns {Promise<Array>} 创建结果数组
+   */
+  async createMultipleLineComments(projectId, mergeRequestIid, comments) {
+    const results = [];
+
+    for (const comment of comments) {
+      try {
+        const result = await this.createLineComment(
+          projectId,
+          mergeRequestIid,
+          comment.body,
+          comment.lineInfo
+        );
+        results.push({
+          status: 'success',
+          result,
+        });
+      } catch (error) {
+        results.push({
+          status: 'error',
+          error: error.message,
+          comment,
+        });
+      }
+    }
+
+    return results;
+  }
 }
 

package/lib/prompt-tools.js

@@ -1,13 +1,14 @@
 /**
- * Prompt 工具 - 用于拼接代码审查的提示词
+ * Prompt 工具 - 用于拼接行级代码审查的提示词
+ * 简化版：只支持行级审查
  */
 
 /**
- * 构建系统提示词
- * @param {string} guardConfig - AI Review Guard 配置内容
+ * 构建系统提示词（附带项目 prompt）
+ * @param {string} projectPrompt - 项目配置的 prompt（来自 reviewguard.md）
  * @returns {string} 系统提示词
  */
-export function buildSystemPrompt(guardConfig = '') {
+export function buildSystemPrompt(projectPrompt = '') {
   let prompt = `你是一个专业的代码审查助手，负责审查 GitLab Merge Request 的代码变更。
 
 你的职责是：
@@ -18,125 +19,83 @@ export function buildSystemPrompt(guardConfig = '') {
 
 请以专业、建设性的语气提供审查意见。`;
 
-  if (guardConfig) {
-    prompt += `\n\n项目特定的审查规则：\n${guardConfig}`;
+  // 附带项目特定的审查规则
+  if (projectPrompt) {
+    prompt += `\n\n## 项目特定的审查规则\n\n${projectPrompt}`;
   }
 
   return prompt;
 }
 
 /**
- * 构建代码审查的用户提示词
- * @param {string} diff - 代码差异
- * @param {string} fileName - 文件名
- * @returns {string} 用户提示词
+ * 构建针对特定行变更的审查提示词（附带项目 prompt）
+ * @param {Object} changeInfo - 变更信息
+ * @param {string} changeInfo.content - 变更内容
+ * @param {string} changeInfo.type - 变更类型（addition/deletion）
+ * @param {number} changeInfo.lineNumber - 行号
+ * @param {string} changeInfo.fileName - 文件名
+ * @param {Object} changeInfo.context - 上下文
+ * @returns {string} 审查提示词
  */
-export function buildReviewPrompt(diff, fileName) {
-  return `请审查以下代码变更：
+export function buildLineReviewPrompt(changeInfo) {
+  const { content, type, lineNumber, fileName, context } = changeInfo;
+  
+  let prompt = `请审查以下代码变更：
 
-**文件名**: ${fileName}
+**文件**: ${fileName}
+**行号**: ${lineNumber}
+**变更类型**: ${type === 'addition' ? '新增' : '删除'}
 
-**代码差异**:
-\`\`\`diff
-${diff}
+**变更内容**:
+\`\`\`
+${type === 'addition' ? '+' : '-'} ${content}
 \`\`\`
+`;
+
+  if (context && (context.before.length > 0 || context.after.length > 0)) {
+    prompt += '\n**上下文**:\n```\n';
+    if (context.before.length > 0) {
+      context.before.forEach(line => {
+        prompt += `  ${line}\n`;
+      });
+    }
+    prompt += `${type === 'addition' ? '+' : '-'} ${content}\n`;
+    if (context.after.length > 0) {
+      context.after.forEach(line => {
+        prompt += `  ${line}\n`;
+      });
+    }
+    prompt += '```\n';
+  }
+
+  prompt += `
+请提供简洁的审查意见：
+1. 如果有问题，指出具体问题
+2. 如果有改进建议，提供具体的建议
+3. 如果代码没有问题，简单说明"代码质量良好"
 
-请提供：
-1. 主要问题（如果有）
-2. 改进建议
-3. 优点（如果有）
+请直接给出审查意见，不要重复代码内容。`;
 
-如果代码没有问题，请简要说明代码质量良好。`;
+  return prompt;
 }
 
 /**
- * 构建完整的审查消息数组
- * @param {Object} params - 参数
- * @param {string} params.diff - 代码差异
- * @param {string} params.fileName - 文件名
- * @param {string} params.guardConfig - AI Review Guard 配置
+ * 构建针对特定行变更的完整消息数组（附带项目 prompt）
+ * @param {Object} changeInfo - 变更信息
+ * @param {string} projectPrompt - 项目配置的 prompt（来自 reviewguard.md）
  * @returns {Array} 消息数组
  */
-export function buildReviewMessages({ diff, fileName, guardConfig = '' }) {
+export function buildLineReviewMessages(changeInfo, projectPrompt = '') {
   return [
-    { role: 'system', content: buildSystemPrompt(guardConfig) },
-    { role: 'user', content: buildReviewPrompt(diff, fileName) },
+    { role: 'system', content: buildSystemPrompt(projectPrompt) },
+    { role: 'user', content: buildLineReviewPrompt(changeInfo) },
   ];
 }
 
-/**
- * 构建批量审查的提示词
- * @param {Array} changes - 代码变更数组
- * @param {string} guardConfig - AI Review Guard 配置
- * @returns {string} 批量审查提示词
- */
-export function buildBatchReviewPrompt(changes, guardConfig = '') {
-  let prompt = buildSystemPrompt(guardConfig);
-  
-  prompt += '\n\n请审查以下 ' + changes.length + ' 个文件的代码变更：\n\n';
-  
-  changes.forEach((change, index) => {
-    const fileName = change.new_path || change.old_path;
-    const status = change.new_file ? '新增' : change.deleted_file ? '删除' : '修改';
-    
-    prompt += `## ${index + 1}. ${fileName} (${status})\n\n`;
-    prompt += '```diff\n';
-    prompt += change.diff || '(无差异内容)';
-    prompt += '\n```\n\n';
-  });
-  
-  prompt += '\n请为每个文件提供审查意见，并在最后给出整体评价。';
-  
-  return prompt;
-}
-
-/**
- * 格式化 diff 内容（可选的预处理）
- * @param {string} diff - 原始 diff
- * @returns {string} 格式化后的 diff
- */
-export function formatDiff(diff) {
-  if (!diff) return '(无变更内容)';
-  
-  // 移除过长的 diff（可选）
-  const maxLines = 500;
-  const lines = diff.split('\n');
-  
-  if (lines.length > maxLines) {
-    return lines.slice(0, maxLines).join('\n') + 
-           `\n... (省略 ${lines.length - maxLines} 行)`;
-  }
-  
-  return diff;
-}
-
-/**
- * 从 change 对象中提取关键信息
- * @param {Object} change - GitLab change 对象
- * @returns {Object} 提取的信息
- */
-export function extractChangeInfo(change) {
-  return {
-    fileName: change.new_path || change.old_path,
-    oldPath: change.old_path,
-    newPath: change.new_path,
-    status: change.new_file ? 'added' : 
-            change.deleted_file ? 'deleted' : 
-            change.renamed_file ? 'renamed' : 
-            'modified',
-    diff: change.diff || '',
-    isNewFile: change.new_file,
-    isDeleted: change.deleted_file,
-    isRenamed: change.renamed_file,
-  };
-}
-
+// 只导出行级审查需要的函数
 export default {
   buildSystemPrompt,
-  buildReviewPrompt,
-  buildReviewMessages,
-  buildBatchReviewPrompt,
-  formatDiff,
-  extractChangeInfo,
+  buildLineReviewPrompt,
+  buildLineReviewMessages,
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gitlab-ai-review",
-  "version": "1.2.0",
-  "description": "GitLab AI Review SDK - 支持 CI/CD 自动配置和 ARK API",
+  "version": "2.0.0",
+  "description": "GitLab AI Review SDK - 行级代码审查，附带项目 Prompt",
   "main": "index.js",
   "type": "module",
   "scripts": {