codecritique 2.0.8 → 2.1.1

package/README.md

@@ -202,6 +202,8 @@ For easier integration with non-JavaScript projects, you can use the provided sh
    - Validates Node.js 24+ requirement
    - Provides helpful error messages for missing dependencies
 
+   The wrapper forwards only `ANTHROPIC_API_KEY`, `ANTHROPIC_BASE_URL`, `ANTHROPIC_LOG`, `GITHUB_TOKEN`, `GH_TOKEN`, `DEBUG`, `VERBOSE`, `CI`, and `GITHUB_WORKSPACE_PATH` from `.env`; other entries, including process-control variables such as `NODE_OPTIONS` and `PATH`, are ignored. An unreadable `.env` stops the wrapper with an error. Run it only in trusted project directories: `ANTHROPIC_BASE_URL` controls where API requests are sent, while `CI` and `GITHUB_WORKSPACE_PATH` control where embedding data is stored.
+
 ## Quick Start
 
 Follow this three-step workflow for optimal code review results:
@@ -541,6 +543,8 @@ DEBUG=true
 VERBOSE=true
 ```
 
+Set `CODECRITIQUE_SKIP_DOTENV=1` to disable `.env` loading, as the shell wrapper does after forwarding its supported variables.
+
 ## Output Formats
 
 CodeCritique supports three output formats:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codecritique",
-  "version": "2.0.8",
+  "version": "2.1.1",
   "description": "AI-powered code review tool for any programming language",
   "type": "module",
   "main": "src/index.js",

package/src/codecritique.test.js

@@ -0,0 +1,169 @@
+import { execFile } from 'node:child_process';
+import { access, chmod, mkdir, mkdtemp, rm, symlink, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { promisify } from 'node:util';
+import { describe, expect, it, onTestFinished } from 'vitest';
+
+const execFileAsync = promisify(execFile);
+
+async function runWrapper(envFile, args = [], command = 'codecritique', extraEnv = {}, envIsDirectory = false, nodeMajorVersion = null) {
+  const directory = await mkdtemp(join(tmpdir(), 'codecritique-shell-'));
+  onTestFinished(() => rm(directory, { recursive: true, force: true }));
+  const fakeCommand = join(directory, command);
+  const envInspector = join(directory, 'inspect-entry-env.mjs');
+
+  if (envIsDirectory) {
+    await mkdir(join(directory, '.env'));
+  }
+  else if (envFile !== null) {
+    await writeFile(join(directory, '.env'), envFile);
+  }
+  await writeFile(
+    envInspector,
+    `process.argv = ['node'];
+process.exit = code => { throw new Error(\`exit \${code}\`); };
+try { await import(${JSON.stringify(new URL('./index.js', import.meta.url).href)}); } catch {}
+console.log(\`inspected_node_options=\${process.env.NODE_OPTIONS || ''}\`);
+`
+  );
+  await writeFile(
+    fakeCommand,
+    `#!/bin/bash
+[ "$1" = "--terminate" ] && kill -TERM $$
+[ "$1" = "--inspect-entry" ] && exec node "${envInspector}"
+[ "$1" = "--inspect-entry-with-dotenv" ] && unset CODECRITIQUE_SKIP_DOTENV && exec node "${envInspector}"
+/usr/bin/env
+printf "arg=%s\\n" "$@"
+`
+  );
+  await chmod(fakeCommand, 0o755);
+  if (nodeMajorVersion === null) {
+    await symlink(process.execPath, join(directory, 'node'));
+  }
+  else {
+    await writeFile(
+      join(directory, 'node'),
+      `#!/bin/bash\nif [ "$1" = "-p" ]; then echo ${nodeMajorVersion}; exit; fi\nif [ "$1" = "--version" ]; then echo v${nodeMajorVersion}.0.0; exit; fi\nexec "${process.execPath}" "$@"\n`
+    );
+    await chmod(join(directory, 'node'), 0o755);
+  }
+
+  const result = await execFileAsync('/bin/bash', [join(import.meta.dirname, 'codecritique.sh'), ...args], {
+    cwd: directory,
+    env: { PATH: directory, ...extraEnv },
+  });
+
+  return { ...result, directory };
+}
+
+describe('codecritique.sh', () => {
+  it.each([
+    [20, 'Error: CodeCritique requires Node.js 24 or newer (found v20.0.0).\n'],
+    ['not-a-version', 'Error: Unable to determine the Node.js major version (received: not-a-version).\n'],
+  ])('rejects unsupported Node version output: %s', async (nodeVersion, stderr) => {
+    await expect(runWrapper(null, [], 'codecritique', {}, false, nodeVersion)).rejects.toMatchObject({
+      code: 1,
+      stderr,
+    });
+  });
+
+  it.each([
+    ['unquoted spaces and globs', 'ANTHROPIC_API_KEY=value with spaces *\n', 'value with spaces *'],
+    ['literal JSON quotes', 'ANTHROPIC_API_KEY={"token":"a*b c"}\n', '{"token":"a*b c"}'],
+  ])('loads %s without corruption', async (_label, envFile, expected) => {
+    const { stdout } = await runWrapper(envFile, ['--flag', 'value with spaces']);
+
+    expect(stdout).toContain(`ANTHROPIC_API_KEY=${expected}`);
+    expect(stdout).toContain('arg=--flag');
+    expect(stdout).toContain('arg=value with spaces');
+  });
+
+  it('does not execute .env contents', async () => {
+    const { directory, stdout } = await runWrapper(
+      'ANTHROPIC_API_KEY=test\nMALICIOUS=$(touch executed)\nNODE_OPTIONS=--require=./does-not-exist.cjs\n'
+    );
+
+    expect(stdout).toContain('ANTHROPIC_API_KEY=test');
+    expect(stdout).not.toContain('NODE_OPTIONS=');
+    await expect(access(join(directory, 'executed'))).rejects.toThrow();
+  });
+
+  it('prevents the real CLI entry point from reloading filtered .env values', async () => {
+    const { stdout } = await runWrapper('ANTHROPIC_API_KEY=test\nNODE_OPTIONS=--require=./does-not-exist.cjs\n', ['--inspect-entry']);
+
+    expect(stdout).toContain('inspected_node_options=\n');
+  });
+
+  it('loads .env at the real CLI entry point when the wrapper sentinel is absent', async () => {
+    const { stdout } = await runWrapper('ANTHROPIC_API_KEY=test\nNODE_OPTIONS=loaded-by-dotenv\n', ['--inspect-entry-with-dotenv']);
+
+    expect(stdout).toContain('inspected_node_options=loaded-by-dotenv\n');
+  });
+
+  it('forwards every supported .env setting', async () => {
+    const supportedEnv = {
+      ANTHROPIC_API_KEY: 'test',
+      ANTHROPIC_BASE_URL: 'https://api.example.test',
+      ANTHROPIC_LOG: 'debug',
+      GITHUB_TOKEN: 'github-token',
+      GH_TOKEN: 'gh-token',
+      DEBUG: '1',
+      VERBOSE: 'true',
+      CI: 'true',
+      GITHUB_WORKSPACE_PATH: '/workspace',
+    };
+    const envFile = Object.entries(supportedEnv)
+      .map(([key, value]) => `${key}=${value}`)
+      .join('\n');
+    const { stdout } = await runWrapper(envFile);
+
+    for (const [key, value] of Object.entries(supportedEnv)) {
+      expect(stdout).toContain(`${key}=${value}`);
+    }
+  });
+
+  it('reports null bytes in supported values without an internal stack', async () => {
+    await expect(runWrapper('ANTHROPIC_API_KEY=test\0value\n')).rejects.toMatchObject({
+      stderr: 'Unable to load .env: ANTHROPIC_API_KEY contains a null byte\n',
+    });
+  });
+
+  it('preserves an inherited API key when .env is absent', async () => {
+    const { stdout } = await runWrapper(null, [], 'codecritique', { ANTHROPIC_API_KEY: 'inherited' });
+
+    expect(stdout).toContain('ANTHROPIC_API_KEY=inherited');
+  });
+
+  it('keeps the original .env-over-inherited-value precedence', async () => {
+    const { stdout } = await runWrapper('ANTHROPIC_API_KEY=from-file\n', [], 'codecritique', {
+      ANTHROPIC_API_KEY: 'from-parent',
+    });
+
+    expect(stdout).toContain('ANTHROPIC_API_KEY=from-file');
+  });
+
+  it.each([null, 'ANTHROPIC_AUTH_TOKEN=token\n'])('warns when no supported Anthropic credentials are configured', async (envFile) => {
+    const { stderr } = await runWrapper(envFile);
+
+    expect(stderr).toContain('Warning: ANTHROPIC_API_KEY is not set.');
+  });
+
+  it('reports unreadable .env paths without an internal stack', async () => {
+    await expect(runWrapper(null, [], 'codecritique', {}, true)).rejects.toMatchObject({
+      stderr: expect.stringMatching(/^Unable to load \.env: .+\n$/),
+    });
+  });
+
+  it('falls back to npx when codecritique is not installed globally', async () => {
+    const { stdout } = await runWrapper('ANTHROPIC_API_KEY=test\n', ['--version'], 'npx');
+
+    expect(stdout).toContain('codecritique not found globally, trying with npx...');
+    expect(stdout).toContain('arg=codecritique');
+    expect(stdout).toContain('arg=--version');
+  });
+
+  it('preserves signal-derived child exit codes', async () => {
+    await expect(runWrapper('ANTHROPIC_API_KEY=test\n', ['--terminate'])).rejects.toMatchObject({ code: 143 });
+  });
+});

package/src/index.js

@@ -15,7 +15,7 @@ import chalk from 'chalk';
 import { Spinner } from 'cli-spinner';
 import { program } from 'commander';
 import { glob } from 'glob';
-import { getDefaultEmbeddingsSystem } from './embeddings/factory.js';
+import { getDefaultEmbeddingsSystem, getDefaultEmbeddingsSystemIfInitialized } from './embeddings/factory.js';
 import { PRHistoryAnalyzer } from './pr-history/analyzer.js';
 import {
   displayAnalysisResults,
@@ -34,8 +34,12 @@ import { diagnosticLog, isDebugEnabled, isVerboseEnabled, verboseLog } from './u
 import { collectPRLevelFindings, getFileLevelIssueCount, hasPRLevelFindings } from './utils/review-results.js';
 import { configureCleanStdoutForDataOutput, isBrokenStdoutPipeError, writeStdout } from './utils/stdout.js';
 
-// Create a default embeddings system instance
-const embeddingsSystem = getDefaultEmbeddingsSystem();
+async function cleanupEmbeddingsSystemIfInitialized() {
+  const embeddingsSystem = getDefaultEmbeddingsSystemIfInitialized();
+  if (embeddingsSystem) {
+    await embeddingsSystem.cleanup();
+  }
+}
 
 const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
 
@@ -103,6 +107,7 @@ program
   .command('embeddings:clear-all')
   .description('Clear ALL stored embeddings (affects all projects - use with caution)')
   .action(async () => {
+    const embeddingsSystem = getDefaultEmbeddingsSystem();
     try {
       console.log(chalk.red('WARNING: This will clear embeddings for ALL projects on this machine!'));
       console.log(chalk.cyan('Clearing all embeddings...'));
@@ -227,7 +232,7 @@ process.on('SIGINT', async () => {
 
   try {
     diagnosticLog(chalk.cyan('SIGINT handler: Attempting embeddingsSystem.cleanup()...'));
-    await embeddingsSystem.cleanup();
+    await cleanupEmbeddingsSystemIfInitialized();
     diagnosticLog(chalk.green('embeddingsSystem.cleanup() completed.'));
     clearTimeout(forceExitTimeout); // Cleanup finished, clear the timeout
     diagnosticLog(chalk.cyan('SIGINT handler: Exiting normally (code 0).'));
@@ -251,7 +256,7 @@ process.on('SIGTERM', async () => {
 
   try {
     diagnosticLog(chalk.cyan('SIGTERM handler: Attempting embeddingsSystem.cleanup()...'));
-    await embeddingsSystem.cleanup();
+    await cleanupEmbeddingsSystemIfInitialized();
     diagnosticLog(chalk.green('embeddingsSystem.cleanup() completed.'));
     clearTimeout(forceExitTimeout); // Cleanup finished, clear the timeout
     diagnosticLog(chalk.cyan('SIGTERM handler: Exiting normally (code 0).'));
@@ -468,7 +473,7 @@ async function runCodeReview(options) {
     // Clean up resources
     diagnosticLog(chalk.cyan('Cleaning up resources...'));
     try {
-      await embeddingsSystem.cleanup();
+      await cleanupEmbeddingsSystemIfInitialized();
       await cleanupClassifier();
       diagnosticLog(chalk.green('All resources cleaned up successfully'));
     }
@@ -497,7 +502,7 @@ async function runCodeReview(options) {
 
     // Clean up resources even on error
     try {
-      await embeddingsSystem.cleanup();
+      await cleanupEmbeddingsSystemIfInitialized();
       await cleanupClassifier();
       diagnosticLog(chalk.green('All resources cleaned up successfully'));
     }
@@ -516,6 +521,7 @@ async function runCodeReview(options) {
  * @param {Object} options - Command options
  */
 async function generateEmbeddings(options) {
+  const embeddingsSystem = getDefaultEmbeddingsSystem();
   try {
     console.log(chalk.bold.blue('AI Code Review - Generating embeddings...'));
     const startTime = Date.now();
@@ -717,6 +723,7 @@ async function generateEmbeddings(options) {
  * Clear stored embeddings for the current project
  */
 async function clearEmbeddings(options) {
+  const embeddingsSystem = getDefaultEmbeddingsSystem();
   try {
     // Determine the working directory for project separation
     // If --directory is specified, use that as the project directory
@@ -751,6 +758,7 @@ async function clearEmbeddings(options) {
  * Show statistics about stored embeddings
  */
 async function showEmbeddingStats(options) {
+  const embeddingsSystem = getDefaultEmbeddingsSystem();
   try {
     // Determine the working directory for project separation
     // If --directory is specified, use that as the project directory

package/src/llm.js

@@ -18,7 +18,9 @@ import dotenv from 'dotenv';
 import { verboseLog } from './utils/logging.js';
 
 // Load env variables if present; do not enforce key at import time
-dotenv.config({ quiet: true });
+if (process.env.CODECRITIQUE_SKIP_DOTENV !== '1') {
+  dotenv.config({ quiet: true });
+}
 
 let anthropic = null;
 

package/src/rag-analyzer.js

@@ -27,6 +27,7 @@ import { isGenericDocument, getGenericDocumentContext } from './utils/document-d
 import { isTestFile, shouldProcessFile } from './utils/file-validation.js';
 import { detectFileType, detectLanguageFromExtension } from './utils/language-detection.js';
 import { debug, verboseLog } from './utils/logging.js';
+import { formatPlannedHolisticFileContext, mergeHolisticFileContextPlans } from './utils/pr-file-context.js';
 import { addLineNumbers } from './utils/string-utils.js';
 
 // Constants for content processing
@@ -36,9 +37,6 @@ const DEFAULT_TRUNCATE_LINES = 300;
 const GUIDELINE_TRUNCATE_LINES = 400;
 const MAX_PR_COMMENTS_FOR_CONTEXT = 15;
 
-// Create embeddings system instance
-const embeddingsSystem = getDefaultEmbeddingsSystem();
-
 // Track if semantic similarity has been initialized
 let semanticSimilarityInitialized = false;
 
@@ -233,6 +231,7 @@ ${ex.content}
  */
 async function getProjectSummary(projectPath, options = {}) {
   const resolvedPath = path.resolve(projectPath);
+  const embeddingsSystem = getDefaultEmbeddingsSystem();
 
   try {
     // Retrieve from database
@@ -1376,23 +1375,24 @@ ${g.content}
 
   // Format PR files with their diffs
   const prFiles = file.prFiles || [];
+  const holisticContextPlans = mergeHolisticFileContextPlans(prFiles, context.options || {});
   const formattedPRFiles = prFiles
     .map((prFile, idx) => {
+      const fileContextPlan = holisticContextPlans[idx];
+      const fileContext = formatPlannedHolisticFileContext(prFile, fileContextPlan, context.options || {});
       return `
 ## FILE ${idx + 1}: ${prFile.path}
 **Language**: ${prFile.language}
 **Type**: ${prFile.isTest ? 'Test' : 'Source'} file
 **Summary**: ${prFile.summary}
+**Context Mode**: ${fileContextPlan.mode === 'full' ? 'Full file content' : 'Focused changed-line context'}
 
 ### Changes (Git Diff):
 \`\`\`diff
 ${prFile.diff}
 \`\`\`
 
-### Full File Content (For Context - line numbers shown for reference):
-\`\`\`${prFile.language}
-${addLineNumbers(prFile.fullContent)}
-\`\`\`
+${fileContext}
 `;
     })
     .join('\n');
@@ -1406,17 +1406,17 @@ ${addLineNumbers(prFile.fullContent)}
 **CRITICAL CONTEXT AWARENESS INSTRUCTIONS:**
 
 For each file in this PR, you have access to:
-1. **FULL FILE CONTENT** - The complete file for understanding context and existing code
+1. **FILE CONTEXT** - Complete file content when it fits the holistic context budget, or focused changed-line windows for very large files/PRs
 2. **GIT DIFF** - Only the changes to review
 
 **Review Rules:**
 - ONLY critique the CHANGED lines shown in each file's diff (lines with + or -)
-- USE the full file content to understand context, dependencies, and existing implementations
+- USE the file context to understand dependencies, nearby behavior, and existing implementations
 - DO NOT suggest adding code that already exists in the unchanged portions of any file
-- DO NOT flag issues about missing code if it exists elsewhere in the full file
-- Before flagging cross-file issues, verify the code doesn't already exist in unchanged portions
-- Do NOT flag functions/variables as missing if they exist elsewhere in the full file
-- The unchanged code is part of each file - always check it before making assumptions`;
+- DO NOT flag issues about missing code when the provided context already shows the code exists
+- Before flagging cross-file issues, verify the code doesn't already exist in the provided context
+- Do NOT flag functions/variables as missing if they exist elsewhere in the provided context
+- The unchanged context is part of each file - always check it before making assumptions`;
 
   let roleDefinition = buildRoleDefinition(baseRole, customDocs, 'pr');
   roleDefinition += '\nAnalyze ALL files together to identify cross-file issues, consistency problems, and overall code quality.';
@@ -1927,6 +1927,7 @@ async function performHolisticPRAnalysis(options) {
  * @returns {Promise<Object>} An object containing the gathered context.
  */
 async function getContextForFile(filePath, content, options = {}) {
+  const embeddingsSystem = getDefaultEmbeddingsSystem();
   const RELEVANT_CHUNK_THRESHOLD = 0.1;
   const W_H1_SIM = 0.2;
   const W_DOC_CONTEXT_MATCH = 0.6;
@@ -2281,6 +2282,7 @@ async function getContextForFile(filePath, content, options = {}) {
 }
 
 async function gatherUnifiedContextForPR(prFiles, options = {}) {
+  const embeddingsSystem = getDefaultEmbeddingsSystem();
   const allProcessedContext = {
     codeExamples: new Map(),
     guidelines: new Map(),

package/src/rag-analyzer.test.js

@@ -578,6 +578,70 @@ describe('rag-analyzer', () => {
       );
       expect(result.success).toBe(true);
     });
+
+    it('should use focused context for oversized holistic PR files', async () => {
+      const hugeContent = Array.from({ length: 5000 }, (_, index) => `huge line ${index + 1}`).join('\n');
+      llm.sendPromptToClaude.mockResolvedValue(createMockHolisticReviewResponse());
+
+      const result = await runAnalysis(
+        'PR_HOLISTIC_REVIEW',
+        setupHolisticReviewOptions({
+          prFiles: [
+            createMockPRFile({
+              path: 'src/small.js',
+              fullContent: 'const small = true;',
+              diff: '@@ -1,1 +1,1 @@\n-const small = false;\n+const small = true;',
+            }),
+            createMockPRFile({
+              path: 'src/huge.js',
+              fullContent: hugeContent,
+              diff: '@@ -2500,1 +2500,1 @@\n-huge line 2500\n+huge line 2500 changed',
+            }),
+          ],
+          prContext: { totalFiles: 2 },
+          maxTotalFullContentTokens: 1000,
+        })
+      );
+
+      const prompt = llm.sendPromptToClaude.mock.calls.at(-1)[0];
+      expect(result.success).toBe(true);
+      expect(prompt).toContain('**Context Mode**: Full file content');
+      expect(prompt).toContain('**Context Mode**: Focused changed-line context');
+      expect(prompt).toContain('const small = true;');
+      expect(prompt).toContain('Focused File Context');
+      expect(prompt).toContain('2500 | huge line 2500');
+      expect(prompt).not.toContain('5000 | huge line 5000');
+    });
+
+    it('should preserve carried holistic context plans for chunked reviews', async () => {
+      llm.sendPromptToClaude.mockResolvedValue(createMockHolisticReviewResponse());
+
+      await runAnalysis(
+        'PR_HOLISTIC_REVIEW',
+        setupHolisticReviewOptions({
+          prFiles: [
+            createMockPRFile({
+              path: 'src/chunked.js',
+              fullContent: 'const wouldFit = true;',
+              diff: '@@ -1,1 +1,1 @@\n-const wouldFit = false;\n+const wouldFit = true;',
+              holisticContextPlan: {
+                mode: 'focused',
+                reason: 'global budget assigned focused context before chunking',
+                contextTokens: 5,
+                totalTokens: 20,
+                contextLineRadius: 0,
+              },
+            }),
+          ],
+          prContext: { totalFiles: 1 },
+        })
+      );
+
+      const prompt = llm.sendPromptToClaude.mock.calls.at(-1)[0];
+      expect(prompt).toContain('**Context Mode**: Focused changed-line context');
+      expect(prompt).toContain('global budget assigned focused context before chunking');
+      expect(prompt).not.toContain('### Full File Content');
+    });
   });
 
   // ==========================================================================

package/src/rag-review.js

@@ -14,6 +14,7 @@ import { ensureBranchExists, findParentBranch, getChangedLinesInfo, getFileConte
 import { detectFileType, detectLanguageFromExtension } from './utils/language-detection.js';
 import { verboseLog } from './utils/logging.js';
 import { shouldChunkPR, chunkPRFiles, combineChunkResults } from './utils/pr-chunking.js';
+import { mergeHolisticFileContextPlans } from './utils/pr-file-context.js';
 
 /**
  * Review a single file using RAG approach
@@ -308,8 +309,10 @@ async function reviewPullRequestWithCrossFileContext(filesToReview, options = {}
     }
 
     // Check if PR should be chunked based on size and complexity (skip if this is already a chunk)
+    let holisticContextPlans = options.holisticContextPlans;
     if (!options.skipChunking) {
       const chunkingDecision = shouldChunkPR(prFiles, options);
+      holisticContextPlans = chunkingDecision.holisticContextPlans;
       verboseLog(verbose, chalk.blue(`PR size assessment: ${chunkingDecision.estimatedTokens} tokens, ${prFiles.length} files`));
       verboseLog(
         verbose && chunkingDecision.shouldChunk,
@@ -319,10 +322,12 @@ async function reviewPullRequestWithCrossFileContext(filesToReview, options = {}
       // If PR is too large, use chunked processing
       if (chunkingDecision.shouldChunk) {
         verboseLog(options, chalk.blue(`🔄 Using chunked processing for large PR (${chunkingDecision.estimatedTokens} tokens)`));
-        return await reviewLargePRInChunks(prFiles, options);
+        return await reviewLargePRInChunks(prFiles, { ...options, holisticContextPlans });
       }
     }
 
+    holisticContextPlans = mergeHolisticFileContextPlans(prFiles, options, holisticContextPlans);
+
     // Step 2: Gather unified context for the entire PR (for regular-sized PRs)
     verboseLog(verbose, chalk.blue(`Performing unified context retrieval for ${prFiles.length} PR files...`));
     const {
@@ -361,7 +366,7 @@ async function reviewPullRequestWithCrossFileContext(filesToReview, options = {}
     try {
       // Create a comprehensive review context with all files and their diffs
       const comprehensiveContext = {
-        prFiles: prFiles.map((file) => ({
+        prFiles: prFiles.map((file, index) => ({
           path: path.relative(workingDir, file.filePath),
           language: file.language,
           isTest: file.isTest,
@@ -369,6 +374,8 @@ async function reviewPullRequestWithCrossFileContext(filesToReview, options = {}
           summary: file.summary,
           fullContent: file.content, // Add full file content for context
           diff: file.diffContent,
+          diffInfo: file.diffInfo,
+          holisticContextPlan: file.holisticContextPlan || holisticContextPlans[index],
           baseBranch: file.baseBranch,
           targetBranch: file.targetBranch,
         })),
@@ -557,7 +564,7 @@ async function reviewLargePRInChunks(prFiles, options) {
 
   // Step 2: Split PR into manageable chunks
   // Each chunk includes both diff AND full file content, plus ~25k context overhead
-  const chunks = chunkPRFiles(prFiles, 35000); // Conservative limit accounting for context overhead
+  const chunks = chunkPRFiles(prFiles, 35000, options); // Conservative limit accounting for context overhead
   verboseLog(options, chalk.green(`✂️ Split PR into ${chunks.length} chunks`));
 
   chunks.forEach((chunk, i) => {

package/src/rag-review.test.js

@@ -270,7 +270,8 @@ describe('rag-review', () => {
       });
 
       // Setup: shouldChunkPR returns true to trigger chunked processing
-      shouldChunkPR.mockReturnValue({ shouldChunk: true, estimatedTokens: 100000, recommendedChunks: 2 });
+      const holisticContextPlans = [{ mode: 'focused', contextTokens: 10, totalTokens: 20 }];
+      shouldChunkPR.mockReturnValue({ shouldChunk: true, estimatedTokens: 100000, recommendedChunks: 2, holisticContextPlans });
 
       // Setup chunks that will be processed
       chunkPRFiles.mockReturnValue([
@@ -298,7 +299,7 @@ describe('rag-review', () => {
 
       // Verify chunking flow was triggered
       expect(shouldChunkPR).toHaveBeenCalled();
-      expect(chunkPRFiles).toHaveBeenCalled();
+      expect(chunkPRFiles).toHaveBeenCalledWith(expect.any(Array), 35000, expect.objectContaining({ holisticContextPlans }));
       expect(combineChunkResults).toHaveBeenCalled();
       expect(result.success).toBe(true);
     });