@in-the-loop-labs/pair-review 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@in-the-loop-labs/pair-review",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Your AI-powered code review partner - Close the feedback loop with AI coding agents",
   "main": "src/server.js",
   "bin": {

package/public/css/pr.css

@@ -295,18 +295,6 @@
   /* Styles handled by individual file items */
 }
 
-.file-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 8px 0;
-  border-bottom: 1px solid #f6f8fa;
-}
-
-.file-item:last-child {
-  border-bottom: none;
-}
-
 .file-name {
   font-family: 'SFMono-Regular', 'Consolas', 'Liberation Mono', 'Menlo', monospace;
   font-size: 13px;
@@ -963,6 +951,8 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  flex: 1;
+  min-width: 0;
 }
 
 .file-item .file-changes {
@@ -973,16 +963,38 @@
   margin-left: 8px;
 }
 
-.file-item[data-status="added"] .file-changes {
+.file-additions {
   color: var(--diff-addition-marker, #3fb950);
 }
 
-.file-item[data-status="modified"] .file-changes {
-  color: var(--color-warning, #d29922);
+.file-deletions {
+  color: var(--diff-deletion-marker, #f85149);
+  margin-left: 6px;
 }
 
-.file-item[data-status="deleted"] .file-changes {
-  color: var(--diff-deletion-marker, #f85149);
+.file-item[data-status="renamed"] .file-changes {
+  color: var(--color-fg-muted, #8b949e);
+}
+
+.file-rename-icon-wrapper {
+  display: inline-flex;
+  align-items: center;
+  flex-shrink: 0;
+}
+
+.file-rename-icon {
+  color: var(--color-fg-muted, #8b949e);
+  margin-right: 4px;
+  vertical-align: middle;
+  flex-shrink: 0;
+}
+
+.file-rename-old-path {
+  opacity: 0.7;
+}
+
+.file-rename-arrow {
+  margin: 0 4px;
 }
 
 .file-item.generated {
@@ -8558,6 +8570,27 @@ body.resizing * {
 .file-comment-card.user-comment {
   /* Override file-comment-card defaults to use user-comment styling */
   margin: 0;  /* Remove margin since container handles spacing */
+  background: linear-gradient(to right, #f5f0ff 0%, var(--file-comment-bg, #ffffff) 100%);
+  border: 1px solid #8b5cf6;
+  border-left: 4px solid #8b5cf6;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+}
+
+.file-comment-card.user-comment .file-comment-header {
+  background: transparent;
+  border-bottom-color: rgba(139, 92, 246, 0.1);
+}
+
+[data-theme="dark"] .file-comment-card.user-comment {
+  background: linear-gradient(to right, rgba(139, 92, 246, 0.15) 0%, var(--file-comment-bg, #0d1117) 100%);
+  border-color: #a78bfa;
+  border-left-color: #a78bfa;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+}
+
+[data-theme="dark"] .file-comment-card.user-comment .file-comment-header {
+  background: transparent;
+  border-bottom-color: rgba(167, 139, 250, 0.1);
 }
 
 /* ==========================================================================

package/public/js/modules/diff-renderer.js

@@ -333,6 +333,8 @@ class DiffRenderer {
    * @param {boolean} [options.isViewed=false] - Whether file is marked as viewed
    * @param {Object} [options.generatedInfo] - Info about generated file (insertions, deletions)
    * @param {Object} [options.fileStats] - File stats for collapsed view {insertions, deletions}
+   * @param {boolean} [options.renamed=false] - Whether the file was renamed
+   * @param {string|null} [options.renamedFrom=null] - Original file path before rename
    * @param {Function} [options.onToggleCollapse] - Callback for toggling collapse state
    * @param {Function} [options.onToggleViewed] - Callback for toggling viewed state
    * @returns {HTMLElement} File header element
@@ -344,6 +346,8 @@ class DiffRenderer {
       isViewed = false,
       generatedInfo = null,
       fileStats = null,
+      renamed = false,
+      renamedFrom = null,
       onToggleCollapse = null,
       onToggleViewed = null
     } = options;
@@ -375,7 +379,20 @@ class DiffRenderer {
     // File name
     const fileName = document.createElement('span');
     fileName.className = 'd2h-file-name';
-    fileName.textContent = filePath;
+    if (renamed && renamedFrom) {
+      const oldPath = document.createElement('span');
+      oldPath.className = 'file-rename-old-path';
+      oldPath.textContent = renamedFrom;
+      const arrow = document.createElement('span');
+      arrow.className = 'file-rename-arrow';
+      arrow.textContent = '\u2192';
+      const newPath = document.createTextNode(filePath);
+      fileName.appendChild(oldPath);
+      fileName.appendChild(arrow);
+      fileName.appendChild(newPath);
+    } else {
+      fileName.textContent = filePath;
+    }
     fileHeader.appendChild(fileName);
 
     // File stats summary (visible in collapsed view)

package/public/js/modules/hunk-parser.js

@@ -345,6 +345,61 @@ class HunkParser {
   static shouldAutoExpand(gapSize) {
     return gapSize < HunkParser.AUTO_EXPAND_THRESHOLD;
   }
+
+  /**
+   * Parse a unified diff patch string into structured blocks (hunks).
+   * Each block contains the hunk header info and its content lines.
+   * Strips trailing empty-string artifacts from split('\n') on newline-terminated input,
+   * which would otherwise be misclassified as context lines and corrupt coordinate calculations.
+   * @param {string} patch - Unified diff patch string (may include diff --git headers)
+   * @returns {Array<{header: string, oldStart: number, newStart: number, lines: string[]}>}
+   */
+  static parseDiffIntoBlocks(patch) {
+    const lines = patch.split('\n');
+    const blocks = [];
+    let currentBlock = null;
+
+    lines.forEach(line => {
+      if (line.startsWith('@@')) {
+        if (currentBlock) {
+          HunkParser._stripTrailingEmpty(currentBlock);
+          blocks.push(currentBlock);
+        }
+        currentBlock = null;
+
+        const match = line.match(/@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/);
+        if (match) {
+          currentBlock = {
+            header: line,
+            oldStart: parseInt(match[1]),
+            newStart: parseInt(match[2]),
+            lines: []
+          };
+        }
+      } else if (currentBlock) {
+        currentBlock.lines.push(line);
+      }
+    });
+
+    if (currentBlock) {
+      HunkParser._stripTrailingEmpty(currentBlock);
+      blocks.push(currentBlock);
+    }
+
+    return blocks;
+  }
+
+  /**
+   * Remove trailing empty string artifact from a block's lines array.
+   * split('\n') on newline-terminated input produces a trailing '' that has no
+   * diff prefix (+/-/space) and would be misclassified as a context line.
+   * @param {Object} block - Block with lines array to clean up
+   */
+  static _stripTrailingEmpty(block) {
+    if (block.lines.length > 0 && block.lines[block.lines.length - 1] === '') {
+      block.lines.pop();
+    }
+  }
 }
 
 // Make HunkParser available globally in browser

package/public/js/pr.js

@@ -675,6 +675,8 @@ class PRManager {
       isViewed,
       generatedInfo: isGenerated ? this.generatedFiles.get(file.file) : null,
       fileStats,
+      renamed: file.renamed || false,
+      renamedFrom: file.renamedFrom || null,
       onToggleCollapse: (path) => this.toggleFileCollapse(path),
       onToggleViewed: (path, checked) => this.toggleFileViewed(path, checked)
     });
@@ -738,40 +740,11 @@ class PRManager {
    * @param {string} fileName - File name
    */
   renderPatch(tbody, patch, fileName) {
-    const lines = patch.split('\n');
     let diffPosition = 0;  // GitHub diff_position (1-indexed, consecutive)
     let prevBlockEnd = { old: 0, new: 0 };
     let isFirstHunk = true;
 
-    // Parse diff into blocks (hunks)
-    const blocks = [];
-    let currentBlock = null;
-
-    lines.forEach(line => {
-      if (line.startsWith('@@')) {
-        // Start new block
-        if (currentBlock) {
-          blocks.push(currentBlock);
-        }
-
-        // Parse hunk header
-        const match = line.match(/@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/);
-        if (match) {
-          currentBlock = {
-            header: line,
-            oldStart: parseInt(match[1]),
-            newStart: parseInt(match[2]),
-            lines: []
-          };
-        }
-      } else if (currentBlock) {
-        currentBlock.lines.push(line);
-      }
-    });
-
-    if (currentBlock) {
-      blocks.push(currentBlock);
-    }
+    const blocks = window.HunkParser.parseDiffIntoBlocks(patch);
 
     // Render blocks with gap sections
     blocks.forEach((block, blockIndex) => {
@@ -784,7 +757,7 @@ class PRManager {
       );
 
       const gapStartOld = prevBlockEnd.old + 1;
-      const gapEndOld = (blockBounds.old || block.oldStart) - 1;
+      const gapEndOld = (blockBounds.old ?? block.oldStart) - 1;
       const gapSize = gapEndOld - gapStartOld + 1;
       // Calculate the corresponding NEW line number for correct right-side display
       const gapStartNew = prevBlockEnd.new + 1;
@@ -889,8 +862,8 @@ class PRManager {
         'last'
       );
       prevBlockEnd = {
-        old: endBounds.old || (block.oldStart + block.lines.filter(l => !l.startsWith('+')).length - 1),
-        new: endBounds.new || (block.newStart + block.lines.filter(l => !l.startsWith('-')).length - 1)
+        old: endBounds.old ?? (block.oldStart + block.lines.filter(l => !l.startsWith('+')).length - 1),
+        new: endBounds.new ?? (block.newStart + block.lines.filter(l => !l.startsWith('-')).length - 1)
       };
     });
 
@@ -898,7 +871,9 @@ class PRManager {
     // This handles the case where there are unchanged lines after the last change
     // Use EOF_SENTINEL (-1) for endLine to indicate "rest of file" (unknown size)
     // The gap is marked as pending validation and will be removed async if no lines exist
-    if (blocks.length > 0) {
+    // Skip for new files: when gapStartOld <= 0, the old file has no content (e.g. @@ -0,0 +1,N @@)
+    // so there are no trailing unchanged lines to expand
+    if (blocks.length > 0 && prevBlockEnd.old > 0) {
       const gapStartOld = prevBlockEnd.old + 1;
       const gapStartNew = prevBlockEnd.new + 1;
       const gapRow = window.HunkParser.createGapSection(
@@ -1164,6 +1139,14 @@ class PRManager {
       const fileName = controls.dataset.fileName;
       const startLine = parseInt(controls.dataset.startLine);
 
+      // Safety net: remove gaps with invalid start lines (should not occur after
+      // the prevBlockEnd.old > 0 guard in renderPatch, but handles edge cases defensively)
+      if (startLine <= 0) {
+        console.debug('Removing EOF gap with invalid startLine:', startLine, 'for file:', fileName);
+        gapRow.remove();
+        return;
+      }
+
       try {
         const data = await this.fetchFileContent(fileName);
         if (!data) {
@@ -2651,7 +2634,9 @@ class PRManager {
             additions: file.insertions,
             deletions: file.deletions,
             binary: file.binary,
-            generated: file.generated || false
+            generated: file.generated || false,
+            renamed: file.renamed || false,
+            renamedFrom: file.renamedFrom || null,
           });
         } else {
           if (!current[part]) current[part] = {};
@@ -2663,6 +2648,10 @@ class PRManager {
   }
 
   getFileStatus(file) {
+    if (file.renamed) {
+      if (file.insertions > 0 || file.deletions > 0) return 'modified';
+      return 'renamed';
+    }
     if (file.binary) return 'modified';
     if (!file.deletions || file.deletions === 0) return 'added';
     if (!file.insertions || file.insertions === 0) return 'deleted';
@@ -2685,7 +2674,9 @@ class PRManager {
         additions: file.insertions,
         deletions: file.deletions,
         binary: file.binary,
-        generated: file.generated || false
+        generated: file.generated || false,
+        renamed: file.renamed || false,
+        renamedFrom: file.renamedFrom || null,
       });
     });
 
@@ -2770,6 +2761,13 @@ class PRManager {
     item.dataset.status = file.status;
 
     if (file.generated) item.classList.add('generated');
+    if (file.renamed && file.renamedFrom) {
+      item.title = `Renamed from: ${file.renamedFrom}`;
+      const renameIcon = document.createElement('span');
+      renameIcon.className = 'file-rename-icon-wrapper';
+      renameIcon.innerHTML = '<svg class="file-rename-icon" viewBox="0 0 16 16" width="14" height="14" fill="currentColor"><path d="M13.25 1c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0 1 13.25 15H2.75A1.75 1.75 0 0 1 1 13.25V2.75C1 1.784 1.784 1 2.75 1ZM2.75 2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V2.75a.25.25 0 0 0-.25-.25Zm9.03 6.03-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H4.75a.75.75 0 0 1 0-1.5h4.69L7.47 5.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018l3.25 3.25a.75.75 0 0 1 0 1.06Z"/></svg>';
+      item.appendChild(renameIcon);
+    }
 
     const fileName = document.createElement('span');
     fileName.className = 'file-name';
@@ -2781,10 +2779,18 @@ class PRManager {
     if (file.binary) {
       changes.textContent = 'BIN';
     } else {
-      const parts = [];
-      if (file.additions > 0) parts.push(`+${file.additions}`);
-      if (file.deletions > 0) parts.push(`-${file.deletions}`);
-      changes.textContent = parts.join(' ') || '';
+      if (file.additions > 0) {
+        const addSpan = document.createElement('span');
+        addSpan.className = 'file-additions';
+        addSpan.textContent = `+${file.additions}`;
+        changes.appendChild(addSpan);
+      }
+      if (file.deletions > 0) {
+        const delSpan = document.createElement('span');
+        delSpan.className = 'file-deletions';
+        delSpan.textContent = `-${file.deletions}`;
+        changes.appendChild(delSpan);
+      }
     }
 
     item.appendChild(fileName);

package/src/ai/analyzer.js

@@ -9,7 +9,7 @@ const execPromise = util.promisify(exec);
 const logger = require('../utils/logger');
 const { extractJSON } = require('../utils/json-extractor');
 const { getGeneratedFilePatterns } = require('../git/gitattributes');
-const { normalizePath, pathExistsInList } = require('../utils/paths');
+const { normalizePath, pathExistsInList, resolveRenamedFile } = require('../utils/paths');
 const { buildFileLineCountMap, validateSuggestionLineNumbers } = require('../utils/line-validation');
 const { getPromptBuilder } = require('./prompts');
 const { formatValidFiles } = require('./prompts/shared/valid-files');
@@ -185,7 +185,7 @@ class Analyzer {
           level3: levelResults.level3.suggestions
         };
 
-        const orchestrationResult = await this.orchestrateWithAI(allSuggestions, prMetadata, mergedInstructions, fileLineCountMap, worktreePath, { analysisId, tier });
+        const orchestrationResult = await this.orchestrateWithAI(allSuggestions, prMetadata, mergedInstructions, worktreePath, { analysisId, tier, progressCallback });
 
         // Validate and finalize suggestions
         const finalSuggestions = this.validateAndFinalizeSuggestions(
@@ -418,6 +418,54 @@ Your suggestions MUST reference the EXACT line where the issue exists:
 `;
   }
 
+  /**
+   * Build lightweight line number guidance for the orchestration step.
+   *
+   * Unlike buildLineNumberGuidance() (used for levels 1-3), this does NOT
+   * instruct the AI to routinely run git-diff-lines or verify every line number.
+   * The orchestration step receives pre-computed suggestions whose line numbers
+   * were already determined by the analysis levels; its primary job is to
+   * intelligently combine them. However, it retains access to git-diff-lines
+   * for cases where it needs to investigate conflicting suggestions or verify
+   * a specific concern.
+   *
+   * @param {string|null} worktreePath - Path to the git worktree (for --cwd option)
+   * @returns {string} Orchestration-specific line number guidance
+   */
+  buildOrchestrationLineNumberGuidance(worktreePath = null) {
+    const scriptCommand = 'git-diff-lines';
+    const cwdOption = worktreePath ? ` --cwd "${worktreePath}"` : '';
+    const fullCommand = `${scriptCommand}${cwdOption}`;
+    return `
+## Line Number Handling
+
+You are receiving pre-computed suggestions from the analysis levels. Each suggestion
+already carries a \`line\` number and \`old_or_new\` value determined during analysis.
+Your primary focus is curation and synthesis, not line number verification.
+
+**Your responsibilities:**
+- **Preserve line numbers as-is** when passing suggestions through to the output.
+- **Preserve \`old_or_new\` values** from input suggestions.
+- **When merging duplicates or near-duplicates** that reference the same line,
+  keep the line number and \`old_or_new\` from the suggestion with the richest
+  context (prefer higher-level analysis when in doubt).
+- **When levels conflict** on the line number or \`old_or_new\` for what appears to
+  be the same issue, use your judgment based on the nature of the concern:
+  - For **architectural or cross-cutting issues**, prefer the suggestion from the
+    level with broader context (Level 3 > Level 2 > Level 1).
+  - For **precise line-level bugs or typos**, prefer the suggestion from the level
+    that targets the specific line most directly (often Level 1, which works
+    closest to the raw diff).
+
+**If you need to inspect a file diff** (e.g., to resolve conflicting suggestions or
+verify a specific concern), use the annotated diff tool instead of \`git diff\`:
+\`\`\`
+${fullCommand}
+\`\`\`
+All git diff arguments work: \`${fullCommand} HEAD~1\`, \`${fullCommand} -- src/\`
+`;
+  }
+
   /**
    * Build the section of the prompt that includes custom review instructions
    * @param {string} customInstructions - Custom instructions text
@@ -454,31 +502,6 @@ Do NOT create suggestions for any files not in this list. If you cannot find iss
 `;
   }
 
-  /**
-   * Build the file line counts section for orchestration prompt
-   * @param {Map<string, number>} fileLineCountMap - Map of file paths to line counts
-   * @returns {string} Prompt section or empty string
-   */
-  buildFileLineCountsSection(fileLineCountMap) {
-    if (!fileLineCountMap || fileLineCountMap.size === 0) return '';
-
-    const lines = ['', '## File Line Counts for Validation'];
-    for (const [filePath, lineCount] of fileLineCountMap) {
-      if (lineCount === 0) {
-        // Empty files are valid text files - any line-specific suggestion would be invalid
-        lines.push(`- ${filePath}: 0 lines (empty file)`);
-      } else if (lineCount > 0) {
-        lines.push(`- ${filePath}: ${lineCount} lines`);
-      }
-      // Skip binary/missing files (lineCount === -1)
-    }
-    lines.push('');
-    lines.push('Verify that all suggestion line numbers are within these bounds.');
-    lines.push('If a suggestion has an invalid line number but valuable insight, convert it to a file-level suggestion.');
-    lines.push('');
-    return lines.join('\n');
-  }
-
   /**
    * Get list of changed files from git diff
    * @param {string} worktreePath - Path to the git worktree
@@ -556,13 +579,15 @@ Do NOT create suggestions for any files not in this list. If you cannot find iss
     }
 
     // Create a Set of normalized valid paths for efficient lookup
-    const normalizedValidPaths = new Set(validPaths.map(p => normalizePath(p)));
+    // Resolve git rename syntax (e.g., "tests/{old.js => new.js}" → "tests/new.js")
+    // so both the rename syntax path and the plain new filename will match
+    const normalizedValidPaths = new Set(validPaths.map(p => normalizePath(resolveRenamedFile(p))));
 
     const validSuggestions = [];
     const discardedSuggestions = [];
 
     for (const suggestion of suggestions) {
-      const normalizedSuggestionPath = normalizePath(suggestion.file);
+      const normalizedSuggestionPath = normalizePath(resolveRenamedFile(suggestion.file));
 
       if (normalizedValidPaths.has(normalizedSuggestionPath)) {
         validSuggestions.push(suggestion);
@@ -1417,7 +1442,7 @@ If you are unsure, use "NEW" - it is correct for the vast majority of suggestion
     // Fallback to getValidFilePaths() which properly looks up pr_metadata via review.id
     let validFilePaths;
     if (changedFiles && changedFiles.length > 0) {
-      validFilePaths = changedFiles.map(f => normalizePath(f));
+      validFilePaths = changedFiles.map(f => normalizePath(resolveRenamedFile(f)));
     } else {
       // Fallback to pr_metadata lookup via review -> pr_metadata join
       validFilePaths = await this.getValidFilePaths(reviewId);
@@ -1570,12 +1595,13 @@ If you are unsure, use "NEW" - it is correct for the vast majority of suggestion
     }
 
     // Use O(1) Set lookup if validPaths is a Set, otherwise normalize and check
-    const normalizedSuggestionPath = normalizePath(suggestionPath);
+    // Resolve git rename syntax so suggestions for renamed files match
+    const normalizedSuggestionPath = normalizePath(resolveRenamedFile(suggestionPath));
     if (validPaths instanceof Set) {
       return validPaths.has(normalizedSuggestionPath);
     }
     // Fallback for array (convert to Set for lookup)
-    const validPathsSet = new Set(validPaths.map(p => normalizePath(p)));
+    const validPathsSet = new Set(validPaths.map(p => normalizePath(resolveRenamedFile(p))));
     return validPathsSet.has(normalizedSuggestionPath);
   }
 
@@ -2273,14 +2299,13 @@ File-level suggestions should NOT have a line number. They apply to the entire f
    * @param {Object} allSuggestions - Object containing suggestions from all levels: {level1: [...], level2: [...], level3: [...]}
    * @param {Object} prMetadata - PR metadata for context
    * @param {string} customInstructions - Optional custom instructions to guide prioritization/filtering
-   * @param {Map<string, number>} fileLineCountMap - Optional map of file paths to line counts for validation
    * @param {string} worktreePath - Path to the git worktree
    * @param {Object} options - Additional options
    * @param {string} options.analysisId - Analysis ID for process tracking (enables cancellation)
    * @returns {Promise<Array>} Curated suggestions array
    */
-  async orchestrateWithAI(allSuggestions, prMetadata, customInstructions = null, fileLineCountMap = null, worktreePath = null, options = {}) {
-    const { analysisId, tier = 'balanced' } = options;
+  async orchestrateWithAI(allSuggestions, prMetadata, customInstructions = null, worktreePath = null, options = {}) {
+    const { analysisId, tier = 'balanced', progressCallback } = options;
     logger.section('[Orchestration] AI Orchestration Starting');
 
     const totalSuggestions = (allSuggestions.level1?.length || 0) +
@@ -2299,7 +2324,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
       const aiProvider = createProvider(this.provider, this.model);
 
       // Build the orchestration prompt
-      const prompt = this.buildOrchestrationPrompt(allSuggestions, prMetadata, customInstructions, fileLineCountMap, worktreePath, tier);
+      const prompt = this.buildOrchestrationPrompt(allSuggestions, prMetadata, customInstructions, worktreePath, tier);
 
       // Execute Claude CLI for orchestration
       logger.info('[Orchestration] Running AI orchestration to curate and merge suggestions...');
@@ -2402,12 +2427,11 @@ File-level suggestions should NOT have a line number. They apply to the entire f
    * @param {Object} allSuggestions - Suggestions from all levels
    * @param {Object} prMetadata - PR metadata for context
    * @param {string} customInstructions - Optional custom instructions to guide prioritization/filtering
-   * @param {Map<string, number>} fileLineCountMap - Optional map of file paths to line counts for validation
    * @param {string} worktreePath - Path to the git worktree
    * @param {string} tier - Capability tier: 'fast', 'balanced', or 'thorough' (default: 'balanced')
    * @returns {string} Orchestration prompt
    */
-  buildOrchestrationPrompt(allSuggestions, prMetadata, customInstructions = null, fileLineCountMap = null, worktreePath = null, tier = 'balanced') {
+  buildOrchestrationPrompt(allSuggestions, prMetadata, customInstructions = null, worktreePath = null, tier = 'balanced') {
     logger.debug(`[Orchestration] Building prompt with tier: ${tier}`);
     const promptBuilder = getPromptBuilder('orchestration', tier, this.provider);
 
@@ -2420,14 +2444,13 @@ File-level suggestions should NOT have a line number. They apply to the entire f
     const context = {
       reviewIntro: `You are orchestrating AI-powered code review suggestions for ${reviewDescription}.`,
       customInstructions: customInstructions ? this.buildCustomInstructionsSection(customInstructions) : '',
-      lineNumberGuidance: this.buildLineNumberGuidance(worktreePath),
+      lineNumberGuidance: this.buildOrchestrationLineNumberGuidance(worktreePath),
       level1Count: allSuggestions.level1?.length || 0,
       level2Count: allSuggestions.level2?.length || 0,
       level3Count: allSuggestions.level3?.length || 0,
       level1Suggestions: this._formatSuggestionsForOrchestration(allSuggestions.level1),
       level2Suggestions: this._formatSuggestionsForOrchestration(allSuggestions.level2),
-      level3Suggestions: this._formatSuggestionsForOrchestration(allSuggestions.level3),
-      fileLineCounts: this.buildFileLineCountsSection(fileLineCountMap)
+      level3Suggestions: this._formatSuggestionsForOrchestration(allSuggestions.level3)
     };
 
     return promptBuilder.build(context);

package/src/ai/prompts/baseline/orchestration/balanced.js

@@ -32,7 +32,6 @@ const { ORCHESTRATION_INPUT_SCHEMA_DOCS } = require('../../shared/output-schema'
  * - {{level1Suggestions}} - Level 1 suggestions as JSON array
  * - {{level2Suggestions}} - Level 2 suggestions as JSON array
  * - {{level3Suggestions}} - Level 3 suggestions as JSON array
- * - {{fileLineCounts}} - File line count validation data (optional)
  */
 const taggedPrompt = `<section name="role" required="true">
 {{reviewIntro}}
@@ -74,10 +73,6 @@ ${ORCHESTRATION_INPUT_SCHEMA_DOCS}
 {{level3Suggestions}}
 </section>
 
-<section name="file-line-counts" optional="true">
-{{fileLineCounts}}
-</section>
-
 <section name="intelligent-merging" required="true">
 ## Orchestration Guidelines
 
@@ -194,7 +189,6 @@ const sections = [
   { name: 'role-description', required: true },
   { name: 'custom-instructions', optional: true },
   { name: 'input-suggestions', locked: true },
-  { name: 'file-line-counts', optional: true },
   { name: 'intelligent-merging', required: true },
   { name: 'priority-curation', required: true },
   { name: 'balanced-output', required: true },
@@ -216,7 +210,6 @@ const defaultOrder = [
   'role-description',
   'custom-instructions',
   'input-suggestions',
-  'file-line-counts',
   'intelligent-merging',
   'priority-curation',
   'balanced-output',

package/src/ai/prompts/baseline/orchestration/fast.js

@@ -35,7 +35,6 @@ const { ORCHESTRATION_INPUT_SCHEMA_DOCS } = require('../../shared/output-schema'
  * - {{level1Suggestions}} - Level 1 suggestions as JSON array
  * - {{level2Suggestions}} - Level 2 suggestions as JSON array
  * - {{level3Suggestions}} - Level 3 suggestions as JSON array
- * - {{fileLineCounts}} - File line count validation data (optional)
  */
 const taggedPrompt = `<section name="role" required="true" tier="fast">
 {{reviewIntro}}
@@ -77,10 +76,6 @@ ${ORCHESTRATION_INPUT_SCHEMA_DOCS}
 {{level3Suggestions}}
 </section>
 
-<section name="file-line-counts" optional="true" tier="fast,balanced,thorough">
-{{fileLineCounts}}
-</section>
-
 <section name="intelligent-merging" required="true" tier="fast">
 ## Rules
 Combine related suggestions. Merge overlaps. Preserve unique insights. Never mention levels.
@@ -149,7 +144,6 @@ const sections = [
   { name: 'role-description', required: true, tier: ['fast'] },
   { name: 'custom-instructions', optional: true, tier: ['fast', 'balanced', 'thorough'] },
   { name: 'input-suggestions', locked: true },
-  { name: 'file-line-counts', optional: true, tier: ['fast', 'balanced', 'thorough'] },
   { name: 'intelligent-merging', required: true, tier: ['fast'] },
   { name: 'priority-curation', required: true, tier: ['fast'] },
   { name: 'balanced-output', required: true, tier: ['fast'] },
@@ -171,7 +165,6 @@ const defaultOrder = [
   'role-description',
   'custom-instructions',
   'input-suggestions',
-  'file-line-counts',
   'intelligent-merging',
   'priority-curation',
   'balanced-output',

package/src/ai/prompts/baseline/orchestration/thorough.js

@@ -39,7 +39,6 @@ const { ORCHESTRATION_INPUT_SCHEMA_DOCS } = require('../../shared/output-schema'
  * - {{level1Suggestions}} - Level 1 suggestions as JSON array
  * - {{level2Suggestions}} - Level 2 suggestions as JSON array
  * - {{level3Suggestions}} - Level 3 suggestions as JSON array
- * - {{fileLineCounts}} - File line count validation data (optional)
  */
 const taggedPrompt = `<section name="role" required="true" tier="thorough">
 {{reviewIntro}}
@@ -101,10 +100,6 @@ ${ORCHESTRATION_INPUT_SCHEMA_DOCS}
 {{level3Suggestions}}
 </section>
 
-<section name="file-line-counts" optional="true" tier="balanced,thorough">
-{{fileLineCounts}}
-</section>
-
 <section name="intelligent-merging" required="true" tier="thorough">
 ## Orchestration Guidelines
 
@@ -375,7 +370,6 @@ const sections = [
   { name: 'reasoning-encouragement', required: true, tier: ['thorough'] },
   { name: 'custom-instructions', optional: true, tier: ['balanced', 'thorough'] },
   { name: 'input-suggestions', locked: true },
-  { name: 'file-line-counts', optional: true, tier: ['balanced', 'thorough'] },
   { name: 'intelligent-merging', required: true, tier: ['thorough'] },
   { name: 'priority-curation', required: true, tier: ['thorough'] },
   { name: 'balanced-output', required: true, tier: ['thorough'] },
@@ -401,7 +395,6 @@ const defaultOrder = [
   'reasoning-encouragement',
   'custom-instructions',
   'input-suggestions',
-  'file-line-counts',
   'intelligent-merging',
   'priority-curation',
   'balanced-output',

package/src/git/worktree.js

@@ -6,7 +6,7 @@ const os = require('os');
 const { getConfigDir } = require('../config');
 const { WorktreeRepository, generateWorktreeId } = require('../database');
 const { getGeneratedFilePatterns } = require('./gitattributes');
-const { normalizeRepository } = require('../utils/paths');
+const { normalizeRepository, resolveRenamedFile, resolveRenamedFileOld } = require('../utils/paths');
 
 /**
  * Git worktree manager for handling PR branch checkouts and diffs
@@ -294,14 +294,23 @@ class GitWorktreeManager {
       // Parse .gitattributes to identify generated files
       const gitattributes = await getGeneratedFilePatterns(worktreePath);
 
-      return diffSummary.files.map(file => ({
-        file: file.file,
-        insertions: file.insertions,
-        deletions: file.deletions,
-        changes: file.changes,
-        binary: file.binary || false,
-        generated: gitattributes.isGenerated(file.file)
-      }));
+      return diffSummary.files.map(file => {
+        const resolvedFile = resolveRenamedFile(file.file);
+        const isRenamed = resolvedFile !== file.file;
+        const result = {
+          file: resolvedFile,
+          insertions: file.insertions,
+          deletions: file.deletions,
+          changes: file.changes,
+          binary: file.binary || false,
+          generated: gitattributes.isGenerated(resolvedFile)
+        };
+        if (isRenamed) {
+          result.renamed = true;
+          result.renamedFrom = resolveRenamedFileOld(file.file);
+        }
+        return result;
+      });
 
     } catch (error) {
       console.error('Error getting changed files:', error);

package/src/utils/paths.js

@@ -152,10 +152,58 @@ function normalizeRepository(owner, repo) {
   return `${trimmedOwner.toLowerCase()}/${trimmedRepo.toLowerCase()}`;
 }
 
+/**
+ * Resolve git rename syntax to extract the new filename.
+ *
+ * Git represents renames with curly-brace syntax:
+ *   "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"
+ *
+ * @param {string} fileName - File name possibly containing rename syntax
+ * @returns {string} Resolved file name with the new path, or original if no rename syntax
+ *
+ * @example
+ * resolveRenamedFile('tests/{old.js => new.js}')  // => 'tests/new.js'
+ * resolveRenamedFile('{old-dir => new-dir}/file.js')  // => 'new-dir/file.js'
+ * resolveRenamedFile('a/{b => c}/d.js')  // => 'a/c/d.js'
+ * resolveRenamedFile('src/foo.js')  // => 'src/foo.js'
+ * resolveRenamedFile(null)  // => null
+ */
+function resolveRenamedFile(fileName) {
+  if (!fileName) return fileName;
+  return fileName.replace(/\{[^}]*\s*=>\s*([^}]*)\}/, '$1').replace(/\/+/g, '/').replace(/^\//, '');
+}
+
+/**
+ * Resolve git rename syntax to extract the OLD filename.
+ *
+ * Git represents renames with curly-brace syntax:
+ *   "tests/{old.js => new.js}"      → "tests/old.js"
+ *   "{old-dir => new-dir}/file.js"  → "old-dir/file.js"
+ *   "a/{b => c}/d.js"              → "a/b/d.js"
+ *
+ * @param {string} fileName - File name possibly containing rename syntax
+ * @returns {string} Resolved file name with the old path, or original if no rename syntax
+ *
+ * @example
+ * resolveRenamedFileOld('tests/{old.js => new.js}')  // => 'tests/old.js'
+ * resolveRenamedFileOld('{old-dir => new-dir}/file.js')  // => 'old-dir/file.js'
+ * resolveRenamedFileOld('a/{b => c}/d.js')  // => 'a/b/d.js'
+ * resolveRenamedFileOld('src/foo.js')  // => 'src/foo.js'
+ * resolveRenamedFileOld(null)  // => null
+ */
+function resolveRenamedFileOld(fileName) {
+  if (!fileName) return fileName;
+  return fileName.replace(/\{([^}]*?)\s*=>\s*[^}]*\}/, '$1').replace(/\/+/g, '/').replace(/^\//, '');
+}
+
 module.exports = {
   normalizePath,
   pathsEqual,
   pathExistsInList,
   pathExistsInSet,
-  normalizeRepository
+  normalizeRepository,
+  resolveRenamedFile,
+  resolveRenamedFileOld
 };