codex-review-mcp 2.10.5 → 2.10.6

package/dist/review/collectDiff.js

@@ -45,47 +45,53 @@ export async function collectDiff(input) {
             }
         }
         await debugLog(`Collecting diff: ${base}...${branchName} in ${workspaceDir}`);
-        // Run git diff for committed changes - use execFileSync to prevent command injection
-        let diff = execFileSync('git', ['diff', `${base}...${branchName}`], {
-            cwd: workspaceDir,
-            encoding: 'utf8',
-            maxBuffer: 10 * 1024 * 1024, // 10MB buffer for large diffs
-        });
-        // If no committed changes, check for uncommitted changes on the branch
-        if (!diff.trim()) {
-            await debugLog(`No committed changes found, checking for uncommitted changes`);
-            // Check if we're currently on the target branch
-            let currentBranch;
-            try {
-                currentBranch = execSync('git rev-parse --abbrev-ref HEAD', {
-                    cwd: workspaceDir,
-                    encoding: 'utf8',
-                    stdio: ['ignore', 'pipe', 'ignore']
-                }).trim();
-            }
-            catch {
-                currentBranch = '';
+        // Check if we're currently on the target branch
+        let currentBranch;
+        try {
+            currentBranch = execSync('git rev-parse --abbrev-ref HEAD', {
+                cwd: workspaceDir,
+                encoding: 'utf8',
+                stdio: ['ignore', 'pipe', 'ignore']
+            }).trim();
+        }
+        catch {
+            currentBranch = '';
+        }
+        const onTargetBranch = currentBranch === branchName;
+        // If on target branch, get ALL changes (committed + uncommitted)
+        // This reviews work-in-progress, not just committed code
+        let diff;
+        if (onTargetBranch) {
+            await debugLog(`On target branch ${branchName}, reviewing ALL changes (committed + uncommitted)`);
+            // Get all changes from base branch (includes both committed and uncommitted)
+            diff = execFileSync('git', ['diff', base], {
+                cwd: workspaceDir,
+                encoding: 'utf8',
+                maxBuffer: 10 * 1024 * 1024,
+            });
+            if (diff.trim()) {
+                await debugLog(`Found changes: ${diff.length} chars (committed + uncommitted)`);
             }
-            if (currentBranch === branchName) {
-                // We're on the target branch - collect uncommitted changes
-                await debugLog(`On target branch ${branchName}, collecting uncommitted changes`);
-                // Get uncommitted changes (staged + unstaged)
-                diff = execFileSync('git', ['diff', base], {
-                    cwd: workspaceDir,
-                    encoding: 'utf8',
-                    maxBuffer: 10 * 1024 * 1024,
-                });
-                if (diff.trim()) {
-                    await debugLog(`Found uncommitted changes: ${diff.length} chars`);
-                }
+        }
+        else {
+            // Not on target branch, only get committed changes
+            await debugLog(`Not on target branch, reviewing only committed changes`);
+            diff = execFileSync('git', ['diff', `${base}...${branchName}`], {
+                cwd: workspaceDir,
+                encoding: 'utf8',
+                maxBuffer: 10 * 1024 * 1024,
+            });
+            if (diff.trim()) {
+                await debugLog(`Found committed changes: ${diff.length} chars`);
             }
         }
         if (!diff.trim()) {
+            const checkType = onTargetBranch
+                ? `All changes (committed + uncommitted): git diff ${base}`
+                : `Committed changes: git diff ${base}...${branchName}`;
             throw new Error(`No changes found on branch ${branchName}.\n` +
-                `Tried:\n` +
-                `  1. Committed changes: git diff ${base}...${branchName}\n` +
-                `  2. Uncommitted changes (if on branch): git diff ${base}\n` +
-                `Make sure the branch exists and has changes (committed or uncommitted).`);
+                `Checked: ${checkType}\n` +
+                `Make sure the branch has changes compared to ${base}.`);
         }
         await debugLog(`Collected diff: ${diff.length} chars, ${diff.split('\n').length} lines`);
         return diff;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-review-mcp",
-  "version": "2.10.5",
+  "version": "2.10.6",
   "main": "index.js",
   "scripts": {
     "build": "tsc",