pi-pr-status 0.1.1 → 0.3.0

package/extensions/pr-status.ts

@@ -1,12 +1,242 @@
 /**
  * PR Status Extension
  *
- * Shows the current branch's PR URL, CI check status, and unresolved
- * review comment count in the pi footer status bar. Polls every 30 seconds.
+ * Shows PR status in the pi footer status bar. Polls every 30 seconds.
+ *
+ * Detects PRs from two sources:
+ * 1. The current git branch (via `gh pr view`)
+ * 2. GitHub PR URLs in user input (e.g. "lets continue this PR: https://github.com/owner/repo/pull/123")
+ *
+ * URL detection fires on the `input` event, so the status appears immediately
+ * — even before the agent starts processing or checks out a branch.
  */
 
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { getBranch, getRepoInfo, getPrForBranch, formatStatus, type PrInfo, type RepoInfo } from "../lib/github.ts";
+import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import { execSync } from "node:child_process";
+
+// --- GitHub helpers (inlined for pi extension compatibility) ---
+
+interface CheckStatus {
+	total: number;
+	pass: number;
+	fail: number;
+	pending: number;
+}
+
+interface PrInfo {
+	number: number;
+	title: string;
+	url: string;
+	state: string;
+	checks: CheckStatus;
+	unresolvedThreads: number;
+}
+
+interface RepoInfo {
+	owner: string;
+	name: string;
+}
+
+function getBranch(cwd: string): string | undefined {
+	try {
+		return execSync("git rev-parse --abbrev-ref HEAD", {
+			cwd,
+			encoding: "utf-8",
+			timeout: 3000,
+			stdio: ["pipe", "pipe", "pipe"],
+		}).trim();
+	} catch {
+		return undefined;
+	}
+}
+
+function getRepoInfo(cwd: string): RepoInfo | undefined {
+	try {
+		const json = execSync("gh repo view --json owner,name", {
+			cwd,
+			encoding: "utf-8",
+			timeout: 5000,
+			stdio: ["pipe", "pipe", "pipe"],
+		}).trim();
+		const repo = JSON.parse(json);
+		return repo.owner?.login && repo.name ? { owner: repo.owner.login, name: repo.name } : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+function parseChecks(statusCheckRollup: unknown[]): CheckStatus {
+	const checks: CheckStatus = { total: 0, pass: 0, fail: 0, pending: 0 };
+	for (const check of statusCheckRollup) {
+		const c = check as Record<string, string>;
+		const conclusion = (c.conclusion || "").toUpperCase();
+		const status = (c.status || "").toUpperCase();
+		const name = c.name || "";
+
+		// Skip ghost checks with no meaningful data (e.g. Vercel deployment statuses)
+		if (!name && !conclusion && !status) continue;
+
+		checks.total++;
+		if (conclusion === "SUCCESS" || conclusion === "NEUTRAL" || conclusion === "SKIPPED") {
+			checks.pass++;
+		} else if (
+			conclusion === "FAILURE" ||
+			conclusion === "TIMED_OUT" ||
+			conclusion === "CANCELLED" ||
+			conclusion === "ACTION_REQUIRED"
+		) {
+			checks.fail++;
+		} else if (
+			status === "IN_PROGRESS" ||
+			status === "QUEUED" ||
+			status === "PENDING" ||
+			status === "WAITING"
+		) {
+			checks.pending++;
+		} else if (status === "COMPLETED") {
+			// Completed but no recognized conclusion — treat as passed
+			checks.pass++;
+		} else {
+			// Unknown state — treat as pending
+			checks.pending++;
+		}
+	}
+	return checks;
+}
+
+const PR_URL_RE = /https:\/\/github\.com\/([^/]+\/[^/]+)\/pull\/(\d+)/;
+
+function parsePrUrl(text: string): { url: string; repo: string; number: number } | null {
+	const match = text.match(PR_URL_RE);
+	if (!match) return null;
+	return { url: match[0], repo: match[1], number: parseInt(match[2], 10) };
+}
+
+function getPrByNumber(repo: string, prNumber: number): PrInfo | undefined {
+	try {
+		const json = execSync(
+			`gh pr view ${prNumber} --repo ${repo} --json number,title,url,state,statusCheckRollup`,
+			{
+				encoding: "utf-8",
+				timeout: 10_000,
+				stdio: ["pipe", "pipe", "pipe"],
+			},
+		).trim();
+		if (!json) return undefined;
+		const pr = JSON.parse(json);
+		if (!pr.number || !pr.url) return undefined;
+
+		const checks = Array.isArray(pr.statusCheckRollup)
+			? parseChecks(pr.statusCheckRollup)
+			: { total: 0, pass: 0, fail: 0, pending: 0 };
+
+		const [owner, name] = repo.split("/");
+		let unresolvedThreads = 0;
+		if (owner && name) {
+			try {
+				const gql = execSync(
+					`gh api graphql -f query='{ repository(owner: "${owner}", name: "${name}") { pullRequest(number: ${pr.number}) { reviewThreads(first: 100) { nodes { isResolved } } } } }'`,
+					{
+						encoding: "utf-8",
+						timeout: 10_000,
+						stdio: ["pipe", "pipe", "pipe"],
+					},
+				).trim();
+				const data = JSON.parse(gql);
+				const threads = data?.data?.repository?.pullRequest?.reviewThreads?.nodes;
+				if (Array.isArray(threads)) {
+					unresolvedThreads = threads.filter((t: { isResolved: boolean }) => !t.isResolved).length;
+				}
+			} catch {
+				// GraphQL failed — show PR without thread count
+			}
+		}
+
+		return {
+			number: pr.number,
+			title: pr.title,
+			url: pr.url,
+			state: pr.state,
+			checks,
+			unresolvedThreads,
+		};
+	} catch {
+		return undefined;
+	}
+}
+
+function getPrForBranch(cwd: string, repo?: RepoInfo): PrInfo | undefined {
+	try {
+		const json = execSync("gh pr view --json number,title,url,state,statusCheckRollup", {
+			cwd,
+			encoding: "utf-8",
+			timeout: 10_000,
+			stdio: ["pipe", "pipe", "pipe"],
+		}).trim();
+		if (!json) return undefined;
+		const pr = JSON.parse(json);
+		if (!pr.number || !pr.url) return undefined;
+
+		const checks = Array.isArray(pr.statusCheckRollup) ? parseChecks(pr.statusCheckRollup) : { total: 0, pass: 0, fail: 0, pending: 0 };
+
+		let unresolvedThreads = 0;
+		if (repo) {
+			try {
+				const gql = execSync(
+					`gh api graphql -f query='{ repository(owner: "${repo.owner}", name: "${repo.name}") { pullRequest(number: ${pr.number}) { reviewThreads(first: 100) { nodes { isResolved } } } } }'`,
+					{
+						cwd,
+						encoding: "utf-8",
+						timeout: 10_000,
+						stdio: ["pipe", "pipe", "pipe"],
+					},
+				).trim();
+				const data = JSON.parse(gql);
+				const threads = data?.data?.repository?.pullRequest?.reviewThreads?.nodes;
+				if (Array.isArray(threads)) {
+					unresolvedThreads = threads.filter((t: { isResolved: boolean }) => !t.isResolved).length;
+				}
+			} catch {
+				// GraphQL failed — show PR without thread count
+			}
+		}
+
+		return {
+			number: pr.number,
+			title: pr.title,
+			url: pr.url,
+			state: pr.state,
+			checks,
+			unresolvedThreads,
+		};
+	} catch {
+		return undefined;
+	}
+}
+
+function formatStatus(pr: PrInfo): string {
+	const stateIcon = pr.state === "MERGED" ? "🟣" : pr.state === "CLOSED" ? "🔴" : "🟢";
+	const parts: string[] = [`${stateIcon} PR #${pr.number}`];
+
+	if (pr.checks.total > 0) {
+		if (pr.checks.fail > 0) {
+			parts.push(`❌ ${pr.checks.fail}/${pr.checks.total} checks failed`);
+		} else if (pr.checks.pending > 0) {
+			parts.push(`⏳ ${pr.checks.pending}/${pr.checks.total} checks pending`);
+		} else {
+			parts.push(`✅ ${pr.checks.total} checks passed`);
+		}
+	}
+
+	if (pr.unresolvedThreads > 0) {
+		parts.push(`💬 ${pr.unresolvedThreads} unresolved`);
+	}
+
+	parts.push(pr.url);
+	return parts.join(" · ");
+}
+
+// --- Extension ---
 
 const POLL_INTERVAL = 30_000;
 const STATUS_KEY = "pr-status";
@@ -17,7 +247,46 @@ export default function (pi: ExtensionAPI) {
 	let lastPr: PrInfo | undefined;
 	let cachedRepo: RepoInfo | undefined;
 
+	// Track a PR pinned by URL (takes priority over branch-based detection).
+	// Only set when the current branch has no active (open) PR of its own.
+	let pinnedPr: { repo: string; number: number } | null = null;
+	let latestCtx: ExtensionContext | null = null;
+
+	/** Returns true when the current branch has an open PR. */
+	function hasActiveBranchPr(): boolean {
+		return !!lastPr && lastPr.state === "OPEN";
+	}
+
+	function showStatus(pr: PrInfo | undefined, ui: { setStatus: (key: string, value: string | undefined) => void }) {
+		lastPr = pr ?? undefined;
+		ui.setStatus(STATUS_KEY, lastPr ? formatStatus(lastPr) : undefined);
+	}
+
 	function update(cwd: string, ui: { setStatus: (key: string, value: string | undefined) => void }) {
+		// If a PR is pinned by URL, use that instead of branch detection
+		if (pinnedPr) {
+			const pr = getPrByNumber(pinnedPr.repo, pinnedPr.number);
+			showStatus(pr, ui);
+
+			// If the branch now has its own open PR, drop the pin and let
+			// branch-based detection take over from the next cycle.
+			if (pr) {
+				const branch = getBranch(cwd);
+				if (branch && branch !== "HEAD" && branch !== lastBranch) {
+					lastBranch = branch;
+				}
+				if (branch && branch !== "HEAD") {
+					if (!cachedRepo) cachedRepo = getRepoInfo(cwd);
+					const branchPr = getPrForBranch(cwd, cachedRepo);
+					if (branchPr && branchPr.state === "OPEN") {
+						pinnedPr = null;
+						showStatus(branchPr, ui);
+					}
+				}
+			}
+			return;
+		}
+
 		const branch = getBranch(cwd);
 
 		if (branch !== lastBranch) {
@@ -26,8 +295,7 @@ export default function (pi: ExtensionAPI) {
 		}
 
 		if (!branch || branch === "HEAD") {
-			lastPr = undefined;
-			ui.setStatus(STATUS_KEY, undefined);
+			showStatus(undefined, ui);
 			return;
 		}
 
@@ -36,24 +304,58 @@ export default function (pi: ExtensionAPI) {
 		}
 
 		const pr = getPrForBranch(cwd, cachedRepo);
-		lastPr = pr ?? undefined;
+		showStatus(pr, ui);
+	}
 
-		if (lastPr) {
-			ui.setStatus(STATUS_KEY, formatStatus(lastPr));
-		} else {
-			ui.setStatus(STATUS_KEY, undefined);
-		}
+	function tryPinFromUrl(text: string, ctx: ExtensionContext) {
+		const parsed = parsePrUrl(text);
+		if (!parsed) return;
+
+		// Don't re-pin the same PR
+		if (pinnedPr?.repo === parsed.repo && pinnedPr?.number === parsed.number) return;
+
+		// Only pin when the current branch has no active (open) PR.
+		// This avoids hijacking the status when casually referencing another PR.
+		if (hasActiveBranchPr()) return;
+
+		pinnedPr = { repo: parsed.repo, number: parsed.number };
+		latestCtx = ctx;
+
+		// Fetch and show immediately
+		const pr = getPrByNumber(parsed.repo, parsed.number);
+		showStatus(pr, ctx.ui);
 	}
 
+	// Detect PR URLs in user input — fires before the agent starts
+	pi.on("input", async (event, ctx) => {
+		if (event.source === "extension") return { action: "continue" as const };
+
+		latestCtx = ctx;
+		tryPinFromUrl(event.text, ctx);
+
+		return { action: "continue" as const };
+	});
+
+	// Also check in before_agent_start for skill/template-expanded text
+	pi.on("before_agent_start", async (event, ctx) => {
+		latestCtx = ctx;
+		tryPinFromUrl(event.prompt, ctx);
+	});
+
 	pi.on("session_start", async (_event, ctx) => {
+		latestCtx = ctx;
 		update(ctx.cwd, ctx.ui);
-		timer = setInterval(() => update(ctx.cwd, ctx.ui), POLL_INTERVAL);
+		timer = setInterval(() => {
+			if (latestCtx) update(latestCtx.cwd, latestCtx.ui);
+		}, POLL_INTERVAL);
 	});
 
 	pi.on("session_switch", async (_event, ctx) => {
 		lastBranch = undefined;
 		lastPr = undefined;
 		cachedRepo = undefined;
+		pinnedPr = null;
+		latestCtx = ctx;
 		update(ctx.cwd, ctx.ui);
 	});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-pr-status",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "description": "A Pi extension that shows the current PR link, CI check status, and unresolved review comments in the footer status bar",
   "author": "Bruno Garcia",
   "license": "MIT",
@@ -18,7 +18,6 @@
   ],
   "files": [
     "extensions/pr-status.ts",
-    "lib/github.ts",
     "README.md",
     "LICENSE"
   ],

package/lib/github.ts

@@ -1,169 +0,0 @@
-/**
- * Pure logic for querying GitHub PR status via the `gh` CLI.
- * Separated from the pi extension API for testability.
- */
-
-import { execSync } from "node:child_process";
-
-export interface CheckStatus {
-	total: number;
-	pass: number;
-	fail: number;
-	pending: number;
-}
-
-export interface PrInfo {
-	number: number;
-	title: string;
-	url: string;
-	state: string;
-	checks: CheckStatus;
-	unresolvedThreads: number;
-}
-
-export interface RepoInfo {
-	owner: string;
-	name: string;
-}
-
-export function getBranch(cwd: string): string | undefined {
-	try {
-		return execSync("git rev-parse --abbrev-ref HEAD", {
-			cwd,
-			encoding: "utf-8",
-			timeout: 3000,
-			stdio: ["pipe", "pipe", "pipe"],
-		}).trim();
-	} catch {
-		return undefined;
-	}
-}
-
-export function getRepoInfo(cwd: string): RepoInfo | undefined {
-	try {
-		const json = execSync("gh repo view --json owner,name", {
-			cwd,
-			encoding: "utf-8",
-			timeout: 5000,
-			stdio: ["pipe", "pipe", "pipe"],
-		}).trim();
-		const repo = JSON.parse(json);
-		return repo.owner?.login && repo.name ? { owner: repo.owner.login, name: repo.name } : undefined;
-	} catch {
-		return undefined;
-	}
-}
-
-export function parseChecks(statusCheckRollup: unknown[]): CheckStatus {
-	const checks: CheckStatus = { total: 0, pass: 0, fail: 0, pending: 0 };
-	for (const check of statusCheckRollup) {
-		const c = check as Record<string, string>;
-		const conclusion = (c.conclusion || "").toUpperCase();
-		const status = (c.status || "").toUpperCase();
-		const name = c.name || "";
-
-		// Skip ghost checks with no meaningful data (e.g. Vercel deployment statuses)
-		if (!name && !conclusion && !status) continue;
-
-		checks.total++;
-		if (conclusion === "SUCCESS" || conclusion === "NEUTRAL" || conclusion === "SKIPPED") {
-			checks.pass++;
-		} else if (
-			conclusion === "FAILURE" ||
-			conclusion === "TIMED_OUT" ||
-			conclusion === "CANCELLED" ||
-			conclusion === "ACTION_REQUIRED"
-		) {
-			checks.fail++;
-		} else if (
-			status === "IN_PROGRESS" ||
-			status === "QUEUED" ||
-			status === "PENDING" ||
-			status === "WAITING"
-		) {
-			checks.pending++;
-		} else if (status === "COMPLETED") {
-			// Completed but no recognized conclusion — treat as passed
-			checks.pass++;
-		} else {
-			// Unknown state — treat as pending
-			checks.pending++;
-		}
-	}
-	return checks;
-}
-
-export function countUnresolvedThreads(threads: { isResolved: boolean }[]): number {
-	return threads.filter((t) => !t.isResolved).length;
-}
-
-export function getPrForBranch(cwd: string, repo?: RepoInfo): PrInfo | undefined {
-	try {
-		const json = execSync("gh pr view --json number,title,url,state,statusCheckRollup", {
-			cwd,
-			encoding: "utf-8",
-			timeout: 10_000,
-			stdio: ["pipe", "pipe", "pipe"],
-		}).trim();
-		if (!json) return undefined;
-		const pr = JSON.parse(json);
-		if (!pr.number || !pr.url) return undefined;
-
-		const checks = Array.isArray(pr.statusCheckRollup) ? parseChecks(pr.statusCheckRollup) : { total: 0, pass: 0, fail: 0, pending: 0 };
-
-		let unresolvedThreads = 0;
-		if (repo) {
-			try {
-				const gql = execSync(
-					`gh api graphql -f query='{ repository(owner: "${repo.owner}", name: "${repo.name}") { pullRequest(number: ${pr.number}) { reviewThreads(first: 100) { nodes { isResolved } } } } }'`,
-					{
-						cwd,
-						encoding: "utf-8",
-						timeout: 10_000,
-						stdio: ["pipe", "pipe", "pipe"],
-					},
-				).trim();
-				const data = JSON.parse(gql);
-				const threads = data?.data?.repository?.pullRequest?.reviewThreads?.nodes;
-				if (Array.isArray(threads)) {
-					unresolvedThreads = countUnresolvedThreads(threads);
-				}
-			} catch {
-				// GraphQL failed — show PR without thread count
-			}
-		}
-
-		return {
-			number: pr.number,
-			title: pr.title,
-			url: pr.url,
-			state: pr.state,
-			checks,
-			unresolvedThreads,
-		};
-	} catch {
-		return undefined;
-	}
-}
-
-export function formatStatus(pr: PrInfo): string {
-	const stateIcon = pr.state === "MERGED" ? "🟣" : pr.state === "CLOSED" ? "🔴" : "🟢";
-	const parts: string[] = [`${stateIcon} PR #${pr.number}`];
-
-	if (pr.checks.total > 0) {
-		if (pr.checks.fail > 0) {
-			parts.push(`❌ ${pr.checks.fail}/${pr.checks.total} checks failed`);
-		} else if (pr.checks.pending > 0) {
-			parts.push(`⏳ ${pr.checks.pending}/${pr.checks.total} checks pending`);
-		} else {
-			parts.push(`✅ ${pr.checks.total} checks passed`);
-		}
-	}
-
-	if (pr.unresolvedThreads > 0) {
-		parts.push(`💬 ${pr.unresolvedThreads} unresolved`);
-	}
-
-	parts.push(pr.url);
-	return parts.join(" · ");
-}