korekt-cli 0.7.0 → 0.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "korekt-cli",
-  "version": "0.7.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',

package/src/index.js

@@ -6,9 +6,11 @@ import chalk from 'chalk';
 import readline from 'readline';
 import ora from 'ora';
 import { createRequire } from 'module';
-import { readFileSync } from 'fs';
-import { join, dirname } from 'path';
+import { writeFileSync, mkdtempSync, rmSync } from 'fs';
+import { join, dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
+import { spawn } from 'child_process';
+import { tmpdir } from 'os';
 import { runLocalReview } from './git-logic.js';
 import { getApiKey, setApiKey, getApiEndpoint, setApiEndpoint } from './config.js';
 import { formatReviewOutput } from './formatter.js';
@@ -71,11 +73,76 @@ async function confirmAction(message) {
     output: process.stdout,
   });
 
-  return new Promise((resolve) => {
+  return new Promise((resolvePromise) => {
     rl.question(message, (answer) => {
       rl.close();
       // Default to 'yes' if the user just presses Enter
-      resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes' || answer === '');
+      resolvePromise(
+        answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes' || answer === ''
+      );
+    });
+  });
+}
+
+/**
+ * Detect CI provider from environment variables
+ * @returns {string|null} Provider name or null if not detected
+ */
+export function detectCIProvider() {
+  if (process.env.GITHUB_TOKEN && process.env.GITHUB_REPOSITORY) {
+    return 'github';
+  }
+  if (process.env.SYSTEM_ACCESSTOKEN && process.env.SYSTEM_PULLREQUEST_PULLREQUESTID) {
+    return 'azure';
+  }
+  if (process.env.BITBUCKET_REPO_SLUG && process.env.BITBUCKET_PR_ID) {
+    return 'bitbucket';
+  }
+  return null;
+}
+
+/**
+ * Run the CI integration script to post comments
+ * @param {string} provider - CI provider (github, azure, bitbucket)
+ * @param {Object} results - Review results from API
+ * @returns {Promise<void>}
+ */
+async function runCIScript(provider, results) {
+  const __filename = fileURLToPath(import.meta.url);
+  const __dirname = dirname(__filename);
+  const scriptPath = resolve(__dirname, '..', 'scripts', `${provider}.sh`);
+
+  // Create secure temp directory and write results
+  const tempDir = mkdtempSync(join(tmpdir(), 'korekt-'));
+  const tempFile = join(tempDir, 'results.json');
+  writeFileSync(tempFile, JSON.stringify(results, null, 2));
+
+  return new Promise((resolvePromise, reject) => {
+    const cleanup = () => {
+      try {
+        rmSync(tempDir, { recursive: true, force: true });
+      } catch (err) {
+        log(chalk.yellow(`Warning: Failed to clean up temp directory: ${err.message}`));
+      }
+    };
+
+    const child = spawn('bash', [scriptPath, tempFile], {
+      stdio: 'inherit',
+      env: process.env,
+    });
+
+    child.on('close', (code) => {
+      cleanup();
+      if (code === 0) {
+        resolvePromise();
+      } else {
+        reject(new Error(`CI script exited with code ${code}`));
+      }
+    });
+
+    child.on('error', (err) => {
+      cleanup();
+      reject(err);
     });
   });
 }
@@ -93,19 +160,16 @@ Examples:
   $ kk stg --dry-run               Preview staged changes review
   $ kk diff                        Review unstaged changes
   $ kk review main --json          Output raw JSON (for CI/CD integration)
+  $ kk review main --comment       Review and post comments to PR (CI/CD)
 
 Common Options:
   --dry-run                        Show payload without sending to API
   --json                           Output raw API response as JSON
+  --comment                        Post review results as PR comments
 
 Configuration:
   $ kk config --key YOUR_KEY
   $ kk config --endpoint https://api.korekt.ai/api/review
-
-CI/CD Integration:
-  $ kk get-script github           Output GitHub Actions integration script
-  $ kk get-script bitbucket        Output Bitbucket Pipelines integration script
-  $ kk get-script azure            Output Azure DevOps integration script
 `
   );
 
@@ -122,6 +186,7 @@ program
     'Ignore files matching these patterns (e.g., "*.lock" "dist/*")'
   )
   .option('--json', 'Output raw API response as JSON')
+  .option('--comment', 'Post review results as PR comments (auto-detects CI provider)')
   .action(async (targetBranch, options) => {
     const reviewTarget = targetBranch ? `against '${targetBranch}'` : '(auto-detecting fork point)';
 
@@ -166,8 +231,8 @@ program
       return;
     }
 
-    // Show summary and ask for confirmation (auto-confirm in JSON mode)
-    if (!options.json) {
+    // Show summary and ask for confirmation (auto-confirm in JSON/comment mode)
+    if (!options.json && !options.comment) {
       log(chalk.yellow('\n📋 Ready to submit for review:\n'));
       log(`  Branch: ${chalk.cyan(payload.source_branch)}`);
       log(`  Commits: ${chalk.cyan(payload.commit_messages.length)}`);
@@ -216,6 +281,32 @@ program
       const elapsed = Math.floor((Date.now() - startTime) / 1000);
       spinner.succeed(`Review completed in ${elapsed}s!`);
 
+      // Handle --comment flag: post results to PR
+      if (options.comment) {
+        const provider = detectCIProvider();
+        if (!provider) {
+          log(
+            chalk.red(
+              'Could not detect CI provider. Make sure required environment variables are set:'
+            )
+          );
+          log(chalk.gray('  GitHub: GITHUB_TOKEN, GITHUB_REPOSITORY, PR_NUMBER, COMMIT_HASH'));
+          log(chalk.gray('  Azure: SYSTEM_ACCESSTOKEN, SYSTEM_PULLREQUEST_PULLREQUESTID'));
+          log(chalk.gray('  Bitbucket: BITBUCKET_REPO_SLUG, BITBUCKET_PR_ID'));
+          process.exit(1);
+        }
+
+        log(chalk.blue(`Posting review comments to ${provider}...`));
+        try {
+          await runCIScript(provider, response.data);
+          log(chalk.green('Successfully posted review comments!'));
+        } catch (err) {
+          log(chalk.red(`Failed to post comments: ${err.message}`));
+          process.exit(1);
+        }
+        return;
+      }
+
       // Output results to stdout
       if (options.json) {
         output(JSON.stringify(response.data, null, 2));
@@ -424,49 +515,6 @@ program
     }
   });
 
-program
-  .command('get-script <provider>')
-  .description('Output a CI/CD integration script for a specific provider')
-  .addHelpText(
-    'after',
-    `
-Providers:
-  github      GitHub Actions integration script
-  bitbucket   Bitbucket Pipelines integration script
-  azure       Azure DevOps integration script
-
-Usage:
-  kk get-script github | bash -s results.json
-  kk get-script bitbucket > bitbucket.sh && chmod +x bitbucket.sh
-  kk get-script azure > azure.sh
-`
-  )
-  .action((provider) => {
-    const validProviders = ['github', 'bitbucket', 'azure'];
-
-    if (!validProviders.includes(provider.toLowerCase())) {
-      console.error(chalk.red(`Invalid provider: ${provider}`));
-      console.error(chalk.gray(`Valid providers: ${validProviders.join(', ')}`));
-      process.exit(1);
-    }
-
-    try {
-      // Get the directory where this script is located
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = dirname(__filename);
-
-      // Build path to the script file
-      const scriptPath = join(__dirname, '..', 'scripts', `${provider.toLowerCase()}.sh`);
-
-      // Read and output the script
-      const scriptContent = readFileSync(scriptPath, 'utf8');
-      output(scriptContent);
-    } catch (error) {
-      console.error(chalk.red(`Failed to read script: ${error.message}`));
-      process.exit(1);
-    }
-  });
-
 // Only parse arguments if this file is being run directly (not imported)
 // In tests, we set NODE_ENV to 'test' via vitest
 if (process.env.NODE_ENV !== 'test') {

package/src/index.test.js

@@ -1,8 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { truncateFileData, formatErrorOutput } from './index.js';
-import { readFileSync } from 'fs';
-import { join, dirname } from 'path';
-import { fileURLToPath } from 'url';
+import { truncateFileData, formatErrorOutput, detectCIProvider } from './index.js';
 
 describe('CLI JSON output mode', () => {
   let stdoutSpy;
@@ -336,137 +333,108 @@ describe('CLI JSON output mode', () => {
   });
 });
 
-describe('get-script command', () => {
-  let stdoutSpy;
+describe('detectCIProvider', () => {
+  const originalEnv = process.env;
 
   beforeEach(() => {
-    stdoutSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+    // Reset environment before each test
+    process.env = { ...originalEnv };
+    // Clear all CI-related env vars
+    delete process.env.GITHUB_TOKEN;
+    delete process.env.GITHUB_REPOSITORY;
+    delete process.env.SYSTEM_ACCESSTOKEN;
+    delete process.env.SYSTEM_PULLREQUEST_PULLREQUESTID;
+    delete process.env.BITBUCKET_REPO_SLUG;
+    delete process.env.BITBUCKET_PR_ID;
   });
 
   afterEach(() => {
-    vi.restoreAllMocks();
+    process.env = originalEnv;
   });
 
-  describe('valid providers', () => {
-    it('should output github script to stdout', () => {
-      const output = (msg) => process.stdout.write(msg + '\n');
-
-      // Read actual github.sh script
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = dirname(__filename);
-      const scriptPath = join(__dirname, '..', 'scripts', 'github.sh');
-      const scriptContent = readFileSync(scriptPath, 'utf8');
-
-      // Simulate get-script command output
-      output(scriptContent);
-
-      // Verify script was output to stdout
-      expect(stdoutSpy).toHaveBeenCalledWith(scriptContent + '\n');
-      expect(stdoutSpy).toHaveBeenCalledTimes(1);
-    });
+  it('should detect GitHub when GITHUB_TOKEN and GITHUB_REPOSITORY are set', () => {
+    process.env.GITHUB_TOKEN = 'ghp_test123';
+    process.env.GITHUB_REPOSITORY = 'owner/repo';
 
-    it('should output bitbucket script to stdout', () => {
-      const output = (msg) => process.stdout.write(msg + '\n');
+    expect(detectCIProvider()).toBe('github');
+  });
 
-      // Read actual bitbucket.sh script
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = dirname(__filename);
-      const scriptPath = join(__dirname, '..', 'scripts', 'bitbucket.sh');
-      const scriptContent = readFileSync(scriptPath, 'utf8');
+  it('should detect Azure when SYSTEM_ACCESSTOKEN and SYSTEM_PULLREQUEST_PULLREQUESTID are set', () => {
+    process.env.SYSTEM_ACCESSTOKEN = 'azure_token';
+    process.env.SYSTEM_PULLREQUEST_PULLREQUESTID = '123';
 
-      // Simulate get-script command output
-      output(scriptContent);
+    expect(detectCIProvider()).toBe('azure');
+  });
 
-      // Verify script was output to stdout
-      expect(stdoutSpy).toHaveBeenCalledWith(scriptContent + '\n');
-      expect(stdoutSpy).toHaveBeenCalledTimes(1);
-    });
+  it('should detect Bitbucket when BITBUCKET_REPO_SLUG and BITBUCKET_PR_ID are set', () => {
+    process.env.BITBUCKET_REPO_SLUG = 'my-repo';
+    process.env.BITBUCKET_PR_ID = '456';
 
-    it('should output azure script to stdout', () => {
-      const output = (msg) => process.stdout.write(msg + '\n');
+    expect(detectCIProvider()).toBe('bitbucket');
+  });
 
-      // Read actual azure.sh script
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = dirname(__filename);
-      const scriptPath = join(__dirname, '..', 'scripts', 'azure.sh');
-      const scriptContent = readFileSync(scriptPath, 'utf8');
+  it('should return null when no CI provider env vars are set', () => {
+    expect(detectCIProvider()).toBe(null);
+  });
 
-      // Simulate get-script command output
-      output(scriptContent);
+  it('should return null when only partial GitHub env vars are set', () => {
+    process.env.GITHUB_TOKEN = 'ghp_test123';
+    // GITHUB_REPOSITORY not set
 
-      // Verify script was output to stdout
-      expect(stdoutSpy).toHaveBeenCalledWith(scriptContent + '\n');
-      expect(stdoutSpy).toHaveBeenCalledTimes(1);
-    });
+    expect(detectCIProvider()).toBe(null);
   });
 
-  describe('script completeness', () => {
-    it('should output complete bash scripts with proper structure', () => {
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = dirname(__filename);
+  it('should return null when only partial Azure env vars are set', () => {
+    process.env.SYSTEM_ACCESSTOKEN = 'azure_token';
+    // SYSTEM_PULLREQUEST_PULLREQUESTID not set
 
-      // Test all three scripts
-      const providers = ['github', 'bitbucket', 'azure'];
-
-      providers.forEach((provider) => {
-        const scriptPath = join(__dirname, '..', 'scripts', `${provider}.sh`);
-        const scriptContent = readFileSync(scriptPath, 'utf8');
+    expect(detectCIProvider()).toBe(null);
+  });
 
-        // Verify script starts with shebang
-        expect(scriptContent).toMatch(/^#!/);
-        expect(scriptContent).toContain('#!/usr/bin/env bash');
+  it('should return null when only partial Bitbucket env vars are set', () => {
+    process.env.BITBUCKET_REPO_SLUG = 'my-repo';
+    // BITBUCKET_PR_ID not set
 
-        // Verify script has substantial content (not truncated)
-        const lineCount = scriptContent.split('\n').length;
-        expect(lineCount).toBeGreaterThan(400);
+    expect(detectCIProvider()).toBe(null);
+  });
 
-        // Verify script ends properly (has exit statement)
-        expect(scriptContent).toContain('exit');
-      });
-    });
+  it('should prioritize GitHub over other providers when multiple are set', () => {
+    // Set all providers
+    process.env.GITHUB_TOKEN = 'ghp_test123';
+    process.env.GITHUB_REPOSITORY = 'owner/repo';
+    process.env.SYSTEM_ACCESSTOKEN = 'azure_token';
+    process.env.SYSTEM_PULLREQUEST_PULLREQUESTID = '123';
+    process.env.BITBUCKET_REPO_SLUG = 'my-repo';
+    process.env.BITBUCKET_PR_ID = '456';
+
+    // GitHub should be detected first due to check order
+    expect(detectCIProvider()).toBe('github');
   });
+});
 
-  describe('error handling', () => {
-    it('should reject invalid provider', () => {
-      const invalidProvider = 'gitlab';
-      const validProviders = ['github', 'bitbucket', 'azure'];
+describe('--comment flag behavior', () => {
+  it('should skip confirmation when --comment is set', () => {
+    const options = { comment: true };
 
-      // Test validation logic from index.js line 513
-      const isValid = validProviders.includes(invalidProvider.toLowerCase());
+    // Logic from index.js: if (!options.json && !options.comment) { confirmAction... }
+    const shouldShowConfirmation = !options.json && !options.comment;
 
-      expect(isValid).toBe(false);
+    expect(shouldShowConfirmation).toBe(false);
+  });
 
-      // In the actual command, this would trigger process.exit(1)
-      // We verify the validation logic correctly identifies invalid providers
-      expect(['github', 'bitbucket', 'azure']).not.toContain(invalidProvider);
-    });
+  it('should skip confirmation when both --json and --comment are set', () => {
+    const options = { json: true, comment: true };
 
-    it('should accept valid providers case-insensitively', () => {
-      const validProviders = ['github', 'bitbucket', 'azure'];
+    const shouldShowConfirmation = !options.json && !options.comment;
 
-      // Test that providers work case-insensitively
-      expect(validProviders.includes('GitHub'.toLowerCase())).toBe(true);
-      expect(validProviders.includes('BITBUCKET'.toLowerCase())).toBe(true);
-      expect(validProviders.includes('Azure'.toLowerCase())).toBe(true);
-    });
+    expect(shouldShowConfirmation).toBe(false);
   });
 
-  describe('bundled script files', () => {
-    it('should have all provider scripts bundled and readable', () => {
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = dirname(__filename);
+  it('should show confirmation when neither --json nor --comment is set', () => {
+    const options = {};
 
-      const providers = ['github', 'bitbucket', 'azure'];
+    const shouldShowConfirmation = !options.json && !options.comment;
 
-      providers.forEach((provider) => {
-        const scriptPath = join(__dirname, '..', 'scripts', `${provider}.sh`);
-
-        // Should not throw - file exists and is readable
-        expect(() => {
-          const content = readFileSync(scriptPath, 'utf8');
-          expect(content.length).toBeGreaterThan(0);
-        }).not.toThrow();
-      });
-    });
+    expect(shouldShowConfirmation).toBe(true);
   });
 });