@diegopetrucci/pi-review 0.1.3 → 0.1.7

package/.pi-fleet-tested-version

@@ -1 +1 @@
-0.78.0
+0.80.6

package/README.md

@@ -31,7 +31,7 @@ Then reload pi:
 
 - Behavior is intentionally kept equivalent to the upstream source, with only packaging/attribution changes for this repository.
 - PR review requires `gh` access and a clean working tree for tracked files.
-- If the project is trusted and a `REVIEW_GUIDELINES.md` file exists next to the repo's `.pi` directory, its contents are appended to the review prompt.
+- If the project is trusted and a `REVIEW_GUIDELINES.md` file exists next to the repo's `<pi-config-dir>` directory, its contents are appended to the review prompt. `<pi-config-dir>` is Pi's runtime config directory name (`CONFIG_DIR_NAME`; `.pi` by default).
 
 ## License and attribution
 

package/index.ts

@@ -29,14 +29,14 @@
  * - `/review --extra "focus on performance regressions"` - add extra review instruction (works with any mode)
  *
  * Project-specific review guidelines:
- * - If the project is trusted and a REVIEW_GUIDELINES.md file exists in the
- *   same directory as .pi, its contents are appended to the review prompt.
+ * - If the project is trusted and a REVIEW_GUIDELINES.md file exists next to
+ *   the project config directory, its contents are appended to the review prompt.
  *
  * Note: PR review requires a clean working tree (no uncommitted changes to tracked files).
  */
 
 import type { ExtensionAPI, ExtensionContext, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { DynamicBorder, BorderedLoader } from "@earendil-works/pi-coding-agent";
+import { CONFIG_DIR_NAME, DynamicBorder, BorderedLoader } from "@earendil-works/pi-coding-agent";
 import {
 	Container,
 	fuzzyFilter,
@@ -49,7 +49,6 @@ import {
 import path from "node:path";
 import { promises as fs } from "node:fs";
 
-const CONFIG_DIR_NAME = ".pi";
 
 // State to track fresh session review (where we branched from).
 // Module-level state means only one review can be active at a time.
@@ -60,6 +59,24 @@ let reviewLoopFixingEnabled = false;
 let reviewCustomInstructions: string | undefined = undefined;
 let reviewLoopInProgress = false;
 
+function getReviewRuntimeState() {
+	return {
+		reviewOriginId,
+		endReviewInProgress,
+		reviewLoopFixingEnabled,
+		reviewCustomInstructions,
+		reviewLoopInProgress,
+	};
+}
+
+function resetReviewRuntimeState() {
+	reviewOriginId = undefined;
+	endReviewInProgress = false;
+	reviewLoopFixingEnabled = false;
+	reviewCustomInstructions = undefined;
+	reviewLoopInProgress = false;
+}
+
 const REVIEW_STATE_TYPE = "review-session";
 const REVIEW_ANCHOR_TYPE = "review-anchor";
 const REVIEW_SETTINGS_TYPE = "review-settings";
@@ -88,7 +105,7 @@ function canReadProjectConfig(ctx: ProjectConfigContext): boolean {
 
 function setReviewWidget(ctx: ExtensionContext, active: boolean) {
 	if (!ctx.hasUI) return;
-	if (!active) {
+	if (!active || ctx.mode !== "tui") {
 		ctx.ui.setWidget("review", undefined);
 		return;
 	}
@@ -630,18 +647,20 @@ async function hasPendingChanges(pi: ExtensionAPI): Promise<boolean> {
 function parsePrReference(ref: string): number | null {
 	const trimmed = ref.trim();
 
-	// Try as a number first
-	const num = parseInt(trimmed, 10);
-	if (!isNaN(num) && num > 0) {
-		return num;
+	if (/^\d+$/.test(trimmed)) {
+		const num = Number(trimmed);
+		if (Number.isSafeInteger(num) && num > 0) {
+			return num;
+		}
 	}
 
 	// Try to extract from GitHub URL
 	// Formats: https://github.com/owner/repo/pull/123
 	//          github.com/owner/repo/pull/123
-	const urlMatch = trimmed.match(/github\.com\/[^/]+\/[^/]+\/pull\/(\d+)/);
+	const urlMatch = trimmed.match(/^(?:https?:\/\/)?(?:www\.)?github\.com\/[^/]+\/[^/]+\/pull\/(\d+)(?:[/?#]|$)/i);
 	if (urlMatch) {
-		return parseInt(urlMatch[1], 10);
+		const num = Number(urlMatch[1]);
+		return Number.isSafeInteger(num) && num > 0 ? num : null;
 	}
 
 	return null;
@@ -763,6 +782,30 @@ async function buildReviewPrompt(
 /**
  * Get user-facing hint for the review target
  */
+type ComposeReviewPromptOptions = {
+	customInstructions?: string;
+	extraInstruction?: string;
+	projectGuidelines?: string | null;
+};
+
+function composeReviewPrompt(prompt: string, options: ComposeReviewPromptOptions = {}): string {
+	let fullPrompt = `${REVIEW_RUBRIC}\n\n---\n\nPlease perform a code review with the following focus:\n\n${prompt}`;
+
+	if (options.customInstructions?.trim()) {
+		fullPrompt += `\n\nShared custom review instructions (applies to all reviews):\n\n${options.customInstructions.trim()}`;
+	}
+
+	if (options.extraInstruction?.trim()) {
+		fullPrompt += `\n\nAdditional user-provided review instruction:\n\n${options.extraInstruction.trim()}`;
+	}
+
+	if (options.projectGuidelines?.trim()) {
+		fullPrompt += `\n\nThis project has additional instructions for code reviews:\n\n${options.projectGuidelines.trim()}`;
+	}
+
+	return fullPrompt;
+}
+
 function getUserFacingHint(target: ReviewTarget): string {
 	switch (target.type) {
 		case "uncommitted":
@@ -833,6 +876,130 @@ function sleep(ms: number): Promise<void> {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+function tokenizeArgs(value: string): string[] {
+	const tokens: string[] = [];
+	let current = "";
+	let quote: '"' | "'" | null = null;
+
+	for (let i = 0; i < value.length; i++) {
+		const char = value[i];
+
+		if (quote) {
+			if (char === "\\" && i + 1 < value.length) {
+				current += value[i + 1];
+				i += 1;
+				continue;
+			}
+			if (char === quote) {
+				quote = null;
+				continue;
+			}
+			current += char;
+			continue;
+		}
+
+		if (char === '"' || char === "'") {
+			quote = char;
+			continue;
+		}
+
+		if (/\s/.test(char)) {
+			if (current.length > 0) {
+				tokens.push(current);
+				current = "";
+			}
+			continue;
+		}
+
+		current += char;
+	}
+
+	if (current.length > 0) {
+		tokens.push(current);
+	}
+
+	return tokens;
+}
+
+function parseReviewPaths(value: string): string[] {
+	return tokenizeArgs(value)
+		.map((item) => item.trim())
+		.filter((item) => item.length > 0);
+}
+
+type ParsedReviewArgs = {
+	target: ReviewTarget | { type: "pr"; ref: string } | null;
+	extraInstruction?: string;
+	error?: string;
+};
+
+function parseArgs(args: string | undefined): ParsedReviewArgs {
+	if (!args?.trim()) return { target: null };
+
+	const rawParts = tokenizeArgs(args.trim());
+	const parts: string[] = [];
+	let extraInstruction: string | undefined;
+
+	for (let i = 0; i < rawParts.length; i++) {
+		const part = rawParts[i];
+		if (part === "--extra") {
+			const next = rawParts[i + 1];
+			if (!next) {
+				return { target: null, error: "Missing value for --extra" };
+			}
+			extraInstruction = next;
+			i += 1;
+			continue;
+		}
+
+		if (part.startsWith("--extra=")) {
+			extraInstruction = part.slice("--extra=".length);
+			continue;
+		}
+
+		parts.push(part);
+	}
+
+	if (parts.length === 0) {
+		return { target: null, extraInstruction };
+	}
+
+	const subcommand = parts[0]?.toLowerCase();
+
+	switch (subcommand) {
+		case "uncommitted":
+			return { target: { type: "uncommitted" }, extraInstruction };
+
+		case "branch": {
+			const branch = parts[1];
+			if (!branch) return { target: null, extraInstruction };
+			return { target: { type: "baseBranch", branch }, extraInstruction };
+		}
+
+		case "commit": {
+			const sha = parts[1];
+			if (!sha) return { target: null, extraInstruction };
+			const title = parts.slice(2).join(" ") || undefined;
+			return { target: { type: "commit", sha, title }, extraInstruction };
+		}
+
+		case "folder": {
+			const paths = parts.slice(1).map((item) => item.trim()).filter((item) => item.length > 0);
+			if (paths.length === 0) return { target: null, extraInstruction };
+			return { target: { type: "folder", paths }, extraInstruction };
+		}
+
+		case "pr": {
+			const ref = parts[1];
+			if (!ref) return { target: null, extraInstruction };
+			return { target: { type: "pr", ref }, extraInstruction };
+		}
+
+		default:
+			return { target: null, extraInstruction };
+	}
+}
+
 async function waitForLoopTurnToStart(ctx: ExtensionContext, previousAssistantId?: string): Promise<boolean> {
 	const deadline = Date.now() + REVIEW_LOOP_START_TIMEOUT_MS;
 
@@ -863,6 +1030,69 @@ type ReviewPresetValue =
 	| typeof TOGGLE_LOOP_FIXING_VALUE
 	| typeof TOGGLE_CUSTOM_INSTRUCTIONS_VALUE;
 
+const REVIEW_SUMMARY_PROMPT = `We are leaving a code-review branch and returning to the main coding branch.
+Create a structured handoff that can be used immediately to implement fixes.
+
+You MUST summarize the review that happened in this branch so findings can be acted on.
+Do not omit findings: include every actionable issue that was identified.
+
+Required sections (in order):
+
+## Review Scope
+- What was reviewed (files/paths, changes, and scope)
+
+## Verdict
+- "correct" or "needs attention"
+
+## Findings
+For EACH finding, include:
+- Priority tag ([P0]..[P3]) and short title
+- File location (\`path/to/file.ext:line\`)
+- Why it matters (brief)
+- What should change (brief, actionable)
+
+## Fix Queue
+1. Ordered implementation checklist (highest priority first)
+
+## Constraints & Preferences
+- Any constraints or preferences mentioned during review
+- Or "(none)"
+
+## Human Reviewer Callouts (Non-Blocking)
+Include only applicable callouts (no yes/no lines):
+- **This change adds a database migration:** <files/details>
+- **This change introduces a new dependency:** <package(s)/details>
+- **This change changes a dependency (or the lockfile):** <files/package(s)/details>
+- **This change modifies auth/permission behavior:** <what changed and where>
+- **This change introduces backwards-incompatible public schema/API/contract changes:** <what changed and where>
+- **This change includes irreversible or destructive operations:** <operation and scope>
+
+If none apply, write "- (none)".
+
+These are informational callouts for humans and are not fix items by themselves.
+
+Preserve exact file paths, function names, and error messages where available.`;
+
+export const __test__ = {
+	applyReviewSettings,
+	applyReviewState,
+	buildReviewPrompt,
+	composeReviewPrompt,
+	getReviewRuntimeState,
+	getReviewSettings,
+	getReviewState,
+	hasBlockingReviewFindings,
+	hasNeedsAttentionVerdict,
+	getUserFacingHint,
+	parseArgs,
+	parsePrReference,
+	parseReviewPaths,
+	REVIEW_SUMMARY_PROMPT,
+	loadProjectReviewGuidelines,
+	resetReviewRuntimeState,
+	tokenizeArgs,
+};
+
 export default function reviewExtension(pi: ExtensionAPI) {
 	function persistReviewSettings() {
 		pi.appendEntry(REVIEW_SETTINGS_TYPE, {
@@ -1276,13 +1506,6 @@ export default function reviewExtension(pi: ExtensionAPI) {
 	}
 
 
-	function parseReviewPaths(value: string): string[] {
-		return value
-			.split(/\s+/)
-			.map((item) => item.trim())
-			.filter((item) => item.length > 0);
-	}
-
 	/**
 	 * Show folder input
 	 */
@@ -1433,20 +1656,11 @@ export default function reviewExtension(pi: ExtensionAPI) {
 		const hint = getUserFacingHint(target);
 		const projectGuidelines = canReadProjectConfig(ctx) ? await loadProjectReviewGuidelines(ctx.cwd) : null;
 
-		// Combine the review rubric with the specific prompt
-		let fullPrompt = `${REVIEW_RUBRIC}\n\n---\n\nPlease perform a code review with the following focus:\n\n${prompt}`;
-
-		if (reviewCustomInstructions) {
-			fullPrompt += `\n\nShared custom review instructions (applies to all reviews):\n\n${reviewCustomInstructions}`;
-		}
-
-		if (options?.extraInstruction?.trim()) {
-			fullPrompt += `\n\nAdditional user-provided review instruction:\n\n${options.extraInstruction.trim()}`;
-		}
-
-		if (projectGuidelines) {
-			fullPrompt += `\n\nThis project has additional instructions for code reviews:\n\n${projectGuidelines}`;
-		}
+		const fullPrompt = composeReviewPrompt(prompt, {
+			customInstructions: reviewCustomInstructions,
+			extraInstruction: options?.extraInstruction,
+			projectGuidelines,
+		});
 
 		const modeHint = useFreshSession ? " (fresh session)" : "";
 		ctx.ui.notify(`Starting review: ${hint}${modeHint}`, "info");
@@ -1456,129 +1670,6 @@ export default function reviewExtension(pi: ExtensionAPI) {
 		return true;
 	}
 
-	/**
-	 * Parse command arguments for direct invocation
-	 * Returns the target or a special marker for PR that needs async handling
-	 */
-	type ParsedReviewArgs = {
-		target: ReviewTarget | { type: "pr"; ref: string } | null;
-		extraInstruction?: string;
-		error?: string;
-	};
-
-	function tokenizeArgs(value: string): string[] {
-		const tokens: string[] = [];
-		let current = "";
-		let quote: '"' | "'" | null = null;
-
-		for (let i = 0; i < value.length; i++) {
-			const char = value[i];
-
-			if (quote) {
-				if (char === "\\" && i + 1 < value.length) {
-					current += value[i + 1];
-					i += 1;
-					continue;
-				}
-				if (char === quote) {
-					quote = null;
-					continue;
-				}
-				current += char;
-				continue;
-			}
-
-			if (char === '"' || char === "'") {
-				quote = char;
-				continue;
-			}
-
-			if (/\s/.test(char)) {
-				if (current.length > 0) {
-					tokens.push(current);
-					current = "";
-				}
-				continue;
-			}
-
-			current += char;
-		}
-
-		if (current.length > 0) {
-			tokens.push(current);
-		}
-
-		return tokens;
-	}
-
-	function parseArgs(args: string | undefined): ParsedReviewArgs {
-		if (!args?.trim()) return { target: null };
-
-		const rawParts = tokenizeArgs(args.trim());
-		const parts: string[] = [];
-		let extraInstruction: string | undefined;
-
-		for (let i = 0; i < rawParts.length; i++) {
-			const part = rawParts[i];
-			if (part === "--extra") {
-				const next = rawParts[i + 1];
-				if (!next) {
-					return { target: null, error: "Missing value for --extra" };
-				}
-				extraInstruction = next;
-				i += 1;
-				continue;
-			}
-
-			if (part.startsWith("--extra=")) {
-				extraInstruction = part.slice("--extra=".length);
-				continue;
-			}
-
-			parts.push(part);
-		}
-
-		if (parts.length === 0) {
-			return { target: null, extraInstruction };
-		}
-
-		const subcommand = parts[0]?.toLowerCase();
-
-		switch (subcommand) {
-			case "uncommitted":
-				return { target: { type: "uncommitted" }, extraInstruction };
-
-			case "branch": {
-				const branch = parts[1];
-				if (!branch) return { target: null, extraInstruction };
-				return { target: { type: "baseBranch", branch }, extraInstruction };
-			}
-
-			case "commit": {
-				const sha = parts[1];
-				if (!sha) return { target: null, extraInstruction };
-				const title = parts.slice(2).join(" ") || undefined;
-				return { target: { type: "commit", sha, title }, extraInstruction };
-			}
-
-
-			case "folder": {
-				const paths = parseReviewPaths(parts.slice(1).join(" "));
-				if (paths.length === 0) return { target: null, extraInstruction };
-				return { target: { type: "folder", paths }, extraInstruction };
-			}
-
-			case "pr": {
-				const ref = parts[1];
-				if (!ref) return { target: null, extraInstruction };
-				return { target: { type: "pr", ref }, extraInstruction };
-			}
-
-			default:
-				return { target: null, extraInstruction };
-		}
-	}
-
 	/**
 	 * Handle PR checkout and return a ReviewTarget (or null on failure)
 	 */
@@ -1754,7 +1845,7 @@ export default function reviewExtension(pi: ExtensionAPI) {
 	pi.registerCommand("review", {
 		description: "Review code changes (PR, uncommitted, branch, commit, or folder)",
 		handler: async (args, ctx) => {
-			if (!ctx.hasUI) {
+			if (ctx.mode !== "tui") {
 				ctx.ui.notify("Review requires interactive mode", "error");
 				return;
 			}
@@ -1859,50 +1950,6 @@ export default function reviewExtension(pi: ExtensionAPI) {
 		},
 	});
 
-	// Custom prompt for review summaries - focuses on preserving actionable findings
-	const REVIEW_SUMMARY_PROMPT = `We are leaving a code-review branch and returning to the main coding branch.
-Create a structured handoff that can be used immediately to implement fixes.
-
-You MUST summarize the review that happened in this branch so findings can be acted on.
-Do not omit findings: include every actionable issue that was identified.
-
-Required sections (in order):
-
-## Review Scope
-- What was reviewed (files/paths, changes, and scope)
-
-## Verdict
-- "correct" or "needs attention"
-
-## Findings
-For EACH finding, include:
-- Priority tag ([P0]..[P3]) and short title
-- File location (\`path/to/file.ext:line\`)
-- Why it matters (brief)
-- What should change (brief, actionable)
-
-## Fix Queue
-1. Ordered implementation checklist (highest priority first)
-
-## Constraints & Preferences
-- Any constraints or preferences mentioned during review
-- Or "(none)"
-
-## Human Reviewer Callouts (Non-Blocking)
-Include only applicable callouts (no yes/no lines):
-- **This change adds a database migration:** <files/details>
-- **This change introduces a new dependency:** <package(s)/details>
-- **This change changes a dependency (or the lockfile):** <files/package(s)/details>
-- **This change modifies auth/permission behavior:** <what changed and where>
-- **This change introduces backwards-incompatible public schema/API/contract changes:** <what changed and where>
-- **This change includes irreversible or destructive operations:** <operation and scope>
-
-If none apply, write "- (none)".
-
-These are informational callouts for humans and are not fix items by themselves.
-
-Preserve exact file paths, function names, and error messages where available.`;
-
 	const REVIEW_FIX_FINDINGS_PROMPT = `Use the latest review summary in this session and implement the review findings now.
 
 Instructions:
@@ -1954,7 +2001,7 @@ Instructions:
 		originId: string,
 		showLoader: boolean,
 	): Promise<{ cancelled: boolean; error?: string } | null> {
-		if (showLoader && ctx.hasUI) {
+		if (showLoader && ctx.mode === "tui") {
 			return ctx.ui.custom<{ cancelled: boolean; error?: string } | null>((tui, theme, _kb, done) => {
 				const loader = new BorderedLoader(tui, theme, "Returning and summarizing review branch...");
 				loader.onAbort = () => done(null);
@@ -2062,6 +2109,13 @@ Instructions:
 			return;
 		}
 
+		if (!getActiveReviewOrigin(ctx)) {
+			if (!getReviewState(ctx)?.active) {
+				ctx.ui.notify("Not in a review branch (use /review first, or review was started in current session mode)", "info");
+			}
+			return;
+		}
+
 		if (endReviewInProgress) {
 			ctx.ui.notify("/end-review is already running", "info");
 			return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegopetrucci/pi-review",
-  "version": "0.1.3",
+  "version": "0.1.7",
   "description": "A standalone pi extension that adds /review and /end-review commands adapted from mitsuhiko/agent-stuff.",
   "keywords": [
     "pi-package",