korekt-cli 0.8.0 → 0.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "korekt-cli",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "AI-powered code review CLI - Keep your kode korekt",
   "main": "src/index.js",
   "bin": {

package/src/git-logic.js

@@ -238,10 +238,12 @@ export async function runUncommittedReview(mode = 'unstaged') {
  */
 export async function getContributors(diffRange, repoRootPath) {
   try {
-    // Get all commit authors with email and name
-    const { stdout: authorOutput } = await execa('git', ['log', '--format=%ae|%an', diffRange], {
-      cwd: repoRootPath,
-    });
+    // Get all commit authors with email and name (exclude merge commits)
+    const { stdout: authorOutput } = await execa(
+      'git',
+      ['log', '--no-merges', '--format=%ae|%an', diffRange],
+      { cwd: repoRootPath }
+    );
 
     if (!authorOutput.trim()) {
       return { author_email: null, author_name: null, contributors: [] };
@@ -398,9 +400,11 @@ export async function runLocalReview(targetBranch = null, ignorePatterns = null)
     console.error(chalk.gray(`Analyzing commits from ${mergeBase.substring(0, 7)} to HEAD...`));
 
     // 3. Get Commit Messages with proper delimiter
-    const { stdout: logOutput } = await execa('git', ['log', '--pretty=%B---EOC---', diffRange], {
-      cwd: repoRootPath,
-    });
+    const { stdout: logOutput } = await execa(
+      'git',
+      ['log', '--no-merges', '--pretty=%B---EOC---', diffRange],
+      { cwd: repoRootPath }
+    );
     const commitMessages = logOutput
       .split('---EOC---')
       .map((msg) => msg.trim())

package/src/git-logic.test.js

@@ -288,7 +288,10 @@ describe('runLocalReview - fork point detection', () => {
             'abc123def456 feature-branch@{0}: commit: latest\nfedcba654321 feature-branch@{1}: commit: middle\n510572bc5197788770004d0d0585822adab0128f feature-branch@{2}: branch: Created from master',
         };
       }
-      if (command.includes('log --pretty=%B---EOC---') && command.includes('510572bc')) {
+      if (
+        command.includes('log --no-merges --pretty=%B---EOC---') &&
+        command.includes('510572bc')
+      ) {
         return { stdout: 'feat: add feature---EOC---' };
       }
       if (command.includes('diff --name-status') && command.includes('510572bc')) {
@@ -338,7 +341,7 @@ describe('runLocalReview - fork point detection', () => {
       if (command.includes('merge-base origin/main HEAD')) {
         return { stdout: 'abc123' };
       }
-      if (command.includes('log --pretty=%B---EOC---')) {
+      if (command.includes('log --no-merges --pretty=%B---EOC---')) {
         return { stdout: 'feat: add feature---EOC---' };
       }
       if (command.includes('diff --name-status')) {
@@ -542,7 +545,7 @@ describe('getContributors', () => {
   it('should extract single contributor with commit count', async () => {
     vi.mocked(execa).mockImplementation(async (cmd, args) => {
       const command = [cmd, ...args].join(' ');
-      if (command.includes('log --format=%ae|%an')) {
+      if (command.includes('log --no-merges --format=%ae|%an')) {
         return {
           stdout: 'john@example.com|John Doe\njohn@example.com|John Doe\njohn@example.com|John Doe',
         };
@@ -565,7 +568,7 @@ describe('getContributors', () => {
   it('should identify author as contributor with most commits', async () => {
     vi.mocked(execa).mockImplementation(async (cmd, args) => {
       const command = [cmd, ...args].join(' ');
-      if (command.includes('log --format=%ae|%an')) {
+      if (command.includes('log --no-merges --format=%ae|%an')) {
         return {
           stdout: [
             'alice@example.com|Alice Smith',
@@ -595,7 +598,7 @@ describe('getContributors', () => {
   it('should handle empty commit range', async () => {
     vi.mocked(execa).mockImplementation(async (cmd, args) => {
       const command = [cmd, ...args].join(' ');
-      if (command.includes('log --format=%ae|%an')) {
+      if (command.includes('log --no-merges --format=%ae|%an')) {
         return { stdout: '' };
       }
       throw new Error(`Unmocked command: ${command}`);
@@ -623,7 +626,7 @@ describe('getContributors', () => {
   it('should handle missing name in git log', async () => {
     vi.mocked(execa).mockImplementation(async (cmd, args) => {
       const command = [cmd, ...args].join(' ');
-      if (command.includes('log --format=%ae|%an')) {
+      if (command.includes('log --no-merges --format=%ae|%an')) {
         return { stdout: 'user@example.com|' };
       }
       throw new Error(`Unmocked command: ${command}`);
@@ -639,7 +642,7 @@ describe('getContributors', () => {
   it('should sort contributors by commit count descending', async () => {
     vi.mocked(execa).mockImplementation(async (cmd, args) => {
       const command = [cmd, ...args].join(' ');
-      if (command.includes('log --format=%ae|%an')) {
+      if (command.includes('log --no-merges --format=%ae|%an')) {
         return {
           stdout: [
             'c@example.com|C User',