@henryqw/pi-pr 2.0.3 → 2.1.0

package/README.md

@@ -23,7 +23,9 @@ Run `/pr` without arguments in a GitHub checkout. It reads the current branch pu
 | Surface | Type | Purpose |
 | --- | --- | --- |
 | Footer | ui | Show a linked `PR #number` and one plain-language status. |
-| Widget hint | ui | Show at most one hint for the next `/pr` step. |
+| Widget | ui | Show one actionable icon-prefixed `Run /pr to …` hint. |
+
+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.
 
 ## Flow
 
@@ -65,7 +67,7 @@ Ordinary conversation comments do not trigger a route or block a merge. Changes
 
 The footer and widget load at session start. They refresh after local commits, PR creation, pushes, and each dispatched workflow settles. 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. Any displayed hint 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 hint when the handler finishes.
+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.
 
 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-ui.ts

@@ -1,4 +1,4 @@
-import { getCapabilities, hyperlink } from "@earendil-works/pi-tui";
+import { getCapabilities, hyperlink, truncateToWidth } from "@earendil-works/pi-tui";
 import {
 	deriveNextStep,
 	type NextStep,
@@ -93,6 +93,10 @@ export function formatPrFooter(display: PrDisplay, theme: PrTheme): string | und
 	return `${link} · ${theme.fg(display.footer.color, display.footer.text)}`;
 }
 
-export function formatPrWidget(display: PrDisplay): string | undefined {
-	return display.widget;
+export function formatPrWidget(display: PrDisplay, theme?: PrTheme, width?: number): string[] | undefined {
+	if (display.widget === undefined) return undefined;
+	const color = display.footer?.color ?? "accent";
+	const icon = color === "error" ? "✗" : color === "warning" ? "!" : color === "success" ? "✓" : "●";
+	const line = `${theme ? theme.fg(color, icon) : icon} ${display.widget}`;
+	return [width === undefined ? line : truncateToWidth(line, Math.max(1, width))];
 }

package/extensions/pr.ts

@@ -12,6 +12,7 @@ import {
 	formatPrFooter,
 	formatPrWidget,
 	projectPrDisplay,
+	type PrDisplay,
 } from "./pr-ui.ts";
 
 const POLL_INTERVAL_MS = 30_000;
@@ -39,10 +40,25 @@ export default function pullRequestExtension(
 	let active: AbortController | undefined;
 	let queued = false;
 	let refreshFailureReported = false;
-	let displayedWidget: string | undefined;
+	let displayedWidget: PrDisplay | undefined;
 	let commandGeneration = 0;
 	const activeInvocations = new Map<number, "routing" | "workflow">();
 
+	const setWidget = (ctx: ExtensionContext, display: PrDisplay | undefined): void => {
+		if (display?.widget === undefined) {
+			ctx.ui.setWidget(UI_KEY, undefined);
+			return;
+		}
+		if (ctx.mode === "tui") {
+			ctx.ui.setWidget(UI_KEY, (_tui, theme) => ({
+				invalidate() {},
+				render: (width) => formatPrWidget(display, theme, width)!,
+			}));
+			return;
+		}
+		ctx.ui.setWidget(UI_KEY, formatPrWidget(display));
+	};
+
 	const render = (
 		ctx: ExtensionContext,
 		pullRequest: Awaited<ReturnType<typeof loadCurrentPullRequest>>,
@@ -53,10 +69,10 @@ export default function pullRequestExtension(
 		if (pullRequest !== null && footer === undefined) {
 			throw new Error("Current pull request display is missing a footer");
 		}
-		displayedWidget = formatPrWidget(display);
+		displayedWidget = display.widget === undefined ? undefined : display;
 		const widget = activeInvocations.size > 0 ? undefined : displayedWidget;
 		ctx.ui.setStatus(UI_KEY, footer);
-		ctx.ui.setWidget(UI_KEY, widget === undefined ? undefined : [widget]);
+		setWidget(ctx, widget);
 	};
 
 	const stop = (): void => {
@@ -172,7 +188,7 @@ export default function pullRequestExtension(
 			const generation = sessionGeneration;
 			const invocation = ++commandGeneration;
 			activeInvocations.set(invocation, "routing");
-			if (displayedWidget !== undefined) ctx.ui.setWidget(UI_KEY, undefined);
+			if (displayedWidget !== undefined) setWidget(ctx, undefined);
 			let nextStep: Awaited<ReturnType<typeof commandHandler>>;
 			try {
 				nextStep = await commandHandler(args, ctx);
@@ -181,7 +197,7 @@ export default function pullRequestExtension(
 					cancelRefresh();
 					activeInvocations.delete(invocation);
 					if (!activeInvocations.size) {
-						ctx.ui.setWidget(UI_KEY, displayedWidget === undefined ? undefined : [displayedWidget]);
+						setWidget(ctx, displayedWidget);
 					}
 					refreshInBackground();
 				}
@@ -192,7 +208,7 @@ export default function pullRequestExtension(
 			if (nextStep !== "none" && nextStep !== "merge") {
 				activeInvocations.set(invocation, "workflow");
 				if (nextStep === "create") ctx.ui.setStatus(UI_KEY, undefined);
-				ctx.ui.setWidget(UI_KEY, undefined);
+				setWidget(ctx, undefined);
 			} else {
 				activeInvocations.delete(invocation);
 				refreshInBackground();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "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-update-branch/SKILL.md

@@ -15,7 +15,7 @@ Before changing anything:
 2. Read `LOCAL_BRANCH`'s validated `%(push:short)` with `git for-each-ref` and enumerate configured remote names. Match an exact `<remote>/` prefix, choosing the unique longest match so remote names containing `/` work. Save that remote and the remaining ref as `PUSH_REMOTE` and `PUSH_REF`, then validate `PUSH_REF` with `git check-ref-format --branch`. Require one push URL and validate its GitHub host and owner/repository. Do not use `%(push:remoteref)` or fall back to `LOCAL_BRANCH`.
 3. Set `PR_FIELDS=number,url,state,baseRefName,headRepository,headRefName,headRefOid,mergeStateStatus,mergeable`. On the push target's host, search open pull requests by the exact push owner and `PUSH_REF`. Inspect every candidate by its URL with exactly `PR_FIELDS`; stop for incomplete, capped, duplicate, or ambiguous results. Never use branch-default `gh pr view` or retry with `LOCAL_BRANCH`.
 4. Require exactly one open PR. Require its HTTPS URL to be exactly `HOST/OWNER/REPOSITORY/pull/NUMBER`, with no credentials, port, query, or fragment, and require its number to match. The URL gives the base host and repository. Require `headRepository.nameWithOwner` and `headRefName` to match the recorded push repository and `PUSH_REF`. Require local `HEAD` to equal `headRefOid`. Record the PR and its base/head repositories and refs. Set `EXPECTED_HEAD_SHA` from the initial head OID; never replace it. A fork head and upstream base are normal.
-5. Validate `refs/heads/<BASE_REF>` with `git check-ref-format`, then split the validated base repository into its exact owner and name. Query `repository.ref(qualifiedName: "refs/heads/<BASE_REF>") { name target { oid } }` with `gh api graphql --hostname "$PR_HOST"`. Require no GraphQL errors, the exact recorded repository and ref, and one full hexadecimal target OID. Record that target as `BASE_SHA`; never replace it. Do not read `baseRefOid`, REST `pull.base.sha`, a local remote-tracking ref, or `git ls-remote` as a substitute.
+5. Validate `refs/heads/<BASE_REF>` with `git check-ref-format`, then split the validated base repository into its exact owner and name. Query `repository { nameWithOwner ref(qualifiedName: "refs/heads/<BASE_REF>") { name target { oid } } }` with `gh api graphql --hostname "$PR_HOST"`. Require no GraphQL errors, `repository.nameWithOwner` to exactly equal the recorded `BASE_REPOSITORY`, the exact recorded ref, and one full hexadecimal target OID. Record that target as `BASE_SHA`; never replace it. Do not read `baseRefOid`, REST `pull.base.sha`, a local remote-tracking ref, or `git ls-remote` as a substitute.
 
 ## Fetch, pin, and merge
 
@@ -49,7 +49,7 @@ printf 'Fetched base %s %s at %s\n' "$BASE_REPOSITORY" "$BASE_REF" "$BASE_SHA"
 
 If protocol lookup, API lookup, URL validation, fetch, or object verification fails, stop. The HTTPS helper is command-local and receives credentials only through Git's credential protocol. Never print a token, run `gh auth setup-git`, or change persistent Git config. The recorded `BASE_SHA` is authoritative for this run. Do not fall back to another URL, ref, protocol, or credential source.
 
-Before merging, require the attached branch to remain `LOCAL_BRANCH` and the tree to remain clean. Re-resolve its configured push target exactly as above and require the saved remote, `PUSH_REF`, sole push URL, host, and repository. Re-read the PR by its recorded URL with exactly `PR_FIELDS`; require its number, URL, open state, base repository/ref, head repository, `PUSH_REF`, and head OID to remain unchanged. Re-run the exact live base-ref GraphQL query and require its repository, ref, and target OID to match the recorded values and `BASE_SHA`. Immediately before merging, require local `HEAD` to equal `EXPECTED_HEAD_SHA`:
+Before merging, require the attached branch to remain `LOCAL_BRANCH` and the tree to remain clean. Re-resolve its configured push target exactly as above and require the saved remote, `PUSH_REF`, sole push URL, host, and repository. Re-read the PR by its recorded URL with exactly `PR_FIELDS`; require its number, URL, open state, base repository/ref, head repository, `PUSH_REF`, and head OID to remain unchanged. Re-run the exact live base-ref GraphQL query, including `repository.nameWithOwner`, and require `repository.nameWithOwner` to exactly equal the recorded `BASE_REPOSITORY`; require its ref and target OID to match the recorded values and `BASE_SHA`. Immediately before merging, require local `HEAD` to equal `EXPECTED_HEAD_SHA`:
 
 ```bash
 LOCAL_HEAD="$(git rev-parse --verify HEAD)"
@@ -107,7 +107,7 @@ After the merge completes:
    ```
 
    Stop on either failure. Record the validated full local `HEAD` as `MERGED_HEAD`. Do not substitute a newer ref or another SHA.
-3. Immediately before the single push, repeat the complete branch, configured push target, sole push URL, recorded-URL PR guard, and live base-ref GraphQL query used before merging. Require all saved identities and PR fields to remain exact, the live base target to remain `BASE_SHA`, the tree to be clean, and local `HEAD` to equal `MERGED_HEAD`. Stop on any change.
+3. Immediately before the single push, repeat the complete branch, configured push target, sole push URL, recorded-URL PR guard, and the same live base-ref GraphQL query, including `repository.nameWithOwner`. Require all saved identities and PR fields to remain exact, `repository.nameWithOwner` to exactly equal the recorded `BASE_REPOSITORY`, the live base target to remain `BASE_SHA`, the tree to be clean, and local `HEAD` to equal `MERGED_HEAD`. Stop on any change.
 4. Push once to the saved configured push ref, without force or retry:
 
    ```bash