@henryqw/pi-pr 2.0.4 → 2.1.1

package/README.md

@@ -14,6 +14,8 @@ The comment sweep resolves its bundled helper and references from the installed
 
 ## Works with
 
+**Requires.** [`@henryqw/pi-herdr`](https://pi.henry.wang/extensions/pi-herdr) is the shared Herdr CLI client. It installs with this package.
+
 **Improves.** [`@henryqw/pi-footer`](https://pi.henry.wang/extensions/pi-footer) shows current-branch pull-request status in the footer.
 
 ## Use
@@ -23,7 +25,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
 
@@ -44,6 +48,16 @@ Each footer entry is one linked `PR #number` plus one plain-language status: `N
 
 `pi-pr-create` honors an existing configured push target. Without one, it pushes a captured OID to the local branch ref on `origin` and sets upstream.
 
+After a `/pr` create workflow settles, the extension waits for a refresh that finds an open current PR. It then ends the Herdr workspace label with one ` · PR #<number>` suffix.
+
+Failed or empty discovery leaves one rename pending for a later refresh. Closed or merged historical matches do not trigger it.
+
+It removes every stale trailing PR suffix before adding the current one. This requires `HERDR_ENV=1` and a non-empty, trimmed `HERDR_WORKSPACE_ID`.
+
+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.
 
 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.
@@ -65,7 +79,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

@@ -3,6 +3,7 @@ import {
 	type ExtensionAPI,
 	type ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+import { createHerdrClient } from "@henryqw/pi-herdr";
 import { createPrCommandHandler } from "./pr-command.ts";
 import {
 	hasLocalCommit,
@@ -12,9 +13,11 @@ import {
 	formatPrFooter,
 	formatPrWidget,
 	projectPrDisplay,
+	type PrDisplay,
 } from "./pr-ui.ts";
 
 const POLL_INTERVAL_MS = 30_000;
+const HERDR_TIMEOUT_MS = 10_000;
 const UI_KEY = "pi-pr";
 const GH_PR_CREATE = /(?:^|[;&|]\s*|\n\s*)gh\s+pr\s+create(?=\s|$|[;&|])/;
 const GIT_COMMIT = /(?:^|[;&|]\s*|\n\s*)git\s+commit(?=\s|$|[;&|])/;
@@ -26,10 +29,54 @@ type PullRequestExtensionDependencies = {
 	createPrCommandHandler?: typeof createPrCommandHandler;
 };
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function parseWorkspaceLabel(response: Record<string, unknown>, workspaceId: string): string {
+	const result = response.result;
+	const workspace = isRecord(result) && isRecord(result.workspace) ? result.workspace : undefined;
+	if (!workspace || workspace.workspace_id !== workspaceId) {
+		throw new Error("workspace get returned a different workspace_id");
+	}
+	const label = workspace.label;
+	if (typeof label !== "string" || !label.trim()) {
+		throw new Error("workspace get returned an empty label");
+	}
+	return label;
+}
+
 export default function pullRequestExtension(
 	pi: ExtensionAPI,
 	dependencies: PullRequestExtensionDependencies = {},
 ): void {
+	const herdr = createHerdrClient(pi.exec.bind(pi));
+	const renameHerdrWorkspace = async (
+		cwd: string,
+		signal: AbortSignal,
+		workspaceId: string,
+		pullRequestNumber: number,
+	): Promise<void> => {
+		signal.throwIfAborted();
+		const current = await herdr.json(["workspace", "get", workspaceId], {
+			cwd,
+			signal,
+			timeout: HERDR_TIMEOUT_MS,
+		});
+		signal.throwIfAborted();
+		const label = parseWorkspaceLabel(current, workspaceId);
+		const normalized = `${label.replace(/(?: · PR #[1-9][0-9]*)+$/, "")} · PR #${pullRequestNumber}`;
+		if (normalized === label) return;
+
+		signal.throwIfAborted();
+		await herdr.run(["workspace", "rename", workspaceId, normalized], {
+			cwd,
+			signal,
+			timeout: HERDR_TIMEOUT_MS,
+		});
+		signal.throwIfAborted();
+	};
+
 	const load = dependencies.loadCurrentPullRequest ?? loadCurrentPullRequest;
 	const detectLocalCommit = dependencies.hasLocalCommit ?? hasLocalCommit;
 	const createCommandHandler = dependencies.createPrCommandHandler ?? createPrCommandHandler;
@@ -39,9 +86,25 @@ export default function pullRequestExtension(
 	let active: AbortController | undefined;
 	let queued = false;
 	let refreshFailureReported = false;
-	let displayedWidget: string | undefined;
+	let pendingWorkspaceRename = false;
+	let displayedWidget: PrDisplay | undefined;
 	let commandGeneration = 0;
-	const activeInvocations = new Map<number, "routing" | "workflow">();
+	const activeInvocations = new Map<number, "routing" | "create-workflow" | "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,
@@ -53,10 +116,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 => {
@@ -64,6 +127,7 @@ export default function pullRequestExtension(
 		context = undefined;
 		queued = false;
 		refreshFailureReported = false;
+		pendingWorkspaceRename = false;
 		displayedWidget = undefined;
 		commandGeneration = 0;
 		activeInvocations.clear();
@@ -85,6 +149,15 @@ export default function pullRequestExtension(
 		}
 	};
 
+	const reportHerdrRenameFailure = (ctx: ExtensionContext, error: unknown): void => {
+		try {
+			const message = error instanceof Error ? error.message : String(error);
+			ctx.ui.notify(`Herdr workspace rename failed: ${message.slice(0, 500)}`, "warning");
+		} catch (reportError) {
+			console.error("Herdr workspace rename failed and could not be reported", error, reportError);
+		}
+	};
+
 	const refresh = async (): Promise<void> => {
 		const ctx = context;
 		if (!ctx) return;
@@ -112,6 +185,20 @@ export default function pullRequestExtension(
 			if (controller.signal.aborted || sessionGeneration !== generation) return;
 			render(ctx, pullRequest, localCommit);
 			refreshFailureReported = false;
+
+			if (pendingWorkspaceRename && pullRequest?.lifecycle === "open") {
+				pendingWorkspaceRename = false;
+				const workspaceId = process.env.HERDR_WORKSPACE_ID?.trim();
+				if (process.env.HERDR_ENV === "1" && workspaceId) {
+					try {
+						await renameHerdrWorkspace(ctx.cwd, controller.signal, workspaceId, pullRequest.number);
+					} catch (error) {
+						if (!controller.signal.aborted && sessionGeneration === generation) {
+							reportHerdrRenameFailure(ctx, error);
+						}
+					}
+				}
+			}
 		} finally {
 			if (active !== controller) return;
 			active = undefined;
@@ -146,13 +233,16 @@ export default function pullRequestExtension(
 	pi.on("agent_settled", async (_event, ctx) => {
 		if (!ctx.hasUI || !ctx.isIdle() || !context) return;
 		let workflowSettled = false;
+		let createWorkflowSettled = false;
 		for (const [invocation, phase] of activeInvocations) {
-			if (phase !== "workflow") continue;
+			if (phase !== "workflow" && phase !== "create-workflow") continue;
 			activeInvocations.delete(invocation);
 			workflowSettled = true;
+			if (phase === "create-workflow") createWorkflowSettled = true;
 		}
 		if (!workflowSettled) return;
 		cancelRefresh();
+		if (createWorkflowSettled) pendingWorkspaceRename = true;
 		await refresh().catch(reportRefreshFailure);
 	});
 
@@ -172,7 +262,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 +271,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();
 				}
@@ -190,9 +280,9 @@ export default function pullRequestExtension(
 			if (sessionGeneration !== generation) return;
 			cancelRefresh();
 			if (nextStep !== "none" && nextStep !== "merge") {
-				activeInvocations.set(invocation, "workflow");
+				activeInvocations.set(invocation, nextStep === "create" ? "create-workflow" : "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.4",
+  "version": "2.1.1",
   "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",
@@ -30,6 +30,9 @@
     "@earendil-works/pi-coding-agent": "^0.85.1",
     "@earendil-works/pi-tui": "^0.85.1"
   },
+  "dependencies": {
+    "@henryqw/pi-herdr": "^0.4.5"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/HenryQW/pi-harness.git",

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

@@ -1024,6 +1024,7 @@ if [ "$1" = pr ] && [ "$2" = view ]; then
   exit 1
 fi
 if [ "$1" = api ] && [ "$2" = graphql ] && [ "$3" = --hostname ] && [ "$4" = ${enterpriseHost} ]; then
+  cat >/dev/null
   echo 'host GraphQL failed' >&2
   exit 1
 fi