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

package/bin/git-diff-lines

@@ -68,7 +68,7 @@ function executeGitDiff(args, cwd = null) {
     if (cwd) {
       spawnOptions.cwd = cwd;
     }
-    const gitProcess = spawn('git', ['diff', ...args], spawnOptions);
+    const gitProcess = spawn('git', ['diff', '--no-ext-diff', ...args], spawnOptions);
 
     let stdout = '';
     let stderr = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@in-the-loop-labs/pair-review",
-  "version": "2.6.2",
+  "version": "2.6.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.6.2",
+  "version": "2.6.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.6.2",
+  "version": "2.6.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/plugin-code-critic/skills/analyze/scripts/git-diff-lines

@@ -84,7 +84,7 @@ GIT_CMD=(git)
 if [[ -n "$GIT_CWD" ]]; then
   GIT_CMD+=(-C "$GIT_CWD")
 fi
-GIT_CMD+=(diff)
+GIT_CMD+=(diff --no-ext-diff)
 # Guard: expanding an empty array with set -u fails in Bash < 4.4
 if [[ ${#GIT_ARGS[@]} -gt 0 ]]; then
   GIT_CMD+=("${GIT_ARGS[@]}")

package/public/css/pr.css

@@ -1587,6 +1587,13 @@
   color: #f85149;
 }
 
+/* When collapsed, the wrapper is only as tall as the header, so the header's
+   sticky positioning can't push it below the toolbar.  Adding scroll-margin
+   ensures scrollIntoView() lands the header below the sticky toolbar. */
+.d2h-file-wrapper.collapsed {
+  scroll-margin-top: var(--toolbar-height, 0px);
+}
+
 /* Hide diff content when collapsed */
 .d2h-file-wrapper.collapsed .d2h-file-body,
 .d2h-file-wrapper.collapsed .d2h-diff-table {

package/src/ai/analyzer.js

@@ -659,7 +659,7 @@ Do NOT create suggestions for any files not in this list. If you cannot find iss
   async getChangedFilesList(worktreePath, prMetadata) {
     try {
       const { stdout } = await execPromise(
-        `git diff ${prMetadata.base_sha}...${prMetadata.head_sha} --name-only`,
+        `git diff --no-ext-diff ${prMetadata.base_sha}...${prMetadata.head_sha} --name-only`,
         { cwd: worktreePath }
       );
       return stdout.trim().split('\n').filter(f => f.length > 0);
@@ -685,7 +685,7 @@ Do NOT create suggestions for any files not in this list. If you cannot find iss
     try {
       // Get modified tracked files (unstaged only - staged files are excluded by design)
       const { stdout: unstaged } = await execPromise(
-        'git diff --name-only',
+        'git diff --no-ext-diff --name-only',
         { cwd: localPath }
       );
 
@@ -777,7 +777,7 @@ The following files are marked as generated in .gitattributes and should be SKIP
 ${generatedPatterns.map(p => `- ${p}`).join('\n')}
 
 These are auto-generated files (like package-lock.json, build outputs, etc.) that should not be reviewed.
-When running git diff, you can exclude these with: git diff ${'{base}'}...${'{head}'} -- ':!pattern' for each pattern.
+When running git diff, you can exclude these with: git diff --no-ext-diff ${'{base}'}...${'{head}'} -- ':!pattern' for each pattern.
 Or simply ignore any changes to files matching these patterns in your analysis.
 `;
   }
@@ -983,10 +983,10 @@ ${prMetadata.description || '(No description provided)'}
     const isLocal = prMetadata.reviewType === 'local';
     if (isLocal) {
       // For local mode, diff against HEAD to see working directory changes
-      return suffix ? `git diff HEAD ${suffix}` : 'git diff HEAD';
+      return suffix ? `git diff --no-ext-diff HEAD ${suffix}` : 'git diff --no-ext-diff HEAD';
     }
     // For PR mode, diff between base and head commits
-    const baseCmd = `git diff ${prMetadata.base_sha}...${prMetadata.head_sha}`;
+    const baseCmd = `git diff --no-ext-diff ${prMetadata.base_sha}...${prMetadata.head_sha}`;
     return suffix ? `${baseCmd} ${suffix}` : baseCmd;
   }
 

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

@@ -30,9 +30,9 @@ const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
  *
  * Tier structure:
  * - free (auto): Cursor's default auto-routing model
- * - fast (composer-1, gpt-5.3-codex-fast, gemini-3-flash): Quick analysis
+ * - fast (composer-2-fast, gpt-5.3-codex-fast, gemini-3-flash): Quick analysis
  * - balanced (composer-1.5, sonnet-4.6-thinking, sonnet-4.5-thinking, gemini-3.1-pro): Recommended for most reviews
- * - thorough (gpt-5.3-codex-high, gpt-5.3-codex-xhigh, opus-4.5-thinking, opus-4.6-thinking): Deep analysis for complex code
+ * - thorough (composer-2, gpt-5.3-codex-high, gpt-5.3-codex-xhigh, opus-4.5-thinking, opus-4.6-thinking): Deep analysis for complex code
  */
 const CURSOR_AGENT_MODELS = [
   {
@@ -45,23 +45,32 @@ const CURSOR_AGENT_MODELS = [
     badgeClass: 'badge-speed'
   },
   {
-    id: 'composer-1.5',
-    name: 'Composer 1.5',
-    tier: 'balanced',
+    id: 'composer-2',
+    name: 'Composer 2',
+    tier: 'thorough',
     tagline: 'Latest Composer',
-    description: 'Cursor Composer model—positioned between Sonnet and Opus for multi-file edits',
-    badge: 'Balanced',
-    badgeClass: 'badge-balanced'
+    description: 'Frontier-level coding model trained with compaction-in-the-loop RL—strong on long-horizon tasks requiring hundreds of actions',
+    badge: 'Latest',
+    badgeClass: 'badge-power'
   },
   {
-    id: 'composer-1',
-    name: 'Composer 1',
+    id: 'composer-2-fast',
+    name: 'Composer 2 Fast',
     tier: 'fast',
-    tagline: 'Original Composer',
-    description: 'Cursor Composer model—good for quick multi-file editing workflows',
+    tagline: 'Fast Composer',
+    description: 'Same intelligence as Composer 2 with lower latency—default for interactive Cursor sessions',
     badge: 'Fast',
     badgeClass: 'badge-speed'
   },
+  {
+    id: 'composer-1.5',
+    name: 'Composer 1.5',
+    tier: 'balanced',
+    tagline: 'Previous Composer',
+    description: 'Previous generation Cursor Composer model—positioned between Sonnet and Opus for multi-file edits',
+    badge: 'Previous Gen',
+    badgeClass: 'badge-balanced'
+  },
   {
     id: 'gpt-5.3-codex-fast',
     name: 'GPT-5.3 Codex Fast',

package/src/chat/prompt-builder.js

@@ -124,8 +124,8 @@ function buildReviewContext(review, prData) {
     lines.push(`This is a local code review for: ${name}`);
     lines.push('');
     lines.push('## Viewing Code Changes');
-    lines.push('The changes under review are **unstaged and untracked local changes**. Staged changes (`git diff --cached`) are treated as already reviewed.');
-    lines.push('To see the diff under review: `git diff`');
+    lines.push('The changes under review are **unstaged and untracked local changes**. Staged changes (`git diff --no-ext-diff --cached`) are treated as already reviewed.');
+    lines.push('To see the diff under review: `git diff --no-ext-diff`');
     lines.push('Do NOT use `git diff HEAD~1` or `git log` — those show committed history, not the changes under review.');
   } else {
     const parts = [];
@@ -146,7 +146,7 @@ function buildReviewContext(review, prData) {
       lines.push('');
       lines.push('## Viewing Code Changes');
       lines.push(`The changes under review are the diff between base commit \`${prData.base_sha.substring(0, 8)}\` and head commit \`${prData.head_sha.substring(0, 8)}\`.`);
-      lines.push(`To see the full diff: \`git diff ${prData.base_sha}...${prData.head_sha}\``);
+      lines.push(`To see the full diff: \`git diff --no-ext-diff ${prData.base_sha}...${prData.head_sha}\``);
       lines.push('Do NOT use `git diff HEAD~1` or `git diff` without arguments — those do not show the PR changes.');
     }
   }

package/src/git/worktree.js

@@ -536,7 +536,8 @@ class GitWorktreeManager {
       // This ensures we compare the exact commits from the PR, even if the base branch has moved
       const diff = await git.diff([
         `${prData.base_sha}...${prData.head_sha}`,
-        '--unified=3'
+        '--unified=3',
+        '--no-ext-diff'
       ]);
 
       return diff;
@@ -559,7 +560,7 @@ class GitWorktreeManager {
 
       // Get file changes with stats using base SHA and head SHA
       // This ensures we get the exact files changed in the PR, even if the base branch has moved
-      const diffSummary = await git.diffSummary([`${prData.base_sha}...${prData.head_sha}`]);
+      const diffSummary = await git.diffSummary([`${prData.base_sha}...${prData.head_sha}`, '--no-ext-diff']);
 
       // Parse .gitattributes to identify generated files
       const gitattributes = await getGeneratedFilePatterns(worktreePath);

package/src/local-review.js

@@ -658,7 +658,7 @@ async function computeLocalDiffDigest(localPath) {
   // Get unstaged diff (the actual content being reviewed)
   let unstagedDiff = '';
   try {
-    const result = await execAsync('git diff', {
+    const result = await execAsync('git diff --no-ext-diff', {
       cwd: localPath,
       encoding: 'utf8',
       maxBuffer: 50 * 1024 * 1024

package/src/main.js

@@ -662,10 +662,10 @@ async function performHeadlessReview(args, config, db, flags, options) {
         }
       }
 
-      diff = await git.diff([`${prData.base_sha}...${prData.head_sha}`, '--unified=3']);
+      diff = await git.diff([`${prData.base_sha}...${prData.head_sha}`, '--unified=3', '--no-ext-diff']);
 
       // Get changed files
-      const diffSummary = await git.diffSummary([`${prData.base_sha}...${prData.head_sha}`]);
+      const diffSummary = await git.diffSummary([`${prData.base_sha}...${prData.head_sha}`, '--no-ext-diff']);
       const gitattributes = await getGeneratedFilePatterns(worktreePath);
 
       changedFiles = diffSummary.files.map(file => {

package/src/routes/github-collections.js

@@ -45,7 +45,7 @@ router.post('/api/github/review-requests/refresh', async (req, res) => {
     const db = req.app.get('db');
     const client = new GitHubClient(githubToken);
     const user = await client.getAuthenticatedUser();
-    const prs = await client.searchPullRequests(`is:pr is:open user-review-requested:${user.login}`);
+    const prs = await client.searchPullRequests(`is:pr is:open archived:false user-review-requested:${user.login}`);
 
     await withTransaction(db, async () => {
       await run(db, 'DELETE FROM github_pr_cache WHERE collection = ?', ['review-requests']);
@@ -99,7 +99,7 @@ router.post('/api/github/my-prs/refresh', async (req, res) => {
     const db = req.app.get('db');
     const client = new GitHubClient(githubToken);
     const user = await client.getAuthenticatedUser();
-    const prs = await client.searchPullRequests(`is:pr is:open author:${user.login}`);
+    const prs = await client.searchPullRequests(`is:pr is:open archived:false author:${user.login}`);
 
     await withTransaction(db, async () => {
       await run(db, 'DELETE FROM github_pr_cache WHERE collection = ?', ['my-prs']);

package/src/routes/pr.js

@@ -682,10 +682,10 @@ router.get('/api/pr/:owner/:repo/:number/diff', async (req, res) => {
 
         if (baseSha && headSha) {
           // Regenerate diff with -w flag to ignore whitespace changes
-          diffContent = await git.diff([`${baseSha}...${headSha}`, '--unified=3', '-w']);
+          diffContent = await git.diff([`${baseSha}...${headSha}`, '--unified=3', '-w', '--no-ext-diff']);
 
           // Regenerate changed files stats with -w flag
-          const diffSummary = await git.diffSummary([`${baseSha}...${headSha}`, '-w']);
+          const diffSummary = await git.diffSummary([`${baseSha}...${headSha}`, '-w', '--no-ext-diff']);
           const gitattributes = await getGeneratedFilePatterns(worktreePath);
           changedFiles = diffSummary.files.map(file => {
             const resolvedFile = resolveRenamedFile(file.file);

package/src/utils/diff-file-list.js

@@ -37,7 +37,7 @@ async function getDiffFileList(db, review) {
     try {
       const opts = { cwd: review.local_path };
       const [{ stdout: unstaged }, { stdout: untracked }] = await Promise.all([
-        execPromise('git diff --name-only', opts),
+        execPromise('git diff --no-ext-diff --name-only', opts),
         execPromise('git ls-files --others --exclude-standard', opts),
       ]);
       const combined = `${unstaged}\n${untracked}`