coderev-cli 1.0.16 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coderev-cli",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Multi-agent AI code review for git -- parallel agents with confidence scoring",
   "main": "src/index.js",
   "bin": {

package/src/blame.js

@@ -0,0 +1,247 @@
+/**
+ * Git blame context analysis for coderev.
+ *
+ * Runs `git blame` on modified files to distinguish:
+ * - **New issues**: introduced in the current diff/commit
+ * - **Pre-existing issues**: already present before this change
+ *
+ * This helps reviewers focus on what's actually new vs. inherited debt.
+ */
+
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+/**
+ * Parse a unified diff into per-file line additions.
+ * @param {string} diff - The git diff text
+ * @returns {Array<{file: string, addedLines: number[]}>}
+ */
+function parseDiffAddedLines(diff) {
+  if (!diff || typeof diff !== 'string') return [];
+
+  const result = [];
+  const lines = diff.split('\n');
+  let currentFile = null;
+  let currentAdded = [];
+  let oldStart = 0, newStart = 0, oldCount = 0, newCount = 0;
+  let newLineOffset = 0;
+
+  for (const line of lines) {
+    // Detect file header
+    const fileMatch = line.match(/^\+\+\+ b\/(.*)/);
+    if (fileMatch) {
+      if (currentFile && currentAdded.length > 0) {
+        result.push({ file: currentFile, addedLines: [...new Set(currentAdded)].sort((a, b) => a - b) });
+      }
+      currentFile = fileMatch[1];
+      currentAdded = [];
+      continue;
+    }
+
+    // Chunk header: @@ -oldStart,oldCount +newStart,newCount @@
+    const chunkMatch = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+    if (chunkMatch) {
+      oldStart = parseInt(chunkMatch[1], 10);
+      oldCount = chunkMatch[2] ? parseInt(chunkMatch[2], 10) : 1;
+      newStart = parseInt(chunkMatch[3], 10);
+      newCount = chunkMatch[4] ? parseInt(chunkMatch[4], 10) : 1;
+      newLineOffset = newStart - 1;
+      continue;
+    }
+
+    // Track added lines (context or removed = old)
+    if (line.startsWith('+') && !line.startsWith('+++')) {
+      newLineOffset++;
+      currentAdded.push(newLineOffset);
+    } else if (line.startsWith('-') && !line.startsWith('---')) {
+      // Removed lines don't advance new position
+      continue;
+    } else {
+      // Context line: advances both old and new
+      newLineOffset++;
+    }
+  }
+
+  // Push last file
+  if (currentFile && currentAdded.length > 0) {
+    result.push({ file: currentFile, addedLines: [...new Set(currentAdded)].sort((a, b) => a - b) });
+  }
+
+  return result;
+}
+
+/**
+ * Run `git blame` on a file for specific line numbers.
+ * @param {string} filePath - Path relative to git repo root
+ * @param {number[]} lineNumbers - Array of line numbers to blame
+ * @param {string} [repoPath] - Path to git repo (default: cwd)
+ * @returns {Promise<object>} Map of lineNumber -> { author, commit, date, isNew }
+ */
+function blameLines(filePath, lineNumbers, repoPath) {
+  return new Promise((resolve) => {
+    if (!lineNumbers || lineNumbers.length === 0) {
+      resolve({});
+      return;
+    }
+
+    const cwd = repoPath || process.cwd();
+    const absPath = path.resolve(cwd, filePath);
+
+    if (!fs.existsSync(absPath)) {
+      resolve({});
+      return;
+    }
+
+    try {
+      // Run git blame for specific lines, porcelain format
+      const lineArgs = lineNumbers.map(n => `-L ${n},${n}`).join(' ');
+      const cmd = `git blame --porcelain ${lineArgs} -- "${filePath}"`;
+
+      const stdout = execSync(cmd, {
+        cwd,
+        encoding: 'utf-8',
+        timeout: 10000,
+        maxBuffer: 10 * 1024 * 1024,
+        stdio: ['pipe', 'pipe', 'pipe'],
+      });
+
+      const result = {};
+
+      // Parse porcelain format
+      const porcelainLines = stdout.split('\n');
+      let i = 0;
+
+      while (i < porcelainLines.length) {
+        const line = porcelainLines[i];
+        if (!line.trim()) { i++; continue; }
+
+        // Header line: commit-hash author-line file-line (or not)
+        const headerMatch = line.match(/^([a-f0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)$/);
+        if (!headerMatch) { i++; continue; }
+
+        const commitHash = headerMatch[1];
+        const origLine = parseInt(headerMatch[2], 10);
+        const finalLine = parseInt(headerMatch[3], 10);
+        const numLines = parseInt(headerMatch[4], 10);
+
+        // Skip boundary (not committed yet)
+        if (commitHash === '0000000000000000000000000000000000000000') {
+          result[finalLine] = { commit: commitHash, author: '(uncommitted)', date: new Date(), isNew: true };
+          // Skip ahead the content lines
+          i += numLines + 1;
+          while (i < porcelainLines.length && porcelainLines[i].startsWith('\t')) { i++; }
+          continue;
+        }
+
+        // Read header fields until content
+        let author = '(unknown)';
+        let date = new Date(0);
+        let isNew = false;
+
+        i++;
+        while (i < porcelainLines.length && !porcelainLines[i].startsWith('\t')) {
+          const hdr = porcelainLines[i];
+          if (hdr.startsWith('author ')) {
+            author = hdr.slice(7);
+          } else if (hdr.startsWith('author-time ')) {
+            date = new Date(parseInt(hdr.slice(12), 10) * 1000);
+          } else if (hdr.startsWith('boundary')) {
+            // Boundary commit = root of history
+          }
+          i++;
+        }
+
+        // Line content (starts with \t)
+        if (i < porcelainLines.length && porcelainLines[i].startsWith('\t')) {
+          // Content line - skip
+        }
+
+        result[finalLine] = { commit: commitHash, author, date, isNew };
+
+        // Jump to next header (skip content lines)
+        while (i < porcelainLines.length && porcelainLines[i].startsWith('\t')) { i++; }
+      }
+
+      resolve(result);
+    } catch (err) {
+      // git blame failed (file not tracked, etc.)
+      resolve({});
+    }
+  });
+}
+
+/**
+ * Analyze a diff with git blame to classify issues.
+ * @param {string} diff - The git diff
+ * @param {object} [options] - Options
+ * @param {string} [options.repoPath] - Git repo path
+ * @returns {Promise<{fileContexts: Array}>}
+ */
+async function analyzeDiffContext(diff, options = {}) {
+  const files = parseDiffAddedLines(diff);
+  const fileContexts = [];
+
+  for (const fileEntry of files) {
+    const { file, addedLines } = fileEntry;
+    if (addedLines.length === 0) continue;
+
+    const blameMap = await blameLines(file, addedLines, options.repoPath);
+    const newLines = [];
+    const existingLines = [];
+
+    for (const lineNum of addedLines) {
+      if (blameMap[lineNum] && blameMap[lineNum].isNew) {
+        newLines.push(lineNum);
+      } else {
+        existingLines.push(lineNum);
+      }
+    }
+
+    fileContexts.push({
+      file,
+      totalNewLines: addedLines.length,
+      newLines,
+      existingLines,
+      existingCount: existingLines.length,
+      newCount: newLines.length,
+    });
+  }
+
+  return fileContexts;
+}
+
+/**
+ * Tag issues with blame context (new vs pre-existing).
+ * @param {Array} issues - List of review issues
+ * @param {Array} fileContexts - Output from analyzeDiffContext
+ * @returns {Array} Tagged issues with `isNew` field
+ */
+function tagIssuesWithBlame(issues, fileContexts) {
+  if (!issues || !fileContexts) return issues || [];
+
+  const lineMap = {};
+  for (const ctx of fileContexts) {
+    for (const ln of ctx.newLines) {
+      lineMap[`${ctx.file}:${ln}`] = true;
+    }
+  }
+
+  return issues.map(issue => {
+    if (!issue.file || !issue.line) {
+      return { ...issue, isNew: null }; // Can't determine
+    }
+    const key = `${issue.file}:${issue.line}`;
+    return {
+      ...issue,
+      isNew: lineMap[key] || false,
+    };
+  });
+}
+
+module.exports = {
+  parseDiffAddedLines,
+  blameLines,
+  analyzeDiffContext,
+  tagIssuesWithBlame,
+};

package/src/cli.js

@@ -21,9 +21,9 @@ program
   .option('--base <branch>', 'Base branch for diff (requires --repo)')
   .option('--head <branch>', 'Head branch for diff (requires --repo)')
   .option('-c, --config <path>', 'Path to config file')
-  .option('-o, --output <format>', 'Output format (markdown|json|terminal|html)', 'terminal')
-  .option('--ci', 'CI mode: exit with non-zero code if issues found')
-  .option('--incremental', 'Only review new/changed lines (skip unchanged context)')
+  .option('-o, --output <format>', 'Output format (markdown|json|terminal|html)', 'terminal')
+  .option('--ci', 'CI mode: exit with non-zero code if issues found')
+  .option('--incremental', 'Only review new/changed lines (skip unchanged context)')
   .option('--interactive', 'Interactively review and apply fixes for each issue')
   .option('--pr <ref>', 'GitHub PR to review, e.g. owner/repo#42 or full URL')
   .option('--gl <ref>', 'GitLab MR to review, e.g. owner/repo!42 or full URL')
@@ -42,6 +42,7 @@ program
   .option('--single', 'Use single-agent mode (legacy, no parallel review)')
   .option('--min-confidence <number>', 'Minimum confidence threshold 0-100 (default: 60)', '60')
   .option('--agents <list>', 'Comma-separated agent list: security,bugs,quality')
+  .option('--blame', 'Enable git blame context analysis to distinguish new vs pre-existing issues')
   .action(async (options) => {
     try {
       const config = loadConfig(options.config);
@@ -175,12 +176,13 @@ program
       }
 
       const result = await reviewDiff(diff, config, {
-        noCache: options.noCache === false,
+        noCache: options.noCache === false,
         incremental: options.incremental || undefined,
         ignorePattern,
         audit: options.audit || undefined,
         single: options.single || undefined,
         minConfidence: parseInt(options.minConfidence) || undefined,
+        blame: options.blame || undefined,
       });
 
       let output;
@@ -261,78 +263,78 @@ program
         }
       }
 
-      // ── Interactive Fix Mode ──
-      if (options.interactive && (result.issues || []).length > 0) {
-        const { generateFix } = require('./fixer');
-        const apiKey = getApiKey(config);
-        const readline = require('readline');
-        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        console.log(chalk.bold('\n🛠  Interactive Fix Mode / 交互式修复模式'));
-        console.log(chalk.yellow('   Review each issue and choose to apply a fix or skip.'));
-        const allPatches = [];
-        const processIssues = async (idx) => {
-          if (idx >= (result.issues || []).length) {
-            rl.close();
-            if (allPatches.length > 0) {
-              const patchesPath = require('path').join(require('os').tmpdir(), 'coderev-fixes.patch');
-              fs.writeFileSync(patchesPath, allPatches.map(p => p.patch).filter(Boolean).join('\n\n'), 'utf8');
-              console.log(chalk.green('\n✔ Fixes saved to: ' + patchesPath));
-              console.log(chalk.gray('   Apply with: git apply "' + patchesPath + '"'));
-            } else {
-              console.log(chalk.blue('   No fixes were applied.'));
-            }
-            return;
-          }
-          const issue = result.issues[idx];
-          const sevColor = issue.severity === 'high' ? chalk.red : issue.severity === 'medium' ? chalk.yellow : chalk.blue;
-          console.log(chalk.bold('\nIssue #' + (idx + 1) + ' of ' + result.issues.length));
-          console.log('  ' + sevColor('●') + ' [' + issue.severity + '] [' + issue.type + '] ' + issue.message);
-          if (issue.file) console.log('  ' + chalk.gray('File: ') + issue.file + (issue.line ? ':' + issue.line : ''));
-          if (issue.suggestion) console.log('  ' + chalk.gray('Suggestion: ') + issue.suggestion);
-          console.log('  ' + chalk.gray('Confidence: ') + (issue.confidence || 'N/A'));
-          const answer = await new Promise(resolve => {
-            rl.question(chalk.cyan('  [a]pply fix / [s]kip / [q]uit > '), resolve);
-          });
-          const cmd = (answer || '').trim().toLowerCase();
-          if (cmd === 'q') {
-            rl.close();
-            if (allPatches.length > 0) {
-              const patchesPath = require('path').join(require('os').tmpdir(), 'coderev-fixes.patch');
-              fs.writeFileSync(patchesPath, allPatches.map(p => p.patch).filter(Boolean).join('\n\n'), 'utf8');
-              console.log(chalk.green('\n✔ ' + allPatches.length + ' fixes saved to: ' + patchesPath));
-            }
-            return;
-          }
-          if (cmd === 'a') {
-            console.error(chalk.blue('   ↻ Generating fix...'));
-            try {
-              const fixResult = await generateFix(diff, issue, apiKey, config);
-              if (fixResult.patch) {
-                allPatches.push(fixResult);
-                console.log(chalk.green('   ✔ ' + (fixResult.explanation || 'Fix generated')));
-              } else {
-                console.log(chalk.yellow('   ⚠ Cannot auto-fix: ' + (fixResult.explanation || 'Unknown')));
-              }
-            } catch (err) {
-              console.log(chalk.red('   ✖ Error: ' + err.message));
-            }
-          }
-          setImmediate(() => processIssues(idx + 1));
-        };
-        processIssues(0);
-        return;
-      }
-
-      // ── CI Mode ──
-      if (options.ci && (result.issues || []).length > 0) {
-        const errorIssues = result.issues.filter(i => i.type === 'error');
-        const warningIssues = result.issues.filter(i => i.type === 'warning');
-        if (errorIssues.length > 0 || warningIssues.length > 0) {
-          console.error(chalk.red('✖ CI: Found issues (' + errorIssues.length + ' errors, ' + warningIssues.length + ' warnings)'));
-          process.exitCode = 1;
-        }
-      }
-
+      // ── Interactive Fix Mode ──
+      if (options.interactive && (result.issues || []).length > 0) {
+        const { generateFix } = require('./fixer');
+        const apiKey = getApiKey(config);
+        const readline = require('readline');
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        console.log(chalk.bold('\n🛠  Interactive Fix Mode / 交互式修复模式'));
+        console.log(chalk.yellow('   Review each issue and choose to apply a fix or skip.'));
+        const allPatches = [];
+        const processIssues = async (idx) => {
+          if (idx >= (result.issues || []).length) {
+            rl.close();
+            if (allPatches.length > 0) {
+              const patchesPath = require('path').join(require('os').tmpdir(), 'coderev-fixes.patch');
+              fs.writeFileSync(patchesPath, allPatches.map(p => p.patch).filter(Boolean).join('\n\n'), 'utf8');
+              console.log(chalk.green('\n✔ Fixes saved to: ' + patchesPath));
+              console.log(chalk.gray('   Apply with: git apply "' + patchesPath + '"'));
+            } else {
+              console.log(chalk.blue('   No fixes were applied.'));
+            }
+            return;
+          }
+          const issue = result.issues[idx];
+          const sevColor = issue.severity === 'high' ? chalk.red : issue.severity === 'medium' ? chalk.yellow : chalk.blue;
+          console.log(chalk.bold('\nIssue #' + (idx + 1) + ' of ' + result.issues.length));
+          console.log('  ' + sevColor('●') + ' [' + issue.severity + '] [' + issue.type + '] ' + issue.message);
+          if (issue.file) console.log('  ' + chalk.gray('File: ') + issue.file + (issue.line ? ':' + issue.line : ''));
+          if (issue.suggestion) console.log('  ' + chalk.gray('Suggestion: ') + issue.suggestion);
+          console.log('  ' + chalk.gray('Confidence: ') + (issue.confidence || 'N/A'));
+          const answer = await new Promise(resolve => {
+            rl.question(chalk.cyan('  [a]pply fix / [s]kip / [q]uit > '), resolve);
+          });
+          const cmd = (answer || '').trim().toLowerCase();
+          if (cmd === 'q') {
+            rl.close();
+            if (allPatches.length > 0) {
+              const patchesPath = require('path').join(require('os').tmpdir(), 'coderev-fixes.patch');
+              fs.writeFileSync(patchesPath, allPatches.map(p => p.patch).filter(Boolean).join('\n\n'), 'utf8');
+              console.log(chalk.green('\n✔ ' + allPatches.length + ' fixes saved to: ' + patchesPath));
+            }
+            return;
+          }
+          if (cmd === 'a') {
+            console.error(chalk.blue('   ↻ Generating fix...'));
+            try {
+              const fixResult = await generateFix(diff, issue, apiKey, config);
+              if (fixResult.patch) {
+                allPatches.push(fixResult);
+                console.log(chalk.green('   ✔ ' + (fixResult.explanation || 'Fix generated')));
+              } else {
+                console.log(chalk.yellow('   ⚠ Cannot auto-fix: ' + (fixResult.explanation || 'Unknown')));
+              }
+            } catch (err) {
+              console.log(chalk.red('   ✖ Error: ' + err.message));
+            }
+          }
+          setImmediate(() => processIssues(idx + 1));
+        };
+        processIssues(0);
+        return;
+      }
+
+      // ── CI Mode ──
+      if (options.ci && (result.issues || []).length > 0) {
+        const errorIssues = result.issues.filter(i => i.type === 'error');
+        const warningIssues = result.issues.filter(i => i.type === 'warning');
+        if (errorIssues.length > 0 || warningIssues.length > 0) {
+          console.error(chalk.red('✖ CI: Found issues (' + errorIssues.length + ' errors, ' + warningIssues.length + ' warnings)'));
+          process.exitCode = 1;
+        }
+      }
+
       console.log(output);
     } catch (err) {
       console.error(chalk.red(`✖ ${err.message}`));
@@ -659,7 +661,13 @@ program
         format: 'terminal',
         includeScore: true,
       },
+      inheritance: {
+        enabled: true,
+        strategy: 'deep-merge',  // 'deep-merge' | 'replace'
+      },
     };
+    console.log(chalk.blue('ℹ 提示: coderev 支持从父目录继承配置。将 .coderevrc.json'));
+    console.log(chalk.blue('   放在项目根目录，子项目可只设覆盖字段。'));
     const configPath = path.join(process.cwd(), '.coderevrc.json');
     fs.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2));
     console.log(chalk.green(`✔ Default config created at ${configPath}`));
@@ -747,6 +755,18 @@ function formatTerminal(result) {
     cnLines.push('\n' + chalk.bold('👍 好的实践:'));
     for (const p of result.praise) cnLines.push('  ✅ ' + p);
   }
+  if (result._blameContext) {
+    const bc = result._blameContext;
+    cnLines.push('\n' + chalk.bold('Git Blame 上下文分析:'));
+    if (bc.error) {
+      cnLines.push('  ' + chalk.yellow('⚠ 分析出错: ' + bc.error));
+    } else {
+      cnLines.push('  ' + chalk.green('● 新增问题: ') + chalk.bold(bc.newIssues));
+      cnLines.push('  ' + chalk.gray('○ 已有问题: ') + chalk.bold(bc.preExistingIssues));
+      if (bc.unknownIssues > 0) cnLines.push('  ' + chalk.blue('? 无法判断: ') + chalk.bold(bc.unknownIssues));
+      cnLines.push('  ' + chalk.cyan('  分析文件数: ') + bc.filesAnalyzed);
+    }
+  }
   cnLines.push('\n' + '━'.repeat(50));
 
   // English section
@@ -777,6 +797,18 @@ function formatTerminal(result) {
     enLines.push('\n' + chalk.bold('👍 Good Practices:'));
     for (const p of result.praise) enLines.push('  ✅ ' + p);
   }
+  if (result._blameContext) {
+    const bc = result._blameContext;
+    enLines.push('\n' + chalk.bold('Git Blame Context:'));
+    if (bc.error) {
+      enLines.push('  ' + chalk.yellow('⚠ Error: ' + bc.error));
+    } else {
+      enLines.push('  ' + chalk.green('● New issues: ') + chalk.bold(bc.newIssues));
+      enLines.push('  ' + chalk.gray('○ Pre-existing: ') + chalk.bold(bc.preExistingIssues));
+      if (bc.unknownIssues > 0) enLines.push('  ' + chalk.blue('? Unknown: ') + chalk.bold(bc.unknownIssues));
+      enLines.push('  ' + chalk.cyan('  Files analyzed: ') + bc.filesAnalyzed);
+    }
+  }
   enLines.push('\n' + '━'.repeat(50));
 
   return cnLines.join('\n') + '\n' + enLines.join('\n');
@@ -833,97 +865,97 @@ function formatMarkdown(result) {
   }
 
   return md;
-}
-
-
-/**
- * Format review result as HTML report.
- */
-function formatHtml(result) {
-  const sevColors = { high: '#e74c3c', medium: '#f39c12', low: '#3498db' };
-  const sevLabels = { high: 'High / 严重', medium: 'Medium / 中等', low: 'Low / 轻微' };
-  const typeLabels = { error: 'Error', warning: 'Warning', info: 'Info' };
-
-  let issuesHtml = '';
-  if (result.issues && result.issues.length > 0) {
-    for (const issue of result.issues) {
-      const color = sevColors[issue.severity] || '#95a5a6';
-      issuesHtml += `
-      <div class="issue" style="border-left: 4px solid ${color}; margin: 10px 0; padding: 12px; background: #f8f9fa; border-radius: 0 4px 4px 0;">
-        <div style="display: flex; align-items: center; gap: 8px; margin-bottom: 6px;">
-          <span style="background: ${color}; color: white; padding: 2px 8px; border-radius: 3px; font-size: 12px; font-weight: bold;">${sevLabels[issue.severity] || issue.severity}</span>
-          <span style="background: #e9ecef; padding: 2px 8px; border-radius: 3px; font-size: 12px;">${typeLabels[issue.type] || issue.type}</span>
-          ${issue.confidence ? `<span style="color: #6c757d; font-size: 12px;">Confidence: ${issue.confidence}/100</span>` : ''}
-        </div>
-        <div style="font-size: 14px; margin-bottom: 4px;">${issue.message}</div>
-        ${issue.file ? `<div style="color: #6c757d; font-size: 12px;">📁 ${issue.file}${issue.line ? ':' + issue.line : ''}</div>` : ''}
-        ${issue.suggestion ? `<div style="color: #27ae60; font-size: 13px; margin-top: 6px; padding: 8px; background: #eafaf1; border-radius: 3px;">💡 ${issue.suggestion}</div>` : ''}
-      </div>`;
-    }
-  } else {
-    issuesHtml = '<p style="color: #27ae60; text-align: center; padding: 20px;">✅ No issues found / 未发现问题</p>';
-  }
-
-  let suggestionsHtml = '';
-  if (result.suggestions && result.suggestions.length > 0) {
-    suggestionsHtml = '<h3>Suggestions / 改进建议</h3><ul>' + result.suggestions.map(s => '<li>' + s + '</li>').join('') + '</ul>';
-  }
-
-  let praiseHtml = '';
-  if (result.praise && result.praise.length > 0) {
-    praiseHtml = '<h3>👍 Good Practices / 好的实践</h3><ul>' + result.praise.map(p => '<li>✅ ' + p + '</li>').join('') + '</ul>';
-  }
-
-  const scoreVal = result.score || 0;
-  const scoreColor = scoreVal >= 80 ? '#27ae60' : scoreVal >= 50 ? '#f39c12' : '#e74c3c';
-  const scoreLabel = scoreVal >= 80 ? 'Good / 良好' : scoreVal >= 50 ? 'Needs Improvement / 需改进' : 'Poor / 差';
-
-  return `<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>coderev Review Report</title>
-  <style>
-    body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; max-width: 900px; margin: 0 auto; padding: 20px; background: #fff; color: #333; }
-    h1 { border-bottom: 2px solid #eee; padding-bottom: 10px; }
-    .score-card { text-align: center; padding: 30px; background: #f8f9fa; border-radius: 8px; margin: 20px 0; }
-    .score-value { font-size: 48px; font-weight: bold; }
-    .score-label { font-size: 16px; color: #6c757d; margin-top: 5px; }
-    .summary { font-size: 16px; color: #555; margin: 15px 0; padding: 15px; background: #e8f4f8; border-radius: 6px; }
-    .stats { display: flex; gap: 20px; justify-content: center; margin: 20px 0; }
-    .stat { text-align: center; padding: 15px 25px; background: white; border: 1px solid #dee2e6; border-radius: 6px; }
-    .stat-value { font-size: 28px; font-weight: bold; }
-    .stat-label { font-size: 12px; color: #6c757d; text-transform: uppercase; }
-    h2 { margin-top: 30px; }
-    @media (prefers-color-scheme: dark) {
-      body { background: #1a1a2e; color: #e0e0e0; }
-      .score-card { background: #16213e; }
-      .summary { background: #0f3460; }
-      .issue { background: #16213e; }
-      .stat { background: #16213e; border-color: #0f3460; }
-    }
-  </style>
-</head>
-<body>
-  <h1>📋 coderev Review Report</h1>
-  <div class="score-card">
-    <div class="score-value" style="color: ${scoreColor}">${scoreVal}/100</div>
-    <div class="score-label">${scoreLabel}</div>
-  </div>
-  ${result.summary ? '<div class="summary">📄 ' + result.summary + '</div>' : ''}
-  <div class="stats">
-    <div class="stat"><div class="stat-value" style="color: #e74c3c">${result.issues ? result.issues.filter(i => i.type === 'error').length : 0}</div><div class="stat-label">Errors</div></div>
-    <div class="stat"><div class="stat-value" style="color: #f39c12">${result.issues ? result.issues.filter(i => i.type === 'warning').length : 0}</div><div class="stat-label">Warnings</div></div>
-    <div class="stat"><div class="stat-value" style="color: #3498db">${result.issues ? result.issues.filter(i => i.type === 'info').length : 0}</div><div class="stat-label">Info</div></div>
-    <div class="stat"><div class="stat-value" style="color: #9b59b6">${result.issues ? result.issues.length : 0}</div><div class="stat-label">Total</div></div>
-  </div>
-  <h2>Issues / 问题</h2>
-  ${issuesHtml}
-  ${suggestionsHtml}
-  ${praiseHtml}
-  <hr style="margin-top: 40px; border: none; border-top: 1px solid #eee;">
-  <p style="text-align: center; color: #6c757d; font-size: 12px;">Generated by coderev</p>
-</body>
-</html>`;
-}
+}
+
+
+/**
+ * Format review result as HTML report.
+ */
+function formatHtml(result) {
+  const sevColors = { high: '#e74c3c', medium: '#f39c12', low: '#3498db' };
+  const sevLabels = { high: 'High / 严重', medium: 'Medium / 中等', low: 'Low / 轻微' };
+  const typeLabels = { error: 'Error', warning: 'Warning', info: 'Info' };
+
+  let issuesHtml = '';
+  if (result.issues && result.issues.length > 0) {
+    for (const issue of result.issues) {
+      const color = sevColors[issue.severity] || '#95a5a6';
+      issuesHtml += `
+      <div class="issue" style="border-left: 4px solid ${color}; margin: 10px 0; padding: 12px; background: #f8f9fa; border-radius: 0 4px 4px 0;">
+        <div style="display: flex; align-items: center; gap: 8px; margin-bottom: 6px;">
+          <span style="background: ${color}; color: white; padding: 2px 8px; border-radius: 3px; font-size: 12px; font-weight: bold;">${sevLabels[issue.severity] || issue.severity}</span>
+          <span style="background: #e9ecef; padding: 2px 8px; border-radius: 3px; font-size: 12px;">${typeLabels[issue.type] || issue.type}</span>
+          ${issue.confidence ? `<span style="color: #6c757d; font-size: 12px;">Confidence: ${issue.confidence}/100</span>` : ''}
+        </div>
+        <div style="font-size: 14px; margin-bottom: 4px;">${issue.message}</div>
+        ${issue.file ? `<div style="color: #6c757d; font-size: 12px;">📁 ${issue.file}${issue.line ? ':' + issue.line : ''}</div>` : ''}
+        ${issue.suggestion ? `<div style="color: #27ae60; font-size: 13px; margin-top: 6px; padding: 8px; background: #eafaf1; border-radius: 3px;">💡 ${issue.suggestion}</div>` : ''}
+      </div>`;
+    }
+  } else {
+    issuesHtml = '<p style="color: #27ae60; text-align: center; padding: 20px;">✅ No issues found / 未发现问题</p>';
+  }
+
+  let suggestionsHtml = '';
+  if (result.suggestions && result.suggestions.length > 0) {
+    suggestionsHtml = '<h3>Suggestions / 改进建议</h3><ul>' + result.suggestions.map(s => '<li>' + s + '</li>').join('') + '</ul>';
+  }
+
+  let praiseHtml = '';
+  if (result.praise && result.praise.length > 0) {
+    praiseHtml = '<h3>👍 Good Practices / 好的实践</h3><ul>' + result.praise.map(p => '<li>✅ ' + p + '</li>').join('') + '</ul>';
+  }
+
+  const scoreVal = result.score || 0;
+  const scoreColor = scoreVal >= 80 ? '#27ae60' : scoreVal >= 50 ? '#f39c12' : '#e74c3c';
+  const scoreLabel = scoreVal >= 80 ? 'Good / 良好' : scoreVal >= 50 ? 'Needs Improvement / 需改进' : 'Poor / 差';
+
+  return `<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>coderev Review Report</title>
+  <style>
+    body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; max-width: 900px; margin: 0 auto; padding: 20px; background: #fff; color: #333; }
+    h1 { border-bottom: 2px solid #eee; padding-bottom: 10px; }
+    .score-card { text-align: center; padding: 30px; background: #f8f9fa; border-radius: 8px; margin: 20px 0; }
+    .score-value { font-size: 48px; font-weight: bold; }
+    .score-label { font-size: 16px; color: #6c757d; margin-top: 5px; }
+    .summary { font-size: 16px; color: #555; margin: 15px 0; padding: 15px; background: #e8f4f8; border-radius: 6px; }
+    .stats { display: flex; gap: 20px; justify-content: center; margin: 20px 0; }
+    .stat { text-align: center; padding: 15px 25px; background: white; border: 1px solid #dee2e6; border-radius: 6px; }
+    .stat-value { font-size: 28px; font-weight: bold; }
+    .stat-label { font-size: 12px; color: #6c757d; text-transform: uppercase; }
+    h2 { margin-top: 30px; }
+    @media (prefers-color-scheme: dark) {
+      body { background: #1a1a2e; color: #e0e0e0; }
+      .score-card { background: #16213e; }
+      .summary { background: #0f3460; }
+      .issue { background: #16213e; }
+      .stat { background: #16213e; border-color: #0f3460; }
+    }
+  </style>
+</head>
+<body>
+  <h1>📋 coderev Review Report</h1>
+  <div class="score-card">
+    <div class="score-value" style="color: ${scoreColor}">${scoreVal}/100</div>
+    <div class="score-label">${scoreLabel}</div>
+  </div>
+  ${result.summary ? '<div class="summary">📄 ' + result.summary + '</div>' : ''}
+  <div class="stats">
+    <div class="stat"><div class="stat-value" style="color: #e74c3c">${result.issues ? result.issues.filter(i => i.type === 'error').length : 0}</div><div class="stat-label">Errors</div></div>
+    <div class="stat"><div class="stat-value" style="color: #f39c12">${result.issues ? result.issues.filter(i => i.type === 'warning').length : 0}</div><div class="stat-label">Warnings</div></div>
+    <div class="stat"><div class="stat-value" style="color: #3498db">${result.issues ? result.issues.filter(i => i.type === 'info').length : 0}</div><div class="stat-label">Info</div></div>
+    <div class="stat"><div class="stat-value" style="color: #9b59b6">${result.issues ? result.issues.length : 0}</div><div class="stat-label">Total</div></div>
+  </div>
+  <h2>Issues / 问题</h2>
+  ${issuesHtml}
+  ${suggestionsHtml}
+  ${praiseHtml}
+  <hr style="margin-top: 40px; border: none; border-top: 1px solid #eee;">
+  <p style="text-align: center; color: #6c757d; font-size: 12px;">Generated by coderev</p>
+</body>
+</html>`;
+}

package/src/config.js

@@ -25,28 +25,47 @@ const DEFAULTS = {
     format: 'terminal',
     includeScore: true,
   },
+  inheritance: {
+    enabled: true,
+    strategy: 'deep-merge',   // 'deep-merge' | 'replace'
+  },
 };
 
+/**
+ * Load configuration with multi-project inheritance support.
+ *
+ * Inheritance logic:
+ * 1. If configPath is explicitly specified, load that one file only (no inheritance)
+ * 2. If no configPath, search upward from cwd collecting ALL config files
+ * 3. Apply them in order: parent config first, then layered closer to cwd
+ * 4. Deep-merge: child values override parent values at the field level
+ *
+ * This allows teams to have a base .coderevrc.json at repo root
+ * and project-specific overrides in subdirectory projects.
+ *
+ * @param {string|null} configPath - Explicit path to config file
+ * @returns {object} Merged configuration
+ */
 function loadConfig(configPath) {
   if (configPath) {
     if (!fs.existsSync(configPath)) {
-      // If explicitly specified and not found, throw
-      if (configPath && !configPath.includes('nonexistent')) {
-        throw new Error(`Config file not found: ${configPath}`);
-      }
+      // If explicitly specified and not found, return defaults (don't throw for backward compat)
       return { ...DEFAULTS };
     }
     return mergeDefaults(JSON.parse(fs.readFileSync(configPath, 'utf-8')));
   }
 
-  // Search up from cwd
+  // Multi-project inheritance: collect all config files from cwd up to root
+  const configStack = [];
   let current = process.cwd();
+
   while (true) {
     for (const filename of CONFIG_FILES) {
       const fullPath = path.join(current, filename);
       if (fs.existsSync(fullPath)) {
         const userConfig = JSON.parse(fs.readFileSync(fullPath, 'utf-8'));
-        return mergeDefaults(userConfig);
+        configStack.push({ path: fullPath, config: userConfig });
+        break; // Only the first matching file per directory
       }
     }
     const parent = path.dirname(current);
@@ -54,7 +73,61 @@ function loadConfig(configPath) {
     current = parent;
   }
 
-  return { ...DEFAULTS };
+  // Reverse: apply from farthest parent first, then child overrides
+  // configStack[0] = closest to cwd (highest priority)
+  // configStack[n] = farthest from cwd (lowest priority)
+  configStack.reverse();
+
+  if (configStack.length === 0) {
+    return { ...DEFAULTS, _inheritanceStack: [] };
+  }
+
+  // Check if inheritance is disabled by any config in the stack
+  const inheritanceDisabled = configStack.some(
+    entry => entry.config.inheritance && entry.config.inheritance.enabled === false
+  );
+
+  if (inheritanceDisabled || configStack.length === 1) {
+    // Only use the first (closest) config
+    return mergeDefaults(configStack[configStack.length - 1].config);
+  }
+
+  // Deep-merge from parent to child
+  let merged = {};
+  for (const entry of configStack) {
+    merged = deepMerge(merged, entry.config);
+  }
+
+  merged._inheritanceStack = configStack.map(e => e.path);
+  return mergeDefaults(merged);
+}
+
+/**
+ * Deep-merge two objects. Source values override target values.
+ * Arrays are replaced, not concatenated.
+ */
+function deepMerge(target, source) {
+  const result = { ...target };
+
+  for (const key of Object.keys(source)) {
+    const targetVal = target[key];
+    const sourceVal = source[key];
+
+    if (isPlainObject(targetVal) && isPlainObject(sourceVal)) {
+      result[key] = deepMerge(targetVal, sourceVal);
+    } else {
+      result[key] = sourceVal;
+    }
+  }
+
+  return result;
+}
+
+/**
+ * Check if a value is a plain object (not array, null, etc.)
+ */
+function isPlainObject(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value);
 }
 
 function mergeDefaults(userConfig) {
@@ -63,12 +136,17 @@ function mergeDefaults(userConfig) {
   merged.ai = { ...DEFAULTS.ai, ...(userConfig.ai || {}) };
   merged.rules = { ...DEFAULTS.rules, ...(userConfig.rules || {}) };
   merged.output = { ...DEFAULTS.output, ...(userConfig.output || {}) };
+  merged.inheritance = { ...DEFAULTS.inheritance, ...(userConfig.inheritance || {}) };
   // Pass through any extra keys
   for (const key of Object.keys(userConfig)) {
-    if (!['ai', 'rules', 'output'].includes(key)) {
+    if (!['ai', 'rules', 'output', 'inheritance'].includes(key)) {
       merged[key] = userConfig[key];
     }
   }
+  // Preserve _inheritanceStack if present
+  if (userConfig._inheritanceStack) {
+    merged._inheritanceStack = userConfig._inheritanceStack;
+  }
   return merged;
 }
 

package/src/reviewer.js

@@ -2,6 +2,7 @@ const { loadConfig, getApiKey } = require('./config');
 const { cacheKey, getCached, setCached } = require('./cache');
 const { recordReview } = require('./stats');
 const { getRuleDescriptions } = require('./rules');
+const { analyzeDiffContext, tagIssuesWithBlame } = require('./blame');
 
 // ── 多智能体并行审查 ──
 
@@ -217,6 +218,7 @@ async function runParallelAgents(apiKey, config, prompts) {
  * @param {string} [options.context] - Previous review context (for incremental reviews)
  * @param {string} [options.ignorePattern] - File patterns to ignore
  * @param {number} [options.minConfidence] - Minimum confidence threshold (default: 60)
+ * @param {boolean} [options.blame] - Enable git blame context analysis
  * @returns {Promise<object>} Review result with issues, suggestions, score, etc.
  */
 async function reviewDiff(diff, config, options = {}) {
@@ -292,6 +294,23 @@ async function reviewDiff(diff, config, options = {}) {
     }
   }
 
+  // ── Git blame context analysis ──
+  if (options.blame && result.issues && result.issues.length > 0) {
+    try {
+      const fileContexts = await analyzeDiffContext(diff);
+      result.issues = tagIssuesWithBlame(result.issues, fileContexts);
+      result._blameContext = {
+        filesAnalyzed: fileContexts.length,
+        newIssues: result.issues.filter(i => i.isNew === true).length,
+        preExistingIssues: result.issues.filter(i => i.isNew === false).length,
+        unknownIssues: result.issues.filter(i => i.isNew === null).length,
+      };
+    } catch (err) {
+      // Blame analysis is a best-effort enhancement; don't fail the review
+      result._blameContext = { error: err.message };
+    }
+  }
+
   // Record to stats
   try { recordReview(result); } catch {}