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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@in-the-loop-labs/pair-review",
-  "version": "3.1.2",
+  "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.2",
+  "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.2",
+  "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/DiffOptionsDropdown.js

@@ -57,11 +57,29 @@ class DiffOptionsDropdown {
     this._outsideClickHandler = null;
     this._escapeHandler = null;
 
-    // Scope state
-    const LS = window.LocalScope;
+    // Scope state — resolve LocalScope with inline fallback so the scope selector
+    // renders even if window.LocalScope failed to load (race condition guard).
+    const FALLBACK_STOPS = ['branch', 'staged', 'unstaged', 'untracked']; // Keep in sync with local-scope.js:STOPS
+    const FALLBACK_DEFAULT = { start: 'unstaged', end: 'untracked' };
+    this._localScope = window.LocalScope || {
+      STOPS: FALLBACK_STOPS,
+      DEFAULT_SCOPE: FALLBACK_DEFAULT,
+      isValidScope: (s, e) => {
+        const si = FALLBACK_STOPS.indexOf(s);
+        const ei = FALLBACK_STOPS.indexOf(e);
+        return si !== -1 && ei !== -1 && si <= ei;
+      },
+      scopeIncludes: (s, e, stop) => {
+        const si = FALLBACK_STOPS.indexOf(s);
+        const ei = FALLBACK_STOPS.indexOf(e);
+        const ti = FALLBACK_STOPS.indexOf(stop);
+        return ti !== -1 && ti >= si && ti <= ei;
+      }
+    };
+    const LS = this._localScope;
     this._branchAvailable = Boolean(branchAvailable);
-    this._scopeStart = (initialScope && initialScope.start) || (LS ? LS.DEFAULT_SCOPE.start : 'unstaged');
-    this._scopeEnd = (initialScope && initialScope.end) || (LS ? LS.DEFAULT_SCOPE.end : 'untracked');
+    this._scopeStart = (initialScope && initialScope.start) || LS.DEFAULT_SCOPE.start;
+    this._scopeEnd = (initialScope && initialScope.end) || LS.DEFAULT_SCOPE.end;
     this._scopeStops = [];
     this._scopeTrackEl = null;
     this._scopeDebounceTimer = null;
@@ -144,7 +162,7 @@ class DiffOptionsDropdown {
   /** Programmatically set scope. */
   set scope(val) {
     if (!val) return;
-    const LS = window.LocalScope;
+    const LS = this._localScope;
     if (LS && !LS.isValidScope(val.start, val.end)) return;
     this._scopeStart = val.start;
     this._scopeEnd = val.end;
@@ -188,8 +206,11 @@ class DiffOptionsDropdown {
     popover.style.zIndex = '1100';
     popover.style.transition = 'opacity 0.15s ease, transform 0.15s ease';
 
-    // Scope selector first — only in local mode
-    if (window.PAIR_REVIEW_LOCAL_MODE && window.LocalScope) {
+    // Scope selector first — only in local mode.
+    // Belt-and-suspenders: also render when scope callbacks were explicitly provided,
+    // in case a race condition prevents the globals from being set in time.
+    const hasLocalScope = (window.PAIR_REVIEW_LOCAL_MODE && window.LocalScope) || this._onScopeChange;
+    if (hasLocalScope) {
       this._renderScopeSelector(popover);
 
       // Divider between scope selector and whitespace checkbox
@@ -261,7 +282,7 @@ class DiffOptionsDropdown {
   }
 
   _renderScopeSelector(popover) {
-    const LS = window.LocalScope;
+    const LS = this._localScope;
 
     // Section container — generous horizontal padding so dots/labels breathe
     const section = document.createElement('div');
@@ -362,13 +383,43 @@ class DiffOptionsDropdown {
       stopEl.appendChild(dot);
       stopEl.appendChild(labelEl);
 
+      // Custom tooltip element (positioned above the dot, hidden by default)
+      const tooltipEl = document.createElement('div');
+      tooltipEl.style.position = 'absolute';
+      tooltipEl.style.bottom = '100%';
+      tooltipEl.style.left = '50%';
+      tooltipEl.style.transform = 'translateX(-50%)';
+      tooltipEl.style.marginBottom = '6px';
+      tooltipEl.style.padding = '4px 8px';
+      tooltipEl.style.fontSize = '11px';
+      tooltipEl.style.lineHeight = '1.3';
+      tooltipEl.style.color = 'var(--color-text-on-emphasis, #ffffff)';
+      tooltipEl.style.background = 'var(--color-neutral-emphasis, #24292f)';
+      tooltipEl.style.borderRadius = '4px';
+      tooltipEl.style.whiteSpace = 'nowrap';
+      tooltipEl.style.pointerEvents = 'none';
+      tooltipEl.style.opacity = '0';
+      tooltipEl.style.transition = 'opacity 0.12s ease';
+      tooltipEl.style.zIndex = '2';
+      stopEl.style.position = 'relative';
+      stopEl.appendChild(tooltipEl);
+
+      stopEl.addEventListener('mouseenter', () => {
+        if (tooltipEl.textContent) {
+          tooltipEl.style.opacity = '1';
+        }
+      });
+      stopEl.addEventListener('mouseleave', () => {
+        tooltipEl.style.opacity = '0';
+      });
+
       stopEl.addEventListener('click', (e) => {
         e.stopPropagation();
         this._handleStopClick(stop, e);
       });
 
       stopsRow.appendChild(stopEl);
-      this._scopeStops.push({ stop, dotEl: dot, labelEl, containerEl: stopEl });
+      this._scopeStops.push({ stop, dotEl: dot, labelEl, containerEl: stopEl, tooltipEl });
     });
 
     trackContainer.appendChild(stopsRow);
@@ -382,7 +433,7 @@ class DiffOptionsDropdown {
   }
 
   _handleStopClick(clickedStop, event) {
-    const LS = window.LocalScope;
+    const LS = this._localScope;
     if (!LS) return;
 
     // Branch disabled? Ignore.
@@ -396,10 +447,14 @@ class DiffOptionsDropdown {
     let newStart = this._scopeStart;
     let newEnd = this._scopeEnd;
 
-    // Alt/Option-click: solo-select this single stop
+    // 'unstaged' is always included — the AI reads files from the working
+    // tree, so the diff must always cover at least the unstaged state.
+    const ui = stops.indexOf('unstaged');
+
+    // Alt/Option-click: select this stop with minimum scope including unstaged
     if (event && event.altKey) {
-      newStart = clickedStop;
-      newEnd = clickedStop;
+      newStart = stops[Math.min(ci, ui)];
+      newEnd = stops[Math.max(ci, ui)];
     } else {
       // Checkbox-like toggle with contiguity constraint
       const included = ci >= si && ci <= ei;
@@ -407,6 +462,7 @@ class DiffOptionsDropdown {
       if (included) {
         // Toggling OFF — only allowed at boundaries, and range must have >1 stop
         if (si === ei) return;
+        if (clickedStop === 'unstaged') return; // unstaged is mandatory
         if (ci === si) {
           newStart = stops[si + 1];
         } else if (ci === ei) {
@@ -457,30 +513,48 @@ class DiffOptionsDropdown {
   }
 
   _updateScopeUI() {
-    const LS = window.LocalScope;
+    const LS = this._localScope;
     if (!LS || !this._scopeStops.length) return;
 
     const stops = LS.STOPS;
     const si = stops.indexOf(this._scopeStart);
     const ei = stops.indexOf(this._scopeEnd);
 
-    this._scopeStops.forEach(({ stop, dotEl, labelEl, containerEl }, i) => {
+    this._scopeStops.forEach(({ stop, dotEl, labelEl, containerEl, tooltipEl }, i) => {
       const included = LS.scopeIncludes(this._scopeStart, this._scopeEnd, stop);
       const isBranch = stop === 'branch';
       const disabled = isBranch && !this._branchAvailable;
 
-      // Determine if clicking this stop would do anything (for cursor hint)
-      const isBoundary = included && (i === si || i === ei) && si !== ei;
+      // Determine if clicking this stop would do anything (for cursor hint).
+      // 'unstaged' is mandatory and cannot be toggled off, so it is never a
+      // clickable boundary even when it sits at a range edge.
+      const isMandatory = stop === 'unstaged';
+      const atRangeEdge = included && (i === si || i === ei) && si !== ei;
+      const isBoundary = atRangeEdge && !isMandatory;
       const isAdjacent = !included && (i === si - 1 || i === ei + 1);
       const clickable = !disabled && (isBoundary || isAdjacent);
 
+      // Tooltip for disabled branch stop
+      containerEl.title = disabled ? 'No feature branch detected' : '';
+
+      // Mandatory stop sitting at a range edge — user might expect to toggle
+      // it off but can't.  Show not-allowed cursor and explanatory tooltip.
+      const mandatoryEdge = isMandatory && atRangeEdge;
+
+      // Update tooltip text (empty string hides the tooltip on hover)
+      if (tooltipEl) {
+        tooltipEl.textContent = mandatoryEdge
+          ? 'Unstaged changes are always included \u2014 the agent reads from your working tree'
+          : '';
+      }
+
       if (disabled) {
         // Disabled state
         dotEl.style.background = 'var(--color-bg-tertiary, #f6f8fa)';
         dotEl.style.borderColor = 'var(--color-border-secondary, #e1e4e8)';
         dotEl.style.boxShadow = 'none';
         labelEl.style.color = 'var(--color-text-tertiary, #8b949e)';
-        containerEl.style.cursor = 'not-allowed';
+        containerEl.style.cursor = 'default';
         containerEl.style.opacity = '0.5';
       } else if (included) {
         // Included (filled) state
@@ -489,7 +563,7 @@ class DiffOptionsDropdown {
         dotEl.style.boxShadow = '0 0 0 2px rgba(139, 92, 246, 0.2)';
         labelEl.style.color = 'var(--color-text-primary, #24292f)';
         labelEl.style.fontWeight = '600';
-        containerEl.style.cursor = clickable ? 'pointer' : 'default';
+        containerEl.style.cursor = clickable ? 'pointer' : (mandatoryEdge ? 'not-allowed' : 'default');
         containerEl.style.opacity = '1';
       } else {
         // Excluded (empty) state

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');