@henryqw/pi-pr 3.1.8 → 3.1.10

package/README.md

@@ -45,10 +45,12 @@ Add optional instructions to guide a creation, branch-update, CI-fix, or feedbac
 | --- | --- | --- |
 | `/pr [instructions]` | command | Run the current pull request's next safe route. |
 | Footer | ui | Show a linked `PR #number` and one plain-language status. |
-| Widget | ui | Show one actionable icon-prefixed `Run /pr to …` hint. |
+| Widget | ui | Show one action hint or transient routing status. |
 
 The footer already shows the pull request and status. Actionable widgets omit duplicate identity and status. Each uses one semantic status icon, a space, and a plain `Run /pr to …` route. `✗` marks errors, `!` warnings, `✓` success, and `●` accent or neutral routes. In TUI, only the icon uses a theme color. RPC and non-TUI output use the same plain text without ANSI.
 
+The widget switches to `⠋ Checking pull request…` as soon as `/pr` starts discovery. The braille spinner animates in TUI mode. RPC receives one plain static line. The footer stays unchanged. The routing widget clears after route selection and before any prompt, notification, mutation, or workflow dispatch.
+
 ## Flow
 
 Each footer entry is one linked `PR #number` plus one plain-language status: `N unresolved`, `draft`, `open`, `approved`, `CI running`, `CI failed`, `changes requested`, `base update required`, `merge conflict`, `merge-ready`, `merged`, or `closed`. Colors support the text; they do not carry meaning alone.
@@ -90,7 +92,7 @@ It renames only the workspace. Outside Herdr, it does nothing.
 
 If Herdr lookup, JSON validation, or rename fails, the PR and normal UI refresh remain available. Each Herdr command has a 10-second timeout. The extension warns with `Herdr workspace rename failed: <error>`.
 
-Current-branch discovery matches the exact push repository and ref. It finds a fork-head PR whose base is an upstream repository. A unique historical match uses the exact remote push-ref OID, not local HEAD.
+Current-branch discovery reads pull requests associated with the exact push repository ref. It does not run a global branch search. It finds a fork-head PR whose base is an upstream repository. A unique historical match uses the exact remote push-ref OID, not local HEAD.
 
 A no-action state includes a draft, merged or closed pull request, running CI, pending review, or blocked merge policy. It also includes a mutating workflow whose tree is dirty or whose local HEAD differs from the PR head.
 
@@ -115,7 +117,7 @@ The footer and widget load at session start. A directory outside a Git worktree
 
 They refresh after local commits, PR creation, pushes, and each dispatched workflow settles. During creation, intermediate refreshes wait until the workflow settles. They also refresh after any successful delegated task settles. Active Git worktrees poll every 30 seconds. Polling updates presentation only and may be stale.
 
-The create widget stays hidden until the local branch has a commit beyond its creation point. Any displayed widget clears as soon as `/pr` starts. A dispatched workflow keeps it hidden until the agent settles. A direct merge, no-action route, or failed command refreshes the widget when the handler finishes.
+The create widget stays hidden until the local branch has a commit beyond its creation point. `/pr` replaces any hint with routing feedback while it selects a route. The feedback clears before route interaction. A dispatched workflow keeps the widget hidden until the agent settles. Direct and no-action routes refresh it after completion. A failed command restores the prior hint and schedules a refresh.
 
 Presentation uses route priority, so draft appears before running CI. `/pr` reads fresh state before routing or merging. The command is authoritative for actions.
 

package/extensions/pr-command.ts

@@ -27,7 +27,11 @@ const WORKFLOWS: Record<WorkflowNextStep, string> = {
 };
 
 type PrCommandPi = Pick<ExtensionAPI, "exec" | "getCommands" | "sendUserMessage">;
-export type PrCommandHandler = (args: string, ctx: ExtensionCommandContext) => Promise<NextStep>;
+export type PrCommandHandler = (
+	args: string,
+	ctx: ExtensionCommandContext,
+	onRouteResolved?: (nextStep: NextStep) => void,
+) => Promise<NextStep>;
 
 type PrCommandDependencies = {
 	loadCurrentPullRequest?: typeof loadCurrentPullRequest;
@@ -175,10 +179,11 @@ export function createPrCommandHandler(
 ): PrCommandHandler {
 	const load = dependencies.loadCurrentPullRequest ?? loadCurrentPullRequest;
 	const link = dependencies.linkInferredPullRequest ?? linkInferredPullRequest;
-	return async (args, ctx) => {
+	return async (args, ctx, onRouteResolved) => {
 		const instructions = args.trim();
 		const discovery = await load(pi, ctx);
 		const nextStep = deriveNextStep(discovery);
+		onRouteResolved?.(nextStep);
 		if (instructions && !(nextStep in WORKFLOWS)) {
 			throw new Error("The current /pr route does not accept instructions");
 		}

package/extensions/pr-github.ts

@@ -18,11 +18,11 @@ import type {
 } from "./pr-routing.ts";
 
 const EXEC_TIMEOUT_MS = 10_000;
-const PR_SEARCH_PAGE_SIZE = 100;
-const PR_SEARCH_CAP = 1_000;
-const PR_SEARCH_MAX_PAGES = PR_SEARCH_CAP / PR_SEARCH_PAGE_SIZE;
+const PR_DISCOVERY_PAGE_SIZE = 100;
+const PR_DISCOVERY_CAP = 1_000;
+const PR_DISCOVERY_MAX_PAGES = PR_DISCOVERY_CAP / PR_DISCOVERY_PAGE_SIZE;
 const PR_FIELDS = "id,number,url,state,isDraft,baseRefName,baseRefOid,headRefName,headRefOid,headRepository,mergeable,mergeStateStatus,reviewDecision,statusCheckRollup";
-const PR_SEARCH_QUERY = "query($searchQuery:String!,$endCursor:String){search(query:$searchQuery,type:ISSUE,first:100,after:$endCursor){issueCount edges{cursor node{__typename ...on PullRequest{number url state baseRepository{nameWithOwner}headRepository{nameWithOwner}headRefName headRefOid}}}pageInfo{hasNextPage startCursor endCursor}}}";
+const PR_DISCOVERY_QUERY = "query($owner:String!,$name:String!,$qualifiedName:String!,$endCursor:String){repository(owner:$owner,name:$name){nameWithOwner ref(qualifiedName:$qualifiedName){name associatedPullRequests(first:100,after:$endCursor){totalCount edges{cursor node{__typename number url state baseRepository{nameWithOwner}headRepository{nameWithOwner}headRefName headRefOid}}pageInfo{hasNextPage startCursor endCursor}}}}}";
 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 BASE_REF_QUERY = "query($owner:String!,$name:String!,$qualifiedName:String!){repository(owner:$owner,name:$name){nameWithOwner ref(qualifiedName:$qualifiedName){name target{oid}}}}";
 const BASE_BRANCH_POLICY_QUERY = "query($owner:String!,$name:String!,$qualifiedName:String!){repository(owner:$owner,name:$name){nameWithOwner ref(qualifiedName:$qualifiedName){name branchProtectionRule{requiresStrictStatusChecks}}}}";
@@ -167,7 +167,7 @@ type SearchSelection =
 	| { kind: "target-invalid" };
 
 type SearchPage = {
-	issueCount: number;
+	totalCount: number;
 	candidates: SearchPullRequest[];
 	cursors: string[];
 	hasNextPage: boolean;
@@ -634,18 +634,29 @@ function searchPullRequest(value: unknown, host: string): SearchPullRequest {
 	};
 }
 
-function parseSearchPage(output: string, host: string): SearchPage {
+function parseSearchPage(output: string, pushTarget: PushTarget): SearchPage | null {
 	const page = parseJson(output, "Find pull requests");
 	if (!isRecord(page)) fail("Find pull requests", "invalid GitHub CLI output");
 	if (page.errors !== undefined) {
 		if (!Array.isArray(page.errors)) fail("Find pull requests", "invalid GitHub CLI output");
 		if (page.errors.length) fail("Find pull requests", "GitHub GraphQL returned errors");
 	}
-	const search = isRecord(page.data) ? page.data.search : undefined;
+	const repository = isRecord(page.data) ? page.data.repository : undefined;
+	if (!isRecord(repository)) fail("Find pull requests", "invalid GitHub CLI output");
 	if (
-		!isRecord(search) || typeof search.issueCount !== "number" ||
-		!Number.isSafeInteger(search.issueCount) || search.issueCount < 0 ||
-		!Array.isArray(search.edges) || search.edges.length > PR_SEARCH_PAGE_SIZE ||
+		normalizeRepository(repositoryName(repository.nameWithOwner, "Find pull requests", "repository.nameWithOwner")) !==
+		pushTarget.repository.normalizedName
+	) fail("Find pull requests", "repository does not match push target");
+	if (repository.ref === null) return null;
+	if (!isRecord(repository.ref)) fail("Find pull requests", "invalid GitHub CLI output");
+	if (text(repository.ref.name, "Find pull requests", "ref.name") !== pushTarget.ref) {
+		fail("Find pull requests", "ref does not match push target");
+	}
+	const search = repository.ref.associatedPullRequests;
+	if (
+		!isRecord(search) || typeof search.totalCount !== "number" ||
+		!Number.isSafeInteger(search.totalCount) || search.totalCount < 0 ||
+		!Array.isArray(search.edges) || search.edges.length > PR_DISCOVERY_PAGE_SIZE ||
 		!isRecord(search.pageInfo)
 	) fail("Find pull requests", "invalid GitHub CLI output");
 	const candidates: SearchPullRequest[] = [];
@@ -653,7 +664,7 @@ function parseSearchPage(output: string, host: string): SearchPage {
 	for (const edge of search.edges) {
 		if (!isRecord(edge)) fail("Find pull requests", "invalid GitHub CLI output");
 		cursors.push(text(edge.cursor, "Find pull requests", "cursor"));
-		candidates.push(searchPullRequest(edge.node, host));
+		candidates.push(searchPullRequest(edge.node, pushTarget.repository.host));
 	}
 	if (new Set(cursors).size !== cursors.length) fail("Find pull requests", "duplicate candidate cursor");
 	const { hasNextPage, startCursor, endCursor } = search.pageInfo;
@@ -664,7 +675,7 @@ function parseSearchPage(output: string, host: string): SearchPage {
 		fail("Find pull requests", "invalid search pageInfo");
 	}
 	return {
-		issueCount: search.issueCount,
+		totalCount: search.totalCount,
 		candidates,
 		cursors,
 		hasNextPage,
@@ -1443,32 +1454,36 @@ async function searchPullRequests(
 	context: PullRequestLoadContext,
 	pushTarget: PushTarget,
 ): Promise<SearchSelection> {
-	const headOwner = pushTarget.repository.nameWithOwner.split("/")[0]!;
-	const searchQuery = `is:pr${pushTarget.provenance === "inferred" ? " is:open" : ""} head:${headOwner}:${pushTarget.ref}`;
+	const [owner, name] = pushTarget.repository.nameWithOwner.split("/");
 	const candidates: SearchPullRequest[] = [];
 	const cursors = new Set<string>();
-	let issueCount: number | null = null;
+	let totalCount: number | null = null;
 	let endCursor: string | null = null;
-	for (let pageIndex = 0; pageIndex < PR_SEARCH_MAX_PAGES; pageIndex += 1) {
+	for (let pageIndex = 0; pageIndex < PR_DISCOVERY_MAX_PAGES; pageIndex += 1) {
 		const args = [
 			"api",
 			"graphql",
 			"--hostname",
 			pushTarget.repository.host,
 			"-f",
-			`query=${PR_SEARCH_QUERY}`,
+			`query=${PR_DISCOVERY_QUERY}`,
+			"-F",
+			`owner=${owner}`,
+			"-F",
+			`name=${name}`,
 			"-F",
-			`searchQuery=${searchQuery}`,
+			`qualifiedName=refs/heads/${pushTarget.ref}`,
 		];
 		if (endCursor !== null) args.push("-F", `endCursor=${endCursor}`);
 		const result = await execute(pi, context, "Find pull requests", "gh", args);
-		const page = parseSearchPage(result.stdout, pushTarget.repository.host);
-		if (issueCount !== null && page.issueCount !== issueCount) {
+		const page = parseSearchPage(result.stdout, pushTarget);
+		if (page === null) return pushTarget.remoteHeadOid === null ? { kind: "none" } : { kind: "target-invalid" };
+		if (totalCount !== null && page.totalCount !== totalCount) {
 			fail("Find pull requests", "inconsistent search result pages");
 		}
-		issueCount = page.issueCount;
-		if (issueCount > PR_SEARCH_CAP) fail("Find pull requests", "GitHub search result cap reached");
-		const expectedPageSize = Math.min(PR_SEARCH_PAGE_SIZE, Math.max(0, issueCount - candidates.length));
+		totalCount = page.totalCount;
+		if (totalCount > PR_DISCOVERY_CAP) fail("Find pull requests", "GitHub pull request result cap reached");
+		const expectedPageSize = Math.min(PR_DISCOVERY_PAGE_SIZE, Math.max(0, totalCount - candidates.length));
 		if (page.candidates.length !== expectedPageSize) fail("Find pull requests", "incomplete search results");
 		for (const cursor of page.cursors) {
 			if (cursors.has(cursor)) fail("Find pull requests", "duplicate candidate cursor");
@@ -1478,7 +1493,7 @@ async function searchPullRequests(
 		if (new Set(candidates.map(({ url }) => url.href.toLowerCase())).size !== candidates.length) {
 			fail("Find pull requests", "duplicate candidate url");
 		}
-		const hasMore = candidates.length < issueCount;
+		const hasMore = candidates.length < totalCount;
 		if (page.hasNextPage !== hasMore) fail("Find pull requests", "incomplete search results");
 		if (!hasMore) {
 			const selected = selectSearchPullRequest(candidates, pushTarget);
@@ -1498,7 +1513,7 @@ async function searchPullRequests(
 		if (page.endCursor === null) fail("Find pull requests", "invalid search pageInfo");
 		endCursor = page.endCursor;
 	}
-	return fail("Find pull requests", "GitHub search result cap reached");
+	return fail("Find pull requests", "GitHub pull request result cap reached");
 }
 
 export async function loadCurrentPullRequest(

package/extensions/pr.ts

@@ -3,6 +3,7 @@ import {
 	type ExtensionAPI,
 	type ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth, type Component, type TUI } from "@earendil-works/pi-tui";
 import { createHerdrClient } from "@henryqw/pi-herdr";
 import { createPrCommandHandler } from "./pr-command.ts";
 import {
@@ -24,6 +25,9 @@ import {
 } from "./pr-ui.ts";
 
 const POLL_INTERVAL_MS = 30_000;
+const ROUTING_SPINNER_INTERVAL_MS = 80;
+const ROUTING_SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+const ROUTING_WIDGET_TEXT = "Checking pull request…";
 const HERDR_TIMEOUT_MS = 10_000;
 const UI_KEY = "pi-pr";
 const OBSERVATION_ENTRY = "pi-pr-observation";
@@ -130,9 +134,23 @@ export default function pullRequestExtension(
 	let mergeCompleted = false;
 	let displayedWidget: PrDisplay | undefined;
 	let commandGeneration = 0;
-	const activeInvocations = new Map<number, "routing" | "create-workflow" | "workflow">();
+	const activeInvocations = new Map<number, "routing" | "resolved" | "create-workflow" | "workflow">();
+	let widgetKind: "presentation" | "routing" = "presentation";
+	let routingSpinnerFrame = 0;
+	let routingSpinnerTimer: ReturnType<typeof setInterval> | undefined;
+	let routingSpinnerTui: TUI | undefined;
+	let routingSpinnerComponent: (Component & { dispose(): void }) | undefined;
+
+	const stopRoutingSpinner = (): void => {
+		if (routingSpinnerTimer !== undefined) clearInterval(routingSpinnerTimer);
+		routingSpinnerTimer = undefined;
+		routingSpinnerTui = undefined;
+		routingSpinnerComponent = undefined;
+	};
 
 	const setWidget = (ctx: ExtensionContext, display: PrDisplay | undefined): void => {
+		stopRoutingSpinner();
+		widgetKind = "presentation";
 		if (display?.widget === undefined) {
 			ctx.ui.setWidget(UI_KEY, undefined);
 			return;
@@ -147,6 +165,57 @@ export default function pullRequestExtension(
 		ctx.ui.setWidget(UI_KEY, formatPrWidget(display));
 	};
 
+	const setRoutingWidget = (ctx: ExtensionContext): void => {
+		if (widgetKind === "routing") return;
+		stopRoutingSpinner();
+		widgetKind = "routing";
+		routingSpinnerFrame = 0;
+		if (ctx.mode !== "tui") {
+			ctx.ui.setWidget(UI_KEY, [`${ROUTING_SPINNER_FRAMES[0]} ${ROUTING_WIDGET_TEXT}`]);
+			return;
+		}
+
+		ctx.ui.setWidget(UI_KEY, (tui, theme) => {
+			let cachedWidth: number | undefined;
+			let cachedLines: string[] | undefined;
+			const component: Component & { dispose(): void } = {
+				invalidate() {
+					cachedWidth = undefined;
+					cachedLines = undefined;
+				},
+				render(width) {
+					if (width <= 0) return [];
+					if (cachedLines !== undefined && cachedWidth === width) return cachedLines;
+					const line = `${theme.fg("accent", ROUTING_SPINNER_FRAMES[routingSpinnerFrame]!)} ${ROUTING_WIDGET_TEXT}`;
+					cachedWidth = width;
+					cachedLines = [truncateToWidth(line, Math.max(1, width))];
+					return cachedLines;
+				},
+				dispose() {
+					if (routingSpinnerComponent !== component) return;
+					stopRoutingSpinner();
+					widgetKind = "presentation";
+				},
+			};
+			routingSpinnerTui = tui;
+			routingSpinnerComponent = component;
+			return component;
+		});
+		routingSpinnerTimer = setInterval(() => {
+			routingSpinnerFrame = (routingSpinnerFrame + 1) % ROUTING_SPINNER_FRAMES.length;
+			routingSpinnerComponent?.invalidate();
+			routingSpinnerTui?.requestRender();
+		}, ROUTING_SPINNER_INTERVAL_MS);
+	};
+
+	const reconcileWidget = (ctx: ExtensionContext): void => {
+		if ([...activeInvocations.values()].includes("routing")) {
+			setRoutingWidget(ctx);
+			return;
+		}
+		setWidget(ctx, activeInvocations.size > 0 ? undefined : displayedWidget);
+	};
+
 	const render = (
 		ctx: ExtensionContext,
 		discovery: Awaited<ReturnType<typeof loadCurrentPullRequest>>,
@@ -159,7 +228,7 @@ export default function pullRequestExtension(
 			lastDiscovery = "inactive";
 			displayedWidget = undefined;
 			ctx.ui.setStatus(UI_KEY, undefined);
-			setWidget(ctx, undefined);
+			reconcileWidget(ctx);
 			return;
 		}
 		const display = projectPrDisplay(discovery, localCommit);
@@ -168,9 +237,8 @@ export default function pullRequestExtension(
 			throw new Error("Pull request display is missing a footer");
 		}
 		displayedWidget = display.widget === undefined ? undefined : display;
-		const widget = activeInvocations.size > 0 ? undefined : displayedWidget;
 		ctx.ui.setStatus(UI_KEY, footer);
-		setWidget(ctx, widget);
+		reconcileWidget(ctx);
 		if (discovery.kind === "blocked") {
 			const key = discoveryIssueKey(discovery.issue);
 			if (lastBlockedIssueKey !== key) {
@@ -203,6 +271,8 @@ export default function pullRequestExtension(
 		displayedWidget = undefined;
 		commandGeneration = 0;
 		activeInvocations.clear();
+		stopRoutingSpinner();
+		widgetKind = "presentation";
 		if (timer !== undefined) clearInterval(timer);
 		timer = undefined;
 		active?.abort();
@@ -255,8 +325,9 @@ export default function pullRequestExtension(
 				if (!controller.signal.aborted && sessionGeneration === generation) {
 					if (!displayEstablished) {
 						const unavailable = unavailablePrDisplay();
+						displayedWidget = undefined;
 						ctx.ui.setStatus(UI_KEY, formatPrFooter(unavailable, ctx.ui.theme));
-						setWidget(ctx, undefined);
+						reconcileWidget(ctx);
 						displayEstablished = true;
 					}
 					reportRefreshFailure();
@@ -352,17 +423,21 @@ export default function pullRequestExtension(
 			const generation = sessionGeneration;
 			const invocation = ++commandGeneration;
 			activeInvocations.set(invocation, "routing");
-			if (displayedWidget !== undefined) setWidget(ctx, undefined);
+			reconcileWidget(ctx);
+			const routeResolved = (): void => {
+				if (sessionGeneration !== generation || activeInvocations.get(invocation) !== "routing") return;
+				activeInvocations.set(invocation, "resolved");
+				reconcileWidget(ctx);
+			};
 			let nextStep: Awaited<ReturnType<typeof commandHandler>>;
 			try {
-				nextStep = await commandHandler(args, ctx);
+				nextStep = await commandHandler(args, ctx, routeResolved);
+				routeResolved();
 			} catch (error) {
 				if (sessionGeneration === generation) {
 					cancelRefresh();
 					activeInvocations.delete(invocation);
-					if (!activeInvocations.size) {
-						setWidget(ctx, displayedWidget);
-					}
+					reconcileWidget(ctx);
 					refreshInBackground();
 				}
 				throw error;
@@ -372,7 +447,7 @@ export default function pullRequestExtension(
 			if (WORKFLOW_ROUTES.has(nextStep)) {
 				activeInvocations.set(invocation, nextStep === "create" ? "create-workflow" : "workflow");
 				if (nextStep === "create") ctx.ui.setStatus(UI_KEY, undefined);
-				setWidget(ctx, undefined);
+				reconcileWidget(ctx);
 			} else {
 				if (nextStep === "merge") mergeCompleted = true;
 				activeInvocations.delete(invocation);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "3.1.8",
+  "version": "3.1.10",
   "description": "Run /pr to safely discover or link the current pull request, then create, update, address feedback, fix CI, or merge when ready.",
   "keywords": [
     "pi-package",