@henryqw/pi-pr 4.0.2 → 4.0.4

package/README.md

@@ -42,11 +42,11 @@ GitHub, use the network, or write files.
 
 Run `/pr` in a GitHub checkout. It reads fresh pull request and local state, then runs one route. The PR hostname selects its GitHub API host, and the extension works outside Herdr.
 
-Creation accepts one optional base anchor. Use `/pr --base=<host>/<owner>/<repository>:<ref>`. All other route instructions fail instead of being ignored.
+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.
 
 | Surface | Type | Purpose |
 | --- | --- | --- |
-| `/pr [--base=<host>/<owner>/<repository>:<ref>]` | command | Run the current pull request's next safe route. |
+| `/pr [--base BRANCH] [creation instructions]` | command | Run the current pull request's next safe route. |
 | Footer | ui | Show a linked `PR #number` and one plain-language status. |
 | Widget | ui | Show one action hint or transient routing status. |
 
@@ -64,7 +64,7 @@ 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, and safe Git push configuration | Start pull-request creation. |
+| 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. |
 | 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. |
@@ -72,13 +72,15 @@ Each footer entry is one linked `PR #number` plus one plain-language status: `N
 | 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. |
 | No-action state | Report the state without taking action. |
-| Merge-ready pull request | Ask for final confirmation, recheck fresh state, and merge directly if confirmed. |
+| Merge-ready pull request | Ask for final confirmation, recheck fresh state, and squash-merge if confirmed. |
 
-`pi-pr-create` accepts an anchored base from `/pr --base=...`. Otherwise, it finds one unique parent from validated `origin` refs and commit history. The parent can be a feature branch.
+`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.
 
-It merges the parent's captured commit before validation and push. It resolves clear conflicts and stops when the base or conflict intent is ambiguous.
+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.
 
-It honors an existing configured push target. Without one, it pushes a captured OID to the local branch ref on `origin` and sets upstream.
+It merges the captured base commit before validation and push. It resolves clear conflicts and stops when the base or conflict intent is ambiguous.
+
+A configured target never changes branch upstream settings. Without a target, the helper pushes the captured OID to the local branch ref on validated `origin` and fetches its tracking ref. It leaves upstream unset. It creates or updates and validates the exact PR before it sets and verifies upstream. A failed setup rolls back only unchanged helper-owned settings. If configuration changed concurrently, it stops without overwriting it. Retrying `publish` resumes setup without another push or PR mutation.
 
 Without a configured push target, discovery checks validated remotes for the same branch ref. One exact open PR becomes an inferred target. `/pr` names the exact `remote/ref` and asks before linking it. The extension revalidates the branch, PR, remote OID, and Git configuration before mutation. It rolls back its upstream and remote-tracking changes if final verification fails.
 
@@ -145,15 +147,15 @@ The GitHub response must match the observed URL, host, repository, head ref, hea
 
 ## Limits and recovery
 
-- `/pr` accepts only the optional anchored creation base described above. It does not open a browser.
+- `/pr` accepts creation syntax only as a leading `--base BRANCH`, followed by optional creation guidance. It does not open a browser.
 - It does not run `/done` or `/sweep`.
 - Polling does not auto-triage comments or start a workflow. The package comment sweep runs 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.
 - Presentation fetches use that exact push URL and exact advertised OID. They do not use shared fetch state.
-- Strict status checks in legacy branch protection or applicable repository rulesets require a base update.
-- Applicable ruleset restrictions intersect repository-wide merge methods. An empty intersection stops the workflow.
+- A pull request that GitHub reports as behind requires a base update.
+- Direct merges always use squash. GitHub rejects the mutation if repository policy does not allow it.
 - Before merge, `/pr` fetches the exact head OID from the validated push URL without shared fetch state.
 - A merge, rebase, cherry-pick, revert, or sequencer state blocks direct merge, even when `git status` is empty.
 - A branch update resolves the base repository ref directly. It stops if that ref moves before merge or push.

package/extensions/pr-ci.ts

@@ -149,7 +149,6 @@ function cloneAuthority(value: CurrentPullRequest): CurrentPullRequest {
 		base: { ...value.base },
 		head: { ...value.head },
 		target: { ...value.target },
-		merge: value.merge ? { ...value.merge, allowedMergeMethods: [...value.merge.allowedMergeMethods] } : null,
 	};
 }
 

package/extensions/pr-command.ts

@@ -2,10 +2,7 @@ import type {
 	ExtensionAPI,
 	ExtensionCommandContext,
 } from "@earendil-works/pi-coding-agent";
-import {
-	executeGitHubMerge,
-	selectMergeMethod,
-} from "./pr-merge.ts";
+import { executeGitHubMerge } from "./pr-merge.ts";
 import {
 	linkInferredPullRequest,
 	loadCurrentPullRequest,
@@ -26,8 +23,6 @@ const WORKFLOWS: Record<WorkflowNextStep, { command: string; action: string }> =
 	sweep: { command: "skill:pi-pr-comment-sweep", action: "start" },
 	"fix-ci": { command: "skill:pi-pr-fix-ci", action: "collect" },
 };
-const CREATE_BASE = /^--base=([a-z0-9](?:[a-z0-9.-]*[a-z0-9])?\/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+:[^\s\0]+)$/;
-
 export type WorkflowReservation =
 	| { route: "create"; target: PullRequestTarget; base?: string }
 	| { route: Exclude<WorkflowNextStep, "create">; pullRequest: CurrentPullRequest };
@@ -62,21 +57,30 @@ export type PrCommandDependencies = {
 	releaseWorkflow?: (runId: string, invocation?: PrCommandInvocation) => void;
 };
 
-function createBase(instructions: string): string | undefined {
-	if (!instructions) return undefined;
-	const match = CREATE_BASE.exec(instructions);
-	if (!match) throw new Error("PR creation accepts only --base=<host>/<owner>/<repository>:<ref>");
-	return match[1]!;
+type ParsedPrArguments = {
+	base?: string;
+	instructions: string;
+};
+
+function parsePrArguments(args: string): ParsedPrArguments {
+	const leading = args.trimStart();
+	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() };
+	}
+	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(
 	nextStep: WorkflowNextStep,
 	discovery: Awaited<ReturnType<typeof loadCurrentPullRequest>>,
+	base: string | undefined,
 	instructions: string,
 ): WorkflowReservation {
 	if (nextStep === "create") {
 		if (discovery.kind !== "none") throw new Error("/pr create failed: creation target is unavailable");
-		const base = createBase(instructions);
 		return { route: "create", target: discovery.creationTarget, ...(base === undefined ? {} : { base }) };
 	}
 	if (instructions) throw new Error("The current /pr helper route does not accept instructions");
@@ -104,6 +108,7 @@ async function dispatchWorkflow(
 	reserve: NonNullable<PrCommandDependencies["reserveWorkflow"]>,
 	markPromptQueued: NonNullable<PrCommandDependencies["markWorkflowPromptQueued"]>,
 	release: NonNullable<PrCommandDependencies["releaseWorkflow"]>,
+	instructions: string,
 ): Promise<void> {
 	const workflow = packageWorkflowCommand(pi, route);
 	let runId: string | undefined;
@@ -117,7 +122,7 @@ async function dispatchWorkflow(
 			? { deliverAs: "followUp" as const, expandPromptTemplates: true }
 			: { expandPromptTemplates: true };
 		invocation?.assertCurrent();
-		pi.sendUserMessage(`/${identity.skill} runId=${identity.runId} action=${identity.action}`, options);
+		pi.sendUserMessage(`/${identity.skill} runId=${identity.runId} action=${identity.action}${instructions ? ` ${instructions}` : ""}`, options);
 	} catch (error) {
 		if (runId !== undefined) release(runId, invocation);
 		throw error;
@@ -176,11 +181,9 @@ async function mergePullRequest(
 	current: CurrentPullRequest,
 	load: typeof loadCurrentPullRequest,
 ): Promise<boolean> {
-	if (!current.merge) throw new Error(`PR #${current.number} merge failed: merge capabilities are unavailable`);
-	const method = selectMergeMethod(current.merge);
 	const confirmed = await ctx.ui.confirm(
 		`Merge PR #${current.number}?`,
-		`Method: ${method}.`,
+		"Method: squash.",
 	);
 	if (!confirmed) return false;
 
@@ -196,8 +199,6 @@ async function mergePullRequest(
 		expectedHead: current.head.oid,
 		expectedBase: current.base,
 		headFetchSource: current.headFetchSource,
-		allowedMergeMethods: current.merge.allowedMergeMethods,
-		viewerDefaultMergeMethod: current.merge.viewerDefaultMergeMethod,
 		revalidateReadiness: async (local) => {
 			const discovery = await load(pi, ctx, local);
 			if (discovery.kind !== "current") {
@@ -210,11 +211,6 @@ async function mergePullRequest(
 			if (deriveNextStep(discovery) !== "merge") {
 				throw new Error(`PR #${fresh.number} merge cancelled: pull request is no longer merge-ready`);
 			}
-			if (!fresh.merge) throw new Error(`PR #${fresh.number} merge failed: merge capabilities are unavailable`);
-			const freshMethod = selectMergeMethod(fresh.merge);
-			if (freshMethod !== method) {
-				throw new Error(`PR #${fresh.number} merge cancelled: merge method changed from ${method} to ${freshMethod}`);
-			}
 		},
 	});
 	return true;
@@ -258,11 +254,14 @@ export function createPrCommandHandler(
 		const commandInvocation = onRouteResolved && "assertCurrent" in onRouteResolved
 			? onRouteResolved as PrCommandInvocation
 			: undefined;
-		const instructions = args.trim();
-		const discovery = await load(pi, ctx);
+		const { base, instructions } = parsePrArguments(args);
+		const discovery = await load(pi, ctx, undefined, undefined, base);
 		commandInvocation?.assertCurrent();
 		const nextStep = deriveNextStep(discovery);
 		onRouteResolved?.(nextStep);
+		if (base !== undefined && nextStep !== "create") {
+			throw new Error("/pr --base is accepted only for pull request creation");
+		}
 		if (instructions && !(nextStep in WORKFLOWS)) {
 			throw new Error("The current /pr route does not accept instructions");
 		}
@@ -289,8 +288,18 @@ export function createPrCommandHandler(
 
 		if (!(nextStep in WORKFLOWS)) throw new Error(`/pr cannot dispatch route ${nextStep}`);
 		const route = nextStep as WorkflowNextStep;
-		const reservation = workflowReservation(route, discovery, instructions);
-		await dispatchWorkflow(pi, ctx, route, reservation, commandInvocation, reserve, markPromptQueued, release);
+		const reservation = workflowReservation(route, discovery, base, instructions);
+		await dispatchWorkflow(
+			pi,
+			ctx,
+			route,
+			reservation,
+			commandInvocation,
+			reserve,
+			markPromptQueued,
+			release,
+			route === "create" ? instructions : "",
+		);
 		return nextStep;
 	};
 }

package/extensions/pr-comment-sweep.ts

@@ -42,10 +42,6 @@ import {
 	type ExecOptions,
 } from "./pr-execution.ts";
 
-export const PR_COMMENT_SWEEP_ACTIONS = [
-	"start", "resume", "show", "record", "publish", "refresh", "resolve", "finalize",
-] as const;
-export type PrCommentSweepAction = (typeof PR_COMMENT_SWEEP_ACTIONS)[number];
 export const SWEEP_RECOVERY_MAX_BYTES = 1024 * 1024;
 
 const STATE_VERSION = 1;
@@ -140,16 +136,6 @@ export type PullRequestCommentSweepOptions = {
 	newRunId?: () => string;
 	pause?: (milliseconds: number) => Promise<void>;
 };
-export type PrCommentSweepRequest =
-	| { action: "start" }
-	| { action: "resume" }
-	| { action: "show"; guard: SweepRunGuard; id: string }
-	| { action: "record"; guard: SweepRunGuard; ledger: SweepLedgerEntry[]; ownedPaths?: string[] }
-	| { action: "publish"; guard: SweepRunGuard }
-	| { action: "refresh"; guard: SweepRunGuard }
-	| { action: "resolve"; guard: SweepRunGuard; threadIds: string[] }
-	| { action: "finalize"; guard: SweepRunGuard; projection: SweepFinalProjection; checks: SweepCheck[] };
-
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -1086,17 +1072,4 @@ export class PullRequestCommentSweep {
 			return { kind: "finalized", pullRequestUrl: state.authority.url, head: state.publicationHead, checks: checks.length };
 		}, { agentDir: this.agentDir, signal: this.signal });
 	}
-
-	async action(request: PrCommentSweepRequest): Promise<SweepStatus | FeedbackItem | { kind: "finalized"; pullRequestUrl: string; head: string; checks: number }> {
-		switch (request.action) {
-			case "start": return await this.start();
-			case "resume": return await this.resume();
-			case "show": return await this.show(request.guard, request.id);
-			case "record": return await this.record(request.guard, request.ledger, request.ownedPaths);
-			case "publish": return await this.publish(request.guard);
-			case "refresh": return await this.refresh(request.guard);
-			case "resolve": return await this.resolve(request.guard, request.threadIds);
-			case "finalize": return await this.finalize(request.guard, request.projection, request.checks);
-		}
-	}
 }