@plannotator/pi-extension 0.19.10 → 0.19.11

package/plannotator-browser.ts

@@ -6,13 +6,13 @@ import { createWorktreePool, type WorktreePool } from "./generated/worktree-pool
 import { fileURLToPath } from "node:url";
 import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
 import {
-	getGitContext,
+	prepareLocalReviewDiff,
 	reviewRuntime,
-	runGitDiff,
 	startAnnotateServer,
 	startPlanReviewServer,
 	startReviewServer,
 	type DiffType,
+	type VcsSelection,
 } from "./server.js";
 import { openBrowser, isRemoteSession } from "./server/network.js";
 import { parsePRUrl, checkPRAuth, fetchPR } from "./server/pr.js";
@@ -190,9 +190,13 @@ export async function openPlanReviewBrowser(
 	return session.waitForDecision();
 }
 
+export function shouldUseLocalPrCheckout(options: { useLocal?: boolean }): boolean {
+	return options.useLocal !== false;
+}
+
 export async function openCodeReview(
 	ctx: ExtensionContext,
-	options: { cwd?: string; defaultBranch?: string; diffType?: DiffType; prUrl?: string } = {},
+	options: { cwd?: string; defaultBranch?: string; diffType?: DiffType; prUrl?: string; vcsType?: VcsSelection; useLocal?: boolean } = {},
 ): Promise<{ approved: boolean; feedback?: string; annotations?: unknown[]; agentSwitch?: string; exit?: boolean }> {
 	const session = await startCodeReviewBrowserSession(ctx, options);
 	return session.waitForDecision();
@@ -200,7 +204,7 @@ export async function openCodeReview(
 
 export async function startCodeReviewBrowserSession(
 	ctx: ExtensionContext,
-	options: { cwd?: string; defaultBranch?: string; diffType?: DiffType; prUrl?: string } = {},
+	options: { cwd?: string; defaultBranch?: string; diffType?: DiffType; prUrl?: string; vcsType?: VcsSelection; useLocal?: boolean } = {},
 ): Promise<
 	BrowserDecisionSession<{
 		approved: boolean;
@@ -220,7 +224,7 @@ export async function startCodeReviewBrowserSession(
 	let rawPatch: string;
 	let gitRef: string;
 	let diffError: string | undefined;
-	let gitCtx: Awaited<ReturnType<typeof getGitContext>> | undefined;
+	let gitCtx: Awaited<ReturnType<typeof prepareLocalReviewDiff>>["gitContext"] | undefined;
 	let prMetadata: Awaited<ReturnType<typeof fetchPR>>["metadata"] | undefined;
 	let diffType: DiffType | undefined;
 	let agentCwd: string | undefined;
@@ -260,152 +264,158 @@ export async function startCodeReviewBrowserSession(
 		gitRef = `${getMRLabel(prRef)} ${getMRNumberLabel(prRef)}`;
 		prMetadata = pr.metadata;
 
-		// Create local worktree for agent file access (--local is the default for PR reviews)
-		let localPath: string | undefined;
-		let sessionDir: string | undefined;
-		try {
-			const repoDir = options.cwd ?? ctx.cwd;
-			const identifier = prMetadata.platform === "github"
-				? `${prMetadata.owner}-${prMetadata.repo}-${prMetadata.number}`
-				: `${prMetadata.projectPath.replace(/\//g, "-")}-${prMetadata.iid}`;
-			const suffix = Math.random().toString(36).slice(2, 8);
-			const prNumber = prMetadata.platform === "github" ? prMetadata.number : prMetadata.iid;
-			sessionDir = join(realpathSync(tmpdir()), `plannotator-pr-${identifier}-${suffix}`);
-			localPath = join(sessionDir, "pool", `pr-${prNumber}`);
-			const fetchRefStr = prMetadata.platform === "github"
-				? `refs/pull/${prMetadata.number}/head`
-				: `refs/merge-requests/${prMetadata.iid}/head`;
-
-			// Validate inputs from platform API to prevent git flag/path injection
-			if (prMetadata.baseBranch.includes('..') || prMetadata.baseBranch.startsWith('-')) throw new Error(`Invalid base branch: ${prMetadata.baseBranch}`);
-			if (!/^[0-9a-f]{40,64}$/i.test(prMetadata.baseSha)) throw new Error(`Invalid base SHA: ${prMetadata.baseSha}`);
-
-			// Detect same-repo vs cross-repo (must match both owner/repo AND host)
-			let isSameRepo = false;
+		if (shouldUseLocalPrCheckout(options)) {
+			// Create local worktree for agent file access (--local is the default for PR reviews)
+			let localPath: string | undefined;
+			let sessionDir: string | undefined;
 			try {
-				const remoteResult = await reviewRuntime.runGit(["remote", "get-url", "origin"], { cwd: repoDir });
-				if (remoteResult.exitCode === 0) {
-					const remoteUrl = remoteResult.stdout.trim();
-					const currentRepo = parseRemoteUrl(remoteUrl);
+				const repoDir = options.cwd ?? ctx.cwd;
+				const identifier = prMetadata.platform === "github"
+					? `${prMetadata.owner}-${prMetadata.repo}-${prMetadata.number}`
+					: `${prMetadata.projectPath.replace(/\//g, "-")}-${prMetadata.iid}`;
+				const suffix = Math.random().toString(36).slice(2, 8);
+				const prNumber = prMetadata.platform === "github" ? prMetadata.number : prMetadata.iid;
+				sessionDir = join(realpathSync(tmpdir()), `plannotator-pr-${identifier}-${suffix}`);
+				localPath = join(sessionDir, "pool", `pr-${prNumber}`);
+				const fetchRefStr = prMetadata.platform === "github"
+					? `refs/pull/${prMetadata.number}/head`
+					: `refs/merge-requests/${prMetadata.iid}/head`;
+
+				// Validate inputs from platform API to prevent git flag/path injection
+				if (prMetadata.baseBranch.includes('..') || prMetadata.baseBranch.startsWith('-')) throw new Error(`Invalid base branch: ${prMetadata.baseBranch}`);
+				if (!/^[0-9a-f]{40,64}$/i.test(prMetadata.baseSha)) throw new Error(`Invalid base SHA: ${prMetadata.baseSha}`);
+
+				// Detect same-repo vs cross-repo (must match both owner/repo AND host)
+				let isSameRepo = false;
+				try {
+					const remoteResult = await reviewRuntime.runGit(["remote", "get-url", "origin"], { cwd: repoDir });
+					if (remoteResult.exitCode === 0) {
+						const remoteUrl = remoteResult.stdout.trim();
+						const currentRepo = parseRemoteUrl(remoteUrl);
+						const prRepo = prMetadata.platform === "github"
+							? `${prMetadata.owner}/${prMetadata.repo}`
+							: prMetadata.projectPath;
+						const repoMatches = !!currentRepo && currentRepo.toLowerCase() === prRepo.toLowerCase();
+						const sshHost = remoteUrl.match(/^[^@]+@([^:]+):/)?.[1];
+						const httpsHost = (() => { try { return new URL(remoteUrl).hostname; } catch { return null; } })();
+						const remoteHost = (sshHost || httpsHost || "").toLowerCase();
+						const prHost = prMetadata.host.toLowerCase();
+						isSameRepo = repoMatches && remoteHost === prHost;
+					}
+				} catch { /* not in a git repo — cross-repo path */ }
+
+				if (isSameRepo) {
+					// ── Same-repo: fast worktree path ──
+					console.error("Fetching PR branch and creating local worktree...");
+					await fetchRef(reviewRuntime, prMetadata.baseBranch, { cwd: repoDir });
+					await ensureObjectAvailable(reviewRuntime, prMetadata.baseSha, { cwd: repoDir });
+					await fetchRef(reviewRuntime, fetchRefStr, { cwd: repoDir });
+
+					await createWorktree(reviewRuntime, {
+						ref: "FETCH_HEAD",
+						path: localPath,
+						detach: true,
+						cwd: repoDir,
+					});
+
+					const wtRepoDir = repoDir;
+					exitHandler = () => {
+						try {
+							for (const entry of worktreePool?.entries() ?? []) {
+								spawnSync("git", ["worktree", "remove", "--force", entry.path], { cwd: wtRepoDir });
+							}
+						} catch {}
+						if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
+					};
+					worktreeCleanup = async () => {
+						if (exitHandler) { process.removeListener("exit", exitHandler); exitHandler = undefined; }
+						if (worktreePool) await worktreePool.cleanup(reviewRuntime);
+						if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
+					};
+					process.once("exit", exitHandler);
+				} else {
+					// ── Cross-repo: shallow clone + fetch PR head ──
 					const prRepo = prMetadata.platform === "github"
 						? `${prMetadata.owner}/${prMetadata.repo}`
 						: prMetadata.projectPath;
-					const repoMatches = !!currentRepo && currentRepo.toLowerCase() === prRepo.toLowerCase();
-					const sshHost = remoteUrl.match(/^[^@]+@([^:]+):/)?.[1];
-					const httpsHost = (() => { try { return new URL(remoteUrl).hostname; } catch { return null; } })();
-					const remoteHost = (sshHost || httpsHost || "").toLowerCase();
-					const prHost = prMetadata.host.toLowerCase();
-					isSameRepo = repoMatches && remoteHost === prHost;
-				}
-			} catch { /* not in a git repo — cross-repo path */ }
-
-			if (isSameRepo) {
-				// ── Same-repo: fast worktree path ──
-				console.error("Fetching PR branch and creating local worktree...");
-				await fetchRef(reviewRuntime, prMetadata.baseBranch, { cwd: repoDir });
-				await ensureObjectAvailable(reviewRuntime, prMetadata.baseSha, { cwd: repoDir });
-				await fetchRef(reviewRuntime, fetchRefStr, { cwd: repoDir });
-
-				await createWorktree(reviewRuntime, {
-					ref: "FETCH_HEAD",
-					path: localPath,
-					detach: true,
-					cwd: repoDir,
-				});
-
-				const wtRepoDir = repoDir;
-				exitHandler = () => {
-					try {
-						for (const entry of worktreePool?.entries() ?? []) {
-							spawnSync("git", ["worktree", "remove", "--force", entry.path], { cwd: wtRepoDir });
-						}
-					} catch {}
-					if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
-				};
-				worktreeCleanup = async () => {
-					if (exitHandler) { process.removeListener("exit", exitHandler); exitHandler = undefined; }
-					if (worktreePool) await worktreePool.cleanup(reviewRuntime);
-					if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
-				};
-				process.once("exit", exitHandler);
-			} else {
-				// ── Cross-repo: shallow clone + fetch PR head ──
-				const prRepo = prMetadata.platform === "github"
-					? `${prMetadata.owner}/${prMetadata.repo}`
-					: prMetadata.projectPath;
-				if (/^-/.test(prRepo)) throw new Error(`Invalid repository identifier: ${prRepo}`);
-				const cli = prMetadata.platform === "github" ? "gh" : "glab";
-				const host = prMetadata.host;
-				// gh/glab repo clone doesn't accept --hostname; set GH_HOST/GITLAB_HOST env instead
-				const isDefaultHost = host === "github.com" || host === "gitlab.com";
-				const cloneEnv = isDefaultHost ? undefined : {
-					...process.env,
-					...(prMetadata.platform === "github" ? { GH_HOST: host } : { GITLAB_HOST: host }),
-				};
-
-				console.error(`Cloning ${prRepo} (shallow)...`);
-				const cloneResult = spawnSync(cli, ["repo", "clone", prRepo, localPath, "--", "--depth=1", "--no-checkout"], { encoding: "utf-8", env: cloneEnv });
-				if ((cloneResult.status ?? 1) !== 0) {
-					throw new Error(`${cli} repo clone failed: ${(cloneResult.stderr ?? "").trim()}`);
+					if (/^-/.test(prRepo)) throw new Error(`Invalid repository identifier: ${prRepo}`);
+					const cli = prMetadata.platform === "github" ? "gh" : "glab";
+					const host = prMetadata.host;
+					// gh/glab repo clone doesn't accept --hostname; set GH_HOST/GITLAB_HOST env instead
+					const isDefaultHost = host === "github.com" || host === "gitlab.com";
+					const cloneEnv = isDefaultHost ? undefined : {
+						...process.env,
+						...(prMetadata.platform === "github" ? { GH_HOST: host } : { GITLAB_HOST: host }),
+					};
+
+					console.error(`Cloning ${prRepo} (shallow)...`);
+					const cloneResult = spawnSync(cli, ["repo", "clone", prRepo, localPath, "--", "--depth=1", "--no-checkout"], { encoding: "utf-8", env: cloneEnv });
+					if ((cloneResult.status ?? 1) !== 0) {
+						throw new Error(`${cli} repo clone failed: ${(cloneResult.stderr ?? "").trim()}`);
+					}
+
+					console.error("Fetching PR branch...");
+					const fetchResult = await reviewRuntime.runGit(["fetch", "--depth=200", "origin", fetchRefStr], { cwd: localPath });
+					if (fetchResult.exitCode !== 0) throw new Error(`Failed to fetch PR head ref: ${fetchResult.stderr.trim()}`);
+
+					const checkoutResult = await reviewRuntime.runGit(["checkout", "FETCH_HEAD"], { cwd: localPath });
+					if (checkoutResult.exitCode !== 0) {
+						throw new Error(`git checkout FETCH_HEAD failed: ${checkoutResult.stderr.trim()}`);
+					}
+
+					// Best-effort: create base refs so agent diffs work
+					const baseFetch = await reviewRuntime.runGit(["fetch", "--depth=200", "origin", prMetadata.baseSha], { cwd: localPath });
+					if (baseFetch.exitCode !== 0) console.error("Warning: failed to fetch baseSha, agent diffs may be inaccurate");
+					await reviewRuntime.runGit(["branch", "--", prMetadata.baseBranch, prMetadata.baseSha], { cwd: localPath });
+					await reviewRuntime.runGit(["update-ref", `refs/remotes/origin/${prMetadata.baseBranch}`, prMetadata.baseSha], { cwd: localPath });
+
+					exitHandler = () => {
+						if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
+					};
+					worktreeCleanup = () => {
+						if (exitHandler) { process.removeListener("exit", exitHandler); exitHandler = undefined; }
+						if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
+					};
+					process.once("exit", exitHandler);
 				}
 
-				console.error("Fetching PR branch...");
-				const fetchResult = await reviewRuntime.runGit(["fetch", "--depth=200", "origin", fetchRefStr], { cwd: localPath });
-				if (fetchResult.exitCode !== 0) throw new Error(`Failed to fetch PR head ref: ${fetchResult.stderr.trim()}`);
-
-				const checkoutResult = await reviewRuntime.runGit(["checkout", "FETCH_HEAD"], { cwd: localPath });
-				if (checkoutResult.exitCode !== 0) {
-					throw new Error(`git checkout FETCH_HEAD failed: ${checkoutResult.stderr.trim()}`);
-				}
-
-				// Best-effort: create base refs so agent diffs work
-				const baseFetch = await reviewRuntime.runGit(["fetch", "--depth=200", "origin", prMetadata.baseSha], { cwd: localPath });
-				if (baseFetch.exitCode !== 0) console.error("Warning: failed to fetch baseSha, agent diffs may be inaccurate");
-				await reviewRuntime.runGit(["branch", "--", prMetadata.baseBranch, prMetadata.baseSha], { cwd: localPath });
-				await reviewRuntime.runGit(["update-ref", `refs/remotes/origin/${prMetadata.baseBranch}`, prMetadata.baseSha], { cwd: localPath });
-
-				exitHandler = () => {
-					if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
-				};
-				worktreeCleanup = () => {
-					if (exitHandler) { process.removeListener("exit", exitHandler); exitHandler = undefined; }
-					if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
-				};
-				process.once("exit", exitHandler);
+				agentCwd = localPath;
+				worktreePool = createWorktreePool(
+					{ sessionDir: sessionDir!, repoDir, isSameRepo },
+					{ path: localPath, prUrl: prMetadata.url, number: prNumber, ready: true },
+				);
+				console.error(`Local checkout ready at ${localPath}`);
+			} catch (err) {
+				console.error("Warning: local worktree creation failed, falling back to remote diff");
+				console.error(err instanceof Error ? err.message : String(err));
+				if (exitHandler) { process.removeListener("exit", exitHandler); exitHandler = undefined; }
+				if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
+				agentCwd = undefined;
+				worktreePool = undefined;
+				worktreeCleanup = undefined;
 			}
-
-			agentCwd = localPath;
-			worktreePool = createWorktreePool(
-				{ sessionDir: sessionDir!, repoDir, isSameRepo },
-				{ path: localPath, prUrl: prMetadata.url, number: prNumber, ready: true },
-			);
-			console.error(`Local checkout ready at ${localPath}`);
-		} catch (err) {
-			console.error("Warning: local worktree creation failed, falling back to remote diff");
-			console.error(err instanceof Error ? err.message : String(err));
-			if (exitHandler) { process.removeListener("exit", exitHandler); exitHandler = undefined; }
-			if (sessionDir) try { rmSync(sessionDir, { recursive: true, force: true }); } catch {}
-			agentCwd = undefined;
-			worktreePool = undefined;
-			worktreeCleanup = undefined;
 		}
 	} else {
 		// --- Local Review Mode ---
 		const cwd = options.cwd ?? ctx.cwd;
-		gitCtx = await getGitContext(cwd);
-		const defaultBranch = options.defaultBranch ?? gitCtx.defaultBranch;
 		const config = loadConfig();
-		diffType = options.diffType ?? resolveDefaultDiffType(config);
-		const result = await runGitDiff(diffType, defaultBranch, cwd, {
+		const result = await prepareLocalReviewDiff({
+			cwd,
+			vcsType: options.vcsType,
+			requestedDiffType: options.diffType,
+			requestedBase: options.defaultBranch,
+			configuredDiffType: resolveDefaultDiffType(config),
 			hideWhitespace: config.diffOptions?.hideWhitespace ?? false,
 		});
-		rawPatch = result.patch;
-		gitRef = result.label;
+		gitCtx = result.gitContext;
+		diffType = result.diffType;
+		rawPatch = result.rawPatch;
+		gitRef = result.gitRef;
 		diffError = result.error;
 		// Remember which base the initial diff was computed against so it can
 		// be forwarded to the server below. Only matters when the caller
 		// overrode the detected default; otherwise it matches gitCtx already.
-		initialBase = defaultBranch;
+		initialBase = result.base;
 	}
 
 	const server = await startReviewServer({

package/plannotator-events.ts

@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
-import type { DiffType } from "./server.js";
+import type { DiffType, VcsSelection } from "./server.js";
 import {
 	getLastAssistantMessageText,
 	getStartupErrorMessage,
@@ -87,6 +87,8 @@ export type PlannotatorReviewStatusResult =
 export interface PlannotatorCodeReviewPayload {
 	diffType?: DiffType;
 	defaultBranch?: string;
+	vcsType?: VcsSelection;
+	useLocal?: boolean;
 	cwd?: string;
 	prUrl?: string;
 }
@@ -264,6 +266,8 @@ export function registerPlannotatorEventListeners(pi: ExtensionAPI): void {
 						cwd: request.payload?.cwd,
 						defaultBranch: request.payload?.defaultBranch,
 						diffType: request.payload?.diffType,
+						vcsType: request.payload?.vcsType,
+						useLocal: request.payload?.useLocal,
 						prUrl: request.payload?.prUrl,
 					});
 					request.respond({ status: "handled", result });