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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@in-the-loop-labs/pair-review",
-  "version": "3.3.5",
+  "version": "3.3.7",
   "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.3.5",
+  "version": "3.3.7",
   "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.3.5",
+  "version": "3.3.7",
   "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/components/AIPanel.js

@@ -965,20 +965,9 @@ class AIPanel {
     expandFileIfCollapsed(file) {
         if (!file) return false;
 
-        // Find the file wrapper - try exact match first, then partial match
-        let fileWrapper = document.querySelector(`[data-file-name="${file}"]`);
-
-        // Fallback: partial path match
-        if (!fileWrapper) {
-            const allWrappers = document.querySelectorAll('.d2h-file-wrapper');
-            for (const wrapper of allWrappers) {
-                const wrapperFile = wrapper.dataset.fileName;
-                if (wrapperFile && (wrapperFile.includes(file) || file.includes(wrapperFile))) {
-                    fileWrapper = wrapper;
-                    break;
-                }
-            }
-        }
+        const fileWrapper = window.prManager?.findFileElement
+            ? window.prManager.findFileElement(file)
+            : window.DiffRenderer?.findFileElement?.(file);
 
         if (!fileWrapper) return false;
 

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

@@ -194,6 +194,88 @@ class DiffRenderer {
     return div.innerHTML;
   }
 
+  /**
+   * Normalize a file path for DOM matching.
+   *
+   * Frontend mirror of `normalizePath()` + `resolveRenamedFile()` from
+   * `src/utils/paths.js`. Browser code cannot `require()` the backend module,
+   * so the logic is duplicated here. Keep this function in sync with those two
+   * when modifying normalization rules, otherwise the frontend and backend
+   * will disagree on which paths are equivalent.
+   *
+   * @param {string} filePath - File path to normalize
+   * @returns {string} Normalized file path
+   */
+  static normalizeFilePath(filePath) {
+    if (typeof filePath !== 'string') return '';
+
+    let normalized = filePath.trim();
+    if (!normalized) return '';
+
+    // Resolve git rename syntax to the new path.
+    normalized = normalized.replace(/\{[^}]*\s*=>\s*([^}]*)\}/, '$1');
+    normalized = normalized.replace(/\/+/g, '/');
+
+    // Strip leading './' and '/' segments until the string stops changing.
+    // This mirrors normalizePath in src/utils/paths.js for interleaved cases
+    // like '/./src/foo.js'.
+    let prevLength;
+    do {
+      prevLength = normalized.length;
+
+      while (normalized.startsWith('./')) {
+        normalized = normalized.slice(2);
+      }
+
+      while (normalized.startsWith('/')) {
+        normalized = normalized.slice(1);
+      }
+    } while (normalized.length !== prevLength);
+
+    return normalized;
+  }
+
+  /**
+   * Check whether two file paths should be treated as the same DOM target.
+   * @param {string} left - First file path
+   * @param {string} right - Second file path
+   * @returns {boolean} True when the paths refer to the same file
+   */
+  static pathsMatch(left, right) {
+    const normalizedLeft = DiffRenderer.normalizeFilePath(left);
+    const normalizedRight = DiffRenderer.normalizeFilePath(right);
+
+    if (!normalizedLeft || !normalizedRight) return false;
+
+    return normalizedLeft === normalizedRight ||
+      normalizedLeft.endsWith(`/${normalizedRight}`) ||
+      normalizedRight.endsWith(`/${normalizedLeft}`);
+  }
+
+  /**
+   * Try a direct selector lookup for a file path.
+   * Falls back silently when CSS.escape is unavailable or the selector is invalid.
+   * @param {string} attribute - data attribute to match (without brackets)
+   * @param {string} filePath - File path to search for
+   * @returns {Element|null} Matching element if found
+   */
+  static queryFileElement(attribute, filePath) {
+    if (!filePath) {
+      return null;
+    }
+
+    const css = globalThis.CSS;
+    const escapedValue = css && typeof css.escape === 'function'
+      ? css.escape(filePath)
+      : filePath;
+
+    try {
+      return document.querySelector(`[${attribute}="${escapedValue}"]`);
+    } catch {
+      return null;
+    }
+  }
+
   /**
    * Render a single diff line
    * @param {HTMLElement|DocumentFragment} container - Container to append to
@@ -696,18 +778,29 @@ class DiffRenderer {
    * @returns {Element|null} The file wrapper element or null if not found
    */
   static findFileElement(filePath) {
-    // Try exact match first
-    let fileElement = document.querySelector(`[data-file-name="${filePath}"]`);
-    if (fileElement) return fileElement;
+    const normalizedPath = DiffRenderer.normalizeFilePath(filePath);
 
-    fileElement = document.querySelector(`[data-file-path="${filePath}"]`);
-    if (fileElement) return fileElement;
+    // Try direct selector lookups first when we can safely escape the value.
+    const selectorCandidates = [filePath];
+    if (normalizedPath && normalizedPath !== filePath) {
+      selectorCandidates.push(normalizedPath);
+    }
+
+    for (const candidate of selectorCandidates) {
+      let fileElement = DiffRenderer.queryFileElement('data-file-name', candidate);
+      if (fileElement) return fileElement;
+
+      fileElement = DiffRenderer.queryFileElement('data-file-path', candidate);
+      if (fileElement) return fileElement;
+    }
 
-    // Try partial match for path segments
+    // Fall back to normalized iteration so special characters, rename syntax,
+    // and formatted variants still resolve to the rendered wrapper.
     const allFileWrappers = document.querySelectorAll('.d2h-file-wrapper');
     for (const wrapper of allFileWrappers) {
       const fileName = wrapper.dataset.fileName;
-      if (fileName && (fileName === filePath || fileName.endsWith('/' + filePath) || filePath.endsWith('/' + fileName))) {
+      const filePathAttr = wrapper.dataset.filePath;
+      if (DiffRenderer.pathsMatch(fileName, filePath) || DiffRenderer.pathsMatch(filePathAttr, filePath)) {
         return wrapper;
       }
     }

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

@@ -1168,17 +1168,22 @@ class FileCommentManager {
    * @param {Array} suggestions - Array of file-level AI suggestions
    */
   loadFileComments(comments, suggestions) {
-    // Group by file
-    const commentsByFile = new Map();
-    const suggestionsByFile = new Map();
+    // Group by rendered file comments zone so path variants still attach to the
+    // correct file on initial load.
+    const commentsByZone = new Map();
+    const suggestionsByZone = new Map();
 
     if (comments) {
       for (const comment of comments) {
         if (comment.is_file_level === 1) {
-          if (!commentsByFile.has(comment.file)) {
-            commentsByFile.set(comment.file, []);
+          const zone = this.findZoneForFile(comment.file);
+          if (!zone) {
+            continue;
           }
-          commentsByFile.get(comment.file).push(comment);
+          if (!commentsByZone.has(zone)) {
+            commentsByZone.set(zone, []);
+          }
+          commentsByZone.get(zone).push(comment);
         }
       }
     }
@@ -1186,10 +1191,14 @@ class FileCommentManager {
     if (suggestions) {
       for (const suggestion of suggestions) {
         if (suggestion.is_file_level === 1) {
-          if (!suggestionsByFile.has(suggestion.file)) {
-            suggestionsByFile.set(suggestion.file, []);
+          const zone = this.findZoneForFile(suggestion.file);
+          if (!zone) {
+            continue;
+          }
+          if (!suggestionsByZone.has(zone)) {
+            suggestionsByZone.set(zone, []);
           }
-          suggestionsByFile.get(suggestion.file).push(suggestion);
+          suggestionsByZone.get(zone).push(suggestion);
         }
       }
     }
@@ -1197,7 +1206,6 @@ class FileCommentManager {
     // Find all file comment zones and populate them
     const zones = document.querySelectorAll('.file-comments-zone');
     for (const zone of zones) {
-      const fileName = zone.dataset.fileName;
       const container = zone.querySelector('.file-comments-container');
 
       // Selectively clear existing cards based on what we're about to reload
@@ -1221,8 +1229,8 @@ class FileCommentManager {
         }
       }
 
-      const fileComments = commentsByFile.get(fileName) || [];
-      const fileSuggestions = suggestionsByFile.get(fileName) || [];
+      const fileComments = commentsByZone.get(zone) || [];
+      const fileSuggestions = suggestionsByZone.get(zone) || [];
 
       // Display AI suggestions first
       for (const suggestion of fileSuggestions) {
@@ -1245,7 +1253,20 @@ class FileCommentManager {
    * @returns {HTMLElement|null} The zone element or null
    */
   findZoneForFile(fileName) {
-    return document.querySelector(`.file-comments-zone[data-file-name="${fileName}"]`);
+    const fileWrapper = window.DiffRenderer?.findFileElement
+      ? window.DiffRenderer.findFileElement(fileName)
+      : null;
+
+    if (fileWrapper) {
+      return fileWrapper.querySelector('.file-comments-zone');
+    }
+
+    try {
+      const escaped = globalThis.CSS?.escape ? CSS.escape(fileName) : fileName;
+      return document.querySelector(`.file-comments-zone[data-file-name="${escaped}"]`);
+    } catch {
+      return null;
+    }
   }
 
   /**

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

@@ -160,6 +160,26 @@ class SuggestionManager {
     return window.CategoryEmoji?.getEmoji(category) || '\u{1F4AC}';
   }
 
+  /**
+   * Resolve a diff file wrapper for the provided path.
+   * @param {string} file - File path
+   * @returns {Element|null} Matching file wrapper
+   */
+  findFileElement(file) {
+    if (this.prManager?.findFileElement) {
+      return this.prManager.findFileElement(file);
+    }
+    if (window.DiffRenderer?.findFileElement) {
+      return window.DiffRenderer.findFileElement(file);
+    }
+    try {
+      const escaped = globalThis.CSS?.escape ? CSS.escape(file) : file;
+      return document.querySelector(`[data-file-name="${escaped}"]`);
+    } catch {
+      return null;
+    }
+  }
+
   /**
    * Find suggestions that target lines currently hidden in gaps
    * @param {Array} suggestions - Array of suggestions
@@ -176,9 +196,7 @@ class SuggestionManager {
       const side = suggestion.side || 'RIGHT';
 
       // Find the file wrapper
-      const fileElement = window.DiffRenderer ?
-        window.DiffRenderer.findFileElement(file) :
-        document.querySelector(`[data-file-name="${file}"]`);
+      const fileElement = this.findFileElement(file);
 
       if (!fileElement) {
         // File not in diff at all, not a hidden line issue
@@ -329,9 +347,7 @@ class SuggestionManager {
         const line = parseInt(lineStr);
 
         // Use helper method for file lookup
-        const fileElement = window.DiffRenderer ?
-          window.DiffRenderer.findFileElement(file) :
-          document.querySelector(`[data-file-name="${file}"]`);
+        const fileElement = this.findFileElement(file);
 
         if (!fileElement) {
           // This can happen when AI suggests a file path that doesn't exist in the diff

package/public/js/pr.js

@@ -2032,7 +2032,7 @@ class PRManager {
    * @param {string} filePath - Path of the file
    */
   toggleFileCollapse(filePath) {
-    const wrapper = document.querySelector(`[data-file-name="${filePath}"]`);
+    const wrapper = this.findFileElement(filePath);
     if (!wrapper) return;
 
     const isCollapsed = wrapper.classList.contains('collapsed');
@@ -2058,7 +2058,7 @@ class PRManager {
    * @param {boolean} isViewed - Whether the file is now viewed
    */
   toggleFileViewed(filePath, isViewed) {
-    const wrapper = document.querySelector(`[data-file-name="${filePath}"]`);
+    const wrapper = this.findFileElement(filePath);
 
     if (isViewed) {
       this.viewedFiles.add(filePath);
@@ -4359,7 +4359,7 @@ class PRManager {
   }
 
   scrollToFile(filePath) {
-    const fileWrapper = document.querySelector(`[data-file-name="${filePath}"]`);
+    const fileWrapper = this.findFileElement(filePath);
     if (fileWrapper) {
       fileWrapper.scrollIntoView({ behavior: 'smooth', block: 'start' });
     }

package/public/js/repo-settings.js

@@ -157,7 +157,9 @@ class RepoSettingsPage {
           const newProvider = this.providers[newProviderId];
 
           if (oldProvider && newProvider) {
-            const currentModel = oldProvider.models.find(m => m.id === this.currentSettings.default_model);
+            // Match by id or alias so legacy model IDs still resolve their tier
+            // when the user switches providers.
+            const currentModel = this.findModelWithAliases(oldProvider, this.currentSettings.default_model);
             if (currentModel) {
               const matchingModel = newProvider.models.find(m => m.tier === currentModel.tier);
               const defaultModel = newProvider.models.find(m => m.default);
@@ -619,6 +621,22 @@ class RepoSettingsPage {
     this.selectedProvider = providerId;
   }
 
+  /**
+   * Look up a model by ID within a provider, matching both canonical `id` and
+   * `aliases`. Historical repo settings may still reference legacy model IDs
+   * (e.g. `gpt-5.4` before reasoning-effort variants were introduced); those
+   * must still resolve to the canonical model so the UI shows the correct
+   * selection instead of silently falling back to the provider default.
+   *
+   * @param {Object} provider - Provider object with a `models` array
+   * @param {string} modelId - Model ID to look up (may be an alias)
+   * @returns {Object|undefined} Matching model definition, or undefined if not found
+   */
+  findModelWithAliases(provider, modelId) {
+    if (!provider || !provider.models || !modelId) return undefined;
+    return provider.models.find(m => m.id === modelId || m.aliases?.includes(modelId));
+  }
+
   /**
    * Render model select dropdown for the currently selected provider
    */
@@ -654,9 +672,10 @@ class RepoSettingsPage {
       return;
     }
 
-    // Find the selected model, fall back to default or first
+    // Find the selected model, fall back to default or first. Match aliases
+    // so legacy model IDs still render the canonical card.
     const modelId = this.currentSettings.default_model;
-    const model = provider.models.find(m => m.id === modelId)
+    const model = this.findModelWithAliases(provider, modelId)
       || provider.models.find(m => m.default)
       || provider.models[0];
 
@@ -691,7 +710,9 @@ class RepoSettingsPage {
     if (!provider) {
       return { providerName: providerId || 'Unknown', modelName: modelId || 'Unknown' };
     }
-    const model = provider.models?.find(m => m.id === modelId);
+    // Match aliases so historical council/voice configs that stored a legacy
+    // model ID still show the canonical model's display name.
+    const model = this.findModelWithAliases(provider, modelId);
     return {
       providerName: provider.name,
       modelName: model ? model.name : (modelId || 'Unknown')
@@ -1166,11 +1187,20 @@ class RepoSettingsPage {
     this.selectProvider(providerId);
     this.renderProviderSelect();
 
-    // Validate saved model exists in current provider
+    // Validate saved model exists in current provider. Match aliases so legacy
+    // model IDs (e.g. `gpt-5.4` recorded before reasoning-effort variants) keep
+    // resolving to the canonical model; if matched via alias, canonicalize the
+    // stored ID so the dropdown selects the right option and the next save
+    // writes the canonical ID back.
     const provider = this.providers[this.selectedProvider];
     if (provider) {
-      const modelExists = provider.models.some(m => m.id === this.currentSettings.default_model);
-      if (!modelExists) {
+      const matchedModel = this.findModelWithAliases(provider, this.currentSettings.default_model);
+      if (matchedModel) {
+        if (matchedModel.id !== this.currentSettings.default_model) {
+          this.currentSettings.default_model = matchedModel.id;
+          this.originalSettings.default_model = matchedModel.id;
+        }
+      } else {
         const fallbackModel = provider.models.find(m => m.default) || provider.models[0];
         if (fallbackModel) {
           this.currentSettings.default_model = fallbackModel.id;

package/src/ai/claude-provider.js

@@ -24,13 +24,24 @@ const CLAUDE_MODELS = [
     id: 'opus-4.7-xhigh',
     cli_model: 'claude-opus-4-7',
     env: { CLAUDE_CODE_EFFORT_LEVEL: 'xhigh' },
-    name: 'Opus 4.7 xhigh',
+    name: 'Opus 4.7 XHigh',
     tier: 'thorough',
     tagline: 'Latest Gen',
     description: 'Opus 4.7 (latest) with extra-high effort',
     badge: 'Latest',
     badgeClass: 'badge-power'
   },
+  {
+    id: 'opus-4.7-high',
+    cli_model: 'claude-opus-4-7',
+    env: { CLAUDE_CODE_EFFORT_LEVEL: 'high' },
+    name: 'Opus 4.7 High',
+    tier: 'thorough',
+    tagline: 'Latest Gen',
+    description: 'Opus 4.7 (latest) with high effort',
+    badge: 'Latest',
+    badgeClass: 'badge-power'
+  },
   {
     id: 'opus',
     aliases: ['opus-4.6-high'],