@henryqw/pi-pr 4.0.6 → 4.0.9

package/README.md

@@ -44,9 +44,12 @@ Run `/pr` in a GitHub checkout. It reads fresh pull request and local state, the
 
 For creation, put an optional base branch first. For example, run `/pr --base release/2026 Keep the title concise.` The base is a branch name, not a host or repository. Only creation accepts the base and remaining guidance. Other routes reject them instead of ignoring them.
 
+Run `/pr --feedback` to explicitly start or resume a feedback sweep. Use it for actionable conversation comments that do not select the sweep automatically. It cannot be combined with a base, other options, or instructions.
+
 | Surface | Type | Purpose |
 | --- | --- | --- |
 | `/pr [--base BRANCH] [creation instructions]` | command | Run the current pull request's next safe route. |
+| `/pr --feedback` | command | Explicitly start or resume the guarded feedback sweep. |
 | Footer | ui | Show a linked `PR #number` and one plain-language status. |
 | Widget | ui | Show one action hint or transient routing status. |
 
@@ -64,17 +67,18 @@ Each footer entry is one linked `PR #number` plus one plain-language status: `N
 
 | Current condition | `/pr` route |
 | --- | --- |
-| No current-branch pull request, no published matching ref, safe Git push configuration, and a commit ahead of the selected base | Start pull-request creation. |
+| No current-branch pull request, no published matching ref, safe Git push configuration, and a commit or ordinary pending work | Start pull-request creation. |
 | One open pull request inferred from a published matching ref | Confirm the exact `remote/ref`, then link the local branch. |
 | Ambiguous or unsafe discovery | Show the blocked reason and do not mutate Git or GitHub. |
 | Base update required or merge conflict | Update from the base branch's current target when the tree is clean and local HEAD equals the PR head. |
 | GitHub Actions job failed | Run the CI fix workflow when the same local prerequisite holds. |
 | External check or commit status failed | Show `CI failed` as a no-action blocker. |
-| Changes requested or unresolved review threads | Run the package comment sweep when the same local prerequisite holds. |
+| Changes requested or unresolved review threads | Start or resume the package comment sweep when the same local prerequisite holds. |
+| Explicit `/pr --feedback` on an open, configured pull request | Start or resume the sweep when the tree is clean and local HEAD equals the PR head. |
 | No-action state | Report the state without taking action. |
 | Merge-ready pull request | Ask for final confirmation, recheck fresh state, and squash-merge if confirmed. |
 
-`pi-pr-create` selects its base in this order: the leading `/pr --base BRANCH`, one `branch.<branch>.gh-merge-base` value, then the default branch of validated `origin`. It captures the selected base OID and merge-base. Creation requires at least one committed change ahead. Dirty work alone does not enable creation. If the current branch is the selected base, pi-pr stays silent because GitHub cannot create a pull request from a ref to itself.
+`pi-pr-create` selects its base in this order: the leading `/pr --base BRANCH`, one `branch.<branch>.gh-merge-base` value, then the default branch of validated `origin`. It captures the selected base OID and merge-base. Creation requires a commit ahead or ordinary pending work, including untracked files. A Git operation in progress does not count as pending work. If the current branch is the selected base, pi-pr stays silent because GitHub cannot create a pull request from a ref to itself.
 
 The base always comes from validated `origin`. The head may use that repository or a fork with the same GitHub source. Base and head must use the same GitHub host. Other fork relationships stop before mutation.
 
@@ -90,6 +94,12 @@ The creation workflow repeats destination, remote OID, PR, and configuration che
 
 Each helper workflow receives a random run ID and its first action. The run stays bound to one session, canonical worktree, route, and fresh authority. Helper calls from another run, session, worktree, or route fail.
 
+For comment sweeps, `/pr` checks the package recovery file without changing it. It selects `start` when recovery is absent. It selects `resume` only when valid recovery matches the fresh route authority. Invalid recovery stays unchanged and blocks dispatch with its path and reason.
+
+`/pr --feedback` uses the same discovery, reservation, recovery, and guard checks. It can select the sweep even when CI failure or merge readiness would otherwise select another route. Without the flag, route priority stays unchanged.
+
+Direct skill or `pi_pr_*` tool calls cannot create route authority. Run `/pr` to reserve a fresh route.
+
 Only one helper run can exist at a time. Most runs expire when the agent settles. A create or branch-update conflict stays available for one user-guided continuation, then expires after that continuation settles. Session replacement and shutdown forget the run without aborting or cleaning a pending merge.
 
 After a `/pr` create workflow settles, the extension waits for a refresh that finds a configured current PR. It then prefixes the Herdr workspace label with `#<number> • `.
@@ -117,7 +127,7 @@ A missing pull request uses creation. For an existing pull request, the first ma
 5. Waiting or local safety block: no action.
 6. Merge-ready: allow clean local HEAD equal to or behind the PR head. Confirm, then merge directly.
 
-Ordinary conversation comments do not trigger a route or block a merge. Changes requested and unresolved review threads can select the package comment sweep.
+Ordinary conversation comments do not trigger a route or block a merge. Changes requested and unresolved review threads can select the package comment sweep. Use `/pr --feedback` when a conversation comment needs action.
 
 The comment sweep resolves its bundled helper and references from the installed package skill path. It does not require an external `jq` executable.
 
@@ -133,7 +143,7 @@ The footer and widget load once at session start. A directory outside a Git work
 
 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. There is no periodic presentation refresh, so external changes may leave the footer and widget stale indefinitely. `/pr` reads fresh state before routing or acting and remains authoritative.
 
-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, except when fresh lookup hits the GitHub API quota: it shows the sanitized message `GitHub API rate limit exhausted; retry after GitHub resets it` and does not immediately retry.
+The create widget stays hidden on a clean branch with no commit ahead. It appears for a commit ahead or ordinary pending work. It stays hidden during a Git operation and when the current branch is the selected base. `/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, except when fresh lookup hits the GitHub API quota: it shows the sanitized message `GitHub API rate limit exhausted; retry after GitHub resets it` and does not immediately retry.
 
 Presentation uses route priority, so draft appears before running CI. `/pr` reads fresh state before routing or merging. The command is authoritative for actions.
 
@@ -147,9 +157,9 @@ The GitHub response must match the observed URL, host, repository, head ref, hea
 
 ## Limits and recovery
 
-- `/pr` accepts creation syntax only as a leading `--base BRANCH`, followed by optional creation guidance. It does not open a browser.
+- `/pr` accepts either standalone `--feedback` or creation syntax with leading `--base BRANCH` and optional guidance. It rejects unknown or conflicting options. It does not open a browser.
 - It does not run `/done` or `/sweep`.
-- Presentation refreshes do not auto-triage comments or start a workflow. The package comment sweep runs only when an explicit `/pr` selects it.
+- Presentation refreshes do not auto-triage comments or start a workflow. The package comment sweep starts or resumes only when an explicit `/pr` selects it.
 - It does not enable auto-merge or add a merge queue.
 - It does not rebase the local branch, overwrite concurrent remote updates, delete branches, or clean up worktrees. Creation uses exact leases plus ancestry checks; an empty lease is only an atomic absence check.
 - Creation, discovery, and comment-sweep pushes require one unambiguous push URL for the configured destination.

package/extensions/pr-command.ts

@@ -11,21 +11,26 @@ import {
 } from "./pr-github.ts";
 import {
 	deriveNextStep,
+	deriveRouteDecision,
+	type FeedbackRouteBlocker,
 	type NextStep,
 	type PullRequestTarget,
+	type RouteIntent,
 } from "./pr-routing.ts";
 
 export type WorkflowNextStep = Extract<NextStep, "create" | "update-branch" | "sweep" | "fix-ci">;
 
-const WORKFLOWS: Record<WorkflowNextStep, { command: string; action: string }> = {
-	create: { command: "skill:pi-pr-create", action: "prepare" },
-	"update-branch": { command: "skill:pi-pr-update-branch", action: "merge" },
-	sweep: { command: "skill:pi-pr-comment-sweep", action: "start" },
-	"fix-ci": { command: "skill:pi-pr-fix-ci", action: "collect" },
+const WORKFLOWS: Record<WorkflowNextStep, { command: string }> = {
+	create: { command: "skill:pi-pr-create" },
+	"update-branch": { command: "skill:pi-pr-update-branch" },
+	sweep: { command: "skill:pi-pr-comment-sweep" },
+	"fix-ci": { command: "skill:pi-pr-fix-ci" },
 };
 export type WorkflowReservation =
 	| { route: "create"; target: PullRequestTarget; base?: string }
 	| { route: Exclude<WorkflowNextStep, "create">; pullRequest: CurrentPullRequest };
+export type WorkflowLaunchAction = "prepare" | "merge" | "start" | "resume" | "collect";
+export type WorkflowReservationResult = { runId: string; action: WorkflowLaunchAction };
 
 type PrCommandPi = Pick<ExtensionAPI, "exec" | "getCommands" | "sendUserMessage">;
 export type PrCommandInvocation = ((nextStep: NextStep) => void) & {
@@ -42,7 +47,7 @@ export type WorkflowPromptIdentity = Readonly<{
 	route: WorkflowNextStep;
 	skill: string;
 	runId: string;
-	action: string;
+	action: WorkflowLaunchAction;
 }>;
 
 export type PrCommandDependencies = {
@@ -52,25 +57,49 @@ export type PrCommandDependencies = {
 		reservation: WorkflowReservation,
 		ctx: ExtensionCommandContext,
 		invocation?: PrCommandInvocation,
-	) => Promise<string>;
+	) => Promise<WorkflowReservationResult>;
 	markWorkflowPromptQueued?: (identity: WorkflowPromptIdentity, queued: boolean) => void;
 	releaseWorkflow?: (runId: string, invocation?: PrCommandInvocation) => void;
 };
 
 type ParsedPrArguments = {
 	base?: string;
+	intent: RouteIntent;
 	instructions: string;
 };
 
 function parsePrArguments(args: string): ParsedPrArguments {
 	const leading = args.trimStart();
+	const trimmed = leading.trim();
+	if (leading.startsWith("--feedback=")) throw new Error("/pr feedback syntax is --feedback");
+	if (/^--feedback(?:\s|$)/.test(leading)) {
+		if (trimmed !== "--feedback") throw new Error("/pr --feedback cannot be combined with other options or instructions");
+		return { intent: "feedback", instructions: "" };
+	}
+	if (/(?:^|\s)--feedback(?=\s|=|$)/.test(leading)) {
+		throw new Error("/pr --feedback cannot be combined with other options or instructions");
+	}
 	if (leading.startsWith("--base=")) throw new Error("/pr base syntax is --base <branch>");
-	if (!leading.startsWith("--base") || !/^--base(?:\s|$)/.test(leading)) {
-		return { instructions: args.trim() };
+	if (/^--base(?:\s|$)/.test(leading)) {
+		const value = /^--base\s+(\S+)/.exec(leading);
+		if (!value) throw new Error("/pr --base requires a branch");
+		const instructions = leading.slice(value[0].length).trim();
+		if (instructions.startsWith("--")) throw new Error(`Unknown /pr option: ${instructions.split(/\s+/, 1)[0]}`);
+		return { base: value[1]!, intent: "automatic", instructions };
+	}
+	if (leading.startsWith("--")) throw new Error(`Unknown /pr option: ${leading.split(/\s+/, 1)[0]}`);
+	return { intent: "automatic", instructions: args.trim() };
+}
+
+function feedbackBlockerMessage(blocker: FeedbackRouteBlocker): string {
+	switch (blocker.kind) {
+		case "discovery-blocked": return "/pr --feedback is blocked because pull request discovery is unsafe";
+		case "pull-request-unavailable": return "/pr --feedback requires a current pull request";
+		case "pull-request-not-open": return "/pr --feedback requires an open pull request";
+		case "target-not-configured": return "/pr --feedback requires a configured pull request target; run /pr to link the branch first";
+		case "worktree-dirty": return "/pr --feedback is blocked by a dirty worktree";
+		case "head-not-equal": return `/pr --feedback is blocked by local HEAD ${blocker.relation}`;
 	}
-	const value = /^--base\s+(\S+)/.exec(leading);
-	if (!value) throw new Error("/pr --base requires a branch");
-	return { base: value[1]!, instructions: leading.slice(value[0].length).trim() };
 }
 
 function workflowReservation(
@@ -96,7 +125,7 @@ function packageWorkflowCommand(pi: PrCommandPi, route: WorkflowNextStep) {
 		candidate.sourceInfo.origin === "package"
 	);
 	if (!command) throw new Error(`${workflow.command} failed: bundled workflow is unavailable`);
-	return { command, action: workflow.action };
+	return command;
 }
 
 async function dispatchWorkflow(
@@ -113,10 +142,11 @@ async function dispatchWorkflow(
 	const workflow = packageWorkflowCommand(pi, route);
 	let runId: string | undefined;
 	try {
-		runId = await reserve(reservation, ctx, invocation);
+		const reserved = await reserve(reservation, ctx, invocation);
+		runId = reserved.runId;
 		invocation?.assertCurrent();
 		const queued = !ctx.isIdle();
-		const identity = { route, skill: workflow.command.name, runId, action: workflow.action };
+		const identity = { route, skill: workflow.name, runId, action: reserved.action };
 		markPromptQueued(identity, queued);
 		const options = queued
 			? { deliverAs: "followUp" as const, expandPromptTemplates: true }
@@ -254,11 +284,13 @@ export function createPrCommandHandler(
 		const commandInvocation = onRouteResolved && "assertCurrent" in onRouteResolved
 			? onRouteResolved as PrCommandInvocation
 			: undefined;
-		const { base, instructions } = parsePrArguments(args);
+		const { base, intent, instructions } = parsePrArguments(args);
 		const discovery = await load(pi, ctx, undefined, undefined, base);
 		commandInvocation?.assertCurrent();
-		const nextStep = deriveNextStep(discovery);
+		const decision = deriveRouteDecision(discovery, intent);
+		const nextStep = decision.nextStep;
 		onRouteResolved?.(nextStep);
+		if (decision.kind === "feedback-blocked") throw new Error(feedbackBlockerMessage(decision.blocker));
 		if (base !== undefined && nextStep !== "create") {
 			throw new Error("/pr --base is accepted only for pull request creation");
 		}

package/extensions/pr-comment-sweep.ts

@@ -1,6 +1,6 @@
 import { createHash, randomUUID } from "node:crypto";
-import { lstat, realpath, rm } from "node:fs/promises";
-import { join, resolve } from "node:path";
+import { realpath, rm } from "node:fs/promises";
+import { join } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
 	extensionConfigDir,
@@ -27,6 +27,7 @@ import {
 	type PullRequestLoadContext,
 } from "./pr-github.ts";
 import {
+	inspectGitOperation,
 	isAncestor,
 	parseNulPaths,
 	parseStatusSnapshot,
@@ -46,7 +47,6 @@ export const SWEEP_RECOVERY_MAX_BYTES = 1024 * 1024;
 
 const STATE_VERSION = 1;
 const STATE_FILE = "state.json";
-const GIT_OPERATION_STATES = ["MERGE_HEAD", "rebase-merge", "rebase-apply", "CHERRY_PICK_HEAD", "REVERT_HEAD", "sequencer"];
 const LEDGER_NOTE_MAX_BYTES = 2 * 1024;
 const CHECK_MAX_COUNT = 32;
 const CHECK_ARGUMENTS_MAX_BYTES = 32 * 1024;
@@ -231,6 +231,16 @@ function sameLinkage(expected: SweepAuthority, current: SweepAuthority, remoteHe
 		current.target.remoteOid === remoteHead;
 }
 
+function recoveryMatchesRouteAuthority(state: SweepState, suppliedAuthority: SweepAuthority): boolean {
+	const permittedHeads = new Set<string>();
+	if (state.attempts.push.state !== "applied") permittedHeads.add(state.original.lease);
+	if (
+		(state.attempts.push.state === "attempting" || state.attempts.push.state === "unknown" || state.attempts.push.state === "applied") &&
+		state.publicationHead
+	) permittedHeads.add(state.publicationHead);
+	return [...permittedHeads].some((head) => sameLinkage(state.authority, suppliedAuthority, head));
+}
+
 function feedbackMatchesAuthority(snapshot: FeedbackSnapshot, authority: SweepAuthority, head: string): boolean {
 	const current = snapshot.pullRequest;
 	return current.id === authority.id && current.number === authority.number && current.url === authority.url &&
@@ -575,6 +585,17 @@ export class PullRequestCommentSweep {
 		return (await this.location()).path;
 	}
 
+	async recoveryLaunchAction(): Promise<"start" | "resume"> {
+		if (!this.suppliedAuthority) throw new Error("Comment sweep recovery inspection requires route authority");
+		const location = await this.location();
+		const state = await this.loadIfPresent(location);
+		if (!state) return "start";
+		if (!recoveryMatchesRouteAuthority(state, this.suppliedAuthority)) {
+			throw new Error(`Comment sweep recovery is preserved at ${location.path}: recovery does not match freshly discovered route authority`);
+		}
+		return "resume";
+	}
+
 	private async loadState(location: Awaited<ReturnType<PullRequestCommentSweep["location"]>>): Promise<SweepState> {
 		const raw = await readTextFileBounded(location.path, SWEEP_RECOVERY_MAX_BYTES, { signal: this.signal });
 		let value: unknown;
@@ -619,23 +640,8 @@ export class PullRequestCommentSweep {
 	}
 
 	private async requireNoGitOperation(): Promise<void> {
-		const paths = await runChecked(this.exec, "git", [
-			"rev-parse", ...GIT_OPERATION_STATES.flatMap((state) => ["--git-path", state]),
-		], this.options());
-		const normalized = paths.stdout.replace(/\r\n/g, "\n");
-		const values = (normalized.endsWith("\n") ? normalized.slice(0, -1) : normalized).split("\n");
-		if (values.length !== GIT_OPERATION_STATES.length || values.some((path) => !path)) {
-			throw new Error("Git operation state path resolution returned invalid output");
-		}
-		for (const [index, path] of values.entries()) {
-			try {
-				await lstat(resolve(this.cwd, path));
-				throw new Error(`${GIT_OPERATION_STATES[index]} is in progress`);
-			} catch (error) {
-				if (error && typeof error === "object" && (error as NodeJS.ErrnoException).code === "ENOENT") continue;
-				throw error;
-			}
-		}
+		const operation = await inspectGitOperation(this.exec, this.options());
+		if (operation !== null) throw new Error(`${operation} is in progress`);
 	}
 
 	private async localPaths(): Promise<string[]> {
@@ -789,17 +795,10 @@ export class PullRequestCommentSweep {
 	async resume(): Promise<SweepStatus> {
 		return await withWorktreeLock(this.cwd, async () => {
 			if (!this.suppliedAuthority) throw new Error("Comment sweep resume requires route authority");
-			const suppliedAuthority = this.suppliedAuthority;
 			const location = await this.location();
 			const state = await this.loadState(location);
-			const permittedHeads = new Set<string>();
-			if (state.attempts.push.state !== "applied") permittedHeads.add(state.original.lease);
-			if (
-				(state.attempts.push.state === "attempting" || state.attempts.push.state === "unknown" || state.attempts.push.state === "applied") &&
-				state.publicationHead
-			) permittedHeads.add(state.publicationHead);
-			if (![...permittedHeads].some((head) => sameLinkage(state.authority, suppliedAuthority, head))) {
-				throw new Error("Comment sweep recovery does not match supplied route authority");
+			if (!recoveryMatchesRouteAuthority(state, this.suppliedAuthority)) {
+				throw new Error(`Comment sweep recovery is preserved at ${location.path}: recovery does not match supplied route authority`);
 			}
 			await this.reconcile(state);
 			state.attempts.resolutions = state.attempts.resolutions.filter(({ state: attempt }) => attempt !== "blocked");

package/extensions/pr-create.ts

@@ -15,7 +15,10 @@ import {
 	type PullRequestLoadContext,
 	type PullRequestPublication,
 } from "./pr-github.ts";
-import type { PullRequestTarget } from "./pr-routing.ts";
+import {
+	isPullRequestCreationEligible,
+	type PullRequestTarget,
+} from "./pr-routing.ts";
 import {
 	assertOnlyDeclaredStatusChanged,
 	inspectWorktree,
@@ -221,13 +224,14 @@ export class PullRequestCreator {
 		return { cwd: this.cwd, signal: this.signal ?? new AbortController().signal };
 	}
 
-	private async freshNone(): Promise<void> {
+	private async freshNone() {
 		const discovery = await this.load(this.pi(), this.context(), undefined, undefined, this.explicitBase);
 		if (discovery.kind !== "none" || !sameTarget(this.target, discovery.creationTarget)) {
 			throw new Error("PR creation cancelled: fresh complete discovery is no longer none");
 		}
 		const branch = line((await runChecked(this.exec, "git", ["branch", "--show-current"], this.options())).stdout, "current branch");
 		if (branch !== this.target.branch) throw new Error("PR creation cancelled: current branch changed");
+		return discovery;
 	}
 
 	private async liveBase(): Promise<string> {
@@ -270,8 +274,11 @@ export class PullRequestCreator {
 				this.target,
 				this.explicitBase,
 			);
-			if (preflight.ahead === 0) {
-				throw new Error("PR creation requires at least one commit ahead of the selected base");
+			if (preflight.worktree === "operation") {
+				throw new Error("PR creation cannot prepare while a Git operation is in progress");
+			}
+			if (!isPullRequestCreationEligible({ ...preflight, relation: "distinct-ref" })) {
+				throw new Error("PR creation requires at least one commit ahead of the selected base or pending work");
 			}
 			const { base } = preflight;
 			this.state.base = {
@@ -286,11 +293,14 @@ export class PullRequestCreator {
 				"fetch", "--no-write-fetch-head", "--no-tags", "--no-recurse-submodules", base.fetchSource, base.oid,
 			], this.options());
 			await runChecked(this.exec, "git", ["cat-file", "-e", `${base.oid}^{commit}`], this.options());
-			await this.freshNone();
+			const fresh = await this.freshNone();
 			if (await readHead(this.exec, this.options()) !== preflight.head) {
 				throw new Error("PR creation cancelled: local HEAD changed during prepare");
 			}
 			if (await this.liveBase() !== base.oid) throw new Error("PR creation cancelled: base ref moved during prepare");
+			if (!isPullRequestCreationEligible(fresh.branch)) {
+				throw new Error("PR creation cancelled: branch no longer has a committed change or pending work");
+			}
 			this.state.phase = "prepared";
 			return { kind: "prepared", base: { ...this.state.base }, mergeBase: base.mergeBase };
 		}, { agentDir: this.agentDir, signal: this.signal });

package/extensions/pr-execution.ts

@@ -37,6 +37,7 @@ export type ExecOptions = {
 export type Exec = (command: string, args: string[], options: ExecOptions) => Promise<ExecResult>;
 
 export type AttemptState = "none" | "attempting" | "applied" | "blocked" | "unknown";
+export type GitWorktreeState = "clean" | "dirty" | "operation";
 
 function positiveInteger(value: number, label: string): number {
 	if (!Number.isSafeInteger(value) || value <= 0) throw new TypeError(`${label} must be a positive safe integer`);
@@ -236,9 +237,8 @@ export async function runChecked(
 	return result;
 }
 
-/** Inspect both porcelain state and Git operation markers without mutating the repository. */
-export async function inspectWorktree(exec: Exec, options: ExecOptions): Promise<"clean" | "dirty"> {
-	const status = await runChecked(exec, "git", ["status", "--porcelain=v1", "--untracked-files=all"], options);
+/** Return the active Git operation marker without mutating the repository. */
+export async function inspectGitOperation(exec: Exec, options: ExecOptions): Promise<string | null> {
 	const stateOutput = await runChecked(exec, "git", [
 		"rev-parse",
 		...GIT_OPERATION_STATES.flatMap((state) => ["--git-path", state]),
@@ -251,7 +251,7 @@ export async function inspectWorktree(exec: Exec, options: ExecOptions): Promise
 	for (const [index, path] of statePaths.entries()) {
 		try {
 			await lstat(resolve(options.cwd, path));
-			return "dirty";
+			return GIT_OPERATION_STATES[index]!;
 		} catch (error) {
 			if (error && typeof error === "object" && (error as NodeJS.ErrnoException).code === "ENOENT") continue;
 			const code = error && typeof error === "object" && typeof (error as NodeJS.ErrnoException).code === "string"
@@ -260,9 +260,21 @@ export async function inspectWorktree(exec: Exec, options: ExecOptions): Promise
 			throw new Error(`Git operation state inspection failed for ${GIT_OPERATION_STATES[index]}: ${code}`);
 		}
 	}
+	return null;
+}
+
+/** Distinguish ordinary pending work from an in-progress Git operation. */
+export async function inspectWorktreeState(exec: Exec, options: ExecOptions): Promise<GitWorktreeState> {
+	const status = await runChecked(exec, "git", ["status", "--porcelain=v1", "--untracked-files=all"], options);
+	if (await inspectGitOperation(exec, options) !== null) return "operation";
 	return status.stdout === "" ? "clean" : "dirty";
 }
 
+/** Inspect both porcelain state and Git operation markers without mutating the repository. */
+export async function inspectWorktree(exec: Exec, options: ExecOptions): Promise<"clean" | "dirty"> {
+	return await inspectWorktreeState(exec, options) === "clean" ? "clean" : "dirty";
+}
+
 /** Exclude concurrent PR mutations for one canonical worktree and pi-pr namespace. */
 export async function withWorktreeLock<T>(
 	cwd: string,

package/extensions/pr-github.ts

@@ -5,7 +5,11 @@ import type {
 import { lstatSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { inspectLocalMergeSafety } from "./pr-merge.ts";
-import { withWorktreeLock } from "./pr-execution.ts";
+import {
+	inspectWorktreeState,
+	withWorktreeLock,
+	type GitWorktreeState,
+} from "./pr-execution.ts";
 import type {
 	CiStatus,
 	LocalMergeSafety,
@@ -112,10 +116,11 @@ export type PullRequestCreationPreflight = {
 		mergeBase: string;
 	};
 	ahead: number;
+	worktree: GitWorktreeState;
 };
 
 type CreationPreflightResult =
-	| { kind: "same-ref" }
+	| { kind: "same-ref"; worktree: GitWorktreeState }
 	| { kind: "distinct-ref"; preflight: PullRequestCreationPreflight };
 
 type CreationIdentity = {
@@ -1158,6 +1163,24 @@ function parseCreationAhead(output: string): number {
 	return ahead;
 }
 
+async function inspectCreationWorktree(
+	pi: Pick<ExtensionAPI, "exec">,
+	context: PullRequestLoadContext,
+): Promise<GitWorktreeState> {
+	try {
+		return await inspectWorktreeState(
+			async (command, args) => await invoke(pi, context, "Inspect creation worktree", command, args),
+			{ cwd: context.cwd, signal: context.signal },
+		);
+	} catch (error) {
+		if (error instanceof PullRequestLoadError) throw error;
+		return fail(
+			"Inspect creation worktree",
+			error instanceof Error ? error.message : "inspection failed",
+		);
+	}
+}
+
 async function preflightCreation(
 	pi: Pick<ExtensionAPI, "exec">,
 	context: PullRequestLoadContext,
@@ -1176,7 +1199,8 @@ async function preflightCreation(
 		: await validateCreationRef(pi, context, explicitBaseRef);
 	const baseRef = configuredBaseRef ?? await readDefaultCreationBaseRef(pi, context, origin);
 	const relation = await inspectCreationRepositoryRelation(pi, context, identity.target, origin, baseRef);
-	if (relation === "same-ref") return { kind: relation };
+	const worktree = await inspectCreationWorktree(pi, context);
+	if (relation === "same-ref") return { kind: relation, worktree };
 	const trackingRef = `refs/remotes/origin/${baseRef}`;
 	await execute(pi, context, "Fetch creation base", "git", [
 		"fetch", "--no-write-fetch-head", "--no-tags", "--no-recurse-submodules", "--",
@@ -1208,6 +1232,7 @@ async function preflightCreation(
 				mergeBase,
 			},
 			ahead,
+			worktree,
 		},
 	};
 }
@@ -1236,7 +1261,9 @@ async function creationDiscovery(
 	return {
 		kind: "none",
 		creationTarget: target,
-		branch: { ahead: result.kind === "same-ref" ? 0 : result.preflight.ahead },
+		branch: result.kind === "same-ref"
+			? { ahead: 0, worktree: result.worktree, relation: result.kind }
+			: { ahead: result.preflight.ahead, worktree: result.preflight.worktree, relation: result.kind },
 	};
 }
 

package/extensions/pr-routing.ts

@@ -40,6 +40,8 @@ export type PullRequestTarget = {
 
 export type BranchCreationState = {
 	ahead: number;
+	worktree: "clean" | "dirty" | "operation";
+	relation: "same-ref" | "distinct-ref";
 };
 
 export type DiscoveryIssue =
@@ -59,6 +61,17 @@ export type PullRequestDiscovery<T extends PullRequest = PullRequest> =
 	| { kind: "inactive" };
 
 export type NextStep = "create" | "link-branch" | "blocked" | "none" | "update-branch" | "sweep" | "fix-ci" | "merge";
+export type RouteIntent = "automatic" | "feedback";
+export type FeedbackRouteBlocker =
+	| { kind: "discovery-blocked" }
+	| { kind: "pull-request-unavailable" }
+	| { kind: "pull-request-not-open" }
+	| { kind: "target-not-configured" }
+	| { kind: "worktree-dirty" }
+	| { kind: "head-not-equal"; relation: Exclude<LocalHeadRelation, "equal"> };
+export type RouteDecision =
+	| { kind: "selected"; nextStep: NextStep }
+	| { kind: "feedback-blocked"; nextStep: "blocked"; blocker: FeedbackRouteBlocker };
 
 function localMutationSafe(local: LocalMergeSafety): boolean {
 	return local.worktree === "clean" && local.head === "equal";
@@ -88,12 +101,52 @@ export function derivePullRequestNextStep(pullRequest: PullRequest): Exclude<Nex
 	return "merge";
 }
 
-export function deriveNextStep(discovery: PullRequestDiscovery<PullRequest & { target: PullRequestTarget }>): NextStep {
+export function isPullRequestCreationEligible(branch: BranchCreationState): boolean {
+	return branch.relation === "distinct-ref" && branch.worktree !== "operation" &&
+		(branch.ahead > 0 || branch.worktree === "dirty");
+}
+
+function deriveAutomaticNextStep(discovery: PullRequestDiscovery<PullRequest & { target: PullRequestTarget }>): NextStep {
 	if (discovery.kind === "inactive") return "none";
 	if (discovery.kind === "blocked") return "blocked";
-	if (discovery.kind === "none") return discovery.branch.ahead > 0 ? "create" : "none";
+	if (discovery.kind === "none") return isPullRequestCreationEligible(discovery.branch) ? "create" : "none";
 	if (discovery.pullRequest.target.provenance === "inferred") {
 		return discovery.pullRequest.lifecycle === "open" ? "link-branch" : "none";
 	}
 	return derivePullRequestNextStep(discovery.pullRequest);
 }
+
+export function deriveRouteDecision(
+	discovery: PullRequestDiscovery<PullRequest & { target: PullRequestTarget }>,
+	intent: RouteIntent = "automatic",
+): RouteDecision {
+	if (intent === "automatic") return { kind: "selected", nextStep: deriveAutomaticNextStep(discovery) };
+	if (discovery.kind === "blocked") {
+		return { kind: "feedback-blocked", nextStep: "blocked", blocker: { kind: "discovery-blocked" } };
+	}
+	if (discovery.kind !== "current") {
+		return { kind: "feedback-blocked", nextStep: "blocked", blocker: { kind: "pull-request-unavailable" } };
+	}
+	const pullRequest = discovery.pullRequest;
+	if (pullRequest.lifecycle !== "open") {
+		return { kind: "feedback-blocked", nextStep: "blocked", blocker: { kind: "pull-request-not-open" } };
+	}
+	if (pullRequest.target.provenance !== "configured") {
+		return { kind: "feedback-blocked", nextStep: "blocked", blocker: { kind: "target-not-configured" } };
+	}
+	if (pullRequest.local.worktree !== "clean") {
+		return { kind: "feedback-blocked", nextStep: "blocked", blocker: { kind: "worktree-dirty" } };
+	}
+	if (pullRequest.local.head !== "equal") {
+		return {
+			kind: "feedback-blocked",
+			nextStep: "blocked",
+			blocker: { kind: "head-not-equal", relation: pullRequest.local.head },
+		};
+	}
+	return { kind: "selected", nextStep: "sweep" };
+}
+
+export function deriveNextStep(discovery: PullRequestDiscovery<PullRequest & { target: PullRequestTarget }>): NextStep {
+	return deriveRouteDecision(discovery).nextStep;
+}

package/extensions/pr.ts

@@ -140,7 +140,7 @@ const FixCiParameters = Type.Union([
 
 type UpdateBranchWorkflow = Pick<PullRequestBranchUpdater, "state" | "merge" | "continue" | "publish">;
 type CreateWorkflow = Pick<PullRequestCreator, "state" | "prepare" | "merge" | "continue" | "push" | "publish">;
-type SweepWorkflow = Pick<PullRequestCommentSweep, "start" | "resume" | "show" | "record" | "publish" | "refresh" | "resolve" | "finalize">;
+type SweepWorkflow = Pick<PullRequestCommentSweep, "recoveryLaunchAction" | "start" | "resume" | "show" | "record" | "publish" | "refresh" | "resolve" | "finalize">;
 type FixCiWorkflow = Pick<PullRequestCiFixer, "collect" | "publish">;
 
 type WorkflowContextBase = {
@@ -337,7 +337,7 @@ export default function pullRequestExtension(
 						loadCurrentPullRequest: load,
 					}),
 				};
-				break;
+				return { runId, action: "merge" };
 			case "create":
 				workflowContext = {
 					...common,
@@ -350,9 +350,9 @@ export default function pullRequestExtension(
 						loadCurrentPullRequest: load,
 					}),
 				};
-				break;
-			case "sweep":
-				workflowContext = {
+				return { runId, action: "prepare" };
+			case "sweep": {
+				const selected: Extract<WorkflowContext, { route: "sweep" }> = {
 					...common,
 					route: "sweep",
 					workflow: createCommentSweep({
@@ -362,7 +362,17 @@ export default function pullRequestExtension(
 						loadCurrentPullRequest: load,
 					}),
 				};
-				break;
+				workflowContext = selected;
+				try {
+					const action = await selected.workflow.recoveryLaunchAction();
+					invocation.assertCurrent();
+					if (workflowContext !== selected) throw new Error("PR workflow session changed during recovery inspection");
+					return { runId, action };
+				} catch (error) {
+					clearWorkflow(selected);
+					throw error;
+				}
+			}
 			case "fix-ci":
 				workflowContext = {
 					...common,
@@ -374,9 +384,8 @@ export default function pullRequestExtension(
 						loadCurrentPullRequest: load,
 					}),
 				};
-				break;
+				return { runId, action: "collect" };
 		}
-		return common.runId;
 	};
 
 	const markWorkflowPromptQueued: NonNullable<PrCommandDependencies["markWorkflowPromptQueued"]> = (identity, queued) => {
@@ -403,7 +412,7 @@ export default function pullRequestExtension(
 	) => {
 		signal?.throwIfAborted();
 		const selected = workflowContext;
-		if (!selected) throw new Error("No PR workflow is active");
+		if (!selected) throw new Error("No PR workflow is active; run /pr to discover and reserve the current route");
 		if (selected.runId !== runId) throw new Error("PR workflow runId is wrong or stale");
 		if (selected.sessionGeneration !== sessionGeneration) throw new Error("PR workflow session is stale");
 		if (selected.route !== route) throw new Error(`PR workflow route is ${selected.route}, not ${route}`);
@@ -774,7 +783,7 @@ export default function pullRequestExtension(
 		releaseWorkflow,
 	});
 	pi.registerCommand("pr", {
-		description: "[--base <branch>] [instructions] — Run the current branch pull request next step",
+		description: "[--feedback | --base <branch> [instructions]] — Run the current branch pull request next step",
 		handler: async (args, ctx) => {
 			if (!ctx.hasUI || !context) return;
 			const generation = sessionGeneration;

package/package.json

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

package/skills/pi-pr-comment-sweep/SKILL.md

@@ -9,9 +9,10 @@ Use the package-owned comment-sweep workflow. It exposes these closed actions:
 `start`, `resume`, `show`, `record`, `publish`, `refresh`, `resolve`, and
 `finalize`.
 
-1. Call `start` for a fresh current-branch pull request. Call `resume` only for
-   saved work. Never replace or delete blocked recovery state by hand. See
-   [Sweep recovery](references/recovery.md).
+1. Use the `start` or `resume` action supplied by `/pr`. `/pr` checks saved work
+   and chooses the action. Do not change it. Direct skill or tool calls cannot
+   create route authority; run `/pr` instead. Never replace or delete blocked
+   recovery state by hand. See [Sweep recovery](references/recovery.md).
 2. Use `show` for one feedback ID at a time. Inspect every conversation
    comment, review, thread, and thread comment. Follow
    [Thread triage](references/thread-triage.md).

package/skills/pi-pr-comment-sweep/references/recovery.md

@@ -10,10 +10,14 @@ The file is private, bounded to 1 MiB, and replaced atomically. It contains the
 frozen PR authority, original head and lease, complete feedback, exact ledger,
 owned paths, and mutation attempts.
 
-Use `resume` when this file exists. Resume checks the canonical worktree, local
-changes, PR linkage, and remote head. It reconciles an attempted push or thread
-resolution before issuing a new epoch and run ID. Calls from the old run then
-fail.
+Run `/pr` to enter recovery. After fresh route discovery, `/pr` checks this file
+without changing it. It selects `start` when the file is absent. It selects
+`resume` only when valid recovery matches the fresh route authority.
+
+Resume checks the canonical worktree, local changes, PR linkage, and remote
+head again under its lock. It reconciles an attempted push or thread resolution
+before issuing a new epoch and run ID. Calls from the old run then fail. Direct
+skill or tool calls cannot create route authority.
 
 A completed post-publish `refresh` stores the new complete snapshot before any
 replacement ledger. Recovery keeps that snapshot in `refresh-pending`, with its
@@ -22,7 +26,9 @@ Use `show` with the resumed guard to inspect each frozen item. Then use `record`
 without `ownedPaths` to supply exact complete coverage for that snapshot.
 Resolution and finalization remain blocked until this record succeeds.
 
-Malformed or oversized recovery is preserved and blocks the workflow. Never
-repair, move, replace, or delete it automatically. An unknown mutation is never
-replayed. If reconciliation cannot prove its exact result, stop and report the
-state path and blocker.
+Malformed, oversized, obsolete, wrong-worktree, or route-mismatched recovery is
+preserved and blocks dispatch. Never repair, move, replace, or delete it
+automatically. Report the state path and exact blocker.
+
+An unknown mutation is never replayed. If reconciliation cannot prove its exact
+result, stop and report the state path and blocker.

package/skills/pi-pr-create/SKILL.md

@@ -7,7 +7,7 @@ description: Prepare and publish the current branch pull request with determinis
 
 Use only `pi_pr_create` for base selection, merge, push, upstream, and GitHub work. Do not repeat its Git or GitHub checks with shell tools.
 
-Start with the prompted `prepare` action. It uses the saved branch base: explicit `/pr --base BRANCH`, one `branch.<branch>.gh-merge-base` value, then validated `origin` default. It requires a committed change ahead. Dirty work alone cannot start this route. The base is always `origin`; fork heads must share its GitHub source and host. Apply trailing prompt guidance only to the PR content.
+Start with the prompted `prepare` action. It uses the saved branch base: explicit `/pr --base BRANCH`, one `branch.<branch>.gh-merge-base` value, then validated `origin` default. It requires a committed change ahead or ordinary pending work, including untracked files. It rejects an in-progress Git operation and a head ref equal to the selected base ref. The base is always `origin`; fork heads must share its GitHub source and host. Apply trailing prompt guidance only to the PR content.
 
 After `prepare`, inspect the returned base and merge-base. Separate and commit coherent pending work. Preserve coherent staging. Exclude `.context/` and unrelated changes. Stop when separation is unsafe.