@henryqw/pi-pr 0.2.0 → 0.3.0

package/README.md

@@ -17,9 +17,9 @@ Requires authenticated GitHub CLI access (`gh auth login`) in a GitHub repositor
 | Footer | UI | Show the current branch pull request. |
 | `/pr` | command | Open current branch PR, or start PR workflow when absent. |
 
-Each entry is one linked `PR #number` plus one plain-language state: `draft`, `open`, `approved`, `CI running`, `CI failed`, `changes requested`, `merge conflict`, `merged`, or `closed`. Status priority favors action: merge conflict, changes requested, CI failure, then CI progress. Colors support text; they do not carry meaning alone.
+Each entry is one linked `PR #number` plus one plain-language state: `<count> unresolved`, `draft`, `open`, `approved`, `CI running`, `CI failed`, `changes requested`, `merge conflict`, `merged`, or `closed`. Known unresolved review threads take priority, followed by merge conflict, changes requested, CI failure, then CI progress. Colors support text; they do not carry meaning alone.
 
-The status loads at session start, polls every 30 seconds, and refreshes after an agent successfully runs `gh pr create` or after `/pr`. No pull request leaves the footer blank.
+The status loads at session start, polls every 30 seconds, and refreshes after an agent successfully runs `gh pr create`, `git push`, or `/pr`. Unresolved review threads are checked every 30 seconds for 20 minutes after an open PR is first found. Each new push or remote PR update, including new comments, restarts that window. Footer and warning notification show the unresolved count when first found or increased. Last known footer count remains after review checks stop. No pull request leaves the footer blank.
 
 `/pr` finds an open PR for current branch. When absent, it starts bundled `/skill:pi-pr-create` workflow. Agent resolves base, inspects and commits scoped changes, runs relevant validation, pushes branch, and creates or updates PR with live title and body. This workflow handles dirty worktrees; it never silently commits unrelated changes.
 

package/extensions/pr.ts

@@ -6,8 +6,11 @@ import {
 import { hyperlink } from "@earendil-works/pi-tui";
 
 const POLL_INTERVAL_MS = 30_000;
-const PR_FIELDS = "number,url,state,isDraft,mergeable,reviewDecision,statusCheckRollup";
+const REVIEW_POLL_WINDOW_MS = 20 * 60_000;
+const PR_FIELDS = "id,number,url,headRefOid,updatedAt,state,isDraft,mergeable,reviewDecision,statusCheckRollup";
+const REVIEW_THREADS_QUERY = "query($id:ID!,$endCursor:String){node(id:$id){...on PullRequest{reviewThreads(first:100,after:$endCursor){nodes{isResolved}pageInfo{hasNextPage endCursor}}}}}";
 const GH_PR_CREATE = /(?:^|[;&|]\s*|\n\s*)gh\s+pr\s+create(?=\s|$|[;&|])/;
+const GIT_PUSH = /(?:^|[;&|]\s*|\n\s*)git\s+push(?=\s|$|[;&|])/;
 const CREATE_PR_SKILL_COMMAND = "skill:pi-pr-create";
 const FAILED_CHECK_STATES = new Set(["ACTION_REQUIRED", "CANCELLED", "ERROR", "FAILURE", "STALE", "STARTUP_FAILURE", "TIMED_OUT"]);
 const SUCCESSFUL_CHECK_STATES = new Set(["NEUTRAL", "SKIPPED", "SUCCESS"]);
@@ -15,8 +18,11 @@ const SUCCESSFUL_CHECK_STATES = new Set(["NEUTRAL", "SKIPPED", "SUCCESS"]);
 type Lifecycle = "D" | "O" | "M" | "C";
 type CiStatus = "success" | "running" | "failure" | "none";
 type PullRequest = {
+	id: string;
 	number: number;
 	url: string;
+	headRefOid: string;
+	updatedAt: string;
 	lifecycle: Lifecycle;
 	mergeable: string;
 	reviewDecision: string | null;
@@ -40,15 +46,21 @@ function pullRequestUrl(value: unknown): string | undefined {
 export function parsePullRequest(value: unknown): PullRequest | undefined {
 	if (!isRecord(value)) return undefined;
 
+	const id = value.id;
 	const number = value.number;
 	const url = pullRequestUrl(value.url);
+	const headRefOid = value.headRefOid;
+	const updatedAt = value.updatedAt;
 	const state = value.state;
 	const isDraft = value.isDraft;
 	const mergeable = value.mergeable;
 	const reviewDecision = value.reviewDecision;
 	const statusCheckRollup = value.statusCheckRollup;
 	if (
-		typeof number !== "number" || !Number.isSafeInteger(number) || number <= 0 || !url || typeof state !== "string" ||
+		typeof id !== "string" || !id ||
+		typeof number !== "number" || !Number.isSafeInteger(number) || number <= 0 || !url ||
+		typeof headRefOid !== "string" || !headRefOid ||
+		typeof updatedAt !== "string" || Number.isNaN(Date.parse(updatedAt)) || typeof state !== "string" ||
 		typeof isDraft !== "boolean" || typeof mergeable !== "string" ||
 		(reviewDecision !== null && typeof reviewDecision !== "string") ||
 		(statusCheckRollup !== null && !Array.isArray(statusCheckRollup))
@@ -57,7 +69,17 @@ export function parsePullRequest(value: unknown): PullRequest | undefined {
 	const lifecycle = state === "MERGED" ? "M" : state === "CLOSED" ? "C" : state === "OPEN" ? isDraft ? "D" : "O" : undefined;
 	if (!lifecycle) return undefined;
 
-	return { number, url, lifecycle, mergeable, reviewDecision, statusCheckRollup: statusCheckRollup ?? [] };
+	return { id, number, url, headRefOid, updatedAt, lifecycle, mergeable, reviewDecision, statusCheckRollup: statusCheckRollup ?? [] };
+}
+
+function parseUnresolvedReviewCount(value: string): number {
+	if (!value.trim()) throw new Error("Read review comments failed: invalid GitHub CLI output");
+	const pages = value.trim().split(/\s+/).map(Number);
+	const count = pages.reduce((total, page) => total + page, 0);
+	if (pages.some((page) => !Number.isSafeInteger(page) || page < 0) || !Number.isSafeInteger(count)) {
+		throw new Error("Read review comments failed: invalid GitHub CLI output");
+	}
+	return count;
 }
 
 function parseRepositoryName(json: string): string {
@@ -125,9 +147,11 @@ function statusFor(pullRequest: PullRequest, ci: CiStatus): Status {
 	return { text: "open", color: "accent" };
 }
 
-export function formatPullRequest(pullRequest: PullRequest, theme: ExtensionContext["ui"]["theme"]): string {
+export function formatPullRequest(pullRequest: PullRequest, theme: ExtensionContext["ui"]["theme"], unresolved = 0): string {
 	const link = hyperlink(theme.fg("text", `PR #${pullRequest.number}`), pullRequest.url);
-	const status = statusFor(pullRequest, ciStatus(pullRequest.statusCheckRollup));
+	const status = unresolved > 0
+		? { text: `${unresolved} unresolved`, color: "warning" as const }
+		: statusFor(pullRequest, ciStatus(pullRequest.statusCheckRollup));
 	return `${link} · ${theme.fg(status.color, status.text)}`;
 }
 
@@ -136,10 +160,14 @@ export default function pullRequestExtension(pi: ExtensionAPI): void {
 	let timer: ReturnType<typeof setInterval> | undefined;
 	let active: AbortController | undefined;
 	let queued = false;
+	let reviewState: { id: string; unresolved: number } | undefined;
+	let reviewWindow: { id: string; headRefOid: string; updatedAt: string; until: number } | undefined;
 
 	const stop = () => {
 		context = undefined;
 		queued = false;
+		reviewState = undefined;
+		reviewWindow = undefined;
 		if (timer !== undefined) clearInterval(timer);
 		timer = undefined;
 		active?.abort();
@@ -169,7 +197,59 @@ export default function pullRequestExtension(pi: ExtensionAPI): void {
 			}
 
 			const pullRequest = parsePullRequest(JSON.parse(result.stdout));
-			ctx.ui.setStatus("pi-pr", pullRequest ? formatPullRequest(pullRequest, ctx.ui.theme) : undefined);
+			if (!pullRequest) {
+				reviewState = undefined;
+				reviewWindow = undefined;
+				ctx.ui.setStatus("pi-pr", undefined);
+				return;
+			}
+			if (pullRequest.lifecycle === "M" || pullRequest.lifecycle === "C") {
+				reviewState = undefined;
+				reviewWindow = undefined;
+				ctx.ui.setStatus("pi-pr", formatPullRequest(pullRequest, ctx.ui.theme));
+				return;
+			}
+			const changedPullRequest = reviewWindow?.id !== pullRequest.id;
+			if (
+				changedPullRequest ||
+				reviewWindow?.headRefOid !== pullRequest.headRefOid ||
+				reviewWindow?.updatedAt !== pullRequest.updatedAt
+			) {
+				if (changedPullRequest) reviewState = undefined;
+				reviewWindow = {
+					id: pullRequest.id,
+					headRefOid: pullRequest.headRefOid,
+					updatedAt: pullRequest.updatedAt,
+					until: Date.now() + REVIEW_POLL_WINDOW_MS,
+				};
+			}
+			ctx.ui.setStatus("pi-pr", formatPullRequest(
+				pullRequest,
+				ctx.ui.theme,
+				reviewState?.id === pullRequest.id ? reviewState.unresolved : 0,
+			));
+			if (Date.now() >= reviewWindow.until) return;
+
+			try {
+				const reviews = await pi.exec(
+					"gh",
+					[
+						"api", "graphql", "--hostname", new URL(pullRequest.url).hostname, "--paginate",
+						"-f", `query=${REVIEW_THREADS_QUERY}`, "-F", `id=${pullRequest.id}`,
+						"--jq", "[.data.node.reviewThreads.nodes[] | select(.isResolved == false)] | length",
+					],
+					{ cwd: ctx.cwd, signal: controller.signal, timeout: 10_000 },
+				);
+				if (controller.signal.aborted || context !== ctx || reviews.code !== 0) return;
+				const unresolved = parseUnresolvedReviewCount(reviews.stdout);
+				if (unresolved > 0 && (reviewState?.id !== pullRequest.id || unresolved > reviewState.unresolved)) {
+					ctx.ui.notify(`PR #${pullRequest.number} has ${unresolved} unresolved review thread${unresolved === 1 ? "" : "s"}`, "warning");
+				}
+				reviewState = { id: pullRequest.id, unresolved };
+				ctx.ui.setStatus("pi-pr", formatPullRequest(pullRequest, ctx.ui.theme, unresolved));
+			} catch {
+				// Keep known PR status when review lookup fails.
+			}
 		} catch {
 			if (!controller.signal.aborted && context === ctx) ctx.ui.setStatus("pi-pr", undefined);
 		} finally {
@@ -195,7 +275,7 @@ export default function pullRequestExtension(pi: ExtensionAPI): void {
 	pi.on("tool_result", async (event, ctx) => {
 		if (!ctx.hasUI || event.isError || !isBashToolResult(event)) return;
 		const command = event.input.command;
-		if (typeof command === "string" && GH_PR_CREATE.test(command)) await refresh(true);
+		if (typeof command === "string" && (GH_PR_CREATE.test(command) || GIT_PUSH.test(command))) await refresh(true);
 	});
 
 	pi.registerCommand("pr", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Show the current branch pull request status in the Pi footer.",
   "keywords": [
     "pi-package",