@in-the-loop-labs/pair-review 3.1.3 → 3.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@in-the-loop-labs/pair-review",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "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": "3.1.3",
+  "version": "3.1.4",
   "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": "3.1.3",
+  "version": "3.1.4",
   "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/css/pr.css

@@ -7468,6 +7468,90 @@ body.resizing * {
   display: table-row;
 }
 
+/* When minimize mode is active, hide file-level comment cards */
+.comments-minimized .file-comment-card {
+  display: none;
+}
+
+/* Per-file expansion override — clicking a file-header indicator reveals that file's cards */
+.comments-minimized .file-comments-zone.file-comments-expanded .file-comment-card {
+  display: block;
+}
+
+/* File-header comment indicator — matches header button sizing, only visible when minimized */
+.file-comment-indicator {
+  display: none;
+}
+
+.comments-minimized .file-comment-indicator {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 3px;
+  width: 28px;
+  height: 28px;
+  padding: 0;
+  background: transparent;
+  border: 1px solid transparent;
+  border-radius: 6px;
+  cursor: pointer;
+  color: var(--color-text-secondary, #656d76);
+  transition: background-color 0.15s, color 0.15s, border-color 0.15s;
+  flex-shrink: 0;
+  font-size: 11px;
+  line-height: 1;
+}
+
+.comments-minimized .file-comment-indicator:has(.indicator-user):hover,
+.comments-minimized .file-comment-indicator:has(.indicator-adopted):hover {
+  background-color: rgba(130, 80, 223, 0.1);
+  border-color: var(--comment-primary, #8250df);
+}
+
+.comments-minimized .file-comment-indicator:has(.indicator-ai):hover {
+  background-color: rgba(217, 119, 6, 0.1);
+  border-color: var(--color-accent-ai, #d97706);
+}
+
+.comments-minimized .file-comment-indicator:has(.indicator-user),
+.comments-minimized .file-comment-indicator:has(.indicator-adopted) {
+  border-color: var(--comment-primary, #8250df);
+  color: var(--comment-primary, #8250df);
+}
+
+.comments-minimized .file-comment-indicator:has(.indicator-ai) {
+  border-color: var(--color-accent-ai, #d97706);
+  color: var(--color-accent-ai, #d97706);
+}
+
+.comments-minimized .file-comment-indicator.expanded {
+  border-width: 2px;
+}
+
+[data-theme="dark"] .comments-minimized .file-comment-indicator:has(.indicator-user),
+[data-theme="dark"] .comments-minimized .file-comment-indicator:has(.indicator-adopted) {
+  border-color: var(--comment-primary, #a371f7);
+  color: var(--comment-primary, #a371f7);
+}
+
+[data-theme="dark"] .comments-minimized .file-comment-indicator:has(.indicator-ai) {
+  border-color: var(--color-accent-ai, #fbbf24);
+  color: var(--color-accent-ai, #fbbf24);
+}
+
+[data-theme="dark"] .comments-minimized .file-comment-indicator:has(.indicator-user):hover,
+[data-theme="dark"] .comments-minimized .file-comment-indicator:has(.indicator-adopted):hover {
+  background-color: rgba(163, 113, 247, 0.15);
+}
+
+[data-theme="dark"] .comments-minimized .file-comment-indicator:has(.indicator-ai):hover {
+  background-color: rgba(251, 191, 36, 0.15);
+}
+
+[data-theme="dark"] .comments-minimized .file-comment-indicator.expanded {
+  border-width: 2px;
+}
+
 /* Indicator button on the right edge of diff code cells */
 .comment-indicator {
   position: absolute;
@@ -7530,11 +7614,11 @@ body.resizing * {
 }
 
 .comment-indicator .indicator-ai {
-  color: var(--ai-accent, #d97706);
+  color: var(--color-accent-ai, #d97706);
 }
 
 .comment-indicator:has(.indicator-ai) {
-  border-color: var(--ai-accent, #d97706);
+  border-color: var(--color-accent-ai, #d97706);
   background: rgba(217, 119, 6, 0.06);
 }
 

package/public/js/components/AIPanel.js

@@ -807,8 +807,9 @@ class AIPanel {
                     const finding = this.findings.find(f => f.id === findingId);
                     if (finding) {
                         suggestionContext = {
+                            suggestionId: findingId ? String(findingId) : null,
                             title: finding.title || title,
-                            body: finding.body || '',
+                            body: finding.formattedBody || finding.body || '',
                             type: finding.type || '',
                             file: finding.file || file,
                             line_start: finding.line_start || null,
@@ -1002,6 +1003,8 @@ class AIPanel {
             if (targetSuggestion) {
                 const minimizer = window.prManager?.commentMinimizer;
                 if (minimizer?.active) {
+                    // Expand file-level comments so the target becomes visible
+                    minimizer.expandForElement(targetSuggestion);
                     // Comments are minimized — scroll to the parent diff line instead
                     const diffRow = minimizer.findDiffRowFor(targetSuggestion);
                     (diffRow || targetSuggestion).scrollIntoView({ behavior: 'smooth', block: 'center' });
@@ -1069,9 +1072,9 @@ class AIPanel {
 
             if (targetElement) {
                 const minimizer = window.prManager?.commentMinimizer;
-                if (minimizer?.active && !isFileLevel) {
-                    // Comments are minimized — scroll to the parent diff line instead
-                    const diffRow = minimizer.findDiffRowFor(targetElement);
+                if (minimizer?.active) {
+                    minimizer.expandForElement(targetElement);
+                    const diffRow = isFileLevel ? null : minimizer.findDiffRowFor(targetElement);
                     (diffRow || targetElement).scrollIntoView({ behavior: 'smooth', block: 'center' });
                 } else {
                     targetElement.scrollIntoView({ behavior: 'smooth', block: 'center' });

package/public/js/components/ChatPanel.js

@@ -32,6 +32,7 @@ class ChatPanel {
     this._pendingContext = [];
     this._pendingContextData = [];
     this._pendingDiffStateNotifications = [];
+    this._pendingUserActionHints = [];
     this._contextSource = null;   // 'suggestion' or 'user' — set when opened with context
     this._contextItemId = null;   // suggestion ID or comment ID from context
     this._contextLineMeta = null;  // { file, line_start, line_end } — set when opened with line context
@@ -667,6 +668,7 @@ class ChatPanel {
     this._pendingContext = [];
     this._pendingContextData = [];
     this._pendingDiffStateNotifications = [];
+    this._pendingUserActionHints = [];
     this._contextSource = null;
     this._contextItemId = null;
     this._contextLineMeta = null;
@@ -1030,6 +1032,7 @@ class ChatPanel {
     this._pendingContext = [];
     this._pendingContextData = [];
     this._pendingDiffStateNotifications = [];
+    this._pendingUserActionHints = [];
     this._contextSource = null;
     this._contextItemId = null;
     this._contextLineMeta = null;
@@ -1269,12 +1272,28 @@ class ChatPanel {
       this._pendingDiffStateNotifications = [];
     }
 
+    // Snapshot user-action-hints queue for error recovery (invisible to user, no UI cards)
+    const savedUserActionHints = this._pendingUserActionHints.slice();
+    let userActionPrefix = '';
+    if (this._pendingUserActionHints.length > 0) {
+      userActionPrefix = '[User Action Hints]\n' + this._pendingUserActionHints.join('\n');
+      this._pendingUserActionHints = [];
+    }
+
+    // Combine invisible prefixes (diff state + user action hints)
+    let invisiblePrefix = '';
+    if (diffStatePrefix && userActionPrefix) {
+      invisiblePrefix = diffStatePrefix + '\n\n' + userActionPrefix;
+    } else {
+      invisiblePrefix = diffStatePrefix || userActionPrefix;
+    }
+
     const savedContext = this._pendingContext;
     const savedContextData = this._pendingContextData;
     if (this._pendingContext.length > 0) {
       const userContext = this._pendingContext.join('\n\n');
-      payload.context = diffStatePrefix
-        ? diffStatePrefix + '\n\n' + userContext
+      payload.context = invisiblePrefix
+        ? invisiblePrefix + '\n\n' + userContext
         : userContext;
       payload.contextData = this._pendingContextData;
       this._pendingContext = [];
@@ -1287,8 +1306,8 @@ class ChatPanel {
         if (btn) btn.remove();
         delete card.dataset.contextIndex;
       });
-    } else if (diffStatePrefix) {
-      payload.context = diffStatePrefix;
+    } else if (invisiblePrefix) {
+      payload.context = invisiblePrefix;
     }
 
     // Lock analysis context card (not indexed, handled separately from pending context)
@@ -1353,6 +1372,7 @@ class ChatPanel {
       this._pendingContext = savedContext;
       this._pendingContextData = savedContextData;
       this._pendingDiffStateNotifications = [...savedDiffState, ...this._pendingDiffStateNotifications];
+      this._pendingUserActionHints = [...savedUserActionHints, ...this._pendingUserActionHints];
       // Restore removability on context cards that were locked before the failed send
       this._restoreRemovableCards();
       console.error('[ChatPanel] Error sending message:', error);
@@ -1371,6 +1391,16 @@ class ChatPanel {
     this._pendingDiffStateNotifications.push(message);
   }
 
+  /**
+   * Queue an invisible user-action hint for the chat agent.
+   * Like diff-state notifications, these do NOT render UI cards and survive panel close.
+   * Drained into the context parameter on the next sendMessage() call.
+   * @param {string} message - Description of the user action (e.g., "[User Action: adopted suggestion 42]")
+   */
+  queueUserActionHint(message) {
+    this._pendingUserActionHints.push(message);
+  }
+
   /**
    * Store pending context and render a compact context card in the UI.
    * Called when the user clicks "Ask about this" on a suggestion.

package/public/js/components/CouncilProgressModal.js

@@ -1312,6 +1312,9 @@ class CouncilProgressModal {
               <span class="council-voice-icon pending">\u25CB</span>
               <span class="council-voice-label">Consolidation</span>
               <span class="council-voice-status pending">Pending</span>
+              <div class="council-voice-detail">
+                <div class="council-voice-snippet" style="display: none;"></div>
+              </div>
             </div>
         `;
       }

package/public/js/components/SuggestionNavigator.js

@@ -371,6 +371,8 @@ class SuggestionNavigator {
       if (suggestionEl) {
         const minimizer = window.prManager?.commentMinimizer;
         if (minimizer?.active) {
+          // Expand file-level comments so the target becomes visible
+          minimizer.expandForElement(suggestionEl);
           // Comments are minimized — scroll to the parent diff line instead
           const diffRow = minimizer.findDiffRowFor(suggestionEl);
           if (diffRow) {

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

@@ -503,8 +503,15 @@ class CommentManager {
       // Refresh minimize-mode indicators so the new comment is reflected
       if (window.prManager?.commentMinimizer) {
         window.prManager.commentMinimizer.refreshIndicators();
+        // Auto-expand so the new comment stays visible in minimize mode
+        const newRow = document.querySelector(`.user-comment-row[data-comment-id="${commentData.id}"]`);
+        if (newRow) {
+          window.prManager.commentMinimizer.expandForElement(newRow);
+        }
       }
 
+      window.chatPanel?.queueUserActionHint(`[User Action: created comment ${result.commentId}]`);
+
     } catch (error) {
       console.error('Error saving comment:', error);
       alert('Failed to save comment');

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

@@ -7,7 +7,10 @@
  * are injected on the right edge of each diff line that has comments, showing
  * a person icon (user comments) or sparkles icon (AI suggestions).
  *
- * Clicking an indicator toggles visibility of that line's comments only.
+ * File-level comments (.file-comment-card inside .file-comments-zone) are also
+ * hidden, with an indicator button injected into the file header bar.
+ *
+ * Clicking an indicator toggles visibility of that line's or file's comments.
  */
 
 class CommentMinimizer {
@@ -24,6 +27,8 @@ class CommentMinimizer {
     this._active = false;
     // Track which diff lines have been expanded by the user (Set of diff row elements)
     this._expandedLines = new Set();
+    // Track which file-comments-zones have been expanded (Set of zone elements)
+    this._expandedFiles = new Set();
   }
 
   /** @returns {boolean} Whether minimize mode is active */
@@ -38,6 +43,7 @@ class CommentMinimizer {
   setMinimized(minimized) {
     this._active = minimized;
     this._expandedLines.clear();
+    this._expandedFiles.clear();
 
     const diffContainer = document.getElementById('diff-container');
     if (!diffContainer) return;
@@ -50,6 +56,8 @@ class CommentMinimizer {
       this._removeAllIndicators();
       // Remove any per-line expansion overrides
       document.querySelectorAll('.comment-expanded').forEach(el => el.classList.remove('comment-expanded'));
+      // Remove any per-file expansion overrides
+      document.querySelectorAll('.file-comments-expanded').forEach(el => el.classList.remove('file-comments-expanded'));
     }
   }
 
@@ -103,10 +111,13 @@ class CommentMinimizer {
       lineMap.set(diffRow, entry);
     }
 
-    // Inject indicators
+    // Inject line-level indicators
     for (const [diffRow, info] of lineMap) {
       this._injectIndicator(diffRow, info);
     }
+
+    // Scan file-comments-zones and inject file-header indicators
+    this._refreshFileIndicators();
   }
 
   /**
@@ -266,7 +277,22 @@ class CommentMinimizer {
   expandForElement(element) {
     if (!this._active) return;
 
-    // Find the containing comment/suggestion row
+    // Check if this element is inside a file-comments-zone (file-level comment)
+    const zone = element.closest('.file-comments-zone');
+    if (zone) {
+      if (this._expandedFiles.has(zone)) return; // already expanded
+      this._expandedFiles.add(zone);
+      zone.classList.add('file-comments-expanded');
+      // Update the file-header indicator button
+      const wrapper = zone.closest('.d2h-file-wrapper');
+      const btn = wrapper?.querySelector('.d2h-file-header .file-comment-indicator');
+      if (btn) {
+        btn.classList.add('expanded');
+      }
+      return;
+    }
+
+    // Line-level: find the containing comment/suggestion row
     const commentRow = element.closest('.user-comment-row, .ai-suggestion-row') || element;
     if (!commentRow.classList.contains('user-comment-row') && !commentRow.classList.contains('ai-suggestion-row')) {
       return;
@@ -290,9 +316,130 @@ class CommentMinimizer {
     }
   }
 
-  /** Remove all indicator buttons from the DOM. */
+  // ---------------------------------------------------------------------------
+  // File-level comment indicators
+  // ---------------------------------------------------------------------------
+
+  /**
+   * Scan all file-comments-zones and inject indicator buttons into file headers.
+   */
+  _refreshFileIndicators() {
+    const zones = document.querySelectorAll('.file-comments-zone');
+    for (const zone of zones) {
+      const cards = zone.querySelectorAll('.file-comment-card');
+      if (cards.length === 0) continue;
+
+      // Count comment types
+      const info = { hasUser: false, hasAI: false, hasAdopted: false, userCount: 0, aiCount: 0, adoptedCount: 0 };
+      for (const card of cards) {
+        // Skip collapsed cards (adopted/dismissed originals remain in DOM)
+        if (card.classList.contains('collapsed')) continue;
+
+        if (card.classList.contains('ai-suggestion')) {
+          info.hasAI = true;
+          info.aiCount++;
+        } else if (card.classList.contains('user-comment')) {
+          if (card.classList.contains('adopted-comment')) {
+            info.hasAdopted = true;
+            info.adoptedCount++;
+          } else {
+            info.hasUser = true;
+            info.userCount++;
+          }
+        }
+      }
+
+      if (info.userCount + info.aiCount + info.adoptedCount === 0) continue;
+
+      // Find the file header — zone and header are siblings inside .d2h-file-wrapper
+      const wrapper = zone.closest('.d2h-file-wrapper');
+      const header = wrapper?.querySelector('.d2h-file-header');
+      if (!header) continue;
+
+      this._injectFileIndicator(header, zone, info);
+    }
+  }
+
+  /**
+   * Inject an indicator button into a file header, positioned before the comment button.
+   * @param {HTMLElement} header - The .d2h-file-header element
+   * @param {HTMLElement} zone - The .file-comments-zone element
+   * @param {Object} info - { hasUser, hasAI, hasAdopted, userCount, aiCount, adoptedCount }
+   */
+  _injectFileIndicator(header, zone, info) {
+    // Don't double-inject
+    if (header.querySelector('.file-comment-indicator')) return;
+
+    const btn = document.createElement('button');
+    btn.className = 'file-comment-indicator';
+    btn.type = 'button';
+
+    // Build icon — pick the dominant type icon
+    const icons = [];
+    if (info.hasUser) {
+      icons.push(`<span class="indicator-icon indicator-user">${CommentMinimizer.PERSON_ICON}</span>`);
+    }
+    if (info.hasAdopted) {
+      icons.push(`<span class="indicator-icon indicator-adopted">${CommentMinimizer.AI_COMMENT_ICON}</span>`);
+    }
+    if (info.hasAI) {
+      icons.push(`<span class="indicator-icon indicator-ai">${CommentMinimizer.SPARKLES_ICON}</span>`);
+    }
+
+    const total = info.userCount + info.adoptedCount + info.aiCount;
+    const countBadge = total > 1 ? `<span class="indicator-count">${total}</span>` : '';
+
+    btn.innerHTML = icons.join('') + countBadge;
+
+    const totalLabel = [];
+    if (info.userCount) totalLabel.push(`${info.userCount} file comment${info.userCount !== 1 ? 's' : ''}`);
+    if (info.adoptedCount) totalLabel.push(`${info.adoptedCount} adopted`);
+    if (info.aiCount) totalLabel.push(`${info.aiCount} suggestion${info.aiCount !== 1 ? 's' : ''}`);
+    btn.title = totalLabel.join(', ');
+
+    // Restore expanded state
+    if (this._expandedFiles.has(zone)) {
+      btn.classList.add('expanded');
+    }
+
+    btn.addEventListener('click', (e) => {
+      e.stopPropagation();
+      e.preventDefault();
+      this._toggleFileComments(zone, btn);
+    });
+
+    // Insert before the file-header-comment-btn if present, otherwise append
+    const commentBtn = header.querySelector('.file-header-comment-btn');
+    if (commentBtn) {
+      header.insertBefore(btn, commentBtn);
+    } else {
+      header.appendChild(btn);
+    }
+  }
+
+  /**
+   * Toggle visibility of file-level comments for a specific file.
+   * @param {HTMLElement} zone - The .file-comments-zone element
+   * @param {HTMLElement} btn - The indicator button
+   */
+  _toggleFileComments(zone, btn) {
+    const isExpanded = this._expandedFiles.has(zone);
+
+    if (isExpanded) {
+      this._expandedFiles.delete(zone);
+      btn.classList.remove('expanded');
+      zone.classList.remove('file-comments-expanded');
+    } else {
+      this._expandedFiles.add(zone);
+      btn.classList.add('expanded');
+      zone.classList.add('file-comments-expanded');
+    }
+  }
+
+  /** Remove all indicator buttons (both line-level and file-level) from the DOM. */
   _removeAllIndicators() {
     document.querySelectorAll('.comment-indicator').forEach(btn => btn.remove());
+    document.querySelectorAll('.file-comment-indicator').forEach(btn => btn.remove());
   }
 }
 

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

@@ -17,12 +17,15 @@ class FileCommentManager {
       if (chatBtn && window.chatPanel) {
         e.stopPropagation();
         const suggestionCard = chatBtn.closest('.ai-suggestion');
-        const bodyText = suggestionCard?.dataset?.originalBody
-          ? JSON.parse(suggestionCard.dataset.originalBody) : '';
+        const bodyText = suggestionCard?.dataset?.formattedBody
+          ? JSON.parse(suggestionCard.dataset.formattedBody)
+          : suggestionCard?.dataset?.originalBody
+            ? JSON.parse(suggestionCard.dataset.originalBody) : '';
         window.chatPanel.open({
           reviewId: this.prManager?.currentPR?.id,
           suggestionId: chatBtn.dataset.suggestionId,
           suggestionContext: {
+            suggestionId: chatBtn.dataset.suggestionId || null,
             title: chatBtn.dataset.title || '',
             body: bodyText,
             type: suggestionCard?.querySelector('.ai-suggestion-badge')?.dataset?.type || '',
@@ -312,6 +315,16 @@ class FileCommentManager {
       // Update count badge
       this.updateCommentCount(zone);
 
+      // Refresh minimize-mode indicators so file-header counts stay current
+      if (this.prManager?.commentMinimizer) {
+        this.prManager.commentMinimizer.refreshIndicators();
+        // Auto-expand so the new comment stays visible in minimize mode
+        const newCard = zone.querySelector(`.file-comment-card[data-comment-id="${commentData.id}"]`);
+        if (newCard) {
+          this.prManager.commentMinimizer.expandForElement(newCard);
+        }
+      }
+
       // Notify AI Panel if available
       if (window.aiPanel?.addComment) {
         window.aiPanel.addComment(commentData);
@@ -322,6 +335,8 @@ class FileCommentManager {
         this.prManager.updateCommentCount();
       }
 
+      window.chatPanel?.queueUserActionHint(`[User Action: created comment ${result.commentId}]`);
+
     } catch (error) {
       console.error('Error saving file-level comment:', error);
       if (window.toast) {
@@ -432,6 +447,7 @@ class FileCommentManager {
     // Store original markdown body for adopt functionality via extractSuggestionData
     // Use JSON.stringify to preserve newlines and special characters (matches line-level suggestions)
     card.dataset.originalBody = JSON.stringify(suggestion.body || '');
+    card.dataset.formattedBody = JSON.stringify(suggestion.formattedBody || '');
 
     // Store target info on the card for reliable retrieval in getFileAndLineInfo
     // File-level suggestions don't have line numbers, just the file name
@@ -604,6 +620,16 @@ class FileCommentManager {
       this.displayUserComment(zone, commentData);
       this.updateCommentCount(zone);
 
+      // Refresh minimize-mode indicators so file-header counts stay current
+      if (this.prManager?.commentMinimizer) {
+        this.prManager.commentMinimizer.refreshIndicators();
+        // Auto-expand so the new comment stays visible in minimize mode
+        const newCard = zone.querySelector(`.file-comment-card[data-comment-id="${commentData.id}"]`);
+        if (newCard) {
+          this.prManager.commentMinimizer.expandForElement(newCard);
+        }
+      }
+
       // Update parent comment count for Preview button
       if (this.prManager?.updateCommentCount) {
         this.prManager.updateCommentCount();
@@ -619,6 +645,8 @@ class FileCommentManager {
         window.aiPanel.updateFindingStatus(suggestion.id, 'adopted');
       }
 
+      window.chatPanel?.queueUserActionHint(`[User Action: adopted suggestion ${suggestion.id}]`);
+
     } catch (error) {
       console.error('Error adopting suggestion:', error);
       if (window.toast) {
@@ -657,11 +685,18 @@ class FileCommentManager {
 
       this.updateCommentCount(zone);
 
+      // Refresh minimize-mode indicators so file-header counts stay current
+      if (this.prManager?.commentMinimizer) {
+        this.prManager.commentMinimizer.refreshIndicators();
+      }
+
       // Update finding status in AI Panel (mark suggestion as dismissed)
       if (window.aiPanel?.updateFindingStatus) {
         window.aiPanel.updateFindingStatus(suggestionId, 'dismissed');
       }
 
+      window.chatPanel?.queueUserActionHint(`[User Action: dismissed suggestion ${suggestionId}]`);
+
     } catch (error) {
       console.error('Error dismissing suggestion:', error);
       if (window.toast) {
@@ -703,6 +738,13 @@ class FileCommentManager {
       // Update comment count (for consistency with dismissAISuggestion)
       this.updateCommentCount(zone);
 
+      // Refresh minimize-mode indicators so file-header counts stay current
+      if (this.prManager?.commentMinimizer) {
+        this.prManager.commentMinimizer.refreshIndicators();
+      }
+
+      window.chatPanel?.queueUserActionHint(`[User Action: restored suggestion ${suggestionId}]`);
+
     } catch (error) {
       console.error('Error restoring suggestion:', error);
       if (window.toast) {
@@ -848,6 +890,16 @@ class FileCommentManager {
       this.displayUserComment(zone, commentData);
       this.updateCommentCount(zone);
 
+      // Refresh minimize-mode indicators so file-header counts stay current
+      if (this.prManager?.commentMinimizer) {
+        this.prManager.commentMinimizer.refreshIndicators();
+        // Auto-expand so the new comment stays visible in minimize mode
+        const newCard = zone.querySelector(`.file-comment-card[data-comment-id="${commentData.id}"]`);
+        if (newCard) {
+          this.prManager.commentMinimizer.expandForElement(newCard);
+        }
+      }
+
       // Update parent comment count for Preview button
       if (this.prManager?.updateCommentCount) {
         this.prManager.updateCommentCount();
@@ -863,6 +915,8 @@ class FileCommentManager {
         window.aiPanel.updateFindingStatus(suggestion.id, 'adopted');
       }
 
+      window.chatPanel?.queueUserActionHint(`[User Action: adopted suggestion ${suggestion.id}]`);
+
     } catch (error) {
       console.error('Error adopting suggestion with edit:', error);
       if (window.toast) {
@@ -1012,6 +1066,11 @@ class FileCommentManager {
 
       this.updateCommentCount(zone);
 
+      // Refresh minimize-mode indicators so file-header counts stay current
+      if (this.prManager?.commentMinimizer) {
+        this.prManager.commentMinimizer.refreshIndicators();
+      }
+
       // Update parent comment count
       if (this.prManager?.updateCommentCount) {
         this.prManager.updateCommentCount();
@@ -1029,6 +1088,11 @@ class FileCommentManager {
         window.aiPanel.updateFindingStatus(apiResult.dismissedSuggestionId, 'dismissed');
       }
 
+      if (apiResult.dismissedSuggestionId) {
+        window.chatPanel?.queueUserActionHint(`[User Action: dismissed suggestion ${apiResult.dismissedSuggestionId}]`);
+      }
+      window.chatPanel?.queueUserActionHint(`[User Action: dismissed comment ${commentId}]`);
+
     } catch (error) {
       console.error('Error deleting comment:', error);
       if (window.toast) {

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

@@ -24,8 +24,9 @@ class SuggestionManager {
           reviewId: this.prManager?.currentPR?.id,
           suggestionId: chatBtn.dataset.suggestionId,
           suggestionContext: {
+            suggestionId: chatBtn.dataset.suggestionId || null,
             title: chatBtn.dataset.title || suggestionData.suggestionTitle || '',
-            body: suggestionData.suggestionText || '',
+            body: suggestionData.formattedBody || suggestionData.suggestionText || '',
             type: suggestionData.suggestionType || '',
             file: chatBtn.dataset.file || '',
             line_start: suggestionDiv?.dataset?.lineNumber ? parseInt(suggestionDiv.dataset.lineNumber) : null,

package/public/js/pr.js

@@ -2542,6 +2542,11 @@ class PRManager {
       if (window.toast) {
         window.toast.showSuccess('Comment dismissed');
       }
+
+      if (apiResult.dismissedSuggestionId) {
+        window.chatPanel?.queueUserActionHint(`[User Action: dismissed suggestion ${apiResult.dismissedSuggestionId}]`);
+      }
+      window.chatPanel?.queueUserActionHint(`[User Action: dismissed comment ${commentId}]`);
     } catch (error) {
       console.error('Error deleting comment:', error);
       if (window.toast) {
@@ -2570,6 +2575,8 @@ class PRManager {
       if (window.toast) {
         window.toast.showSuccess('Comment restored');
       }
+
+      window.chatPanel?.queueUserActionHint(`[User Action: restored comment ${commentId}]`);
     } catch (error) {
       console.error('Error restoring comment:', error);
       if (window.toast) {
@@ -3050,6 +3057,7 @@ class PRManager {
             });
             this.displayUserComment(newComment, suggestionRow);
             this._notifyAdoption(suggestionId, newComment);
+            window.chatPanel?.queueUserActionHint(`[User Action: adopted suggestion ${suggestionId}]`);
           } catch (error) {
             console.error('Error saving edited suggestion:', error);
             alert(`Failed to save suggestion: ${error.message}`);
@@ -3095,6 +3103,7 @@ class PRManager {
 
       this.displayUserComment(result.newComment, result.suggestionRow);
       this._notifyAdoption(suggestionId, result.newComment);
+      window.chatPanel?.queueUserActionHint(`[User Action: adopted suggestion ${suggestionId}]`);
     } catch (error) {
       console.error('Error adopting suggestion:', error);
       alert(`Failed to adopt suggestion: ${error.message}`);
@@ -3158,6 +3167,8 @@ class PRManager {
       if (this.commentMinimizer) {
         this.commentMinimizer.refreshIndicators();
       }
+
+      window.chatPanel?.queueUserActionHint(`[User Action: dismissed suggestion ${suggestionId}]`);
     } catch (error) {
       console.error('Error dismissing suggestion:', error);
       alert('Failed to dismiss suggestion');
@@ -3213,6 +3224,8 @@ class PRManager {
       if (this.commentMinimizer) {
         this.commentMinimizer.refreshIndicators();
       }
+
+      window.chatPanel?.queueUserActionHint(`[User Action: restored suggestion ${suggestionId}]`);
     } catch (error) {
       console.error('Error restoring suggestion:', error);
       alert('Failed to restore suggestion');

package/src/ai/claude-provider.js

@@ -22,23 +22,13 @@ const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
 const CLAUDE_MODELS = [
   {
     id: 'haiku',
-    name: 'Haiku 4.5',
+    name: 'Haiku 4.6',
     tier: 'fast',
     tagline: 'Lightning Fast',
     description: 'Quick analysis for simple changes',
     badge: 'Fastest',
     badgeClass: 'badge-speed'
   },
-  {
-    id: 'sonnet-4.5',
-    cli_model: 'claude-sonnet-4.5',
-    name: 'Sonnet 4.5',
-    tier: 'balanced',
-    tagline: 'Previous Gen',
-    description: 'Sonnet 4.5 — previous generation balanced model',
-    badge: 'Previous Gen',
-    badgeClass: 'badge-balanced'
-  },
   {
     id: 'sonnet-4.6',
     cli_model: 'claude-sonnet-4-6',

package/src/ai/codex-provider.js

@@ -21,27 +21,29 @@ const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
  * Codex model definitions with tier mappings
  *
  * Based on OpenAI Codex Models guide (developers.openai.com/codex/models)
- * - gpt-5.1-codex-mini: Smaller, cost-effective variant for quick scans
- * - gpt-5.2-codex: Advanced coding model for everyday reviews, good reasoning/cost balance
- * - gpt-5.3-codex: Capable agentic coding model with frontier performance and reasoning
- * - gpt-5.4: Latest generation with enhanced reasoning depth
+ * - gpt-5.4-nano: Cheapest model ($0.20/$1.25 per MTok), good for surface scans
+ * - gpt-5.4-mini: Fast with 400k context ($0.75/$4.50 per MTok)
+ * - gpt-5.4: Flagship model combining coding, reasoning, and agentic workflows
+ * - gpt-5.3-codex: Industry-leading coding model for complex engineering tasks
+ *
+ * Deprecated (April 2026): gpt-5.1-codex-mini, gpt-5.1-codex-max, gpt-5.1-codex
  */
 const CODEX_MODELS = [
   {
-    id: 'gpt-5.1-codex-mini',
-    name: 'GPT-5.1 Mini',
+    id: 'gpt-5.4-nano',
+    name: 'GPT-5.4 Nano',
     tier: 'fast',
-    tagline: 'Blazing Fast',
-    description: 'Quick, low-cost reviews for style issues, obvious bugs, and lint-level feedback.',
-    badge: 'Fastest',
+    tagline: 'Cheapest',
+    description: 'Ultra-low-cost surface scans for style issues, obvious bugs, and lint-level feedback.',
+    badge: 'Cheapest',
     badgeClass: 'badge-speed'
   },
   {
-    id: 'gpt-5.2-codex',
-    name: 'GPT-5.2 Codex',
+    id: 'gpt-5.4-mini',
+    name: 'GPT-5.4 Mini',
     tier: 'balanced',
     tagline: 'Best Balance',
-    description: 'Strong everyday reviewer—good reasoning and code understanding for PR-sized changes without top-tier cost.',
+    description: 'Fast reviews with 400k context—good balance of speed and capability for everyday PR review.',
     badge: 'Recommended',
     badgeClass: 'badge-recommended',
     default: true
@@ -51,7 +53,7 @@ const CODEX_MODELS = [
     name: 'GPT-5.3 Codex',
     tier: 'thorough',
     tagline: 'Deep Review',
-    description: 'Capable agentic coding model—combines frontier coding performance with strong reasoning for cross-file analysis.',
+    description: 'Industry-leading coding model—frontier performance with strong reasoning for cross-file analysis.',
     badge: 'Thorough',
     badgeClass: 'badge-power'
   },
@@ -60,7 +62,7 @@ const CODEX_MODELS = [
     name: 'GPT-5.4',
     tier: 'thorough',
     tagline: 'Latest Gen',
-    description: 'Latest generation model with enhanced reasoning depth for complex architectural reviews.',
+    description: 'Flagship model combining coding, reasoning, and agentic workflows for complex architectural reviews.',
     badge: 'Most Thorough',
     badgeClass: 'badge-power'
   }
@@ -76,7 +78,7 @@ class CodexProvider extends AIProvider {
    * @param {Object} configOverrides.env - Additional environment variables
    * @param {Object[]} configOverrides.models - Custom model definitions
    */
-  constructor(model = 'gpt-5.2-codex', configOverrides = {}) {
+  constructor(model = 'gpt-5.4-mini', configOverrides = {}) {
     super(model);
 
     // Command precedence: ENV > config > default
@@ -698,7 +700,7 @@ class CodexProvider extends AIProvider {
   }
 
   static getDefaultModel() {
-    return 'gpt-5.2-codex';
+    return 'gpt-5.4-mini';
   }
 
   static getInstallInstructions() {

package/src/ai/copilot-provider.js

@@ -21,21 +21,30 @@ const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
  *
  * GitHub Copilot CLI supports multiple AI models including OpenAI,
  * Anthropic, and Google models via the --model flag.
- * Available models (as of Feb 2026): claude-haiku-4.5, claude-sonnet-4.6,
- * claude-sonnet-4.5, gpt-5.2-codex, gpt-5.3-codex,
+ * Available models (as of April 2026): claude-haiku-4.6, claude-sonnet-4.6,
+ * claude-sonnet-4.5, gpt-5.4, gpt-5.4-mini, gpt-5.3-codex,
  * claude-opus-4.5, claude-opus-4.6, claude-opus-4.6-fast.
  * Default is claude-sonnet-4.6.
  */
 const COPILOT_MODELS = [
   {
-    id: 'claude-haiku-4.5',
-    name: 'Claude Haiku 4.5',
+    id: 'claude-haiku-4.6',
+    name: 'Claude Haiku 4.6',
     tier: 'fast',
     tagline: 'Quick Scan',
     description: 'Rapid feedback for obvious issues, style checks, and simple logic errors',
     badge: 'Speedy',
     badgeClass: 'badge-speed'
   },
+  {
+    id: 'gpt-5.4-mini',
+    name: 'GPT-5.4 Mini',
+    tier: 'fast',
+    tagline: 'Fast & Cheap',
+    description: 'Low-cost fast reviews with solid reasoning—included at no premium cost',
+    badge: 'Fast',
+    badgeClass: 'badge-speed'
+  },
   {
     id: 'claude-sonnet-4.6',
     name: 'Claude Sonnet 4.6',
@@ -47,29 +56,20 @@ const COPILOT_MODELS = [
     default: true
   },
   {
-    id: 'claude-sonnet-4.5',
-    name: 'Claude Sonnet 4.5',
-    tier: 'balanced',
-    tagline: 'Previous Gen',
-    description: 'Previous generation Sonnet—strong code understanding with excellent quality-to-cost ratio',
-    badge: 'Previous Gen',
-    badgeClass: 'badge-balanced'
-  },
-  {
-    id: 'gpt-5.2-codex',
-    name: 'GPT-5.2 Codex',
-    tier: 'balanced',
-    tagline: 'Alternative View',
-    description: 'OpenAI code-specialized model—different perspective for cross-file analysis',
-    badge: 'Balanced',
-    badgeClass: 'badge-balanced'
+    id: 'gpt-5.4',
+    name: 'GPT-5.4',
+    tier: 'thorough',
+    tagline: 'Latest OpenAI',
+    description: 'Flagship OpenAI model combining coding, reasoning, and agentic workflows',
+    badge: 'Latest',
+    badgeClass: 'badge-power'
   },
   {
     id: 'gpt-5.3-codex',
     name: 'GPT-5.3 Codex',
     tier: 'thorough',
     tagline: 'Deep Code Analysis',
-    description: 'Most capable OpenAI coding model—frontier performance for complex multi-file reviews',
+    description: 'Industry-leading coding model—frontier performance for complex multi-file reviews',
     badge: 'Thorough',
     badgeClass: 'badge-power'
   },

package/src/ai/gemini-provider.js

@@ -20,6 +20,16 @@ const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
  * Gemini model definitions with tier mappings
  */
 const GEMINI_MODELS = [
+  {
+    id: 'gemini-3.1-flash-lite-preview',
+    aliases: ['gemini-3.1-flash-lite'],
+    name: '3.1 Flash Lite',
+    tier: 'fast',
+    tagline: 'Cheapest',
+    description: 'Ultra-efficient model for high-volume cost-conscious scans',
+    badge: 'Cheapest',
+    badgeClass: 'badge-speed'
+  },
   {
     id: 'gemini-3-flash-preview',
     aliases: ['gemini-3-flash'],

package/src/ai/pi-provider.js

@@ -16,7 +16,10 @@
  * for cross-provider switching, which translates to `--provider <provider> --model <model>`.
  */
 
+const crypto = require('crypto');
 const path = require('path');
+const os = require('os');
+const fs = require('fs');
 const { spawn } = require('child_process');
 const { AIProvider, registerProvider, quoteShellArgs } = require('./provider');
 const logger = require('../utils/logger');
@@ -244,19 +247,23 @@ class PiProvider extends AIProvider {
 
       const levelPrefix = logPrefix || `[Level ${level}]`;
       logger.info(`${levelPrefix} Executing Pi CLI...`);
-      logger.info(`${levelPrefix} Writing prompt via stdin: ${prompt.length} bytes`);
+      logger.info(`${levelPrefix} Prompt: ${prompt.length} bytes`);
+
+      // Write prompt to a temp file and use Pi's @file syntax as a positional arg.
+      // This bypasses devx stdin interference that breaks --mode json output.
+      const tmpFile = path.join(os.tmpdir(), `pair-review-prompt-${Date.now()}-${process.pid}-${crypto.randomUUID()}.txt`);
+      fs.writeFileSync(tmpFile, prompt);
+      const cleanupTmpFile = () => { try { fs.unlinkSync(tmpFile); } catch { /* ignore */ } };
 
-      // Use stdin for prompt instead of CLI argument (avoids shell escaping issues)
-      // Pi reads from stdin when using -p with no positional message arguments
       let fullCommand;
       let fullArgs;
 
       if (this.useShell) {
-        fullCommand = `${this.piCmd} ${quoteShellArgs(this.baseArgs).join(' ')}`;
+        fullCommand = `${this.piCmd} ${quoteShellArgs([...this.baseArgs, `@${tmpFile}`]).join(' ')}`;
         fullArgs = [];
       } else {
         fullCommand = this.piCmd;
-        fullArgs = [...this.baseArgs];
+        fullArgs = [...this.baseArgs, `@${tmpFile}`];
       }
 
       const pi = spawn(fullCommand, fullArgs, {
@@ -269,6 +276,10 @@ class PiProvider extends AIProvider {
         shell: this.useShell
       });
 
+      // Close stdin immediately — prompt is delivered via @file, but some
+      // wrappers (e.g., devx) keep the process alive until stdin is closed.
+      pi.stdin.end();
+
       const pid = pi.pid;
       logger.debug(`${levelPrefix} Pi CLI command: ${fullCommand} ${fullArgs.join(' ')}`);
       logger.info(`${levelPrefix} Spawned Pi CLI process: PID ${pid}`);
@@ -340,6 +351,7 @@ class PiProvider extends AIProvider {
 
       // Handle completion
       pi.on('close', (code) => {
+        cleanupTmpFile();
         if (settled) return;  // Already settled by timeout or error
 
         // Flush any remaining stream parser buffer
@@ -413,7 +425,7 @@ class PiProvider extends AIProvider {
 
           // Use async IIFE to handle the async LLM extraction
           (async () => {
-            // Guard: if already settled (by timeout, stdin error, or cancellation),
+            // Guard: if already settled (by timeout, process error, or cancellation),
             // skip the LLM extraction entirely to avoid misleading log output
             if (settled) return;
 
@@ -437,6 +449,7 @@ class PiProvider extends AIProvider {
 
       // Handle errors
       pi.on('error', (error) => {
+        cleanupTmpFile();
         if (error.code === 'ENOENT') {
           logger.error(`${levelPrefix} Pi CLI not found. Please ensure Pi CLI is installed.`);
           settle(reject, new Error(`${levelPrefix} Pi CLI not found. ${PiProvider.getInstallInstructions()}`));
@@ -445,21 +458,6 @@ class PiProvider extends AIProvider {
           settle(reject, error);
         }
       });
-
-      // Handle stdin errors (e.g., EPIPE if process exits before write completes)
-      pi.stdin.on('error', (err) => {
-        logger.error(`${levelPrefix} stdin error: ${err.message}`);
-      });
-
-      // Send the prompt to stdin (Pi reads from stdin when using -p with no args)
-      pi.stdin.write(prompt, (err) => {
-        if (err) {
-          logger.error(`${levelPrefix} Failed to write prompt to stdin: ${err}`);
-          pi.kill('SIGTERM');
-          settle(reject, new Error(`${levelPrefix} Failed to write prompt to stdin: ${err}`));
-        }
-      });
-      pi.stdin.end();
     });
   }
 
@@ -740,14 +738,13 @@ class PiProvider extends AIProvider {
     // Build args consistently using the shared method, applying provider and model extra_args
     const args = this.buildArgsForModel(model);
 
-    // For extraction, we pass the prompt via stdin
-    // Pi reads from stdin when using -p with no positional message arguments
+    // Use @file syntax for prompt delivery (bypasses devx stdin interference)
     if (useShell) {
       return {
         command: `${piCmd} ${quoteShellArgs(args).join(' ')}`,
         args: [],
         useShell: true,
-        promptViaStdin: true,
+        promptViaFile: true,
         env: this.extraEnv
       };
     }
@@ -755,7 +752,7 @@ class PiProvider extends AIProvider {
       command: piCmd,
       args,
       useShell: false,
-      promptViaStdin: true,
+      promptViaFile: true,
       env: this.extraEnv
     };
   }

package/src/ai/provider.js

@@ -6,7 +6,10 @@
  * and provides a factory function to create provider instances.
  */
 
+const crypto = require('crypto');
 const path = require('path');
+const os = require('os');
+const fs = require('fs');
 const { spawn } = require('child_process');
 const logger = require('../utils/logger');
 const { extractJSON } = require('../utils/json-extractor');
@@ -181,6 +184,7 @@ class AIProvider {
    * @property {string[]} args - Arguments (prompt will be appended if promptViaStdin is false)
    * @property {boolean} useShell - Whether to use shell mode
    * @property {boolean} promptViaStdin - If true, send prompt to stdin; if false, append to args
+   * @property {boolean} promptViaFile - If true, write prompt to a temp file and pass @filepath as a positional arg (Pi-specific @file syntax; currently only used by PiProvider)
    */
   getExtractionConfig(model) {
     // Default: extraction not supported
@@ -213,7 +217,7 @@ class AIProvider {
       };
     }
 
-    const { command, args, useShell, promptViaStdin, env: configEnv } = config;
+    const { command, args, useShell, promptViaStdin, promptViaFile, env: configEnv } = config;
     const prompt = `Extract the JSON object from the following text. Return ONLY the valid JSON, nothing else. Do not include any explanation, markdown formatting, or code blocks - just the raw JSON.
 
 === BEGIN INPUT TEXT ===
@@ -222,7 +226,21 @@ ${rawResponse}
 
     return new Promise((resolve) => {
       // Build final command and args based on prompt delivery method
-      const finalArgs = promptViaStdin ? args : [...args, prompt];
+      // promptViaFile: write to temp file, pass @filepath as positional arg (Pi @file syntax)
+      // promptViaStdin: write to process stdin after spawn
+      // default: pass prompt as positional CLI arg
+      let tmpFile = null;
+      let cleanupTmpFile = () => {};
+      let finalArgs;
+
+      if (promptViaFile) {
+        tmpFile = path.join(os.tmpdir(), `pair-review-extract-${Date.now()}-${process.pid}-${crypto.randomUUID()}.txt`);
+        fs.writeFileSync(tmpFile, prompt);
+        cleanupTmpFile = () => { try { fs.unlinkSync(tmpFile); } catch { /* ignore */ } };
+        finalArgs = [...args, `@${tmpFile}`];
+      } else {
+        finalArgs = promptViaStdin ? args : [...args, prompt];
+      }
 
       logger.info(`${levelPrefix} Attempting LLM-based JSON extraction with ${extractionModel}...`);
 
@@ -269,6 +287,7 @@ ${rawResponse}
       });
 
       proc.on('close', (code) => {
+        cleanupTmpFile();
         if (settled) return;
 
         if (code !== 0) {
@@ -295,11 +314,12 @@ ${rawResponse}
       });
 
       proc.on('error', (error) => {
+        cleanupTmpFile();
         logger.warn(`${levelPrefix} LLM extraction process error: ${error.message}`);
         settle({ success: false, error: error.message });
       });
 
-      // Send prompt via stdin if configured
+      // Deliver prompt based on config method
       if (promptViaStdin) {
         // Handle stdin errors (e.g., EPIPE if process exits before write completes)
         proc.stdin.on('error', (err) => {
@@ -314,6 +334,9 @@ ${rawResponse}
           }
         });
         proc.stdin.end();
+      } else if (promptViaFile) {
+        // Prompt delivered via @file arg — close stdin so wrappers (e.g., devx) don't hang
+        proc.stdin.end();
       }
     });
   }

package/src/chat/pi-bridge.js

@@ -35,6 +35,7 @@ class PiBridge extends EventEmitter {
    * @param {boolean} [options.useShell] - Use shell mode for multi-word commands
    * @param {string[]} [options.skills] - Array of skill file paths to load via --skill
    * @param {string[]} [options.extensions] - Array of extension directory paths to load via -e
+   * @param {string[]} [options.extraArgs] - Extra CLI args to append (e.g., from config extra_args)
    * @param {string} [options.sessionPath] - Path to a session file for resumption
    */
   constructor(options = {}) {
@@ -49,6 +50,7 @@ class PiBridge extends EventEmitter {
     this.useShell = options.useShell || false;
     this.skills = options.skills || [];
     this.extensions = options.extensions || [];
+    this.extraArgs = options.extraArgs || [];
     this.sessionPath = options.sessionPath || null;
 
     this._process = null;
@@ -288,6 +290,12 @@ class PiBridge extends EventEmitter {
       args.push('-e', ext);
     }
 
+    // Append extra args from provider config (e.g., extra_args in chat_providers).
+    // These go last so they can override earlier flags if needed.
+    if (this.extraArgs.length > 0) {
+      args.push(...this.extraArgs);
+    }
+
     return args;
   }
 

package/src/chat/session-manager.js

@@ -580,6 +580,7 @@ class ChatSessionManager {
       provider: def?.provider || null,
       model: options.model || def?.model,
       piCommand: def?.command,
+      extraArgs: def?.args,
       env: def?.env,
       useShell: def?.useShell,
       tools: CHAT_TOOLS,