@henryqw/pi-pr 5.0.0 → 5.0.2

package/README.md

@@ -116,7 +116,7 @@ If Herdr lookup, JSON validation, or rename fails, the PR and normal UI refresh
 
 Current-branch discovery reads pull requests associated with the exact push repository ref. It does not run a global branch search. 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 drafts, merged or closed pull requests, running or unsupported failed CI, pending review, and blocked merge policy. A dirty tree or mismatched local HEAD also blocks a mutating workflow.
+A no-action state includes drafts, merged or closed pull requests, unsupported failed CI, pending review, and blocked merge policy. Running CI blocks merge but not other mutating workflows. A dirty tree or mismatched local HEAD also blocks a mutating workflow.
 
 ### Route priority
 

package/extensions/pr-github.ts

@@ -223,11 +223,6 @@ export type BranchUpstreamTarget = {
 	remoteOid: string;
 };
 
-export type BranchUpstreamConfiguration = {
-	remote: string[];
-	merge: string[];
-};
-
 type SearchSelection =
 	| { kind: "candidate"; candidate: SearchPullRequest; pullRequest: ListedPullRequest | null }
 	| { kind: "none" }
@@ -969,29 +964,6 @@ function parseBaseRefOid(output: string, candidate: ListedPullRequest): string {
 	return parseBaseRefAuthority(output, candidate.base);
 }
 
-export async function hasLocalCommit(
-	pi: Pick<ExtensionAPI, "exec">,
-	context: PullRequestLoadContext,
-): Promise<boolean> {
-	const branch = singleLine(
-		(await execute(pi, context, "Read current branch", "git", ["branch", "--show-current"])).stdout,
-		"Read current branch",
-		"branch",
-	);
-	const output = (await execute(pi, context, "Read branch history", "git", [
-		"reflog",
-		"show",
-		"--format=%H",
-		`refs/heads/${branch}`,
-	])).stdout.replace(/\r\n/g, "\n");
-	const entries = output.split("\n");
-	if (entries.at(-1) === "") entries.pop();
-	if (!entries.length) fail("Read branch history", "missing branch creation entry");
-	const commits = entries.map((entry) => oid(entry, "Read branch history", "commit"));
-	// ponytail: reflog expiry can hide old branch history; resolve the PR base if this becomes observable.
-	return commits[0] !== commits.at(-1);
-}
-
 function validatedCreationTarget(target: PullRequestTarget): PullRequestTarget {
 	if (!isRecord(target)) fail("Read creation target", "invalid target");
 	if (target.provenance !== "configured" && target.provenance !== "inferred") {
@@ -1347,22 +1319,6 @@ async function readConfigValues(
 	}
 }
 
-export async function readBranchUpstreamConfiguration(
-	pi: Pick<ExtensionAPI, "exec">,
-	context: PullRequestLoadContext,
-	branch: string,
-): Promise<BranchUpstreamConfiguration> {
-	const checkedBranch = text(branch, "Read branch upstream", "branch");
-	const [remote, merge] = await Promise.all([
-		readConfigValues(pi, context, `branch.${checkedBranch}.remote`),
-		readConfigValues(pi, context, `branch.${checkedBranch}.merge`),
-	]);
-	if (remote === null || merge === null) {
-		throw new Error("Read branch upstream failed: invalid Git configuration");
-	}
-	return { remote, merge };
-}
-
 async function readBooleanConfigValues(
 	pi: Pick<ExtensionAPI, "exec">,
 	context: PullRequestLoadContext,
@@ -2090,42 +2046,6 @@ function sameConfigValues(left: readonly string[], right: readonly string[]): bo
 	return left.length === right.length && left.every((value, index) => value === right[index]);
 }
 
-export async function restoreBranchUpstreamConfiguration(
-	pi: Pick<ExtensionAPI, "exec">,
-	context: PullRequestLoadContext,
-	target: Pick<BranchUpstreamTarget, "branch" | "remote" | "ref">,
-	original: BranchUpstreamConfiguration,
-): Promise<void> {
-	let incomplete = false;
-	for (const [key, expected, values] of [
-		[`branch.${target.branch}.remote`, target.remote, original.remote],
-		[`branch.${target.branch}.merge`, `refs/heads/${target.ref}`, original.merge],
-	] as const) {
-		try {
-			const current = await readConfigValues(pi, context, key);
-			if (current === null) incomplete = true;
-			else if (sameConfigValues(current, values)) continue;
-			else if (current.length === 1 && current[0] === expected) {
-				await restoreConfigValue(pi, context, key, expected, values);
-			} else incomplete = true;
-		} catch {
-			incomplete = true;
-		}
-	}
-	for (const [key, values] of [
-		[`branch.${target.branch}.remote`, original.remote],
-		[`branch.${target.branch}.merge`, original.merge],
-	] as const) {
-		try {
-			const current = await readConfigValues(pi, context, key);
-			if (current === null || !sameConfigValues(current, values)) incomplete = true;
-		} catch {
-			incomplete = true;
-		}
-	}
-	if (incomplete) throw new Error("Restore branch upstream failed and rollback was incomplete");
-}
-
 async function restoreLinkState(
 	pi: Pick<ExtensionAPI, "exec">,
 	context: PullRequestLoadContext,

package/extensions/pr-routing.ts

@@ -93,10 +93,10 @@ export function derivePullRequestNextStep(pullRequest: PullRequest): Exclude<Nex
 		return localMutationSafe(local) ? "sweep" : "none";
 	}
 	if (
-		conditions.ci === "running" ||
 		conditions.review === "pending" ||
 		conditions.policy === "pending" ||
-		!localMergeSafe(local)
+		!localMergeSafe(local) ||
+		conditions.ci === "running"
 	) return "none";
 	return "merge";
 }

package/package.json

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