@henryqw/pi-pr 2.0.1 → 2.0.2

package/README.md

@@ -70,7 +70,11 @@ Ordinary conversation comments do not trigger a route or block a merge. Changes
 
 ## Refresh
 
-The footer and widget load at session start. They refresh after local commits, PR creation, and pushes, and poll every 30 seconds. Polling updates presentation only and may be stale. The create hint stays hidden until the local branch has a commit beyond its creation point. Presentation uses route priority, so draft appears before running CI. `/pr` reads fresh state before routing or merging. The command is authoritative for actions.
+The footer and widget load at session start. They refresh after local commits, PR creation, pushes, and the creation workflow. They also poll every 30 seconds. Polling updates presentation only and may be stale.
+
+The create hint stays hidden until the local branch has a commit beyond its creation point. It clears as soon as `/pr` starts creation. It returns if the workflow finishes without a pull request.
+
+Presentation uses route priority, so draft appears before running CI. `/pr` reads fresh state before routing or merging. The command is authoritative for actions.
 
 ## Safety limits
 

package/extensions/pr-command.ts

@@ -1,7 +1,6 @@
 import type {
 	ExtensionAPI,
 	ExtensionCommandContext,
-	RegisteredCommand,
 } from "@earendil-works/pi-coding-agent";
 import {
 	executeGitHubMerge,
@@ -26,7 +25,7 @@ const WORKFLOWS: Record<WorkflowNextStep, string> = {
 };
 
 type PrCommandPi = Pick<ExtensionAPI, "exec" | "getCommands" | "sendUserMessage">;
-export type PrCommandHandler = RegisteredCommand["handler"];
+export type PrCommandHandler = (args: string, ctx: ExtensionCommandContext) => Promise<NextStep>;
 
 function dispatchWorkflow(pi: PrCommandPi, ctx: ExtensionCommandContext, commandName: string): void {
 	const command = pi.getCommands().find((candidate) =>
@@ -141,14 +140,15 @@ export function createPrCommandHandler(pi: PrCommandPi): PrCommandHandler {
 				const notification = noActionNotification(current);
 				ctx.ui.notify(notification.message, notification.type);
 			}
-			return;
+			return nextStep;
 		}
 		if (nextStep === "merge") {
 			if (!current) throw new Error("/pr merge failed: pull request is unavailable");
 			await mergePullRequest(pi, ctx, current);
-			return;
+			return nextStep;
 		}
 
 		dispatchWorkflow(pi, ctx, WORKFLOWS[nextStep]);
+		return nextStep;
 	};
 }

package/extensions/pr-github.ts

@@ -877,7 +877,6 @@ export async function loadCurrentPullRequest(
 ): Promise<CurrentPullRequest | null> {
 	const pushTarget = await readPushTarget(pi, context);
 	if (pushTarget === null) return null;
-	const [headOwner] = pushTarget.repository.nameWithOwner.split("/");
 	const search = await execute(pi, context, "Find pull requests", "gh", [
 		"api",
 		"search/issues",
@@ -888,7 +887,7 @@ export async function loadCurrentPullRequest(
 		"-X",
 		"GET",
 		"-f",
-		`q=is:pr head:${headOwner}:${pushTarget.ref}`,
+		`q=is:pr head:${pushTarget.ref}${pushTarget.remoteHeadOid === null ? "" : ` ${pushTarget.remoteHeadOid}`}`,
 		"-f",
 		`per_page=${PR_LIST_LIMIT}`,
 	]);

package/extensions/pr.ts

@@ -34,10 +34,15 @@ export default function pullRequestExtension(
 	const detectLocalCommit = dependencies.hasLocalCommit ?? hasLocalCommit;
 	const createCommandHandler = dependencies.createPrCommandHandler ?? createPrCommandHandler;
 	let context: ExtensionContext | undefined;
+	let sessionGeneration = 0;
 	let timer: ReturnType<typeof setInterval> | undefined;
 	let active: AbortController | undefined;
 	let queued = false;
 	let refreshFailureReported = false;
+	let displayedNextStep: ReturnType<typeof projectPrDisplay>["nextStep"] | undefined;
+	let displayedWidget: string | undefined;
+	let commandGeneration = 0;
+	const pendingCreations = new Set<number>();
 
 	const render = (
 		ctx: ExtensionContext,
@@ -49,15 +54,23 @@ export default function pullRequestExtension(
 		if (pullRequest !== null && footer === undefined) {
 			throw new Error("Current pull request display is missing a footer");
 		}
-		const widget = formatPrWidget(display);
+		if (pullRequest !== null) pendingCreations.clear();
+		displayedWidget = formatPrWidget(display);
+		const widget = pendingCreations.size > 0 && display.nextStep === "create" ? undefined : displayedWidget;
+		displayedNextStep = display.nextStep;
 		ctx.ui.setStatus(UI_KEY, footer);
 		ctx.ui.setWidget(UI_KEY, widget === undefined ? undefined : [widget]);
 	};
 
 	const stop = (): void => {
+		sessionGeneration += 1;
 		context = undefined;
 		queued = false;
 		refreshFailureReported = false;
+		displayedNextStep = undefined;
+		displayedWidget = undefined;
+		commandGeneration = 0;
+		pendingCreations.clear();
 		if (timer !== undefined) clearInterval(timer);
 		timer = undefined;
 		active?.abort();
@@ -79,6 +92,7 @@ export default function pullRequestExtension(
 	const refresh = async (): Promise<void> => {
 		const ctx = context;
 		if (!ctx) return;
+		const generation = sessionGeneration;
 		if (active) {
 			queued = true;
 			return;
@@ -92,13 +106,14 @@ export default function pullRequestExtension(
 			let localCommit = false;
 			try {
 				pullRequest = await load(pi, loadContext);
+				if (controller.signal.aborted || sessionGeneration !== generation) return;
 				if (pullRequest === null) localCommit = await detectLocalCommit(pi, loadContext);
 			} catch (error) {
 				// Keep the last known display when lookup is unavailable.
-				if (!controller.signal.aborted && context === ctx) reportRefreshFailure(error);
+				if (!controller.signal.aborted && sessionGeneration === generation) reportRefreshFailure(error);
 				return;
 			}
-			if (controller.signal.aborted || context !== ctx) return;
+			if (controller.signal.aborted || sessionGeneration !== generation) return;
 			render(ctx, pullRequest, localCommit);
 			refreshFailureReported = false;
 		} finally {
@@ -115,16 +130,30 @@ export default function pullRequestExtension(
 		void refresh().catch(reportRefreshFailure);
 	};
 
+	const cancelRefresh = (): void => {
+		active?.abort();
+		active = undefined;
+		queued = false;
+	};
+
 	pi.on("session_start", async (_event, ctx) => {
 		stop();
+		const generation = sessionGeneration;
 		if (!ctx.hasUI) return;
 		context = ctx;
 		await refresh();
-		if (context === ctx) timer = setInterval(refreshInBackground, POLL_INTERVAL_MS);
+		if (sessionGeneration === generation) timer = setInterval(refreshInBackground, POLL_INTERVAL_MS);
 	});
 
 	pi.on("session_shutdown", stop);
 
+	pi.on("agent_settled", async (_event, ctx) => {
+		if (!ctx.hasUI || !ctx.isIdle() || !context || !pendingCreations.size) return;
+		cancelRefresh();
+		pendingCreations.clear();
+		await refresh().catch(reportRefreshFailure);
+	});
+
 	pi.on("tool_result", async (event, ctx) => {
 		if (!ctx.hasUI || event.isError || !isBashToolResult(event)) return;
 		const command = event.input.command;
@@ -137,10 +166,38 @@ export default function pullRequestExtension(
 	pi.registerCommand("pr", {
 		description: "Run the current branch pull request next step",
 		handler: async (args, ctx) => {
-			if (!ctx.hasUI) return;
+			if (!ctx.hasUI || !context) return;
+			const generation = sessionGeneration;
+			const invocation = ++commandGeneration;
+			const displayedCreation = displayedNextStep === "create";
+			if (displayedCreation) {
+				pendingCreations.add(invocation);
+				ctx.ui.setWidget(UI_KEY, undefined);
+			}
+			let nextStep: Awaited<ReturnType<typeof commandHandler>>;
 			try {
-				await commandHandler(args, ctx);
-			} finally {
+				nextStep = await commandHandler(args, ctx);
+			} catch (error) {
+				if (sessionGeneration === generation) {
+					cancelRefresh();
+					pendingCreations.delete(invocation);
+					if (!pendingCreations.size) {
+						ctx.ui.setWidget(UI_KEY, displayedNextStep === "create" && displayedWidget !== undefined
+							? [displayedWidget]
+							: undefined);
+					}
+					refreshInBackground();
+				}
+				throw error;
+			}
+			if (sessionGeneration !== generation) return;
+			cancelRefresh();
+			if (nextStep === "create") {
+				pendingCreations.add(invocation);
+				ctx.ui.setStatus(UI_KEY, undefined);
+				ctx.ui.setWidget(UI_KEY, undefined);
+			} else {
+				pendingCreations.delete(invocation);
 				refreshInBackground();
 			}
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Run /pr to automatically choose the current pull request's next safe lifecycle step: create, update, address feedback, fix CI, or merge when ready.",
   "keywords": [
     "pi-package",

package/skills/pi-pr-comment-sweep/scripts/pr-feedback.mjs

@@ -383,10 +383,9 @@ function candidatePrUrls(pages, hostname) {
 
 function discoverOpenPr(localHead) {
   const push = configuredPushTarget();
-  const [owner] = push.repository.split("/", 2);
   const response = readJsonValueCommand("gh", [
     "api", "search/issues", "--hostname", push.hostname, "--paginate", "--slurp", "-X", "GET",
-    "-f", `q=is:pr is:open head:${owner}:${push.ref}`,
+    "-f", `q=is:pr is:open head:${push.ref} ${localHead}`,
     "-f", `per_page=${PR_LIST_LIMIT}`,
   ]);
   const candidates = candidatePrUrls(response, push.hostname).map((url) => {
@@ -1151,7 +1150,7 @@ if [ "$*" = "repo view ${enterpriseHost}/Owner/Repo --json nameWithOwner,url" ];
   echo '{"nameWithOwner":"Owner/Repo","url":"https://${enterpriseHost}/Owner/Repo"}'
   exit 0
 fi
-if [ "$*" = "api search/issues --hostname ${enterpriseHost} --paginate --slurp -X GET -f q=is:pr is:open head:Owner:feature/pr -f per_page=100" ]; then
+if [ "$*" = "api search/issues --hostname ${enterpriseHost} --paginate --slurp -X GET -f q=is:pr is:open head:feature/pr ${discoveryMetadata.headRefOid} -f per_page=100" ]; then
   echo '[{"total_count":1,"incomplete_results":false,"items":[{"html_url":"https://${enterpriseHost}/Upstream/Project/pull/1"}]}]'
   exit 0
 fi
@@ -1198,7 +1197,7 @@ exit 1
     const discoveryCommands = readFileSync(discoveryCalls, "utf8").trim().split("\n");
     assert.equal(discoveryCommands[0], `repo view ${enterpriseHost}/Owner/Repo --json nameWithOwner,url`);
     assert(!discoveryCommands.some((command) => command.includes("account") || command.includes("secret")));
-    assert.equal(discoveryCommands[1], `api search/issues --hostname ${enterpriseHost} --paginate --slurp -X GET -f q=is:pr is:open head:Owner:feature/pr -f per_page=100`);
+    assert.equal(discoveryCommands[1], `api search/issues --hostname ${enterpriseHost} --paginate --slurp -X GET -f q=is:pr is:open head:feature/pr ${discoveryMetadata.headRefOid} -f per_page=100`);
     assert.match(discoveryCommands[2], new RegExp(`^pr view https://${enterpriseHost}/Upstream/Project/pull/1 `));
     assert(!discoveryCommands.some((command) => command.startsWith("pr view --json")));
 
@@ -1215,7 +1214,7 @@ if [ "$*" = "repo view ${enterpriseHost}/Owner/Repo --json nameWithOwner,url" ];
   echo '{"nameWithOwner":"Owner/Repo","url":"https://${enterpriseHost}/Owner/Repo"}'
   exit 0
 fi
-if [ "$*" = "api search/issues --hostname ${enterpriseHost} --paginate --slurp -X GET -f q=is:pr is:open head:Owner:feature/pr -f per_page=100" ]; then
+if [ "$*" = "api search/issues --hostname ${enterpriseHost} --paginate --slurp -X GET -f q=is:pr is:open head:feature/pr ${discoveryMetadata.headRefOid} -f per_page=100" ]; then
   echo '[{"total_count":1,"incomplete_results":false,"items":[{"html_url":"https://${enterpriseHost}/Owner/Repo/pull/1"}]}]'
   exit 0
 fi
@@ -1277,7 +1276,7 @@ exit 1
     assert.equal(readFileSync(resolved, "utf8"), "first\n");
     const resolutionCommands = readFileSync(resolutionCalls, "utf8").trim().split("\n");
     assert.equal(resolutionCommands[0], `repo view ${enterpriseHost}/Owner/Repo --json nameWithOwner,url`);
-    assert.equal(resolutionCommands[1], `api search/issues --hostname ${enterpriseHost} --paginate --slurp -X GET -f q=is:pr is:open head:Owner:feature/pr -f per_page=100`);
+    assert.equal(resolutionCommands[1], `api search/issues --hostname ${enterpriseHost} --paginate --slurp -X GET -f q=is:pr is:open head:feature/pr ${discoveryMetadata.headRefOid} -f per_page=100`);
     assert.match(resolutionCommands[2], new RegExp(`^pr view https://${enterpriseHost}/Owner/Repo/pull/1 `));
     assert(!resolutionCommands.some((command) => command.startsWith("pr view --json")));