@in-the-loop-labs/pair-review 2.4.1 → 2.4.3

package/package.json

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

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

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

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

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

package/public/css/pr.css

@@ -12277,9 +12277,12 @@ body.resizing * {
   font-size: 14px;
 }
 
-/* Override flex: 1 so the file name doesn't push the badge away */
+/* Don't grow (keeps badge next to text), shrink for long paths, clip from the left so the filename stays visible */
 .context-file-header .d2h-file-name {
-  flex: none;
+  flex: 0 1 auto;
+  direction: rtl;
+  unicode-bidi: plaintext;
+  text-overflow: ellipsis;
 }
 
 /* Push viewed checkbox (and everything after it) to the right */

package/public/js/pr.js

@@ -4480,7 +4480,16 @@ class PRManager {
     const tbody = document.createElement('tbody');
     tbody.className = 'd2h-diff-tbody context-chunk';
     tbody.dataset.contextId = contextFile.id;
-    tbody.dataset.lineStart = contextFile.line_start;
+
+    // Compute effective display range, shifting for end-of-file
+    const clampedEnd = Math.min(contextFile.line_end, data.lines.length);
+    const intendedSize = contextFile.line_end - contextFile.line_start + 1;
+    let effectiveStart = contextFile.line_start;
+    const actualSize = clampedEnd - effectiveStart + 1;
+    if (actualSize < intendedSize && effectiveStart > 1) {
+      effectiveStart = Math.max(1, effectiveStart - (intendedSize - actualSize));
+    }
+    tbody.dataset.lineStart = effectiveStart;
 
     // Chunk header row with range label and per-chunk dismiss button
     const headerRow = document.createElement('tr');
@@ -4493,8 +4502,7 @@ class PRManager {
     contentTd.colSpan = 3;
     const rangeLabel = document.createElement('span');
     rangeLabel.className = 'context-range-label';
-    const lineEnd = Math.min(contextFile.line_end, data.lines.length);
-    rangeLabel.textContent = `Lines ${contextFile.line_start}\u2013${lineEnd}`;
+    rangeLabel.textContent = `Lines ${effectiveStart}\u2013${clampedEnd}`;
     contentTd.appendChild(rangeLabel);
     const chunkDismiss = document.createElement('button');
     chunkDismiss.className = 'context-chunk-dismiss';
@@ -4508,25 +4516,22 @@ class PRManager {
     headerRow.appendChild(contentTd);
     tbody.appendChild(headerRow);
 
-    const lineStart = contextFile.line_start;
-    const clampedEnd = Math.min(contextFile.line_end, data.lines.length);
-
     // Add expand-up gap row if there are lines above the context range
-    if (lineStart > 1) {
-      const gapAboveSize = lineStart - 1;
+    if (effectiveStart > 1) {
+      const gapAboveSize = effectiveStart - 1;
       const gapAbove = window.HunkParser.createGapRowElement(
         contextFile.file,
-        1,              // startLine (old coords)
-        lineStart - 1,  // endLine (old coords)
+        1,                  // startLine (old coords)
+        effectiveStart - 1, // endLine (old coords)
         gapAboveSize,
         'above',
         this.expandGapContext.bind(this),
-        1               // startLineNew (same as old for context files — no diff offset)
+        1                   // startLineNew (same as old for context files — no diff offset)
       );
       tbody.appendChild(gapAbove);
     }
 
-    for (let i = lineStart; i <= clampedEnd; i++) {
+    for (let i = effectiveStart; i <= clampedEnd; i++) {
       const lineData = {
         type: 'context',
         oldNumber: i,
@@ -4874,8 +4879,9 @@ class PRManager {
       lineStartVal = 1;
       lineEndVal = 100;
     } else if (lineEnd == null) {
-      lineStartVal = lineStart;
-      lineEndVal = lineStart + 49;
+      // Center a ~21-line window around the target line (±10 lines)
+      lineStartVal = Math.max(1, lineStart - 10);
+      lineEndVal = lineStartVal + 20;
     } else {
       lineStartVal = lineStart;
       lineEndVal = Math.min(lineEnd, lineStart + 499);

package/src/ai/analyzer.js

@@ -38,6 +38,29 @@ function buildReviewerLabel(idx, voice) {
   return `Reviewer ${idx + 1} (${voice.provider}/${voice.model})`;
 }
 
+/**
+ * Capture a unified diff snapshot for an analysis run.
+ * This ensures the diff is preserved even if the branch is force-pushed later.
+ *
+ * @param {Analyzer} analyzer - Analyzer instance (provides buildGitDiffCommand)
+ * @param {string} worktreePath - Path to the git worktree
+ * @param {Object} prMetadata - PR metadata with base/head branch info
+ * @param {string} logPrefix - Prefix for log messages
+ * @returns {Promise<string|null>} The diff snapshot or null if capture failed
+ */
+async function captureDiffSnapshot(analyzer, worktreePath, prMetadata, logPrefix = '') {
+  try {
+    const diffCmd = analyzer.buildGitDiffCommand(prMetadata);
+    const { stdout } = await execPromise(diffCmd, { cwd: worktreePath, maxBuffer: 50 * 1024 * 1024 });
+    logger.info(`${logPrefix}Captured diff snapshot (${stdout.length} bytes)`);
+    return stdout;
+  } catch (diffError) {
+    logger.warn(`${logPrefix}Failed to capture diff snapshot: ${diffError.message}`);
+    // Continue without diff snapshot - share endpoint will fall back to current PR diff
+    return null;
+  }
+}
+
 /**
  * Build shared context for a council voice/reviewer.
  * Used by both single-voice and multi-voice paths in runReviewerCentricCouncil.
@@ -167,7 +190,11 @@ class Analyzer {
       logger.info(`${logPrefix}HEAD SHA: ${headSha}`);
     }
 
-    // Create analysis run record in database (skip when caller already created it)
+    // Capture unified diff snapshot for this analysis run
+    // This ensures the diff is preserved even if the branch is force-pushed later
+    const diffSnapshot = await captureDiffSnapshot(this, worktreePath, prMetadata, logPrefix);
+
+    // Create or update analysis run record in database
     const analysisRunRepo = new AnalysisRunRepository(this.db);
     if (!skipRunCreation) {
       try {
@@ -180,13 +207,22 @@ class Analyzer {
           customInstructions: mergedInstructions,  // Keep for backward compat
           repoInstructions,
           requestInstructions,
-          headSha
+          headSha,
+          diff: diffSnapshot
         });
         logger.info(`${logPrefix}Created analysis_run record: ${runId}`);
       } catch (createError) {
         logger.warn(`${logPrefix}Failed to create analysis_run record: ${createError.message}`);
         // Continue with analysis even if record creation fails
       }
+    } else if (diffSnapshot) {
+      // Run was created by caller, but we still need to store the diff snapshot
+      try {
+        await analysisRunRepo.update(runId, { diff: diffSnapshot });
+        logger.info(`${logPrefix}Updated analysis_run with diff snapshot`);
+      } catch (updateError) {
+        logger.warn(`${logPrefix}Failed to update analysis_run with diff: ${updateError.message}`);
+      }
     }
 
     // Load generated file patterns to skip during analysis
@@ -2657,6 +2693,9 @@ File-level suggestions should NOT have a line number. They apply to the entire f
     const headSha = prMetadata?.head_sha || null;
     const analysisRunRepo = new AnalysisRunRepository(this.db);
 
+    // Capture unified diff snapshot for this analysis run
+    const diffSnapshot = await captureDiffSnapshot(this, worktreePath, prMetadata, '[ReviewerCouncil] ');
+
     // Create parent analysis run only if caller didn't already create it
     // (when runId is passed via options, the route handler has already inserted the record)
     if (!options.runId) {
@@ -2671,6 +2710,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
           repoInstructions: instructions?.repoInstructions || null,
           requestInstructions: instructions?.requestInstructions || null,
           headSha,
+          diff: diffSnapshot,
           configType: 'council',
           levelsConfig: enabledLevels
         });
@@ -2678,6 +2718,14 @@ File-level suggestions should NOT have a line number. They apply to the entire f
       } catch (err) {
         logger.warn(`[ReviewerCouncil] Failed to create parent run record: ${err.message}`);
       }
+    } else if (diffSnapshot) {
+      // Run was created by caller, but we still need to store the diff snapshot
+      try {
+        await analysisRunRepo.update(parentRunId, { diff: diffSnapshot });
+        logger.info(`[ReviewerCouncil] Updated analysis_run with diff snapshot`);
+      } catch (updateError) {
+        logger.warn(`[ReviewerCouncil] Failed to update analysis_run with diff: ${updateError.message}`);
+      }
     }
 
     const voices = councilConfig.voices || [];
@@ -2768,6 +2816,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
           repoInstructions: instructions?.repoInstructions || null,
           requestInstructions: instructions?.requestInstructions || null,
           headSha,
+          diff: diffSnapshot,
           parentRunId,
           configType: 'council',
           levelsConfig: enabledLevels

package/src/chat/claude-code-bridge.js

@@ -465,6 +465,14 @@ class ClaudeCodeBridge extends EventEmitter {
             toolName: name,
             status: 'start',
           });
+        } else if (event.content_block && event.content_block.type === 'text') {
+          // When a new text block starts and we already have accumulated text
+          // from a previous block, inject paragraph separation so the markdown
+          // renderer doesn't smash the blocks together (e.g., "diff.The").
+          if (this._accumulatedText) {
+            this._accumulatedText += '\n\n';
+            this.emit('delta', { text: '\n\n' });
+          }
         }
         break;
 

package/src/database.js

@@ -20,7 +20,7 @@ function getDbPath() {
 /**
  * Current schema version - increment this when adding new migrations
  */
-const CURRENT_SCHEMA_VERSION = 26;
+const CURRENT_SCHEMA_VERSION = 27;
 
 /**
  * Database schema SQL statements
@@ -157,6 +157,7 @@ const SCHEMA_SQL = {
       repo_instructions TEXT,
       request_instructions TEXT,
       head_sha TEXT,
+      diff TEXT,
       summary TEXT,
       status TEXT NOT NULL DEFAULT 'running' CHECK(status IN ('running', 'completed', 'failed', 'cancelled')),
       total_suggestions INTEGER DEFAULT 0,
@@ -1206,6 +1207,29 @@ const MIGRATIONS = {
     }
 
     console.log('Migration to schema version 26 complete');
+  },
+
+  // Migration to version 27: adds diff column to analysis_runs for snapshot preservation
+  27: (db) => {
+    console.log('Migrating to schema version 27: Add diff column to analysis_runs');
+
+    const hasDiff = columnExists(db, 'analysis_runs', 'diff');
+    if (!hasDiff) {
+      try {
+        db.prepare('ALTER TABLE analysis_runs ADD COLUMN diff TEXT').run();
+        console.log('  Added diff column to analysis_runs');
+      } catch (error) {
+        // Ignore duplicate column errors (race condition protection)
+        if (!error.message.includes('duplicate column name')) {
+          throw error;
+        }
+        console.log('  Column diff already exists (race condition)');
+      }
+    } else {
+      console.log('  Column diff already exists');
+    }
+
+    console.log('Migration to schema version 27 complete');
   }
 };
 
@@ -2899,17 +2923,18 @@ class AnalysisRunRepository {
    * @param {string} [runInfo.repoInstructions] - Repository-level instructions from repo_settings
    * @param {string} [runInfo.requestInstructions] - Request-level instructions from the analyze request
    * @param {string} [runInfo.headSha] - Git HEAD SHA at the time of analysis (PR head commit or local HEAD)
+   * @param {string} [runInfo.diff] - Unified diff snapshot at the time of analysis
    * @param {string} [runInfo.status='running'] - Initial status (default 'running'; pass 'completed' for externally-produced results)
    * @returns {Promise<Object>} Created analysis run record
    */
-  async create({ id, reviewId, provider = null, model = null, tier = null, customInstructions = null, repoInstructions = null, requestInstructions = null, headSha = null, status = 'running', parentRunId = null, configType = 'single', levelsConfig = null }) {
+  async create({ id, reviewId, provider = null, model = null, tier = null, customInstructions = null, repoInstructions = null, requestInstructions = null, headSha = null, diff = null, status = 'running', parentRunId = null, configType = 'single', levelsConfig = null }) {
     const isTerminal = ['completed', 'failed', 'cancelled'].includes(status);
     const completedAt = isTerminal ? 'CURRENT_TIMESTAMP' : 'NULL';
     const levelsConfigJson = levelsConfig ? JSON.stringify(levelsConfig) : null;
     await run(this.db, `
-      INSERT INTO analysis_runs (id, review_id, provider, model, tier, custom_instructions, repo_instructions, request_instructions, head_sha, status, completed_at, parent_run_id, config_type, levels_config)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ${completedAt}, ?, ?, ?)
-    `, [id, reviewId, provider, model, tier, customInstructions, repoInstructions, requestInstructions, headSha, status, parentRunId, configType, levelsConfigJson]);
+      INSERT INTO analysis_runs (id, review_id, provider, model, tier, custom_instructions, repo_instructions, request_instructions, head_sha, diff, status, completed_at, parent_run_id, config_type, levels_config)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ${completedAt}, ?, ?, ?)
+    `, [id, reviewId, provider, model, tier, customInstructions, repoInstructions, requestInstructions, headSha, diff, status, parentRunId, configType, levelsConfigJson]);
 
     // Query back the inserted row to return actual database values (including timestamps)
     return await this.getById(id);
@@ -2923,6 +2948,7 @@ class AnalysisRunRepository {
    * @param {string} [updates.summary] - Analysis summary
    * @param {number} [updates.totalSuggestions] - Total suggestions count
    * @param {number} [updates.filesAnalyzed] - Files analyzed count
+   * @param {string} [updates.diff] - Unified diff snapshot to store
    * @param {Object} [options] - Update options
    * @param {string} [options.skipIfStatus] - Skip the update if the record already has this status (prevents redundant writes)
    * @returns {Promise<boolean>} True if record was updated
@@ -2956,6 +2982,11 @@ class AnalysisRunRepository {
       params.push(updates.filesAnalyzed);
     }
 
+    if (updates.diff !== undefined) {
+      setClauses.push('diff = ?');
+      params.push(updates.diff);
+    }
+
     if (setClauses.length === 0) {
       return false;
     }
@@ -2980,13 +3011,21 @@ class AnalysisRunRepository {
   /**
    * Get an analysis run by ID
    * @param {string} id - Analysis run ID
+   * @param {Object} [options] - Optional query options
+   * @param {boolean} [options.includeDiff=false] - Include the diff column (can be large)
    * @returns {Promise<Object|null>} Analysis run record or null
    */
-  async getById(id) {
+  async getById(id, { includeDiff = false } = {}) {
+    const columns = [
+      'id', 'review_id', 'provider', 'model', 'tier', 'custom_instructions', 'repo_instructions', 'request_instructions',
+      'head_sha', 'summary', 'status', 'total_suggestions', 'files_analyzed', 'started_at', 'completed_at',
+      'parent_run_id', 'config_type', 'levels_config'
+    ];
+    if (includeDiff) {
+      columns.splice(9, 0, 'diff'); // Insert diff after head_sha
+    }
     const row = await queryOne(this.db, `
-      SELECT id, review_id, provider, model, tier, custom_instructions, repo_instructions, request_instructions,
-             head_sha, summary, status, total_suggestions, files_analyzed, started_at, completed_at,
-             parent_run_id, config_type, levels_config
+      SELECT ${columns.join(', ')}
       FROM analysis_runs
       WHERE id = ?
     `, [id]);
@@ -3000,14 +3039,21 @@ class AnalysisRunRepository {
    * @param {number} reviewId - Review ID (works for both PR and local modes)
    * @param {Object} [options] - Optional query options
    * @param {number} [options.limit] - Maximum number of runs to return
+   * @param {boolean} [options.includeDiff=false] - Include the diff column (can be large)
    * @returns {Promise<Array<Object>>} Array of analysis run records
    */
-  async getByReviewId(reviewId, { limit } = {}) {
+  async getByReviewId(reviewId, { limit, includeDiff = false } = {}) {
     const params = [reviewId];
+    const columns = [
+      'id', 'review_id', 'provider', 'model', 'tier', 'custom_instructions', 'repo_instructions', 'request_instructions',
+      'head_sha', 'summary', 'status', 'total_suggestions', 'files_analyzed', 'started_at', 'completed_at',
+      'parent_run_id', 'config_type', 'levels_config'
+    ];
+    if (includeDiff) {
+      columns.splice(9, 0, 'diff'); // Insert diff after head_sha
+    }
     let sql = `
-      SELECT id, review_id, provider, model, tier, custom_instructions, repo_instructions, request_instructions,
-             head_sha, summary, status, total_suggestions, files_analyzed, started_at, completed_at,
-             parent_run_id, config_type, levels_config
+      SELECT ${columns.join(', ')}
       FROM analysis_runs
       WHERE review_id = ?
       ORDER BY COALESCE(completed_at, started_at) DESC, CASE WHEN parent_run_id IS NULL THEN 0 ELSE 1 END, started_at DESC, id DESC`;
@@ -3028,12 +3074,41 @@ class AnalysisRunRepository {
     return rows.length > 0 ? rows[0] : null;
   }
 
+  /**
+   * Get the most recently completed analysis run for a review
+   * @param {number} reviewId - Review ID (works for both PR and local modes)
+   * @param {Object} [options] - Optional query options
+   * @param {boolean} [options.includeDiff=false] - Include the diff column (can be large)
+   * @returns {Promise<Object|null>} Most recently completed analysis run or null
+   */
+  async getLatestCompletedByReviewId(reviewId, { includeDiff = false } = {}) {
+    const columns = [
+      'id', 'review_id', 'provider', 'model', 'tier', 'custom_instructions', 'repo_instructions', 'request_instructions',
+      'head_sha', 'summary', 'status', 'total_suggestions', 'files_analyzed', 'started_at', 'completed_at',
+      'parent_run_id', 'config_type', 'levels_config'
+    ];
+    if (includeDiff) {
+      columns.splice(9, 0, 'diff'); // Insert diff after head_sha
+    }
+    const row = await queryOne(this.db, `
+      SELECT ${columns.join(', ')}
+      FROM analysis_runs
+      WHERE review_id = ? AND status = 'completed'
+      ORDER BY completed_at DESC
+      LIMIT 1
+    `, [reviewId]);
+
+    return row || null;
+  }
+
   /**
    * Get child runs for a parent council run, ordered by start time ascending
    * @param {string} parentRunId - Parent analysis run ID
    * @returns {Promise<Array<Object>>} Array of child analysis run records
    */
   async getChildRuns(parentRunId) {
+    // Note: diff column is intentionally omitted - child runs share the same diff as parent
+    // to avoid data duplication. Use the parent run's diff when needed.
     return query(this.db, `
       SELECT id, review_id, provider, model, tier, custom_instructions, repo_instructions, request_instructions,
              head_sha, summary, status, total_suggestions, files_analyzed, started_at, completed_at,

package/src/routes/pr.js

@@ -1900,7 +1900,8 @@ router.get('/api/pr/:owner/:repo/:number/share', async (req, res) => {
 
       if (requestedRunId) {
         // Specific run requested - fetch it directly
-        targetRun = await analysisRunRepo.getById(requestedRunId);
+        // Include diff since the share endpoint needs it for the snapshot
+        targetRun = await analysisRunRepo.getById(requestedRunId, { includeDiff: true });
         // Verify it belongs to this review and is completed
         if (!targetRun || targetRun.review_id !== review.id || targetRun.status !== 'completed') {
           targetRun = null;
@@ -1909,8 +1910,8 @@ router.get('/api/pr/:owner/:repo/:number/share', async (req, res) => {
 
       // If no specific run requested or it wasn't found/valid, fall back to the most recently completed run
       if (!targetRun) {
-        const runs = await analysisRunRepo.getByReviewId(review.id);
-        targetRun = runs.find(r => r.status === 'completed') || null;
+        // Include diff since the share endpoint needs it for the snapshot
+        targetRun = await analysisRunRepo.getLatestCompletedByReviewId(review.id, { includeDiff: true });
       }
 
       if (targetRun) {
@@ -1927,6 +1928,15 @@ router.get('/api/pr/:owner/:repo/:number/share', async (req, res) => {
           customInstructions: targetRun.custom_instructions || targetRun.request_instructions || null
         };
 
+        // Use the run's snapshot of headSha and diff if available (for consistency with suggestions)
+        // Falls back to current PR data for old runs that predate snapshot capture
+        if (targetRun.head_sha) {
+          payload.headSha = targetRun.head_sha;
+        }
+        if (targetRun.diff) {
+          payload.diff = targetRun.diff;
+        }
+
         // Get suggestions for this run
         const rows = await query(db, `
           SELECT