feat(review): deterministic incremental plans, widened one import hop

packages/cli/src/commands/review.test.ts

@@ -49,6 +49,7 @@ describe('reviewCommand', () => {
       'fetch-pr',
       'capture-local',
       'plan-diff',
+      'rescope',
       'repo-context',
       'pr-context',
       'comment-status',

packages/cli/src/commands/review.ts

@@ -16,6 +16,7 @@ import { findingsCommand } from './review/findings.js';
 import { fetchPrCommand } from './review/fetch-pr.js';
 import { captureLocalCommand } from './review/capture-local.js';
 import { planDiffCommand } from './review/plan-diff.js';
+import { rescopeCommand } from './review/rescope.js';
 import { repoContextCommand } from './review/repo-context.js';
 import { prContextCommand } from './review/pr-context.js';
 import { commentStatusCommand } from './review/comment-status.js';
@@ -60,6 +61,7 @@ export const reviewCommand: CommandModule = {
       .command(fetchPrCommand)
       .command(captureLocalCommand)
       .command(planDiffCommand)
+      .command(rescopeCommand)
       .command(repoContextCommand)
       .command(prContextCommand)
       .command(commentStatusCommand)
@@ -86,7 +88,7 @@ export const reviewCommand: CommandModule = {
       .command(cleanupCommand)
       .demandCommand(
         1,
-        'Specify a subcommand: run, parse-args, match-remote, meta, issue-context, fetch-diff, comment-body, fetch-pr, capture-local, plan-diff, repo-context, pr-context, comment-status, load-rules, agent-prompt, build-test, base-tree, test-delta, drive, mock-provider, extract-step, script-lint, resolve-anchors, check-coverage, cost-ledger, presubmit, test-efficacy, test-plan, findings, publish-assets, compose-review, save-artifact, submit, or cleanup.',
+        'Specify a subcommand: run, parse-args, match-remote, meta, issue-context, fetch-diff, comment-body, fetch-pr, capture-local, plan-diff, rescope, repo-context, pr-context, comment-status, load-rules, agent-prompt, build-test, base-tree, test-delta, drive, mock-provider, extract-step, script-lint, resolve-anchors, check-coverage, cost-ledger, presubmit, test-efficacy, test-plan, findings, publish-assets, compose-review, save-artifact, submit, or cleanup.',
       )
       .version(false),
   handler: () => {

packages/cli/src/commands/review/agent-prompt.test.ts

@@ -5611,3 +5611,197 @@ describe('--all-chunks topology anomaly note (#9242)', () => {
     }
   });
 });
+
+describe('incremental-scope briefs', () => {
+  // A rescoped plan carries two scopes in one diff. The chunk brief must say
+  // which scope each of ITS files is in — an interaction file re-reviewed from
+  // scratch re-reports what the previous round already ruled on — and the
+  // whole-diff readers must be told the rest of the PR is absent on purpose,
+  // or they go find it in the worktree.
+  const chunk = (id: number, path: string, start: number) => ({
+    id,
+    startLine: start,
+    endLine: start + 9,
+    lines: 10,
+    chars: 400,
+    maxLineChars: 80,
+    oversized: false,
+    files: [{ path, newStart: 1, newEnd: 10 }],
+  });
+  const INCREMENTAL_PLAN = {
+    diffPathAbsolute: '/abs/.qwen/tmp/qwen-review-pr-7-diff-incremental.txt',
+    chunks: [chunk(1, 'src/changed.ts', 1), chunk(2, 'src/caller.ts', 11)],
+    incremental: {
+      anchor: 'abc1234def5678900000',
+      deltaFiles: ['src/changed.ts'],
+      interaction: [
+        { path: 'src/caller.ts', importsChanged: ['src/changed.ts'] },
+      ],
+      contextFileCount: 1,
+      fullDiffPath: '.qwen/tmp/qwen-review-pr-7-diff.txt',
+    },
+  };
+
+  it('a delta chunk is briefed to review in full, an interaction chunk at the seam', () => {
+    const delta = buildChunkAgentPrompt(INCREMENTAL_PLAN, 1);
+    expect(delta).toContain('INCREMENTAL round');
+    expect(delta).toContain('abc1234def56');
+    expect(delta).toContain('changed since the last round');
+    expect(delta).not.toContain('INTERACTION only');
+
+    const seam = buildChunkAgentPrompt(INCREMENTAL_PLAN, 2);
+    expect(seam).toContain('INCREMENTAL round');
+    expect(seam).toContain('cleared by the previous round');
+    expect(seam).toContain('INTERACTION only');
+    expect(seam).toContain('src/changed.ts');
+  });
+
+  it('whole-diff role briefs carry the frame once, up front', () => {
+    const p = buildRoleBrief(INCREMENTAL_PLAN, '2');
+    expect(p).toContain('Incremental round');
+    expect(p).toContain('deliberately absent');
+  });
+
+  it('a chunk-scoped ROLE brief lists its OWN files uncapped', () => {
+    // The reverse auditors are the sole reviewers of their territory; the
+    // globally capped list can elide their own files past entry 30, leaving
+    // no way to learn the class or recover the tail.
+    const wide = {
+      ...INCREMENTAL_PLAN,
+      incremental: {
+        anchor: 'abc1234def567890',
+        deltaFiles: Array.from({ length: 40 }, (_, i) => `src/d${i}.ts`).concat(
+          ['src/changed.ts'],
+        ),
+        interaction: [
+          { path: 'src/caller.ts', importsChanged: ['src/changed.ts'] },
+        ],
+      },
+    };
+    const brief = buildRoleBrief(wide, 'reverse-audit', { chunk: 2 });
+    expect(brief).toContain("Your territory's files, by scope class:");
+    expect(brief).toContain('src/caller.ts — **interaction only**');
+    // Chunk 1's delta file is named in ITS brief, not elided by the cap.
+    expect(buildRoleBrief(wide, 'reverse-audit', { chunk: 1 })).toContain(
+      'src/changed.ts — **changed since the last round**',
+    );
+  });
+
+  it('a full-range plan renders no incremental framing at all', () => {
+    expect(buildChunkAgentPrompt(PLAN, 13)).not.toContain('INCREMENTAL');
+    expect(buildRoleBrief(PLAN, '2')).not.toContain('Incremental round');
+  });
+
+  it('a malformed incremental block degrades to full-scope briefs — chunk AND role', () => {
+    for (const bad of [
+      { anchor: 42 },
+      // Valid anchor, but no scope list survives validation: rendering the
+      // frame with zero bullets is not a degrade, it is a confusion.
+      { anchor: 'abc1234def567890', deltaFiles: [], interaction: [] },
+      // An interaction entry whose edges were all invalid names a seam
+      // pointing at nothing ("because it imports , which changed").
+      {
+        anchor: 'abc1234def567890',
+        deltaFiles: [],
+        interaction: [{ path: 'src/caller.ts', importsChanged: [42] }],
+      },
+    ]) {
+      const mangled = { ...INCREMENTAL_PLAN, incremental: bad };
+      expect(buildChunkAgentPrompt(mangled, 1)).not.toContain('INCREMENTAL');
+      expect(buildRoleBrief(mangled, '2')).not.toContain('Incremental round');
+    }
+  });
+
+  it('a mixed delta+interaction chunk renders BOTH scope bullets', () => {
+    // rescope's composite is cut on line count, not scope class, so one
+    // chunk can straddle the two kinds; an else-if between the bullet
+    // branches would silently drop the seam brief for exactly that chunk.
+    const mixed = {
+      ...INCREMENTAL_PLAN,
+      chunks: [
+        {
+          id: 1,
+          startLine: 1,
+          endLine: 20,
+          lines: 20,
+          chars: 800,
+          maxLineChars: 80,
+          oversized: false,
+          files: [
+            { path: 'src/changed.ts', newStart: 1, newEnd: 10 },
+            { path: 'src/caller.ts', newStart: 1, newEnd: 10 },
+          ],
+        },
+      ],
+    };
+    const p = buildChunkAgentPrompt(mixed, 1);
+    expect(p).toContain('changed since the last round');
+    expect(p).toContain('INTERACTION only');
+    expect(p).toContain('the scope class WINS');
+  });
+
+  it('caps the scope lists at 30 entries and 8 edges per entry', () => {
+    const wide = {
+      ...INCREMENTAL_PLAN,
+      incremental: {
+        anchor: 'abc1234def567890',
+        deltaFiles: Array.from({ length: 40 }, (_, i) => `src/d${i}.ts`),
+        interaction: [
+          {
+            path: 'src/hub.ts',
+            importsChanged: Array.from(
+              { length: 20 },
+              (_, i) => `src/d${i}.ts`,
+            ),
+          },
+        ],
+      },
+    };
+    const p = buildRoleBrief(wide, '2');
+    expect(p).toContain('(+10 more)'); // 40 entries − 30 cap
+    expect(p).toContain('(+12 more)'); // 20 edges − 8 cap
+  });
+
+  it('an interaction entry whose edges are all EMPTY strings degrades away', () => {
+    const mangled = {
+      ...INCREMENTAL_PLAN,
+      incremental: {
+        anchor: 'abc1234def567890',
+        deltaFiles: [],
+        interaction: [{ path: 'src/caller.ts', importsChanged: ['', ''] }],
+      },
+    };
+    expect(buildChunkAgentPrompt(mangled, 1)).not.toContain('INCREMENTAL');
+  });
+
+  it('a chunk whose files carry NO scope class gets no incremental frame', () => {
+    // The block validates globally, but a frame with zero bullets implies
+    // the chunk is out of scope — say nothing instead.
+    const foreign = {
+      ...INCREMENTAL_PLAN,
+      chunks: [
+        {
+          id: 1,
+          startLine: 1,
+          endLine: 10,
+          lines: 10,
+          chars: 400,
+          maxLineChars: 80,
+          oversized: false,
+          files: [{ path: 'src/unrelated.ts', newStart: 1, newEnd: 10 }],
+        },
+      ],
+    };
+    expect(buildChunkAgentPrompt(foreign, 1)).not.toContain(
+      'INCREMENTAL round',
+    );
+  });
+
+  it('whole-diff briefs name each file with its scope class', () => {
+    const p = buildRoleBrief(INCREMENTAL_PLAN, '2');
+    expect(p).toContain(
+      'Changed since the last round (full review): src/changed.ts.',
+    );
+    expect(p).toContain('src/caller.ts (imports src/changed.ts)');
+  });
+});