git-diff-ai-reviewer 1.2.2 → 1.2.3

package/bin/review.js

@@ -3,7 +3,7 @@
 require('dotenv').config();
 const path = require('path');
 const fs = require('fs');
-const { getDiff, getChangedFiles, getBranchName, isGitRepo } = require('../src/git');
+const { getDiff, getChangedFiles, getBranchName, isGitRepo, resolveBaseRef } = require('../src/git');
 const { reviewCode, parseSeverityCounts, detectProvider, PROVIDERS, DEFAULT_MODELS } = require('../src/provider');
 const { buildFixPrompt } = require('../src/prompts');
 const { loadConfig } = require('../src/config');
@@ -149,8 +149,12 @@ async function commandReview(config, flags) {
 
     // Get branch and diff info
     const branchName = getBranchName();
+    const { ref: effectiveBase, isRemote } = resolveBaseRef(baseBranch);
     console.log(`  Branch:     ${branchName}`);
-    console.log(`  Base:       ${baseBranch}`);
+    console.log(`  Base:       ${effectiveBase}`);
+    if (!isRemote) {
+        console.log(`  ⚠ Remote origin/${baseBranch} not found — using local ref`);
+    }
 
     const changedFiles = getChangedFiles(baseBranch);
     if (changedFiles.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-diff-ai-reviewer",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "AI-powered code review using Claude or Gemini API. Reviews git branch diffs and generates actionable fix prompts.",
   "main": "src/index.js",
   "bin": {

package/src/git.js

@@ -1,22 +1,48 @@
 const { execSync } = require('child_process');
 
 /**
- * Get the diff between the current branch and a base branch.
+ * Resolve the effective base ref for diff comparison.
+ * Always prefers the remote version of the base branch (e.g. origin/main)
+ * so the diff reflects what will actually change on the remote after push.
+ * Falls back to the local branch name when the remote ref doesn't exist
+ * (e.g. first push of a new repo).
+ * @param {string} baseBranch - The configured base branch name
+ * @param {string} cwd - Working directory
+ * @returns {{ ref: string, isRemote: boolean }} The ref to diff against
+ */
+function resolveBaseRef(baseBranch, cwd = process.cwd()) {
+    // Try origin/<baseBranch> first
+    try {
+        execSync(`git rev-parse --verify origin/${baseBranch}`, {
+            cwd,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return { ref: `origin/${baseBranch}`, isRemote: true };
+    } catch {
+        // Remote ref doesn't exist — fall back to local branch
+        return { ref: baseBranch, isRemote: false };
+    }
+}
+
+/**
+ * Get the diff between the current branch and the remote base branch.
  * @param {string} baseBranch - The base branch to compare against (default: 'main')
  * @param {string} cwd - Working directory (default: process.cwd())
  * @returns {string} The git diff output
  */
 function getDiff(baseBranch = 'main', cwd = process.cwd()) {
     try {
-        // First try three-dot diff (for branch comparison)
-        const diff = execSync(`git diff ${baseBranch}...HEAD`, {
+        const { ref } = resolveBaseRef(baseBranch, cwd);
+
+        const diff = execSync(`git diff ${ref}...HEAD`, {
             cwd,
             encoding: 'utf-8',
-            maxBuffer: 10 * 1024 * 1024, // 10MB buffer for large diffs
+            maxBuffer: 10 * 1024 * 1024,
         });
 
         if (!diff.trim()) {
-            // Fallback: try two-dot diff (for uncommitted changes)
+            // Fallback: uncommitted changes
             const uncommitted = execSync('git diff HEAD', {
                 cwd,
                 encoding: 'utf-8',
@@ -24,7 +50,6 @@ function getDiff(baseBranch = 'main', cwd = process.cwd()) {
             });
 
             if (!uncommitted.trim()) {
-                // Also check staged changes
                 const staged = execSync('git diff --cached', {
                     cwd,
                     encoding: 'utf-8',
@@ -42,14 +67,16 @@ function getDiff(baseBranch = 'main', cwd = process.cwd()) {
 }
 
 /**
- * Get list of changed files between current branch and base branch.
+ * Get list of changed files between current branch and the remote base branch.
  * @param {string} baseBranch - The base branch to compare against
  * @param {string} cwd - Working directory
  * @returns {string[]} Array of changed file paths
  */
 function getChangedFiles(baseBranch = 'main', cwd = process.cwd()) {
     try {
-        const output = execSync(`git diff --name-only ${baseBranch}...HEAD`, {
+        const { ref } = resolveBaseRef(baseBranch, cwd);
+
+        const output = execSync(`git diff --name-only ${ref}...HEAD`, {
             cwd,
             encoding: 'utf-8',
         });
@@ -110,4 +137,5 @@ module.exports = {
     getChangedFiles,
     getBranchName,
     isGitRepo,
+    resolveBaseRef,
 };