korekt-cli 0.8.4 → 0.9.0

package/package.json

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

package/src/formatter.js

@@ -29,6 +29,8 @@ const CATEGORY_ICONS = {
   documentation: '📝',
   test_coverage: '🧪',
   readability: '📖',
+  architectural: '🏗️',
+  file_structure: '📁',
   default: '⚙️', // Default icon
 };
 

package/src/git-logic.js

@@ -1,5 +1,6 @@
 import { execa } from 'execa';
 import chalk from 'chalk';
+import { detectCIProvider, getPrUrl } from './utils.js';
 
 /**
  * Truncate content to a maximum number of lines using "head and tail".
@@ -244,6 +245,8 @@ export async function runUncommittedReview(mode = 'unstaged') {
       changed_files: changedFiles,
       source_branch: branchName,
       changed_lines: calculateChangedLines(changedFiles),
+      is_ci: detectCIProvider() !== null,
+      pr_url: null, // Uncommitted changes are never part of a PR
     };
   } catch (error) {
     console.error(chalk.red('Failed to analyze uncommitted changes:'), error.message);
@@ -524,6 +527,8 @@ export async function runLocalReview(targetBranch = null, ignorePatterns = null)
       author_name,
       contributors,
       changed_lines: calculateChangedLines(changedFiles),
+      is_ci: detectCIProvider() !== null,
+      pr_url: getPrUrl(),
     };
   } catch (error) {
     console.error(chalk.red('Failed to run local review analysis:'), error.message);

package/src/git-logic.test.js

@@ -9,6 +9,7 @@ import {
   getContributors,
 } from './git-logic.js';
 import { execa } from 'execa';
+import { detectCIProvider } from './utils.js';
 
 describe('parseNameStatus', () => {
   it('should correctly parse M, A, and D statuses', () => {
@@ -830,3 +831,183 @@ describe('changed_lines calculation', () => {
     expect(result.changed_lines).toBe(0);
   });
 });
+
+describe('is_ci flag in payload', () => {
+  beforeEach(() => {
+    vi.mock('execa');
+    vi.mock('./utils.js', () => ({
+      detectCIProvider: vi.fn(),
+      getPrUrl: vi.fn().mockReturnValue(null),
+    }));
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it('should set is_ci to true when detectCIProvider returns a provider', async () => {
+    vi.mocked(detectCIProvider).mockReturnValue('github');
+
+    vi.mocked(execa).mockImplementation(async (cmd, args) => {
+      const command = [cmd, ...args].join(' ');
+
+      if (command.includes('remote get-url origin')) {
+        return { stdout: 'https://github.com/user/repo.git' };
+      }
+      if (command.includes('rev-parse --abbrev-ref HEAD')) {
+        return { stdout: 'feature-branch' };
+      }
+      if (command.includes('rev-parse --show-toplevel')) {
+        return { stdout: '/fake/repo/path' };
+      }
+      if (command.includes('diff --cached --name-status')) {
+        return { stdout: 'M\tfile.js' };
+      }
+      if (command.includes('diff --cached -U15 -- file.js')) {
+        return { stdout: 'diff --git a/file.js b/file.js\n+new line' };
+      }
+      if (command.includes('show HEAD:file.js')) {
+        return { stdout: 'old content' };
+      }
+
+      throw new Error(`Unmocked command: ${command}`);
+    });
+
+    const result = await runUncommittedReview('staged');
+
+    expect(result).toBeDefined();
+    expect(result.is_ci).toBe(true);
+  });
+
+  it('should set is_ci to false when detectCIProvider returns null', async () => {
+    vi.mocked(detectCIProvider).mockReturnValue(null);
+
+    vi.mocked(execa).mockImplementation(async (cmd, args) => {
+      const command = [cmd, ...args].join(' ');
+
+      if (command.includes('remote get-url origin')) {
+        return { stdout: 'https://github.com/user/repo.git' };
+      }
+      if (command.includes('rev-parse --abbrev-ref HEAD')) {
+        return { stdout: 'feature-branch' };
+      }
+      if (command.includes('rev-parse --show-toplevel')) {
+        return { stdout: '/fake/repo/path' };
+      }
+      if (command.includes('diff --cached --name-status')) {
+        return { stdout: 'M\tfile.js' };
+      }
+      if (command.includes('diff --cached -U15 -- file.js')) {
+        return { stdout: 'diff --git a/file.js b/file.js\n+new line' };
+      }
+      if (command.includes('show HEAD:file.js')) {
+        return { stdout: 'old content' };
+      }
+
+      throw new Error(`Unmocked command: ${command}`);
+    });
+
+    const result = await runUncommittedReview('staged');
+
+    expect(result).toBeDefined();
+    expect(result.is_ci).toBe(false);
+  });
+
+  it('should include is_ci in runLocalReview payload', async () => {
+    vi.mocked(detectCIProvider).mockReturnValue('azure');
+
+    vi.mocked(execa).mockImplementation(async (cmd, args) => {
+      const command = [cmd, ...args].join(' ');
+
+      if (command.includes('remote get-url origin')) {
+        return { stdout: 'https://github.com/user/repo.git' };
+      }
+      if (command.includes('rev-parse --abbrev-ref HEAD')) {
+        return { stdout: 'feature-branch' };
+      }
+      if (command.includes('rev-parse --show-toplevel')) {
+        return { stdout: '/path/to/repo' };
+      }
+      if (command.includes('rev-parse --verify main')) {
+        return { stdout: 'commit-hash' };
+      }
+      if (command === 'git fetch origin main') {
+        return { stdout: '' };
+      }
+      if (command.includes('merge-base origin/main HEAD')) {
+        return { stdout: 'abc123' };
+      }
+      if (command.includes('log --no-merges --pretty=%B---EOC---')) {
+        return { stdout: 'feat: add feature---EOC---' };
+      }
+      if (command.includes('log --no-merges --format=%ae|%an')) {
+        return { stdout: 'user@example.com|User Name' };
+      }
+      if (command.includes('diff --name-status')) {
+        return { stdout: 'M\tfile.js' };
+      }
+      if (command.includes('diff -U15')) {
+        return { stdout: 'diff content' };
+      }
+      if (command.includes('show abc123:file.js')) {
+        return { stdout: 'original content' };
+      }
+
+      return { stdout: '' };
+    });
+
+    const result = await runLocalReview('main');
+
+    expect(result).toBeDefined();
+    expect(result.is_ci).toBe(true);
+  });
+
+  it('should set is_ci to false in runLocalReview when not in CI', async () => {
+    vi.mocked(detectCIProvider).mockReturnValue(null);
+
+    vi.mocked(execa).mockImplementation(async (cmd, args) => {
+      const command = [cmd, ...args].join(' ');
+
+      if (command.includes('remote get-url origin')) {
+        return { stdout: 'https://github.com/user/repo.git' };
+      }
+      if (command.includes('rev-parse --abbrev-ref HEAD')) {
+        return { stdout: 'feature-branch' };
+      }
+      if (command.includes('rev-parse --show-toplevel')) {
+        return { stdout: '/path/to/repo' };
+      }
+      if (command.includes('rev-parse --verify main')) {
+        return { stdout: 'commit-hash' };
+      }
+      if (command === 'git fetch origin main') {
+        return { stdout: '' };
+      }
+      if (command.includes('merge-base origin/main HEAD')) {
+        return { stdout: 'abc123' };
+      }
+      if (command.includes('log --no-merges --pretty=%B---EOC---')) {
+        return { stdout: 'feat: add feature---EOC---' };
+      }
+      if (command.includes('log --no-merges --format=%ae|%an')) {
+        return { stdout: 'user@example.com|User Name' };
+      }
+      if (command.includes('diff --name-status')) {
+        return { stdout: 'M\tfile.js' };
+      }
+      if (command.includes('diff -U15')) {
+        return { stdout: 'diff content' };
+      }
+      if (command.includes('show abc123:file.js')) {
+        return { stdout: 'original content' };
+      }
+
+      return { stdout: '' };
+    });
+
+    const result = await runLocalReview('main');
+
+    expect(result).toBeDefined();
+    expect(result.is_ci).toBe(false);
+  });
+});

package/src/index.js

@@ -14,6 +14,10 @@ import { tmpdir } from 'os';
 import { runLocalReview } from './git-logic.js';
 import { getApiKey, setApiKey, getApiEndpoint, setApiEndpoint } from './config.js';
 import { formatReviewOutput } from './formatter.js';
+import { detectCIProvider, truncateFileData, formatErrorOutput } from './utils.js';
+
+// Re-export utilities for backward compatibility
+export { detectCIProvider, truncateFileData, formatErrorOutput, getPrUrl } from './utils.js';
 
 const require = createRequire(import.meta.url);
 const { version } = require('../package.json');
@@ -26,44 +30,6 @@ const { version } = require('../package.json');
 const log = (msg) => process.stderr.write(msg + '\n');
 const output = (msg) => process.stdout.write(msg + '\n');
 
-/**
- * Truncates file data (diff and content) for display purposes
- * @param {Object} file - File object with path, status, diff, content, etc.
- * @param {number} maxLength - Maximum length before truncation (default: 500)
- * @returns {Object} File object with truncated diff and content
- */
-export function truncateFileData(file, maxLength = 500) {
-  return {
-    path: file.path,
-    status: file.status,
-    ...(file.old_path && { old_path: file.old_path }),
-    diff:
-      file.diff.length > maxLength
-        ? `${file.diff.substring(0, maxLength)}... [truncated ${file.diff.length - maxLength} chars]`
-        : file.diff,
-    content:
-      file.content.length > maxLength
-        ? `${file.content.substring(0, maxLength)}... [truncated ${file.content.length - maxLength} chars]`
-        : file.content,
-  };
-}
-
-/**
- * Formats error object for JSON output
- * @param {Error} error - Error object from axios or other source
- * @returns {Object} Formatted error output with success: false
- */
-export function formatErrorOutput(error) {
-  return {
-    success: false,
-    error: error.message,
-    ...(error.response && {
-      status: error.response.status,
-      data: error.response.data,
-    }),
-  };
-}
-
 /**
  * Ask for user confirmation before proceeding
  */
@@ -84,23 +50,6 @@ async function confirmAction(message) {
   });
 }
 
-/**
- * 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)

package/src/index.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { truncateFileData, formatErrorOutput, detectCIProvider } from './index.js';
+import { truncateFileData, formatErrorOutput, detectCIProvider, getPrUrl } from './index.js';
 
 describe('CLI JSON output mode', () => {
   let stdoutSpy;
@@ -438,3 +438,111 @@ describe('--comment flag behavior', () => {
     expect(shouldShowConfirmation).toBe(true);
   });
 });
+
+describe('getPrUrl', () => {
+  const originalEnv = process.env;
+
+  beforeEach(() => {
+    // Reset environment before each test
+    process.env = { ...originalEnv };
+    // Clear all PR-related env vars
+    delete process.env.GITHUB_REPOSITORY;
+    delete process.env.PR_NUMBER;
+    delete process.env.BITBUCKET_WORKSPACE;
+    delete process.env.BITBUCKET_REPO_SLUG;
+    delete process.env.BITBUCKET_PR_ID;
+    delete process.env.SYSTEM_COLLECTIONURI;
+    delete process.env.SYSTEM_TEAMPROJECT;
+    delete process.env.BUILD_REPOSITORY_NAME;
+    delete process.env.SYSTEM_PULLREQUEST_PULLREQUESTID;
+  });
+
+  afterEach(() => {
+    process.env = originalEnv;
+  });
+
+  it('should return GitHub PR URL when GitHub env vars are set', () => {
+    process.env.GITHUB_REPOSITORY = 'owner/repo';
+    process.env.PR_NUMBER = '123';
+
+    expect(getPrUrl()).toBe('https://github.com/owner/repo/pull/123');
+  });
+
+  it('should return Bitbucket PR URL when Bitbucket env vars are set', () => {
+    process.env.BITBUCKET_WORKSPACE = 'myworkspace';
+    process.env.BITBUCKET_REPO_SLUG = 'myrepo';
+    process.env.BITBUCKET_PR_ID = '456';
+
+    expect(getPrUrl()).toBe('https://bitbucket.org/myworkspace/myrepo/pull-requests/456');
+  });
+
+  it('should return Azure DevOps PR URL when Azure env vars are set', () => {
+    process.env.SYSTEM_COLLECTIONURI = 'https://dev.azure.com/myorg/';
+    process.env.SYSTEM_TEAMPROJECT = 'myproject';
+    process.env.BUILD_REPOSITORY_NAME = 'myrepo';
+    process.env.SYSTEM_PULLREQUEST_PULLREQUESTID = '789';
+
+    expect(getPrUrl()).toBe('https://dev.azure.com/myorg/myproject/_git/myrepo/pullrequest/789');
+  });
+
+  it('should strip trailing slash from Azure DevOps collection URI', () => {
+    process.env.SYSTEM_COLLECTIONURI = 'https://dev.azure.com/myorg/';
+    process.env.SYSTEM_TEAMPROJECT = 'myproject';
+    process.env.BUILD_REPOSITORY_NAME = 'myrepo';
+    process.env.SYSTEM_PULLREQUEST_PULLREQUESTID = '789';
+
+    const url = getPrUrl();
+    expect(url).not.toContain('myorg//myproject');
+    expect(url).toContain('myorg/myproject');
+  });
+
+  it('should URL-encode spaces in Azure DevOps project and repo names', () => {
+    process.env.SYSTEM_COLLECTIONURI = 'https://dev.azure.com/myorg/';
+    process.env.SYSTEM_TEAMPROJECT = 'My Project';
+    process.env.BUILD_REPOSITORY_NAME = 'My Repo';
+    process.env.SYSTEM_PULLREQUEST_PULLREQUESTID = '789';
+
+    expect(getPrUrl()).toBe(
+      'https://dev.azure.com/myorg/My%20Project/_git/My%20Repo/pullrequest/789'
+    );
+  });
+
+  it('should return null when no PR env vars are set', () => {
+    expect(getPrUrl()).toBe(null);
+  });
+
+  it('should return null when only partial GitHub env vars are set', () => {
+    process.env.GITHUB_REPOSITORY = 'owner/repo';
+    // PR_NUMBER not set
+
+    expect(getPrUrl()).toBe(null);
+  });
+
+  it('should return null when only partial Bitbucket env vars are set', () => {
+    process.env.BITBUCKET_WORKSPACE = 'myworkspace';
+    process.env.BITBUCKET_REPO_SLUG = 'myrepo';
+    // BITBUCKET_PR_ID not set
+
+    expect(getPrUrl()).toBe(null);
+  });
+
+  it('should return null when only partial Azure env vars are set', () => {
+    process.env.SYSTEM_COLLECTIONURI = 'https://dev.azure.com/myorg/';
+    process.env.SYSTEM_TEAMPROJECT = 'myproject';
+    // BUILD_REPOSITORY_NAME and SYSTEM_PULLREQUEST_PULLREQUESTID not set
+
+    expect(getPrUrl()).toBe(null);
+  });
+
+  it('should prioritize GitHub over other providers when multiple are set', () => {
+    // Set all providers
+    process.env.GITHUB_REPOSITORY = 'owner/repo';
+    process.env.PR_NUMBER = '123';
+    process.env.BITBUCKET_WORKSPACE = 'myworkspace';
+    process.env.BITBUCKET_REPO_SLUG = 'myrepo';
+    process.env.BITBUCKET_PR_ID = '456';
+
+    // GitHub should be detected first due to check order
+    expect(getPrUrl()).toBe('https://github.com/owner/repo/pull/123');
+  });
+});

package/src/utils.js

@@ -0,0 +1,84 @@
+/**
+ * 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;
+}
+
+/**
+ * Build PR URL from CI environment variables
+ * @returns {string|null} Full PR URL or null if not in CI PR context
+ */
+export function getPrUrl() {
+  // GitHub Actions
+  if (process.env.GITHUB_REPOSITORY && process.env.PR_NUMBER) {
+    return `https://github.com/${process.env.GITHUB_REPOSITORY}/pull/${process.env.PR_NUMBER}`;
+  }
+  // Bitbucket Pipelines
+  if (
+    process.env.BITBUCKET_WORKSPACE &&
+    process.env.BITBUCKET_REPO_SLUG &&
+    process.env.BITBUCKET_PR_ID
+  ) {
+    return `https://bitbucket.org/${process.env.BITBUCKET_WORKSPACE}/${process.env.BITBUCKET_REPO_SLUG}/pull-requests/${process.env.BITBUCKET_PR_ID}`;
+  }
+  // Azure DevOps Pipelines
+  if (
+    process.env.SYSTEM_COLLECTIONURI &&
+    process.env.SYSTEM_TEAMPROJECT &&
+    process.env.BUILD_REPOSITORY_NAME &&
+    process.env.SYSTEM_PULLREQUEST_PULLREQUESTID
+  ) {
+    const collectionUri = process.env.SYSTEM_COLLECTIONURI.replace(/\/$/, '');
+    return `${collectionUri}/${encodeURIComponent(process.env.SYSTEM_TEAMPROJECT)}/_git/${encodeURIComponent(process.env.BUILD_REPOSITORY_NAME)}/pullrequest/${process.env.SYSTEM_PULLREQUEST_PULLREQUESTID}`;
+  }
+  return null;
+}
+
+/**
+ * Truncates file data (diff and content) for display purposes
+ * @param {Object} file - File object with path, status, diff, content, etc.
+ * @param {number} maxLength - Maximum length before truncation (default: 500)
+ * @returns {Object} File object with truncated diff and content
+ */
+export function truncateFileData(file, maxLength = 500) {
+  return {
+    path: file.path,
+    status: file.status,
+    ...(file.old_path && { old_path: file.old_path }),
+    diff:
+      file.diff.length > maxLength
+        ? `${file.diff.substring(0, maxLength)}... [truncated ${file.diff.length - maxLength} chars]`
+        : file.diff,
+    content:
+      file.content.length > maxLength
+        ? `${file.content.substring(0, maxLength)}... [truncated ${file.content.length - maxLength} chars]`
+        : file.content,
+  };
+}
+
+/**
+ * Formats error object for JSON output
+ * @param {Error} error - Error object from axios or other source
+ * @returns {Object} Formatted error output with success: false
+ */
+export function formatErrorOutput(error) {
+  return {
+    success: false,
+    error: error.message,
+    ...(error.response && {
+      status: error.response.status,
+      data: error.response.data,
+    }),
+  };
+}