@henryqw/pi-pr 6.2.2 → 6.2.3

package/README.md

@@ -61,9 +61,9 @@ Run `/pr` in a GitHub checkout. It reads fresh local and GitHub state, takes the
 
 Creation chooses the base from `branch.<branch>.gh-merge-base` or the validated `origin` default branch. It requires a commit ahead or ordinary pending work, including untracked files. It stays silent on the base branch itself. The head may be in a fork on the same GitHub host; other fork relationships block creation. A published ref without a PR, multiple candidate remotes or PRs, and unsafe push configuration also block it.
 
-Local work takes priority over other open-PR routes. Behind or diverged local HEAD blocks publication; a behind base alone never authorizes a rebase. Running CI prevents merging, not a safe earlier route. New or edited standalone comments and review bodies are assessed before merge or waiting; GitHub does not provide a resolution control for these, so they are triaged rather than marked resolved. A sweep makes scoped fixes without a second approval, but new feedback after publication waits for a later `/pr` cycle.
+Local work normally takes priority over other open-PR routes, except when `/pr` finds verified, matching-branch recovery for a conflict rebase or feedback sweep; those workflows resume first. Behind or diverged local HEAD blocks publication; a behind base alone never authorizes a rebase. Running CI prevents merging, not a safe earlier route. New or edited standalone comments and review bodies are assessed before merge or waiting; GitHub does not provide a resolution control for these, so they are triaged rather than marked resolved. A sweep makes scoped fixes without a second approval, but new feedback after publication waits for a later `/pr` cycle.
 
-The footer shows one linked `PR #number` and a text status such as `N unresolved`, `CI failed`, `merge conflict`, or `merge-ready`. The widget shows a route hint without repeating the footer. Status text remains meaningful without color. When `/pr` begins, the widget shows `⠋ Checking pull request…` until route selection; errors use `✗`, warnings `!`, success `✓`, and neutral routes `●`.
+For an identified PR, the footer shows a linked `PR #number` and a text status such as `N unresolved`, `CI failed`, `merge conflict`, or `merge-ready`. Blocked discovery and unavailable status show generic `PR` text without a number or link. The widget shows a route hint without repeating the footer. Status text remains meaningful without color. When `/pr` begins, the widget shows `⠋ Checking pull request…` until route selection; errors use `✗`, warnings `!`, success `✓`, and neutral routes `●`.
 
 ### Refresh and Herdr
 

package/extensions/pr-ui.ts

@@ -35,42 +35,43 @@ export type PrTheme = {
 	fg(color: PrStatusColor | "text", text: string): string;
 };
 
-export function discoveryIssueKey(issue: DiscoveryIssue): string {
-	switch (issue.kind) {
-		case "candidate-remotes-ambiguous":
-			return `${issue.kind}:${[...issue.remotes].sort().join(",")}`;
-		case "candidate-prs-ambiguous":
-			return `${issue.kind}:${issue.urls.map((url) => url.href).sort().join(",")}`;
-		case "candidate-oid-mismatch":
-			return `${issue.kind}:${issue.remote}:${issue.urls.map((url) => url.href).sort().join(",")}`;
-		case "published-without-pr":
-		case "link-configuration":
-			return `${issue.kind}:${issue.remote}`;
-		case "detached-head":
-		case "origin-invalid":
-		case "target-invalid":
-			return issue.kind;
-	}
-}
-
-export function discoveryIssueMessage(issue: DiscoveryIssue): string {
+export function discoveryIssueDetails(issue: DiscoveryIssue): { key: string; message: string } {
 	switch (issue.kind) {
 		case "detached-head":
-			return "PR discovery is blocked because HEAD is detached";
-		case "candidate-remotes-ambiguous":
-			return `PR target is ambiguous across remotes: ${[...issue.remotes].sort().join(", ")}`;
-		case "candidate-prs-ambiguous":
-			return `PR target is ambiguous across pull requests: ${issue.urls.map((url) => url.href).sort().join(", ")}`;
+			return { key: issue.kind, message: "PR discovery is blocked because HEAD is detached" };
+		case "candidate-remotes-ambiguous": {
+			const remotes = [...issue.remotes].sort();
+			return {
+				key: `${issue.kind}:${remotes.join(",")}`,
+				message: `PR target is ambiguous across remotes: ${remotes.join(", ")}`,
+			};
+		}
+		case "candidate-prs-ambiguous": {
+			const urls = issue.urls.map((url) => url.href).sort();
+			return {
+				key: `${issue.kind}:${urls.join(",")}`,
+				message: `PR target is ambiguous across pull requests: ${urls.join(", ")}`,
+			};
+		}
 		case "candidate-oid-mismatch":
-			return `PR discovery is blocked because ${issue.remote} has a different pull request head`;
+			return {
+				key: `${issue.kind}:${issue.remote}:${issue.urls.map((url) => url.href).sort().join(",")}`,
+				message: `PR discovery is blocked because ${issue.remote} has a different pull request head`,
+			};
 		case "published-without-pr":
-			return `Branch is published on ${issue.remote}; configure it before creating a pull request`;
+			return {
+				key: `${issue.kind}:${issue.remote}`,
+				message: `Branch is published on ${issue.remote}; configure it before creating a pull request`,
+			};
 		case "link-configuration":
-			return `PR discovery cannot safely link remote ${issue.remote}; simplify the branch push configuration first`;
+			return {
+				key: `${issue.kind}:${issue.remote}`,
+				message: `PR discovery cannot safely link remote ${issue.remote}; simplify the branch push configuration first`,
+			};
 		case "origin-invalid":
-			return "PR creation is blocked because origin is not one validated GitHub destination";
+			return { key: issue.kind, message: "PR creation is blocked because origin is not one validated GitHub destination" };
 		case "target-invalid":
-			return "PR discovery is blocked by an invalid push target";
+			return { key: issue.kind, message: "PR discovery is blocked by an invalid push target" };
 	}
 }
 

package/extensions/pr.ts

@@ -30,8 +30,7 @@ import {
 } from "./pr-github.ts";
 import { isRecord, parseSingleOutputLine, runChecked } from "./pr-execution.ts";
 import {
-	discoveryIssueKey,
-	discoveryIssueMessage,
+	discoveryIssueDetails,
 	formatPrFooter,
 	formatPrWidget,
 	projectPrDisplay,
@@ -627,9 +626,9 @@ export default function pullRequestExtension(
 		ctx.ui.setStatus(UI_KEY, footer);
 		reconcileWidget(ctx);
 		if (discovery.kind === "blocked") {
-			const key = discoveryIssueKey(discovery.issue);
+			const { key, message } = discoveryIssueDetails(discovery.issue);
 			if (lastBlockedIssueKey !== key) {
-				ctx.ui.notify(discoveryIssueMessage(discovery.issue), "warning");
+				ctx.ui.notify(message, "warning");
 				lastBlockedIssueKey = key;
 			}
 		} else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "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",