@in-the-loop-labs/pair-review 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@in-the-loop-labs/pair-review",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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": "2.0.0",
+  "version": "2.0.1",
   "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": "2.0.0",
+  "version": "2.0.1",
   "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

@@ -11198,14 +11198,78 @@ body.resizing * {
   opacity: 0.6;
 }
 
-/* Highlight flash when navigating to a line from a chat file link */
-.chat-file-link--highlight {
-  animation: chat-file-link-flash 2s ease-out;
+/* Unified line highlight for navigating to lines from chat/context links.
+   Applied to <tr> elements; styles target <td> children since box-shadow
+   and background-color animations don't render on <tr> in most browsers. */
+.chat-line-highlight td {
+  animation: chat-line-highlight-bg 3.5s ease-out forwards !important;
 }
 
-@keyframes chat-file-link-flash {
-  0% { background-color: rgba(227, 179, 65, 0.25); }
-  100% { background-color: transparent; }
+.chat-line-highlight > td:first-child {
+  animation: chat-line-highlight-border 3.5s ease-out forwards !important;
+}
+
+@keyframes chat-line-highlight-bg {
+  0% {
+    background-color: rgba(227, 179, 65, 0.20);
+  }
+  57% {
+    background-color: rgba(227, 179, 65, 0.08);
+  }
+  100% {
+    background-color: transparent;
+  }
+}
+
+@keyframes chat-line-highlight-border {
+  0% {
+    box-shadow: inset 5px 0 0 #e3b341;
+    background-color: rgba(227, 179, 65, 0.20);
+  }
+  57% {
+    /* ~2s: border still solid, background fading */
+    box-shadow: inset 5px 0 0 #e3b341;
+    background-color: rgba(227, 179, 65, 0.08);
+  }
+  100% {
+    box-shadow: inset 5px 0 0 transparent;
+    background-color: transparent;
+  }
+}
+
+[data-theme="dark"] .chat-line-highlight td {
+  animation: chat-line-highlight-bg-dark 3.5s ease-out forwards !important;
+}
+
+[data-theme="dark"] .chat-line-highlight > td:first-child {
+  animation: chat-line-highlight-border-dark 3.5s ease-out forwards !important;
+}
+
+@keyframes chat-line-highlight-bg-dark {
+  0% {
+    background-color: rgba(227, 179, 65, 0.15);
+  }
+  57% {
+    background-color: rgba(227, 179, 65, 0.06);
+  }
+  100% {
+    background-color: transparent;
+  }
+}
+
+@keyframes chat-line-highlight-border-dark {
+  0% {
+    box-shadow: inset 5px 0 0 #e3b341;
+    background-color: rgba(227, 179, 65, 0.15);
+  }
+  57% {
+    box-shadow: inset 5px 0 0 #e3b341;
+    background-color: rgba(227, 179, 65, 0.06);
+  }
+  100% {
+    box-shadow: inset 5px 0 0 transparent;
+    background-color: transparent;
+  }
 }
 
 .chat-file-link--loading {
@@ -11227,28 +11291,6 @@ body.resizing * {
   to { transform: rotate(360deg); }
 }
 
-/* Gutter arrow for "already here" micro-feedback */
-.chat-gutter-arrow {
-  position: absolute;
-  left: -2px;
-  top: 50%;
-  transform: translateY(-50%);
-  color: #e3b341;
-  font-size: 20px;
-  font-weight: bold;
-  pointer-events: none;
-  transition: opacity 0.3s ease;
-  z-index: 2;
-}
-
-.chat-gutter-arrow--fade {
-  opacity: 0;
-}
-
-[data-theme="dark"] .chat-gutter-arrow {
-  color: #e3b341;
-}
-
 /* Error bubble */
 .chat-panel__error-bubble {
   display: flex;
@@ -11362,6 +11404,7 @@ body.resizing * {
 
 /* Chat Panel Context Card */
 .chat-panel__context-card {
+  position: relative;
   display: flex;
   align-items: center;
   gap: 6px;
@@ -11391,6 +11434,7 @@ body.resizing * {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  min-width: 0;
   color: var(--color-text-secondary);
 }
 
@@ -11405,9 +11449,12 @@ body.resizing * {
   display: none;
   align-items: center;
   justify-content: center;
+  position: absolute;
+  right: 6px;
+  top: 50%;
+  transform: translateY(-50%);
   width: 16px;
   height: 16px;
-  margin-left: auto;
   padding: 0;
   border: none;
   border-radius: 50%;
@@ -11416,7 +11463,6 @@ body.resizing * {
   font-size: 12px;
   line-height: 1;
   cursor: pointer;
-  flex-shrink: 0;
   transition: background 0.15s ease, color 0.15s ease;
 }
 
@@ -11938,20 +11984,6 @@ body.resizing * {
   color: var(--color-text-secondary);
 }
 
-/* Highlight flash animation for scroll-to-line targeting */
-.highlight-flash {
-  animation: highlightFlash 1.5s ease-out;
-}
-
-@keyframes highlightFlash {
-  0% {
-    background-color: var(--color-selection, #fff8c5);
-  }
-  100% {
-    background-color: transparent;
-  }
-}
-
 /* Dark theme overrides for context files */
 [data-theme="dark"] .d2h-file-wrapper.context-file {
   border-left-color: var(--color-accent-primary, #58a6ff);

package/public/js/components/ChatPanel.js

@@ -2135,6 +2135,7 @@ class ChatPanel {
     const bubble = streamingMsg.querySelector('.chat-panel__bubble');
     if (bubble) {
       bubble.innerHTML = this.renderMarkdown(text) + '<span class="chat-panel__cursor"></span>';
+      this._linkifyFileReferences(bubble);
     }
     this.scrollToBottom();
   }
@@ -2530,6 +2531,7 @@ class ChatPanel {
       if (contextEl) {
         // Context file — find the right chunk by line number or use first chunk
         let contextFileId = contextEl.dataset?.contextId; // legacy: on wrapper itself
+        let lineFoundInChunk = !!contextFileId; // legacy mode assumes line is present
         if (!contextFileId && lineStart) {
           // Merged wrapper: find chunk tbody containing this line
           const chunks = [...contextEl.querySelectorAll('tbody.context-chunk[data-context-id]')];
@@ -2537,27 +2539,32 @@ class ChatPanel {
             const row = chunk.querySelector(`tr[data-line-number="${lineStart}"]`);
             if (row) {
               contextFileId = chunk.dataset.contextId;
+              lineFoundInChunk = true;
               break;
             }
           }
         }
-        if (!contextFileId) {
-          // Fallback: use first chunk's context ID
-          const firstChunk = contextEl.querySelector('tbody.context-chunk[data-context-id]');
-          if (firstChunk) contextFileId = firstChunk.dataset.contextId;
-        }
-        if (window.prManager?.scrollToContextFile) {
-          window.prManager.scrollToContextFile(file, lineStart, contextFileId);
+
+        if (lineFoundInChunk || !lineStart) {
+          if (!contextFileId) {
+            const firstChunk = contextEl.querySelector('tbody.context-chunk[data-context-id]');
+            if (firstChunk) contextFileId = firstChunk.dataset.contextId;
+          }
+          if (window.prManager?.scrollToContextFile) {
+            window.prManager.scrollToContextFile(file, lineStart, contextFileId);
+          }
+          return;
         }
+        // Line not found in any existing chunk — fall through to add new range
       } else {
         // Diff file
         if (lineStart) {
-          this._scrollToLine(file, lineStart);
+          await this._scrollToLine(file, lineStart, lineEnd);
         } else if (window.prManager?.scrollToFile) {
           window.prManager.scrollToFile(file);
         }
+        return;
       }
-      return;
     }
 
     // File not in DOM — try to add as context file
@@ -2574,7 +2581,7 @@ class ChatPanel {
 
       if (result.type === 'diff') {
         if (lineStart) {
-          this._scrollToLine(file, lineStart);
+          await this._scrollToLine(file, lineStart, lineEnd);
         } else if (window.prManager?.scrollToFile) {
           window.prManager.scrollToFile(file);
         }
@@ -2594,13 +2601,17 @@ class ChatPanel {
   }
 
   /**
-   * Scroll to a specific line within a file wrapper, with micro-feedback
-   * when the target is already visible.
+   * Scroll to a specific line within a file wrapper, applying a bold
+   * left-border + background highlight that fades over ~3.5s.
+   * Supports line ranges: if lineEnd is provided, all rows from
+   * lineStart to lineEnd are highlighted. If the line is in a collapsed
+   * diff chunk, expands the chunk first via ensureLinesVisible().
    * @param {string} file - File path
-   * @param {number} lineStart - Target line number
+   * @param {number} lineStart - Target line number (start of range)
+   * @param {number|null} [lineEnd] - End of target line range (used for expansion)
    * @param {HTMLElement} [fileWrapper] - Pre-resolved file wrapper element
    */
-  _scrollToLine(file, lineStart, fileWrapper) {
+  async _scrollToLine(file, lineStart, lineEnd, fileWrapper) {
     if (!fileWrapper) {
       const escaped = CSS.escape(file);
       fileWrapper = document.querySelector(`[data-file-name="${escaped}"]`) ||
@@ -2608,68 +2619,60 @@ class ChatPanel {
     }
     if (!fileWrapper) return;
 
-    // Find the target row by line number
-    const lineNums = fileWrapper.querySelectorAll('.line-num2');
-    let targetRow = null;
-    for (const ln of lineNums) {
-      if (ln.textContent.trim() === String(lineStart)) {
-        targetRow = ln.closest('tr');
-        break;
-      }
+    // Collect all target rows (single line or range)
+    const end = lineEnd || lineStart;
+    let targetRows = this._findLineRows(fileWrapper, lineStart, end);
+
+    // If not found, try expanding the collapsed diff context
+    if (targetRows.length === 0 && window.prManager?.ensureLinesVisible) {
+      await window.prManager.ensureLinesVisible([
+        { file, line_start: lineStart, line_end: end, side: 'RIGHT' }
+      ]);
+      targetRows = this._findLineRows(fileWrapper, lineStart, end);
     }
-    if (!targetRow) return;
+    if (targetRows.length === 0) return;
+
+    const primaryRow = targetRows[0];
 
-    // Check if the target row is already visible in the viewport
-    const rect = targetRow.getBoundingClientRect();
+    // Check if the primary target row is already visible in the viewport
+    const rect = primaryRow.getBoundingClientRect();
     const isVisible = rect.top >= 0 && rect.bottom <= window.innerHeight;
 
-    if (isVisible) {
-      // Already visible — provide micro-feedback instead of scrolling
-      this._showLineFeedback(targetRow, lineStart);
-    } else {
-      // Scroll to the row, then apply highlight
-      targetRow.scrollIntoView({ behavior: 'smooth', block: 'center' });
-      targetRow.classList.add('chat-file-link--highlight');
-      setTimeout(() => targetRow.classList.remove('chat-file-link--highlight'), 2000);
-    }
-  }
-
-  /**
-   * Show micro-feedback when a target line is already visible:
-   * 1. A brief hop animation (scroll nudge)
-   * 2. A temporary gutter arrow indicator
-   * @param {HTMLElement} row - The target table row
-   * @param {number} lineNum - The line number
-   */
-  _showLineFeedback(row, lineNum) {
-    // Highlight the row
-    row.classList.add('chat-file-link--highlight');
-    setTimeout(() => row.classList.remove('chat-file-link--highlight'), 2000);
-
-    // Inject a temporary gutter arrow
-    const lineNumCell = row.querySelector('.d2h-code-linenumber');
-    if (lineNumCell) {
-      const arrow = document.createElement('span');
-      arrow.className = 'chat-gutter-arrow';
-      arrow.textContent = '\u2192'; // →
-      lineNumCell.appendChild(arrow);
-      // Fade out and remove after 1.5s
-      setTimeout(() => {
-        arrow.classList.add('chat-gutter-arrow--fade');
-        arrow.addEventListener('transitionend', () => arrow.remove(), { once: true });
-        // Safety cleanup in case transitionend doesn't fire
-        setTimeout(() => arrow.remove(), 500);
-      }, 1500);
-    }
-
-    // Hop animation — small vertical nudge
-    const scrollContainer = document.getElementById('diff-container') ||
-      row.closest('.d2h-wrapper') || document.documentElement;
-    const currentScroll = scrollContainer.scrollTop;
-    scrollContainer.scrollTo({ top: currentScroll - 30, behavior: 'smooth' });
-    setTimeout(() => {
-      scrollContainer.scrollTo({ top: currentScroll, behavior: 'smooth' });
-    }, 150);
+    if (!isVisible) {
+      primaryRow.scrollIntoView({ behavior: 'smooth', block: 'center' });
+    }
+
+    // Apply the highlight to all target rows
+    for (const row of targetRows) {
+      // Remove any existing highlight first (in case of rapid re-clicks)
+      row.classList.remove('chat-line-highlight');
+      // Force reflow so re-adding the class restarts the animation
+      void row.offsetWidth;
+      row.classList.add('chat-line-highlight');
+      row.addEventListener('animationend', () => {
+        row.classList.remove('chat-line-highlight');
+      }, { once: true });
+    }
+  }
+
+  /**
+   * Find all table rows matching a line range within a file wrapper.
+   * @param {HTMLElement} fileWrapper - The file wrapper element
+   * @param {number} lineStart - Start line number
+   * @param {number} lineEnd - End line number (inclusive)
+   * @returns {HTMLElement[]} Matching rows
+   */
+  _findLineRows(fileWrapper, lineStart, lineEnd) {
+    const rows = [];
+    const lineNums = fileWrapper.querySelectorAll('.line-num2');
+    for (const ln of lineNums) {
+      const num = parseInt(ln.textContent.trim(), 10);
+      if (!isNaN(num) && num >= lineStart && num <= lineEnd) {
+        const row = ln.closest('tr');
+        if (row) rows.push(row);
+      }
+    }
+    return rows;
   }
 
   /**

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

@@ -43,6 +43,45 @@ class CommentManager {
     });
   }
 
+  /**
+   * Check whether a line falls within a diff hunk for the given file.
+   * Uses the parsed hunk blocks from HunkParser rather than relying on
+   * diff_position, which may be absent for comments created by the chat agent.
+   *
+   * @param {string} fileName - The file path
+   * @param {number} lineNum - The line number to check
+   * @param {string} [side='RIGHT'] - 'LEFT' for old/deleted lines, 'RIGHT' for new/added/context
+   * @returns {boolean} true if the line is inside a diff hunk
+   */
+  isLineInDiffHunk(fileName, lineNum, side = 'RIGHT') {
+    const patch = this.prManager?.filePatches?.get(fileName);
+    if (!patch || !window.HunkParser) return false;
+
+    const blocks = window.HunkParser.parseDiffIntoBlocks(patch);
+    for (const block of blocks) {
+      let oldLine = block.oldStart;
+      let newLine = block.newStart;
+
+      for (const line of block.lines) {
+        if (line.startsWith('\\ No newline')) continue;
+        if (line.startsWith('+')) {
+          if (side === 'RIGHT' && newLine === lineNum) return true;
+          newLine++;
+        } else if (line.startsWith('-')) {
+          if (side === 'LEFT' && oldLine === lineNum) return true;
+          oldLine++;
+        } else {
+          // Context line — present on both sides
+          if (side === 'LEFT' && oldLine === lineNum) return true;
+          if (side === 'RIGHT' && newLine === lineNum) return true;
+          oldLine++;
+          newLine++;
+        }
+      }
+    }
+    return false;
+  }
+
   /**
    * Show comment form inline
    * @param {HTMLElement} targetRow - The row to insert the comment form after
@@ -503,7 +542,13 @@ class CommentManager {
     // WORKAROUND: Comments on expanded context lines (outside diff hunks) will be
     // submitted as file-level comments since GitHub's API doesn't support line-level
     // comments on these lines. Show an indicator to inform the user.
-    const isExpandedContext = comment.diff_position === null || comment.diff_position === undefined;
+    // Check actual diff hunk membership rather than diff_position, which may be
+    // absent for comments created by the chat agent even when they target hunk lines.
+    const commentSide = comment.side || 'RIGHT';
+    const isRange = comment.line_end && comment.line_end !== comment.line_start;
+    const isExpandedContext = isRange
+      ? !this.isLineInDiffHunk(comment.file, comment.line_start, commentSide) || !this.isLineInDiffHunk(comment.file, comment.line_end, commentSide)
+      : !this.isLineInDiffHunk(comment.file, comment.line_start, commentSide);
     const expandedContextIndicator = isExpandedContext
       ? `<span class="expanded-context-indicator" title="This expanded context comment will be posted to GitHub as a file-level comment">
            <svg viewBox="0 0 16 16" width="14" height="14">

package/public/js/pr.js

@@ -4575,9 +4575,11 @@ class PRManager {
       setTimeout(() => {
         const row = wrapper.querySelector(`tr[data-line-number="${lineStart}"]`);
         if (row) {
-          row.classList.add('highlight-flash');
+          row.classList.remove('chat-line-highlight');
+          void row.offsetWidth;
+          row.classList.add('chat-line-highlight');
           row.addEventListener('animationend', () => {
-            row.classList.remove('highlight-flash');
+            row.classList.remove('chat-line-highlight');
           }, { once: true });
         }
       }, 400);
@@ -4593,13 +4595,7 @@ class PRManager {
       return { type: 'diff' };
     }
 
-    // 3. Check existing context files (idempotent)
-    const existing = this.contextFiles?.find(cf => cf.file === file);
-    if (existing) {
-      return { type: 'context', contextFile: existing };
-    }
-
-    // 4. Compute line range defaults
+    // 3. Compute line range values up front (used by both existing-check and POST)
     let lineStartVal, lineEndVal;
     if (lineStart == null && lineEnd == null) {
       lineStartVal = 1;
@@ -4612,6 +4608,55 @@ class PRManager {
       lineEndVal = Math.min(lineEnd, lineStart + 499);
     }
 
+    // 4. Check existing context files — expand range if needed
+    const existingEntries = this.contextFiles?.filter(cf => cf.file === file) || [];
+    if (existingEntries.length > 0 && lineStart != null) {
+      const covering = existingEntries.find(cf =>
+        cf.line_start <= lineStartVal && cf.line_end >= lineEndVal
+      );
+      if (covering) {
+        return { type: 'context', contextFile: covering };
+      }
+
+      const overlapping = existingEntries.find(cf =>
+        cf.line_start <= lineEndVal && cf.line_end >= lineStartVal
+      );
+      if (overlapping) {
+        const newStart = Math.min(overlapping.line_start, lineStartVal);
+        let newEnd = Math.max(overlapping.line_end, lineEndVal);
+        if (newEnd - newStart + 1 > 500) {
+          newEnd = newStart + 499;
+        }
+        const reviewId = this.currentPR.id;
+        try {
+          const resp = await fetch(`/api/reviews/${reviewId}/context-files/${overlapping.id}`, {
+            method: 'PATCH',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ line_start: newStart, line_end: newEnd })
+          });
+          if (resp.ok) {
+            // Evict stale entries for this file so loadContextFiles sees
+            // them as new IDs and triggers a fresh render.
+            const staleFile = overlapping.file;
+            this.contextFiles = (this.contextFiles || []).filter(cf => cf.file !== staleFile);
+            // Remove the file wrapper from the DOM so chunks are re-created
+            const staleWrapper = document.querySelector(
+              `.d2h-file-wrapper.context-file[data-file-name="${CSS.escape(staleFile)}"]`
+            );
+            if (staleWrapper) staleWrapper.remove();
+
+            await this.loadContextFiles();
+            const updated = this.contextFiles?.find(cf => cf.id === overlapping.id);
+            return { type: 'context', contextFile: updated || overlapping, expanded: true };
+          }
+        } catch (err) {
+          console.error('Error expanding context file range:', err);
+        }
+      }
+    } else if (existingEntries.length > 0) {
+      return { type: 'context', contextFile: existingEntries[0] };
+    }
+
     // 5. POST to add context file
     const reviewId = this.currentPR.id;
     try {

package/src/ai/cursor-agent-provider.js

@@ -165,6 +165,7 @@ class CursorAgentProvider extends AIProvider {
    * @param {string[]} configOverrides.extra_args - Additional CLI arguments
    * @param {Object} configOverrides.env - Additional environment variables
    * @param {Object[]} configOverrides.models - Custom model definitions
+   * @param {boolean} configOverrides.yolo - When true, use --yolo instead of --trust/--sandbox
    */
   constructor(model = DEFAULT_CURSOR_AGENT_MODEL, configOverrides = {}) {
     super(model);
@@ -209,9 +210,12 @@ class CursorAgentProvider extends AIProvider {
     //   in parseCursorAgentResponse (isStreamingDelta / timestamp_ms check). If this
     //   flag is removed, the parser will treat all assistant events as complete messages,
     //   which is fine but will change accumulation behavior. Keep these in sync.
-    // Use --sandbox enabled for security (when not in yolo mode)
-    const sandboxArgs = configOverrides.yolo ? ['--sandbox', 'disabled'] : ['--sandbox', 'enabled'];
-    const baseArgs = ['-p', '--output-format', 'stream-json', '--stream-partial-output', '--model', model, ...sandboxArgs];
+    // Normal mode: --trust to auto-approve the working directory, --sandbox enabled for safety
+    // Yolo mode: --yolo to skip all permissions (implies trust + sandbox disabled)
+    const permissionArgs = configOverrides.yolo
+      ? ['--yolo']
+      : ['--trust', '--sandbox', 'enabled'];
+    const baseArgs = ['-p', '--output-format', 'stream-json', '--stream-partial-output', '--model', model, ...permissionArgs];
     const providerArgs = configOverrides.extra_args || [];
     const modelConfig = configOverrides.models?.find(m => m.id === model);
     const modelArgs = modelConfig?.extra_args || [];
@@ -700,7 +704,8 @@ class CursorAgentProvider extends AIProvider {
    */
   buildArgsForModel(model) {
     // Base args for extraction (text output, no tools needed)
-    const baseArgs = ['-p', '--output-format', 'text', '--model', model];
+    // --trust needed to auto-approve the working directory without interactive prompt
+    const baseArgs = ['-p', '--output-format', 'text', '--trust', '--model', model];
     // Provider-level extra_args (from configOverrides)
     const providerArgs = this.configOverrides?.extra_args || [];
     // Model-specific extra_args (from the model config for the given model)

package/src/chat/prompt-builder.js

@@ -57,7 +57,7 @@ function buildChatPrompt({ review, prData, skillPath, chatInstructions }) {
     ? `(\`${skillPath}\`)`
     : '(`.pi/skills/pair-review-api/SKILL.md`)';
   sections.push(
-    `You MUST load the pair-review-api skill ${skillRef} for endpoint details. With it you can create, update, and delete review comments, adopt or dismiss AI suggestions, and trigger new analyses via curl.\n` +
+    `You MUST read the pair-review-api skill ${skillRef} for endpoint details using the Read tool. With it you can create, update, and delete review comments, adopt or dismiss AI suggestions, and trigger new analyses via curl.\n` +
     'IMPORTANT: Do NOT mention that you are reading a skill file, loading API documentation, or consulting reference material. Just use the API naturally as if you already know it.'
   );
 
@@ -72,6 +72,16 @@ function buildChatPrompt({ review, prData, skillPath, chatInstructions }) {
     'Add context files judiciously — only when directly relevant, with focused line ranges.'
   );
 
+  // Tool usage discipline — avoid unnecessary Task delegation
+  sections.push(
+    '## Tool usage\n\n' +
+    'Prefer answering from context you already have (the diff, suggestions, and prior conversation). ' +
+    'For simple lookups — reading a file, searching for a symbol, running a git command — use the basic tools directly. ' +
+    'Only use the Task tool for genuinely large, multi-step operations that would consume significant context ' +
+    '(e.g., tracing a complex call chain across many files, or broad codebase exploration). ' +
+    'Most chat questions should not require a Task.'
+  );
+
   // Instructions
   sections.push(
     'Answer questions about this review, the code changes, and any AI suggestions. ' +

package/src/routes/context-files.js

@@ -172,6 +172,57 @@ router.get('/api/reviews/:reviewId/context-files', validateReviewId, async (req,
   }
 });
 
+/**
+ * PATCH /api/reviews/:reviewId/context-files/:id
+ * Update the line range of an existing context file entry.
+ * Body: { line_start, line_end }
+ */
+router.patch('/api/reviews/:reviewId/context-files/:id', validateReviewId, async (req, res) => {
+  try {
+    const id = parseInt(req.params.id, 10);
+
+    if (isNaN(id) || id <= 0) {
+      return res.status(400).json({ error: 'Invalid context file ID' });
+    }
+
+    const { line_start, line_end } = req.body;
+
+    const lineStart = parseInt(line_start, 10);
+    const lineEnd = parseInt(line_end, 10);
+
+    if (isNaN(lineStart) || lineStart <= 0) {
+      return res.status(400).json({ error: 'line_start must be a positive integer' });
+    }
+
+    if (isNaN(lineEnd) || lineEnd <= 0) {
+      return res.status(400).json({ error: 'line_end must be a positive integer' });
+    }
+
+    if (lineEnd < lineStart) {
+      return res.status(400).json({ error: 'line_end must be >= line_start' });
+    }
+
+    if (lineEnd - lineStart + 1 > 500) {
+      return res.status(400).json({ error: 'Range cannot exceed 500 lines' });
+    }
+
+    const db = req.app.get('db');
+    const contextFileRepo = new ContextFileRepository(db);
+
+    const updated = await contextFileRepo.updateRange(id, lineStart, lineEnd);
+
+    if (!updated) {
+      return res.status(404).json({ error: 'Context file not found' });
+    }
+
+    res.json({ success: true });
+    broadcastReviewEvent(req.reviewId, { type: 'review:context_files_changed' }, { sourceClientId: req.get('X-Client-Id') });
+  } catch (error) {
+    logger.error('Error updating context file range:', error);
+    res.status(500).json({ error: 'Failed to update context file range' });
+  }
+});
+
 /**
  * DELETE /api/reviews/:reviewId/context-files/:id
  * Remove a single context file range by ID.

package/src/routes/pr.js

@@ -25,6 +25,7 @@ const { v4: uuidv4 } = require('uuid');
 const fs = require('fs').promises;
 const path = require('path');
 const logger = require('../utils/logger');
+const { buildDiffLineSet } = require('../utils/diff-annotator');
 const { broadcastReviewEvent } = require('../sse/review-events');
 const simpleGit = require('simple-git');
 const {
@@ -988,8 +989,8 @@ router.post('/api/pr/:owner/:repo/:number/submit-review', async (req, res) => {
     // GraphQL supports both line-level comments (within diff hunks) and file-level comments
     // (for expanded context lines outside diff hunks via subjectType: FILE).
     //
-    // Comments on expanded context lines (diff_position IS NULL) are formatted as file-level
-    // comments with a "(Ref Line X)" prefix in the body.
+    // We check whether the comment's target line actually appears in a diff hunk
+    // rather than relying on diff_position (which may not be set by all sources).
     const prNodeId = prData.node_id;
     if (!prNodeId) {
       return res.status(400).json({
@@ -997,6 +998,8 @@ router.post('/api/pr/:owner/:repo/:number/submit-review', async (req, res) => {
       });
     }
 
+    const diffLineSet = buildDiffLineSet(diffContent);
+
     const graphqlComments = comments.map(comment => {
       const side = comment.side || 'RIGHT';
       const isRange = comment.line_end && comment.line_end !== comment.line_start;
@@ -1013,10 +1016,15 @@ router.post('/api/pr/:owner/:repo/:number/submit-review', async (req, res) => {
         };
       }
 
-      // Detect expanded context comments (no diff_position)
-      // These are submitted as file-level comments since GitHub API rejects
-      // line-level comments on lines outside diff hunks.
-      const isExpandedContext = comment.diff_position === null || comment.diff_position === undefined;
+      // Detect expanded context comments by checking whether the target line
+      // actually appears in a diff hunk. This is more reliable than checking
+      // diff_position, which may be absent for comments created by the chat agent.
+      // For range comments, both endpoints must be inside the diff; if the start
+      // line falls outside a hunk but the end is inside, submitting with start_line
+      // would produce a position GitHub cannot render.
+      const isExpandedContext = isRange
+        ? !diffLineSet.isLineInDiff(comment.file, comment.line_start, side) || !diffLineSet.isLineInDiff(comment.file, comment.line_end, side)
+        : !diffLineSet.isLineInDiff(comment.file, comment.line_start, side);
 
       if (isExpandedContext) {
         // File-level comment with line reference prefix

package/src/utils/diff-annotator.js

@@ -187,6 +187,7 @@ function annotateDiff(rawDiff) {
   }
 
   const lines = rawDiff.split('\n');
+  if (lines[lines.length - 1] === '') lines.pop();
   const output = [];
 
   let currentFile = {};
@@ -404,11 +405,84 @@ function parseAnnotatedDiff(annotatedDiff) {
   return files;
 }
 
+/**
+ * Build a lookup of which file+side+line combinations appear in diff hunks.
+ * Used to determine whether a comment targets a line GitHub can render inline
+ * (inside a hunk) vs. one that must be submitted as file-level.
+ *
+ * @param {string} rawDiff - Raw unified diff from git
+ * @returns {{ isLineInDiff: (file: string, line: number, side?: string) => boolean }}
+ */
+function buildDiffLineSet(rawDiff) {
+  if (!rawDiff || rawDiff.trim() === '') {
+    return { isLineInDiff: () => false };
+  }
+
+  const entries = new Set();
+  const diffLines = rawDiff.split('\n');
+  // Trim trailing empty element produced by split('\n') on newline-terminated input.
+  // Without this, the empty string matches the context-line branch and adds phantom
+  // entries for lines beyond the actual hunk boundary.
+  if (diffLines[diffLines.length - 1] === '') diffLines.pop();
+  let currentFile = {};
+  let oldLineNum = 0;
+  let newLineNum = 0;
+  let inHunk = false;
+
+  for (const line of diffLines) {
+    if (line.startsWith('diff --git')) {
+      currentFile = {};
+      inHunk = false;
+      parseFileHeader(line, currentFile);
+      continue;
+    }
+
+    if (parseFileHeader(line, currentFile)) {
+      continue;
+    }
+
+    const hunkInfo = parseHunkHeader(line);
+    if (hunkInfo) {
+      oldLineNum = hunkInfo.oldStart;
+      newLineNum = hunkInfo.newStart;
+      inHunk = true;
+      continue;
+    }
+
+    if (!inHunk) continue;
+
+    if (line.startsWith('\\ No newline')) continue;
+
+    const filePath = currentFile.newPath || currentFile.oldPath;
+    if (!filePath) continue;
+
+    if (line.startsWith('+')) {
+      entries.add(`${filePath}:RIGHT:${newLineNum}`);
+      newLineNum++;
+    } else if (line.startsWith('-')) {
+      entries.add(`${filePath}:LEFT:${oldLineNum}`);
+      oldLineNum++;
+    } else if (line.startsWith(' ') || line === '') {
+      entries.add(`${filePath}:LEFT:${oldLineNum}`);
+      entries.add(`${filePath}:RIGHT:${newLineNum}`);
+      oldLineNum++;
+      newLineNum++;
+    }
+  }
+
+  return {
+    isLineInDiff(file, lineNum, side = 'RIGHT') {
+      return entries.has(`${file}:${side}:${lineNum}`);
+    }
+  };
+}
+
 module.exports = {
   annotateDiff,
   parseAnnotatedDiff,
   parseHunkHeader,
   formatLineNum,
   getLineMarker,
-  getLineContent
+  getLineContent,
+  buildDiffLineSet
 };