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

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);
@@ -670,22 +670,20 @@ Do NOT create suggestions for any files not in this list. If you cannot find iss
   }
 
   /**
-   * Get list of changed files for local mode analysis
-   * Includes unstaged changes and untracked files only.
-   *
-   * Design note: Staged files are intentionally excluded. Local mode focuses on
-   * reviewing uncommitted working directory changes before they are staged.
-   * Staged changes are considered "ready to commit" and outside the scope of
-   * local review at this point.
+   * Get list of changed files for local mode analysis.
+   * By default includes unstaged changes and untracked files.
+   * When `options.includeStaged` is true, also includes staged (git add'd) files.
    *
    * @param {string} localPath - Path to the local git repository
+   * @param {Object} [options]
+   * @param {boolean} [options.includeStaged] - Also include staged files
    * @returns {Promise<Array<string>>} List of changed file paths
    */
-  async getLocalChangedFiles(localPath) {
+  async getLocalChangedFiles(localPath, options = {}) {
     try {
-      // Get modified tracked files (unstaged only - staged files are excluded by design)
+      // Get modified tracked files (unstaged)
       const { stdout: unstaged } = await execPromise(
-        'git diff --name-only',
+        'git diff --no-ext-diff --name-only',
         { cwd: localPath }
       );
 
@@ -695,12 +693,20 @@ Do NOT create suggestions for any files not in this list. If you cannot find iss
         { cwd: localPath }
       );
 
-      // Combine and dedupe (no staged files - see design note above)
-      // Filter empty strings immediately after split to handle empty git output
       const unstagedFiles = unstaged.trim().split('\n').filter(f => f.length > 0);
       const untrackedFiles = untracked.trim().split('\n').filter(f => f.length > 0);
       const allFiles = [...unstagedFiles, ...untrackedFiles];
 
+      // Include staged files when scope includes staged
+      if (options.includeStaged) {
+        const { stdout: staged } = await execPromise(
+          'git diff --no-ext-diff --cached --name-only',
+          { cwd: localPath }
+        );
+        const stagedFiles = staged.trim().split('\n').filter(f => f.length > 0);
+        allFiles.push(...stagedFiles);
+      }
+
       return [...new Set(allFiles)];
     } catch (error) {
       logger.warn(`Could not get local changed files for ${localPath}: ${error.message}`);
@@ -777,7 +783,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 +989,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/config.js

@@ -23,6 +23,7 @@ const DEFAULT_CONFIG = {
   default_provider: "claude",  // AI provider: 'claude', 'gemini', 'codex', 'copilot', 'opencode', 'cursor-agent', 'pi'
   default_model: "opus",       // Model within the provider (e.g., 'opus' for Claude, 'gemini-2.5-pro' for Gemini)
   worktree_retention_days: 7,
+  review_retention_days: 21,
   dev_mode: false,  // When true, disables static file caching for development
   debug_stream: false,  // When true, logs AI provider streaming events (equivalent to --debug-stream CLI flag)
   db_name: "",  // Custom database filename (default: database.db). Useful for per-worktree isolation.
@@ -35,6 +36,7 @@ const DEFAULT_CONFIG = {
   chat_providers: {},  // Custom chat provider configurations (overrides built-in defaults)
   monorepos: {},  // Monorepo configurations: { "owner/repo": { path: "~/path/to/clone" } }
   assisted_by_url: "https://github.com/in-the-loop-labs/pair-review",  // URL for "Review assisted by" footer link
+  hooks: {},  // Hook commands per event: { "review.started": { "my_hook": { "command": "..." } } }
   enable_graphite: false  // When true, shows Graphite links alongside GitHub links
 };