@in-the-loop-labs/pair-review 2.6.3 → 3.0.0

package/src/routes/mcp.js

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright 2026 Tim Perkins (tjwp) | SPDX-License-Identifier: Apache-2.0
 const express = require('express');
 const { McpServer } = require('@modelcontextprotocol/sdk/server/mcp.js');
 const { StreamableHTTPServerTransport } = require('@modelcontextprotocol/sdk/server/streamableHttp.js');
@@ -11,6 +11,7 @@ const { getTierForModel } = require('../ai/provider');
 const { TIERS, TIER_ALIASES, resolveTier } = require('../ai/prompts/config');
 const { GitWorktreeManager } = require('../git/worktree');
 const path = require('path');
+const { getCurrentBranch } = require('../local-review');
 const { normalizeRepository } = require('../utils/paths');
 const logger = require('../utils/logger');
 const { broadcastReviewEvent } = require('../events/review-events');
@@ -118,7 +119,11 @@ async function resolveReview(args, db) {
   const reviewRepo = new ReviewRepository(db);
 
   if (args.path && args.headSha) {
-    const review = await reviewRepo.getLocalReview(args.path, args.headSha);
+    let headBranch = args.branch;
+    if (!headBranch) {
+      try { headBranch = await getCurrentBranch(args.path); } catch (_) { /* non-fatal */ }
+    }
+    const review = await reviewRepo.findLocalReview(args.path, args.headSha, headBranch);
     if (!review) {
       return { review: null, error: `No local review found for path "${args.path}" with HEAD SHA "${args.headSha}"` };
     }
@@ -507,22 +512,27 @@ function createMCPServer(db, options = {}) {
           const localPath = args.path;
           const localHeadSha = args.headSha;
 
+          // Resolve current branch for session identity
+          let localHeadBranch;
+          try { localHeadBranch = await getCurrentBranch(localPath); } catch (_) { /* non-fatal */ }
+
           // Look up or create local review record
-          // Try to get repository name from existing review, else use directory basename
+          let reviewId;
           let repository;
-          const existingReview = await reviewRepo.getLocalReview(localPath, localHeadSha);
+          const existingReview = await reviewRepo.findLocalReview(localPath, localHeadSha, localHeadBranch);
           if (existingReview) {
+            reviewId = existingReview.id;
             repository = existingReview.repository;
           } else {
             repository = path.basename(localPath);
+            reviewId = await reviewRepo.upsertLocalReview({
+              localPath,
+              localHeadSha,
+              repository,
+              localHeadBranch
+            });
           }
 
-          const reviewId = await reviewRepo.upsertLocalReview({
-            localPath,
-            localHeadSha,
-            repository
-          });
-
           // Concurrent analysis guard: check if one is already running
           const existingAnalysisId = reviewToAnalysisId.get(reviewId);
           if (existingAnalysisId && activeAnalyses.get(existingAnalysisId)?.status === 'running') {
@@ -687,7 +697,7 @@ function createMCPServer(db, options = {}) {
           const worktreePath = await worktreeManager.getWorktreePath({ owner, repo, number: prNumber });
 
           // Get or create review record
-          const review = await reviewRepo.getOrCreate({ prNumber, repository });
+          const { review } = await reviewRepo.getOrCreate({ prNumber, repository });
 
           // Resolve provider and model
           const repoSettings = await repoSettingsRepo.getRepoSettings(repository);

package/src/routes/pr.js

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright 2026 Tim Perkins (tjwp) | SPDX-License-Identifier: Apache-2.0
 /**
  * Core PR Routes
  *
@@ -18,6 +18,7 @@ const { query, queryOne, run, withTransaction, WorktreeRepository, ReviewReposit
 const { GitWorktreeManager } = require('../git/worktree');
 const { GitHubClient } = require('../github/client');
 const { getGeneratedFilePatterns } = require('../git/gitattributes');
+const { getShaAbbrevLength, DEFAULT_SHA_ABBREV_LENGTH } = require('../git/sha-abbrev');
 const { normalizeRepository, resolveRenamedFile, resolveRenamedFileOld } = require('../utils/paths');
 const { mergeInstructions } = require('../utils/instructions');
 const Analyzer = require('../ai/analyzer');
@@ -28,6 +29,8 @@ const { getGitHubToken } = require('../config');
 const logger = require('../utils/logger');
 const { buildDiffLineSet } = require('../utils/diff-annotator');
 const { broadcastReviewEvent } = require('../events/review-events');
+const { fireHooks, hasHooks } = require('../hooks/hook-runner');
+const { buildReviewStartedPayload, buildReviewLoadedPayload, buildAnalysisStartedPayload, buildAnalysisCompletedPayload, getCachedUser } = require('../hooks/payloads');
 const simpleGit = require('simple-git');
 const {
   activeAnalyses,
@@ -179,11 +182,12 @@ router.get('/api/pr/:owner/:repo/:number', async (req, res) => {
       });
     }
 
-    // Get review record if it exists (don't create on GET - REST compliance)
-    // The review.id is used for comments to avoid ID collision with local mode
+    // Eagerly create the review record on first visit so all subsequent
+    // events (analysis, comments, hooks) always have a real reviewId.
+    // To distinguish new vs returning, snapshot the current record first.
     const db = req.app.get('db');
     const reviewRepo = new ReviewRepository(db);
-    const review = await reviewRepo.getReviewByPR(prNumber, repository);
+    const { review, created: isNewReview } = await reviewRepo.getOrCreate({ prNumber, repository });
 
     // Parse extended PR data
     let extendedData = {};
@@ -196,10 +200,9 @@ router.get('/api/pr/:owner/:repo/:number', async (req, res) => {
     // Parse owner and repo from repository field
     const [repoOwner, repoName] = repository.split('/');
 
-    // Check for pending GitHub draft if we have a review record
-    // This avoids unnecessary GitHub API calls for PRs the user hasn't started reviewing
+    // Check for pending GitHub draft
     let pendingDraft = null;
-    if (review) {
+    {
       const config = req.app.get('config');
       const githubToken = getGitHubToken(config || {}) || req.app.get('githubToken');
 
@@ -220,13 +223,17 @@ router.get('/api/pr/:owner/:repo/:number', async (req, res) => {
       }
     }
 
+    // Compute SHA abbreviation length from the worktree's git config
+    const shaAbbrevLength = extendedData.worktree_path
+      ? getShaAbbrevLength(extendedData.worktree_path)
+      : DEFAULT_SHA_ABBREV_LENGTH;
+
     // Prepare response
     // Use review.id instead of prMetadata.id to avoid ID collision with local mode
-    // When no review exists yet, id will be null
     const response = {
       success: true,
       data: {
-        id: review ? review.id : null,
+        id: review.id,
         owner: repoOwner,
         repo: repoName,
         number: prMetadata.pr_number,
@@ -238,6 +245,7 @@ router.get('/api/pr/:owner/:repo/:number', async (req, res) => {
         head_branch: prMetadata.head_branch,
         head_sha: extendedData.head_sha || null,  // Head commit SHA for GitHub API comments
         node_id: extendedData.node_id || null,  // GraphQL node ID for review submission
+        shaAbbrevLength,
         created_at: prMetadata.created_at,
         updated_at: prMetadata.updated_at,
         file_changes: extendedData.changed_files ? extendedData.changed_files.length : 0,
@@ -259,6 +267,22 @@ router.get('/api/pr/:owner/:repo/:number', async (req, res) => {
 
     res.json(response);
 
+    // Fire review hook (after response, non-blocking)
+    const config = req.app.get('config') || {};
+    const prContext = {
+      number: prNumber, owner: repoOwner, repo: repoName,
+      author: prMetadata.author, baseBranch: prMetadata.base_branch, headBranch: prMetadata.head_branch,
+      baseSha: extendedData.base_sha || null, headSha: extendedData.head_sha || null,
+    };
+    const hookEvent = isNewReview ? 'review.started' : 'review.loaded';
+    if (hasHooks(hookEvent, config)) {
+      getCachedUser(config).then(user => {
+        const builder = isNewReview ? buildReviewStartedPayload : buildReviewLoadedPayload;
+        const payload = builder({ reviewId: review.id, mode: 'pr', prContext, user });
+        fireHooks(hookEvent, payload, config);
+      }).catch(err => { logger.warn(`Review hook failed: ${err.message}`); });
+    }
+
   } catch (error) {
     console.error('Error fetching PR data:', error);
     res.status(500).json({
@@ -358,7 +382,7 @@ router.post('/api/pr/:owner/:repo/:number/refresh', async (req, res) => {
     // Get or create a review record for this PR
     // The review.id is used for comments to avoid ID collision with local mode
     const reviewRepo = new ReviewRepository(db);
-    const review = await reviewRepo.getOrCreate({ prNumber, repository });
+    const { review } = await reviewRepo.getOrCreate({ prNumber, repository });
 
     // Fetch and return updated PR data (reuse the same structure as GET endpoint)
     const prMetadata = await queryOne(db, `
@@ -1013,7 +1037,7 @@ router.post('/api/pr/:owner/:repo/:number/submit-review', async (req, res) => {
     // Get or create a review record for this PR
     // Comments are associated with review.id, not prMetadata.id
     const reviewRepo = new ReviewRepository(db);
-    const review = await reviewRepo.getOrCreate({ prNumber, repository });
+    const { review } = await reviewRepo.getOrCreate({ prNumber, repository });
 
     // Get all active user comments for this PR using review.id
     const comments = await query(db, `
@@ -1518,7 +1542,7 @@ router.post('/api/pr/:owner/:repo/:number/analyses', async (req, res) => {
     const runId = uuidv4();
     const analysisId = runId;
 
-    const review = await reviewRepo.getOrCreate({ prNumber, repository });
+    const { review } = await reviewRepo.getOrCreate({ prNumber, repository });
 
     const analysisRunRepo = new AnalysisRunRepository(db);
     const levelsConfig = parseEnabledLevels(requestEnabledLevels, requestSkipLevel3);
@@ -1562,6 +1586,19 @@ router.post('/api/pr/:owner/:repo/:number/analyses', async (req, res) => {
 
     broadcastProgress(analysisId, initialStatus);
     broadcastReviewEvent(review.id, { type: 'review:analysis_started', analysisId });
+    const analysisConfig = req.app.get('config') || {};
+    const analysisPrContext = {
+      number: prNumber, owner, repo,
+      author: prMetadata.author, baseBranch: prMetadata.base_branch, headBranch: prMetadata.head_branch,
+      baseSha: prMetadata.base_sha || null, headSha: prMetadata.head_sha || null,
+    };
+    if (hasHooks('analysis.started', analysisConfig)) {
+      getCachedUser(analysisConfig).then(user => {
+        fireHooks('analysis.started', buildAnalysisStartedPayload({
+          reviewId: review.id, analysisId, provider, model, mode: 'pr', prContext: analysisPrContext, user,
+        }), analysisConfig);
+      }).catch(() => {});
+    }
 
     const analyzer = new Analyzer(req.app.get('db'), model, provider);
 
@@ -1657,6 +1694,18 @@ router.post('/api/pr/:owner/:repo/:number/analyses', async (req, res) => {
 
         broadcastProgress(analysisId, completedStatus);
         broadcastReviewEvent(review.id, { type: 'review:analysis_completed' });
+
+        // Fire analysis.completed hook
+        const hookConfig = req.app.get('config') || {};
+        if (hasHooks('analysis.completed', hookConfig)) {
+          getCachedUser(hookConfig).then(user => {
+            fireHooks('analysis.completed', buildAnalysisCompletedPayload({
+              reviewId: review.id, analysisId, provider, model, status: 'success',
+              totalSuggestions: completionInfo.totalSuggestions,
+              mode: 'pr', prContext: analysisPrContext, user,
+            }), hookConfig);
+          }).catch(() => {});
+        }
       })
       .catch(error => {
         const currentStatus = activeAnalyses.get(analysisId);
@@ -1667,6 +1716,15 @@ router.post('/api/pr/:owner/:repo/:number/analyses', async (req, res) => {
 
         if (error.isCancellation) {
           logger.info(`Analysis cancelled for PR #${prNumber}`);
+          if (hasHooks('analysis.completed', analysisConfig)) {
+            getCachedUser(analysisConfig).then(user => {
+              fireHooks('analysis.completed', buildAnalysisCompletedPayload({
+                reviewId: review.id, analysisId, provider, model,
+                status: 'cancelled', totalSuggestions: 0,
+                mode: 'pr', prContext: analysisPrContext, user,
+              }), analysisConfig);
+            }).catch(() => {});
+          }
           return;
         }
 
@@ -1690,6 +1748,16 @@ router.post('/api/pr/:owner/:repo/:number/analyses', async (req, res) => {
         activeAnalyses.set(analysisId, failedStatus);
 
         broadcastProgress(analysisId, failedStatus);
+
+        if (hasHooks('analysis.completed', analysisConfig)) {
+          getCachedUser(analysisConfig).then(user => {
+            fireHooks('analysis.completed', buildAnalysisCompletedPayload({
+              reviewId: review.id, analysisId, provider, model,
+              status: 'failed', totalSuggestions: 0,
+              mode: 'pr', prContext: analysisPrContext, user,
+            }), analysisConfig);
+          }).catch(() => {});
+        }
       })
       .finally(() => {
         // Clean up review to analysis ID mapping (unified map)
@@ -1771,7 +1839,7 @@ router.post('/api/pr/:owner/:repo/:number/analyses/council', async (req, res) =>
     const repoInstructions = repoSettings?.default_instructions || null;
     const requestInstructions = rawInstructions?.trim() || null;
 
-    const review = await reviewRepo.getOrCreate({ prNumber, repository });
+    const { review } = await reviewRepo.getOrCreate({ prNumber, repository });
 
     if (requestInstructions) {
       await reviewRepo.upsertCustomInstructions(prNumber, repository, requestInstructions);
@@ -1788,6 +1856,16 @@ router.post('/api/pr/:owner/:repo/:number/analyses/council', async (req, res) =>
         headSha: prMetadata.head_sha,
         logLabel: `PR #${prNumber}`,
         initialStatusExtra: { prNumber, reviewType: 'pr' },
+        config: req.app.get('config') || {},
+        hookContext: {
+          mode: 'pr',
+          prContext: {
+            number: prNumber, owner, repo,
+            author: prMetadata.author, baseBranch: prMetadata.base_branch,
+            headBranch: prMetadata.head_branch,
+            baseSha: prMetadata.base_sha || null, headSha: prMetadata.head_sha || null,
+          },
+        },
         onSuccess: async (result) => {
           if (result.summary) {
             await reviewRepo.upsertSummary(prNumber, repository, result.summary);

package/src/routes/reviews.js

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright 2026 Tim Perkins (tjwp) | SPDX-License-Identifier: Apache-2.0
 /**
  * Unified Review Comment Routes
  *

package/src/routes/setup.js

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright 2026 Tim Perkins (tjwp) | SPDX-License-Identifier: Apache-2.0
 /**
  * Setup Routes
  *
@@ -165,6 +165,7 @@ router.post('/api/setup/local', async (req, res) => {
         const result = await setupLocalReview({
           db,
           targetPath,
+          config: req.app.get('config') || {},
           onProgress: (progress) => {
             sendSetupEvent(setupId, 'step', progress);
           }

package/src/routes/shared.js

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright 2026 Tim Perkins (tjwp) | SPDX-License-Identifier: Apache-2.0
 /**
  * Shared utilities for route handlers
  *