@henryqw/pi-pr 6.2.0 → 6.2.1

package/extensions/pr-command.ts

@@ -40,7 +40,7 @@ export type PrCommandInvocation = ((nextStep: NextStep) => void) & {
 export type PrCommandHandler = (
 	args: string,
 	ctx: ExtensionContext,
-	onRouteResolved?: PrCommandInvocation | ((nextStep: NextStep) => void),
+	onRouteResolved?: PrCommandInvocation,
 ) => Promise<NextStep>;
 
 export type WorkflowPromptIdentity = Readonly<{
@@ -234,15 +234,12 @@ export function createPrCommandHandler(
 	const release = dependencies.releaseWorkflow ?? (() => {});
 	const handle = async (
 		args: string, ctx: ExtensionContext,
-		onRouteResolved?: PrCommandInvocation | ((nextStep: NextStep) => void),
+		onRouteResolved?: PrCommandInvocation,
 		linkedAuthority?: CurrentPullRequest,
 	): Promise<NextStep> => {
-		const commandInvocation = onRouteResolved && "assertCurrent" in onRouteResolved
-			? onRouteResolved as PrCommandInvocation
-			: undefined;
 		if (args.trim()) throw new Error("/pr does not accept arguments");
 		const discovery = await load(pi, ctx);
-		commandInvocation?.assertCurrent();
+		onRouteResolved?.assertCurrent();
 		if (linkedAuthority && (discovery.kind !== "current" || discovery.pullRequest.target.provenance !== "configured" ||
 			!isSameConfirmedMerge(linkedAuthority, discovery.pullRequest))) {
 			throw new Error("Link branch continuation cancelled: configured pull request context changed");
@@ -252,20 +249,20 @@ export function createPrCommandHandler(
 			!discovery.pullRequest.conditions.draft && discovery.pullRequest.target.provenance === "configured" &&
 			await inspectBranchRecovery(discovery.pullRequest, ctx)) {
 			nextStep = "update-branch";
-			commandInvocation?.assertCurrent();
+			onRouteResolved?.assertCurrent();
 		}
 		if (nextStep !== "update-branch" && discovery.kind === "current" && discovery.pullRequest.lifecycle === "open" &&
 			!discovery.pullRequest.conditions.draft && discovery.pullRequest.target.provenance === "configured" &&
 			await inspectSweepRecovery(discovery.pullRequest, ctx)) {
 			nextStep = "sweep";
-			commandInvocation?.assertCurrent();
+			onRouteResolved?.assertCurrent();
 		}
 		if (discovery.kind === "current" && (nextStep === "merge" || nextStep === "none") &&
 			discovery.pullRequest.lifecycle === "open" && !discovery.pullRequest.conditions.draft &&
 			discovery.pullRequest.target.provenance === "configured" &&
 			discovery.pullRequest.local.worktree === "clean" && discovery.pullRequest.local.head === "equal") {
 			if (await needsFeedback(discovery.pullRequest, { cwd: ctx.cwd, signal: ctx.signal, load })) nextStep = "sweep";
-			commandInvocation?.assertCurrent();
+			onRouteResolved?.assertCurrent();
 		}
 		onRouteResolved?.(nextStep);
 		if (discovery.kind === "inactive") return nextStep;
@@ -293,7 +290,7 @@ export function createPrCommandHandler(
 
 		if (!(nextStep in WORKFLOWS)) throw new Error(`/pr cannot dispatch route ${nextStep}`);
 		const route = nextStep as WorkflowNextStep;
-		if (commandInvocation?.completedRoutes?.has(route)) {
+		if (onRouteResolved?.completedRoutes?.has(route)) {
 			ctx.ui.notify(`PR ${route} already ran; inspect fresh state before retrying`, "warning");
 			return "none";
 		}
@@ -303,7 +300,7 @@ export function createPrCommandHandler(
 			ctx,
 			route,
 			reservation,
-			commandInvocation,
+			onRouteResolved,
 			reserve,
 			markPromptQueued,
 			release,

package/extensions/pr-routing.ts

@@ -96,7 +96,7 @@ export function isPullRequestCreationEligible(branch: BranchCreationState): bool
 		(branch.ahead > 0 || branch.worktree === "dirty");
 }
 
-function deriveAutomaticNextStep(discovery: PullRequestDiscovery<PullRequest & { target: PullRequestTarget }>): NextStep {
+export function deriveNextStep(discovery: PullRequestDiscovery<PullRequest & { target: PullRequestTarget }>): NextStep {
 	if (discovery.kind === "inactive") return "none";
 	if (discovery.kind === "blocked") return "blocked";
 	if (discovery.kind === "none") return isPullRequestCreationEligible(discovery.branch) ? "create" : "none";
@@ -105,7 +105,3 @@ function deriveAutomaticNextStep(discovery: PullRequestDiscovery<PullRequest & {
 	}
 	return derivePullRequestNextStep(discovery.pullRequest);
 }
-
-export function deriveNextStep(discovery: PullRequestDiscovery<PullRequest & { target: PullRequestTarget }>): NextStep {
-	return deriveAutomaticNextStep(discovery);
-}

package/extensions/pr-ui.ts

@@ -91,14 +91,12 @@ function footerStatus(input: PrDisplayInput): Pick<PrFooter, "text" | "color"> {
 	return { text: "open", color: "accent" };
 }
 
-function widgetText(input: PrDisplayInput, nextStep: NextStep): string | undefined {
+function widgetText(nextStep: NextStep): string | undefined {
 	switch (nextStep) {
 		case "publish-work":
 			return "Run /pr to publish local work";
 		case "update-branch":
-			return input.conditions.conflict
-				? "Run /pr to resolve merge conflict"
-				: "Run /pr to update branch";
+			return "Run /pr to resolve merge conflict";
 		case "sweep":
 			return "Run /pr to address review feedback";
 		case "fix-ci":
@@ -145,7 +143,7 @@ export function projectPrDisplay(
 			url: input.url.href,
 			...footerStatus(input),
 		},
-		widget: widgetText(input, nextStep),
+		widget: widgetText(nextStep),
 	};
 }
 

package/package.json

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