@in-the-loop-labs/pair-review 1.4.2 → 1.4.3

package/package.json

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

package/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pair-review",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "pair-review app integration — Open PRs and local changes in the pair-review web UI, run server-side AI analysis, and address review feedback. Requires the pair-review MCP server.",
   "author": {
     "name": "in-the-loop-labs",

package/plugin-code-critic/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "code-critic",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "AI-powered code review analysis — Run three-level AI analysis and implement-review-fix loops directly in your coding agent. Works standalone, no server required.",
   "author": {
     "name": "in-the-loop-labs",

package/public/js/local.js

@@ -650,7 +650,7 @@ class LocalManager {
                 data-file="${fileName}"
                 data-line="${lineStart}"
                 data-line-end="${lineEnd}"
-                ${side ? `data-side="${side}"` : ''}
+                data-side="${side || 'RIGHT'}"
               >${manager.escapeHtml(currentText)}</textarea>
               <div class="comment-edit-actions">
                 <button class="btn btn-sm btn-primary save-edit-btn">Save</button>

package/public/js/modules/comment-manager.js

@@ -245,12 +245,14 @@ class CommentManager {
     const rows = targetWrapper.querySelectorAll('tr[data-line-number]');
     const codeLines = [];
 
+    // Always filter by side to prevent including both OLD and NEW versions of modified lines.
+    // Default to 'RIGHT' because suggestions target the NEW version of code.
+    // This is the definitive fix: even if callers fail to propagate side, we never return both versions.
+    const effectiveSide = side || 'RIGHT';
+
     for (const row of rows) {
       const lineNum = parseInt(row.dataset.lineNumber, 10);
-      // Filter by line number, file name, and side (if provided)
-      // Side filtering prevents including both deleted and added versions of modified lines
-      const matchesSide = !side || row.dataset.side === side;
-      if (lineNum >= startLine && lineNum <= endLine && row.dataset.fileName === fileName && matchesSide) {
+      if (lineNum >= startLine && lineNum <= endLine && row.dataset.fileName === fileName && row.dataset.side === effectiveSide) {
         // Get the code content cell
         const codeCell = row.querySelector('.d2h-code-line-ctn');
         if (codeCell) {
@@ -279,6 +281,9 @@ class CommentManager {
     const startLine = parseInt(textarea.dataset.line, 10);
     const endLine = parseInt(textarea.dataset.lineEnd, 10) || startLine;
     const side = textarea.dataset.side;
+    if (!side) {
+      console.warn('[Suggestion] textarea missing data-side attribute, defaulting to RIGHT');
+    }
 
     // Get the code from the selected lines (pass side to avoid including both deleted and added lines)
     const code = this.getCodeFromLines(fileName, startLine, endLine, side);
@@ -587,7 +592,7 @@ class CommentManager {
             data-file="${comment.file}"
             data-line="${comment.line_start}"
             data-line-end="${comment.line_end || comment.line_start}"
-            ${comment.side ? `data-side="${comment.side}"` : ''}
+            data-side="${comment.side || 'RIGHT'}"
           >${escapeHtml(comment.body)}</textarea>
           <div class="comment-edit-actions">
             <button class="btn btn-sm btn-primary save-edit-btn">

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

@@ -517,6 +517,8 @@ class DiffRenderer {
 
     const headerContent = functionContext
       ? `<span class="hunk-context-icon" aria-label="Function context">f</span><span class="hunk-context-text">${DiffRenderer.escapeHtml(functionContext)}</span>`
+      // "..." dividers act as visual separators between non-contiguous code
+      // sections when git couldn't identify a surrounding function/class scope.
       : '<span class="hunk-divider" aria-label="Code section divider">...</span>';
 
     headerRow.innerHTML = `<td colspan="2" class="d2h-info">${headerContent}</td>`;
@@ -554,6 +556,62 @@ class DiffRenderer {
            trimmedLine.includes(trimmedContext + ' ');
   }
 
+  /**
+   * Handle hunk header rows that are no longer at a gap boundary.
+   * A hunk header (d2h-info row) should only be visible when:
+   *   1. It is the first row in the tbody (file-level context), OR
+   *   2. Its immediately preceding sibling is a gap row (context-expand-row)
+   *
+   * When a header with function context (_f_ marker) becomes stranded after
+   * upward expansion, it is relocated to the nearest gap row above within the
+   * same hunk section. This preserves the function context indicator for the
+   * remaining gap, whether or not the function definition is now visible below.
+   *
+   * Headers without function context (... dividers) or those with no reachable
+   * gap above are removed.
+   * @param {HTMLElement} tbody - The table body containing the diff
+   */
+  static removeStrandedHunkHeaders(tbody) {
+    if (!tbody) return;
+
+    const infoRows = tbody.querySelectorAll('tr.d2h-info');
+    for (const row of infoRows) {
+      const prev = row.previousElementSibling;
+      // Keep if this is the first row in the tbody (provides file-level context)
+      if (!prev) continue;
+      // Keep if preceded by a gap row (the header marks the boundary)
+      if (prev.classList.contains('context-expand-row')) continue;
+
+      // Header is stranded between visible code lines.
+      // If it has function context, try to relocate it to the nearest gap above
+      // so the gap retains its function context indicator.
+      if (row.dataset.functionContext) {
+        let sibling = row.previousElementSibling;
+        let nearestGap = null;
+        while (sibling) {
+          if (sibling.classList.contains('context-expand-row')) {
+            nearestGap = sibling;
+            break;
+          }
+          // Stop at another hunk header - don't cross hunk boundaries.
+          // (This also means only the nearest stranded header in DOM order
+          // gets relocated to a given gap; subsequent ones are removed.)
+          if (sibling.classList.contains('d2h-info')) break;
+          sibling = sibling.previousElementSibling;
+        }
+
+        if (nearestGap) {
+          // Relocate: move the header to right after the gap row
+          nearestGap.insertAdjacentElement('afterend', row);
+          continue;
+        }
+      }
+
+      // No gap found above or no function context - remove the stranded header
+      row.remove();
+    }
+  }
+
   /**
    * Update function context visibility for all hunk headers in a file's tbody
    * Called once after any expansion in a file - checks all headers efficiently

package/public/js/pr.js

@@ -1455,9 +1455,10 @@ class PRManager {
       gapRow.parentNode.insertBefore(fragment, gapRow);
       gapRow.remove();
 
-      // Check all function context markers in this file and remove any whose
-      // function definitions are now visible
+      // Remove hunk headers that are no longer at a gap boundary,
+      // then check remaining headers for visible function definitions
       if (window.DiffRenderer) {
+        window.DiffRenderer.removeStrandedHunkHeaders(tbody);
         window.DiffRenderer.updateFunctionContextVisibility(tbody);
       }
 
@@ -1478,6 +1479,7 @@ class PRManager {
     const hasExplicitEndLineNew = !isNaN(parseInt(controls.dataset.endLineNew));
 
     const fileName = controls.dataset.fileName;
+    const position = controls.dataset.position || 'between';
     const tbody = gapRow.closest('tbody');
 
     if (!tbody) return;
@@ -1488,6 +1490,13 @@ class PRManager {
 
       const fragment = document.createDocumentFragment();
 
+      // Compute positions for each remnant based on file boundary proximity.
+      // The upper remnant keeps 'above' only if the original gap was at the file start;
+      // the lower remnant keeps 'below' only if the original gap was at the file end.
+      // Inner remnants become 'between' since they're sandwiched between visible content.
+      const gapAbovePosition = position === 'above' ? 'above' : 'between';
+      const gapBelowPosition = position === 'below' ? 'below' : 'between';
+
       // Create gap above if needed
       const gapAboveSize = expandStart - gapStart;
       if (gapAboveSize > 0) {
@@ -1496,7 +1505,7 @@ class PRManager {
           gapStart,
           expandStart - 1,
           gapAboveSize,
-          'above',
+          gapAbovePosition,
           (controls, dir, cnt) => this.expandGapContext(controls, dir, cnt),
           gapStartNew  // Preserve the NEW line number offset
         );
@@ -1537,7 +1546,7 @@ class PRManager {
           expandEnd + 1,
           gapEnd,
           gapBelowSize,
-          'below',
+          gapBelowPosition,
           (controls, dir, cnt) => this.expandGapContext(controls, dir, cnt),
           belowGapStartNew  // Updated NEW line number for gap below
         );
@@ -1553,9 +1562,10 @@ class PRManager {
       gapRow.parentNode.insertBefore(fragment, gapRow);
       gapRow.remove();
 
-      // Check all function context markers in this file and remove any whose
-      // function definitions are now visible
+      // Remove hunk headers that are no longer at a gap boundary,
+      // then check remaining headers for visible function definitions
       if (window.DiffRenderer) {
+        window.DiffRenderer.removeStrandedHunkHeaders(tbody);
         window.DiffRenderer.updateFunctionContextVisibility(tbody);
       }
 
@@ -1718,10 +1728,6 @@ class PRManager {
     this.commentManager.updateSuggestionButtonState(textarea, button);
   }
 
-  getCodeFromLines(fileName, startLine, endLine) {
-    return this.commentManager.getCodeFromLines(fileName, startLine, endLine);
-  }
-
   insertSuggestionBlock(textarea, button) {
     this.commentManager.insertSuggestionBlock(textarea, button);
   }
@@ -1783,7 +1789,7 @@ class PRManager {
             data-file="${fileName}"
             data-line="${lineStart}"
             data-line-end="${lineEnd}"
-            ${side ? `data-side="${side}"` : ''}
+            data-side="${side || 'RIGHT'}"
           >${this.escapeHtml(currentText)}</textarea>
           <div class="comment-edit-actions">
             <button class="btn btn-sm btn-primary save-edit-btn">Save</button>