@dreki-gg/pi-code-reviewer 0.1.1 → 0.2.0

package/extensions/code-reviewer/commands/review-tool.ts

@@ -38,7 +38,7 @@ export function registerReviewTool(pi: ExtensionAPI) {
       ),
     }),
 
-    async execute(_toolCallId, params, signal, _onUpdate, ctx) {
+    async execute(_toolCallId, params, signal, onUpdate, ctx) {
       const cwd = ctx.cwd;
       const config = loadConfig(cwd);
       const lensDir = getLensDir(cwd, config);
@@ -58,12 +58,14 @@ export function registerReviewTool(pi: ExtensionAPI) {
 
       const lensNames = resolveLensNames(params.lenses, config, available);
 
+      ctx.ui.setStatus('code-review', '🔍 Collecting diff...');
       const diff = await collectDiff(pi, cwd, {
         base: params.base,
         staged: params.staged,
       });
 
       if (!diff.diff.trim()) {
+        ctx.ui.setStatus('code-review', undefined);
         return {
           content: [{ type: 'text', text: 'No changes to review.' }],
           details: {},
@@ -71,15 +73,25 @@ export function registerReviewTool(pi: ExtensionAPI) {
       }
 
       const results: LensResult[] = [];
-      for (const name of lensNames) {
+      for (let i = 0; i < lensNames.length; i++) {
         if (signal?.aborted) break;
 
+        const name = lensNames[i];
+        const progressMsg = `Lens ${i + 1}/${lensNames.length}: ${name}`;
+        ctx.ui.setStatus('code-review', `🔍 ${progressMsg}`);
+        onUpdate?.({
+          content: [{ type: 'text', text: progressMsg }],
+          details: { currentLens: name, lensIndex: i + 1, totalLenses: lensNames.length },
+        });
+
         const lens = available.get(name)!;
         const content = getLensContent(lensDir, name) ?? '';
         const result = await reviewWithLens(pi, ctx, cwd, lens, content, diff, signal);
         results.push(result);
       }
 
+      ctx.ui.setStatus('code-review', undefined);
+
       const report: ReviewReport = {
         diff: diff.diff,
         diffStat: diff.stat,

package/extensions/code-reviewer/commands/review.ts

@@ -3,7 +3,7 @@ import type { ExtensionAPI } from '@earendil-works/pi-coding-agent';
 import { loadConfig, getLensDir } from '../config';
 import { collectDiff } from '../diff';
 import { discoverLenses, getLensContent } from '../lenses';
-import { reviewWithLens } from '../reviewer';
+import { reviewWithLens, buildDiffSection } from '../reviewer';
 import { parseReviewArgs } from '../parse-args';
 
 export function registerReviewCommand(pi: ExtensionAPI) {
@@ -34,36 +34,61 @@ export function registerReviewCommand(pi: ExtensionAPI) {
         return;
       }
 
+      ctx.ui.setStatus('code-review', '🔍 Collecting diff...');
       const diff = await collectDiff(pi, cwd, {
         base: parsed.base,
         staged: parsed.staged,
       });
 
       if (!diff.diff.trim()) {
+        ctx.ui.setStatus('code-review', undefined);
         ctx.ui.notify('No changes to review', 'info');
         return;
       }
 
       ctx.ui.notify(`Reviewing ${diff.label} through ${lensNames.length} lens(es)...`, 'info');
+      ctx.ui.setStatus('code-review', `🔍 Reviewing (0/${lensNames.length})...`);
+
+      const lensSections: string[] = [];
+      for (let i = 0; i < lensNames.length; i++) {
+        const name = lensNames[i];
+        ctx.ui.setStatus('code-review', `🔍 Lens ${i + 1}/${lensNames.length}: ${name}`);
 
-      const lensPrompts: string[] = [];
-      for (const name of lensNames) {
         const lens = available.get(name)!;
         const content = getLensContent(lensDir, name) ?? '';
         const result = await reviewWithLens(pi, ctx, cwd, lens, content, diff);
 
-        if (result._prompt) {
-          lensPrompts.push(result._prompt);
+        if (result._lensSection) {
+          lensSections.push(result._lensSection);
         }
       }
 
+      ctx.ui.setStatus('code-review', undefined);
+
       const combinedPrompt = [
         `Review the following changes through ${lensNames.length} lens(es): ${lensNames.join(', ')}.`,
         '',
         'For each lens, evaluate the diff against its criteria and produce findings.',
         'Output your review as a structured report with sections per lens.',
         '',
-        ...lensPrompts,
+        buildDiffSection(diff),
+        '',
+        '## Lenses',
+        '',
+        ...lensSections,
+        '',
+        '## Instructions',
+        '',
+        'For each lens above, review the diff and output a JSON array of findings:',
+        '',
+        '```json',
+        '[',
+        '  { "file": "path/to/file.ts", "line": 42, "severity": "warning", "message": "Description" }',
+        ']',
+        '```',
+        '',
+        'After each lens JSON array, write a 2-3 sentence summary.',
+        'If there are no findings for a lens, return an empty array `[]` and note the code looks good.',
       ].join('\n');
 
       pi.sendUserMessage(combinedPrompt, { deliverAs: 'followUp' });

package/extensions/code-reviewer/reviewer.ts

@@ -33,23 +33,13 @@ async function runLensTools(
   return outputs;
 }
 
-/** Build the review prompt for a single lens. */
-function buildReviewPrompt(
-  lens: LensConfig,
-  lensContent: string,
-  diff: DiffSource,
-  toolOutputs: Record<string, string>,
-): string {
+/** Build the shared diff section of the review prompt (included once). */
+export function buildDiffSection(diff: DiffSource): string {
   const parts: string[] = [];
-
-  parts.push(`You are reviewing code changes through the "${lens.name}" lens.`);
-  parts.push('');
-  parts.push('## Lens Definition');
-  parts.push(lensContent);
-  parts.push('');
-  parts.push(`## Diff (${diff.label})`);
   const maxDiffLen = 50_000;
   const diffTruncated = diff.diff.length > maxDiffLen;
+
+  parts.push(`## Diff (${diff.label})`);
   parts.push('```diff');
   parts.push(diff.diff.slice(0, maxDiffLen));
   parts.push('```');
@@ -64,21 +54,60 @@ function buildReviewPrompt(
   parts.push(diff.stat);
   parts.push('```');
 
+  return parts.join('\n');
+}
+
+/** Build the lens-specific section of the review prompt (no diff duplication). */
+function buildLensSection(
+  lens: LensConfig,
+  lensContent: string,
+  toolOutputs: Record<string, string>,
+): string {
+  const parts: string[] = [];
+
+  parts.push(`### Lens: ${lens.name}`);
+  parts.push('');
+  parts.push('#### Lens Definition');
+  parts.push(lensContent);
+
   if (Object.keys(toolOutputs).length > 0) {
     parts.push('');
-    parts.push('## Tool Outputs');
+    parts.push('#### Tool Outputs');
     for (const [cmd, output] of Object.entries(toolOutputs)) {
-      parts.push(`### \`${cmd}\``);
+      parts.push(`##### \`${cmd}\``);
       parts.push('```');
       parts.push(output.slice(0, 20_000));
       parts.push('```');
     }
   }
 
+  parts.push('');
+  parts.push('#### Severity levels');
+  if (lens.severityRules.blocker) parts.push(`- **blocker**: ${lens.severityRules.blocker}`);
+  if (lens.severityRules.warning) parts.push(`- **warning**: ${lens.severityRules.warning}`);
+  if (lens.severityRules.note) parts.push(`- **note**: ${lens.severityRules.note}`);
+
+  return parts.join('\n');
+}
+
+/** Build the full review prompt for a single lens (includes diff — used by the tool path). */
+function buildReviewPrompt(
+  lens: LensConfig,
+  lensContent: string,
+  diff: DiffSource,
+  toolOutputs: Record<string, string>,
+): string {
+  const parts: string[] = [];
+
+  parts.push(`You are reviewing code changes through the "${lens.name}" lens.`);
+  parts.push('');
+  parts.push(buildDiffSection(diff));
+  parts.push('');
+  parts.push(buildLensSection(lens, lensContent, toolOutputs));
   parts.push('');
   parts.push('## Instructions');
   parts.push('');
-  parts.push('Review the diff through this lens. For each finding, output a JSON array:');
+  parts.push('Review the diff above through this lens. For each finding, output a JSON array:');
   parts.push('');
   parts.push('```json');
   parts.push('[');
@@ -88,11 +117,6 @@ function buildReviewPrompt(
   parts.push(']');
   parts.push('```');
   parts.push('');
-  parts.push('Severity levels:');
-  if (lens.severityRules.blocker) parts.push(`- **blocker**: ${lens.severityRules.blocker}`);
-  if (lens.severityRules.warning) parts.push(`- **warning**: ${lens.severityRules.warning}`);
-  if (lens.severityRules.note) parts.push(`- **note**: ${lens.severityRules.note}`);
-  parts.push('');
   parts.push(
     'After the JSON array, write a 2-3 sentence summary of your review through this lens.',
   );
@@ -116,15 +140,14 @@ export async function reviewWithLens(
 
   // Build the prompt
   const prompt = buildReviewPrompt(lens, lensContent, diff, toolOutputs);
+  const lensSection = buildLensSection(lens, lensContent, toolOutputs);
 
-  // Use sendMessage to delegate to the agent for review
-  // For now, we return the prompt and let the command handler
-  // pass it to a subagent via the subagent tool
   return {
     lens: lens.name,
     findings: [],
     summary: '',
     toolOutputs,
     _prompt: prompt,
+    _lensSection: lensSection,
   };
 }

package/extensions/code-reviewer/types.ts

@@ -22,6 +22,8 @@ export type LensResult = {
   toolOutputs?: Record<string, string>;
   /** Review prompt built for this lens, used internally to delegate to the agent. */
   _prompt?: string;
+  /** Lens-specific section (without diff), used by /review command to avoid diff duplication. */
+  _lensSection?: string;
 };
 
 export type ReviewConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreki-gg/pi-code-reviewer",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Multi-lens code review extension for pi — configurable review criteria per project",
   "keywords": [
     "pi-package"