@in-the-loop-labs/pair-review 3.3.5 → 3.3.7

package/src/local-review.js

@@ -1,5 +1,5 @@
 // Copyright 2026 Tim Perkins (tjwp) | SPDX-License-Identifier: Apache-2.0
-const { execSync, exec } = require('child_process');
+const { execSync, exec, execFileSync } = require('child_process');
 const { promisify } = require('util');
 const crypto = require('crypto');
 const path = require('path');
@@ -15,7 +15,7 @@ const { initializeDatabase, ReviewRepository, RepoSettingsRepository } = require
 const { startServer } = require('./server');
 const { localReviewDiffs } = require('./routes/shared');
 const { getShaAbbrevLength } = require('./git/sha-abbrev');
-const { GIT_DIFF_FLAGS } = require('./git/diff-flags');
+const { GIT_DIFF_FLAGS, GIT_DIFF_FLAGS_ARRAY } = require('./git/diff-flags');
 const open = (...args) => process.env.PAIR_REVIEW_NO_OPEN ? Promise.resolve() : import('open').then(({ default: open }) => open(...args));
 
 // Design note: This module uses execSync for git commands despite async function signatures.
@@ -393,12 +393,23 @@ async function findMergeBase(repoPath, baseBranch) {
  * Generate diff output for untracked files using git diff --no-index.
  * @param {string} repoPath - Path to the git repository
  * @param {Array} untrackedFiles - Array from getUntrackedFiles()
- * @param {string} wFlag - Whitespace flag (e.g. ' -w' or '')
- * @param {string} [contextFlag=''] - Unified context flag (e.g. ' --unified=3')
- * @param {string} [extraArgsStr=''] - Additional git diff flags (e.g. ' --patience')
+ * @param {Object} [options]
+ * @param {boolean} [options.hideWhitespace=false] - Whether to pass -w
+ * @param {number} [options.contextLines=25] - Number of unified context lines
+ * @param {string[]} [options.extraArgs=[]] - Additional git diff flags
  * @returns {string} Combined diff text for untracked files
  */
-function generateUntrackedDiffs(repoPath, untrackedFiles, wFlag, contextFlag = '', extraArgsStr = '') {
+function generateUntrackedDiffs(repoPath, untrackedFiles, options = {}) {
+  const diffArgs = [
+    'diff',
+    '--no-index',
+    ...GIT_DIFF_FLAGS_ARRAY,
+    `--unified=${options.contextLines ?? 25}`,
+    ...(options.extraArgs || []),
+    ...(options.hideWhitespace ? ['-w'] : []),
+    '--',
+    '/dev/null'
+  ];
   let diff = '';
   for (const untracked of untrackedFiles) {
     if (!untracked.skipped) {
@@ -406,16 +417,21 @@ function generateUntrackedDiffs(repoPath, untrackedFiles, wFlag, contextFlag = '
         const filePath = path.join(repoPath, untracked.file);
         let fileDiff;
         try {
-          fileDiff = execSync(`git diff --no-index ${GIT_DIFF_FLAGS}${contextFlag}${extraArgsStr}${wFlag} -- /dev/null "${filePath}"`, {
+          fileDiff = execFileSync('git', [...diffArgs, filePath], {
             cwd: repoPath,
             encoding: 'utf8',
             stdio: ['pipe', 'pipe', 'pipe'],
             maxBuffer: 10 * 1024 * 1024
           });
         } catch (diffError) {
+          const diffStdout = typeof diffError?.stdout === 'string'
+            ? diffError.stdout
+            : Buffer.isBuffer(diffError?.stdout)
+              ? diffError.stdout.toString('utf8')
+              : null;
           if (diffError && typeof diffError === 'object' &&
-              diffError.status === GIT_DIFF_HAS_DIFFERENCES && typeof diffError.stdout === 'string') {
-            fileDiff = diffError.stdout;
+              diffError.status === GIT_DIFF_HAS_DIFFERENCES && diffStdout !== null) {
+            fileDiff = diffStdout;
           } else {
             throw diffError;
           }
@@ -552,7 +568,7 @@ async function generateScopedDiff(repoPath, scopeStart, scopeEnd, baseBranch, op
     const untrackedFiles = await getUntrackedFiles(repoPath);
     stats.untrackedFiles = untrackedFiles.length;
 
-    const untrackedDiff = generateUntrackedDiffs(repoPath, untrackedFiles, wFlag, contextFlag, extraArgsStr);
+    const untrackedDiff = generateUntrackedDiffs(repoPath, untrackedFiles, options);
     if (untrackedDiff) {
       if (diff) diff += '\n';
       diff += untrackedDiff;

package/src/main.js

@@ -116,7 +116,7 @@ OPTIONS:
     --model <name>          Override the AI model. Claude Code is the default provider.
                             Available models: opus, sonnet, haiku (Claude Code);
                             also: opus-4.5, opus-4.6-low, opus-4.6-medium, opus-4.6-1m,
-                                  opus-4.7-xhigh
+                                  opus-4.7-high, opus-4.7-xhigh
                             or use provider-specific models with Gemini/Codex
     --use-checkout          Use current directory instead of creating worktree
                             (automatic in GitHub Actions)

package/src/routes/pr.js

@@ -25,7 +25,7 @@ const Analyzer = require('../ai/analyzer');
 const { v4: uuidv4 } = require('uuid');
 const fs = require('fs').promises;
 const path = require('path');
-const { getGitHubToken, getWorktreeDisplayName, resolveLoadSkills, buildCouncilProviderOverrides } = require('../config');
+const { getGitHubToken, getWorktreeDisplayName, resolveLoadSkills, buildCouncilProviderOverrides, getRepoSkipBulkFetch } = require('../config');
 const logger = require('../utils/logger');
 const { buildDiffLineSet } = require('../utils/diff-annotator');
 const { broadcastReviewEvent } = require('../events/review-events');
@@ -45,6 +45,7 @@ const {
   registerProcess: registerProcessForCancellation
 } = require('./shared');
 const { safeParseJson } = require('../utils/safe-parse-json');
+const { mergeChangedFilesWithDiff } = require('../utils/diff-file-list');
 const { resolveOriginalFileContentSpecs } = require('../utils/diff-file-content');
 const { validateCouncilConfig, normalizeCouncilConfig } = require('./councils');
 const { TIERS, TIER_ALIASES, VALID_TIERS, resolveTier } = require('../ai/prompts/config');
@@ -254,6 +255,8 @@ router.get('/api/pr/:owner/:repo/:number', async (req, res) => {
     }
 
     // Prepare response
+    const changedFiles = mergeChangedFilesWithDiff(extendedData.changed_files || [], extendedData.diff || '');
+
     // Use review.id instead of prMetadata.id to avoid ID collision with local mode
     const response = {
       success: true,
@@ -274,8 +277,8 @@ router.get('/api/pr/:owner/:repo/:number', async (req, res) => {
         shaAbbrevLength,
         created_at: prMetadata.created_at,
         updated_at: prMetadata.updated_at,
-        file_changes: extendedData.changed_files ? extendedData.changed_files.length : 0,
-        changed_files: extendedData.changed_files || [],
+        file_changes: changedFiles.length,
+        changed_files: changedFiles,
         additions: extendedData.additions || 0,
         deletions: extendedData.deletions || 0,
         diff_content: extendedData.diff || '',
@@ -375,7 +378,13 @@ router.post('/api/pr/:owner/:repo/:number/refresh', async (req, res) => {
 
     // Update worktree with latest changes
     const worktreeManager = new GitWorktreeManager(db);
-    const worktreePath = await worktreeManager.updateWorktree(owner, repo, prNumber, prData);
+    const worktreePath = await worktreeManager.updateWorktree(
+      owner,
+      repo,
+      prNumber,
+      prData,
+      { skipBulkFetch: getRepoSkipBulkFetch(config, repository) }
+    );
 
     // Generate fresh diff and get changed files
     const diffPrData = {
@@ -759,6 +768,8 @@ router.get('/api/pr/:owner/:repo/:number/diff', async (req, res) => {
     let diffContent = prData.diff || '';
     let changedFiles = prData.changed_files || [];
 
+    let gitattributes = null;
+
     if (hideWhitespace && worktreeRecord && worktreeRecord.path) {
       try {
         const worktreePath = worktreeRecord.path;
@@ -774,7 +785,7 @@ router.get('/api/pr/:owner/:repo/:number/diff', async (req, res) => {
 
           const summaryArgs = [`${baseSha}...${headSha}`, ...GIT_DIFF_SUMMARY_FLAGS_ARRAY, '-w'];
           const diffSummary = await git.diffSummary(summaryArgs);
-          const gitattributes = await getGeneratedFilePatterns(worktreePath);
+          gitattributes = await getGeneratedFilePatterns(worktreePath);
           changedFiles = diffSummary.files.map(file => {
             const resolvedFile = resolveRenamedFile(file.file);
             const isRenamed = resolvedFile !== file.file;
@@ -799,17 +810,22 @@ router.get('/api/pr/:owner/:repo/:number/diff', async (req, res) => {
     } else if (worktreeRecord && worktreeRecord.path) {
       // Add generated flag to changed files based on .gitattributes
       try {
-        const gitattributes = await getGeneratedFilePatterns(worktreeRecord.path);
-        changedFiles = changedFiles.map(file => ({
-          ...file,
-          generated: gitattributes.isGenerated(file.file)
-        }));
+        gitattributes = await getGeneratedFilePatterns(worktreeRecord.path);
       } catch (error) {
         logger.warn(`Could not load .gitattributes: ${error.message}`);
         // Continue without generated flags
       }
     }
 
+    changedFiles = mergeChangedFilesWithDiff(changedFiles, diffContent);
+
+    if (gitattributes) {
+      changedFiles = changedFiles.map(file => ({
+        ...file,
+        generated: gitattributes.isGenerated(file.file)
+      }));
+    }
+
     // When diff was regenerated (whitespace), compute aggregate stats from
     // the regenerated changedFiles instead of using stale cached values from prData.
     const additions = hideWhitespace

package/src/utils/diff-file-list.js

@@ -3,9 +3,111 @@ const { promisify } = require('util');
 const { exec } = require('child_process');
 const { queryOne } = require('../database');
 const { GIT_DIFF_FLAGS } = require('../git/diff-flags');
+const { normalizePath, resolveRenamedFile } = require('./paths');
 
 const execPromise = promisify(exec);
 
+/**
+ * Parse a unified diff into a map of file path -> per-file patch.
+ * Uses the "b/" path from the diff header as the canonical file path.
+ *
+ * @param {string} diff - Full unified diff
+ * @returns {Map<string, string>} Map of file paths to full patch text
+ */
+function parseUnifiedDiffPatches(diff) {
+  const filePatchMap = new Map();
+  if (!diff) return filePatchMap;
+
+  const parts = diff.split(/(?=^diff --git )/m);
+
+  for (const part of parts) {
+    if (!part.trim()) continue;
+
+    const match = part.match(/^diff --git a\/(.+?) b\/(.+)$/m);
+    if (match) {
+      filePatchMap.set(match[2], part);
+    }
+  }
+
+  return filePatchMap;
+}
+
+/**
+ * Count additions and deletions inside a single patch body.
+ *
+ * @param {string} patch - Per-file patch text
+ * @returns {{ insertions: number, deletions: number }}
+ */
+function countPatchStats(patch) {
+  let insertions = 0;
+  let deletions = 0;
+
+  for (const line of patch.split('\n')) {
+    if (line.startsWith('+') && !line.startsWith('+++ ')) {
+      insertions++;
+    } else if (line.startsWith('-') && !line.startsWith('--- ')) {
+      deletions++;
+    }
+  }
+
+  return { insertions, deletions };
+}
+
+/**
+ * Merge changed_files metadata with the authoritative file list from the diff.
+ * This recovers files when cached changed_files were derived from abbreviated
+ * diff --stat output and no longer match the full patch headers.
+ *
+ * @param {Array<object|string>} changedFiles - Existing changed_files array
+ * @param {string} diff - Full unified diff
+ * @returns {Array<object|string>} Merged changed_files array
+ */
+function mergeChangedFilesWithDiff(changedFiles, diff) {
+  const patchMap = parseUnifiedDiffPatches(diff);
+  if (patchMap.size === 0) {
+    return Array.isArray(changedFiles) ? changedFiles : [];
+  }
+
+  // Drop cached `git diff --stat` ellipsis stubs once we have authoritative
+  // patch headers to recover the full file paths from.
+  const existing = (Array.isArray(changedFiles) ? changedFiles : []).filter(entry => {
+    const filePath = typeof entry === 'string' ? entry : entry?.file;
+    return filePath && !filePath.includes('...');
+  });
+
+  const normalizedExisting = new Set(existing.map(file => {
+    const filePath = typeof file === 'string' ? file : file?.file;
+    return normalizePath(resolveRenamedFile(filePath));
+  }).filter(Boolean));
+
+  const merged = [...existing];
+
+  for (const [filePath, patch] of patchMap.entries()) {
+    const normalizedPatchPath = normalizePath(resolveRenamedFile(filePath));
+    if (normalizedExisting.has(normalizedPatchPath)) {
+      continue;
+    }
+
+    const { insertions, deletions } = countPatchStats(patch);
+    const renameFrom = patch.match(/^rename from (.+)$/m)?.[1] || null;
+    const renameTo = patch.match(/^rename to (.+)$/m)?.[1] || null;
+    const binary = /^Binary files .* differ$/m.test(patch) || /^GIT binary patch$/m.test(patch);
+
+    merged.push({
+      file: filePath,
+      insertions,
+      deletions,
+      changes: insertions + deletions,
+      binary,
+      renamed: Boolean(renameFrom && renameTo),
+      renamedFrom: renameFrom
+    });
+    normalizedExisting.add(normalizedPatchPath);
+  }
+
+  return merged;
+}
+
 /**
  * Return the list of file paths that belong to the review's diff.
  * Works for both PR-mode and local-mode reviews.
@@ -25,7 +127,9 @@ async function getDiffFileList(db, review) {
 
       if (prRecord?.pr_data) {
         const prData = JSON.parse(prRecord.pr_data);
-        return (prData.changed_files || []).map(f => f.file);
+        return mergeChangedFilesWithDiff(prData.changed_files || [], prData.diff || '')
+          .map(f => typeof f === 'string' ? f : f.file)
+          .filter(Boolean);
       }
     } catch {
       // parse / query error – fall through to empty list
@@ -55,4 +159,9 @@ async function getDiffFileList(db, review) {
   return [];
 }
 
-module.exports = { getDiffFileList };
+module.exports = {
+  getDiffFileList,
+  parseUnifiedDiffPatches,
+  countPatchStats,
+  mergeChangedFilesWithDiff
+};

package/src/utils/paths.js

@@ -13,6 +13,8 @@
  * - Handles interleaved patterns like '/./src' by iterating
  * - Normalizes multiple consecutive slashes to single slash
  * - Does NOT modify case (paths are case-sensitive on most systems)
+ * - Frontend mirror lives in `DiffRenderer.normalizeFilePath`
+ *   (`public/js/modules/diff-renderer.js`); keep behavior in sync
  *
  * @param {string} filePath - The file path to normalize
  * @returns {string} Normalized path
@@ -159,6 +161,8 @@ function normalizeRepository(owner, repo) {
  *   "tests/{old.js => new.js}"      → "tests/new.js"
  *   "{old-dir => new-dir}/file.js"  → "new-dir/file.js"
  *   "a/{b => c}/d.js"              → "a/c/d.js"
+ * Frontend mirror lives in `DiffRenderer.normalizeFilePath`
+ * (`public/js/modules/diff-renderer.js`); keep behavior in sync.
  *
  * @param {string} fileName - File name possibly containing rename syntax
  * @returns {string} Resolved file name with the new path, or original if no rename syntax