@henryqw/pi-pr 6.0.3 → 6.0.5

package/extensions/pr-ci.ts

@@ -12,6 +12,7 @@ import {
 	extensionExecApi,
 	inspectWorktree,
 	isAncestor,
+	parseSingleOutputLine,
 	readHead,
 	readRemoteOid,
 	requiredOid,
@@ -177,13 +178,6 @@ function parseJson(output: string, label: string): unknown {
 	}
 }
 
-function outputLine(output: string, label: string): string {
-	const normalized = output.replace(/\r\n/g, "\n");
-	const lines = (normalized.endsWith("\n") ? normalized.slice(0, -1) : normalized).split("\n");
-	if (lines.length !== 1 || !lines[0]) throw new Error(`${label} returned invalid output`);
-	return requiredText(lines[0], label);
-}
-
 function actionsUrl(authority: CurrentPullRequest, suffix: string): string {
 	const url = new URL(authority.url.origin);
 	url.pathname = `/${authority.base.repository}/actions/${suffix}`;
@@ -312,9 +306,7 @@ export class PullRequestCiFixer {
 	private collectedFingerprint?: string;
 
 	constructor(options: PullRequestCiFixOptions) {
-		if (!options.authority || options.authority.lifecycle !== "open" ||
-			options.authority.target.provenance !== "configured" || options.authority.conditions.ci !== "failure" ||
-			options.authority.local.worktree !== "clean" || options.authority.local.head !== "equal") {
+		if (!options.authority || options.authority.target.provenance !== "configured") {
 			throw new TypeError("CI repair requires a configured failed pull request with a clean equal local HEAD");
 		}
 		const head = requiredOid(options.authority.head.oid, "pull request head OID");
@@ -357,10 +349,10 @@ export class PullRequestCiFixer {
 	}
 
 	private async requireOriginalLocal(): Promise<void> {
-		const branch = outputLine(
+		const branch = requiredText(parseSingleOutputLine(
 			(await runChecked(this.exec, "git", ["branch", "--show-current"], this.options())).stdout,
 			"current branch",
-		);
+		), "current branch");
 		if (branch !== this.authority.target.branch) throw new Error("CI repair cancelled: current branch changed");
 		if (await inspectWorktree(this.exec, this.options()) !== "clean") {
 			throw new Error("CI repair requires a clean worktree with no Git operation in progress");
@@ -695,10 +687,10 @@ export class PullRequestCiFixer {
 		await this.requireCollectedEvidence();
 		const original = this.authority.head.oid;
 		await this.requireSavedDestination(original);
-		const branch = outputLine(
+		const branch = requiredText(parseSingleOutputLine(
 			(await runChecked(this.exec, "git", ["branch", "--show-current"], this.options())).stdout,
 			"current branch",
-		);
+		), "current branch");
 		if (branch !== this.authority.target.branch) throw new Error("CI repair publish cancelled: current branch changed");
 		if (await inspectWorktree(this.exec, this.options()) !== "clean") {
 			throw new Error("CI repair publish requires a clean worktree with no Git operation in progress");

package/extensions/pr-command.ts

@@ -288,9 +288,12 @@ export function createPrCommandHandler(
 		const discovery = await load(pi, ctx, undefined, undefined, base);
 		commandInvocation?.assertCurrent();
 		const decision = deriveRouteDecision(discovery, intent);
+		if (decision.kind === "feedback-blocked") {
+			onRouteResolved?.("blocked");
+			throw new Error(feedbackBlockerMessage(decision.blocker));
+		}
 		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,7 @@
 import { createHash, randomUUID } from "node:crypto";
 import { realpath, rm } from "node:fs/promises";
 import { join } from "node:path";
+import { isDeepStrictEqual } from "node:util";
 import { spawnBounded, type Exec, type ExecOptions } from "@henryqw/pi-process";
 import {
 	extensionConfigDir,
@@ -32,6 +33,7 @@ import {
 	isAncestor,
 	isRecord,
 	parseNulPaths,
+	parseSingleOutputLine,
 	parseStatusSnapshot,
 	readHead,
 	readRemoteOid,
@@ -342,16 +344,12 @@ function parseProjection(value: unknown): SweepFinalProjection {
 	};
 }
 
-function sameProjection(left: SweepFinalProjection, right: SweepFinalProjection): boolean {
-	return JSON.stringify(left) === JSON.stringify(right);
-}
-
 function projectionMatches(snapshot: FeedbackSnapshot, projection: SweepFinalProjection): boolean {
 	if (feedbackContentFingerprint(snapshot) !== projection.contentFingerprint) return false;
 	const items = feedbackEntries(snapshot).map(({ id, kind }) => ({ id, kind })).sort((left, right) =>
 		left.id.localeCompare(right.id) || left.kind.localeCompare(right.kind));
 	const threads = snapshot.reviewThreads.map(({ id, isResolved }) => ({ id, isResolved })).sort((left, right) => left.id.localeCompare(right.id));
-	return JSON.stringify(items) === JSON.stringify(projection.items) && JSON.stringify(threads) === JSON.stringify(projection.threads);
+	return isDeepStrictEqual(items, projection.items) && isDeepStrictEqual(threads, projection.threads);
 }
 
 function resolutionAttempt(value: unknown, index: number): ResolutionAttempt {
@@ -463,7 +461,7 @@ function parseState(value: unknown, expectedRoot: string, expectedId: string): S
 		throw new Error("push attempt head does not match publication head");
 	}
 	if (hasFinalProjection !== (projection !== null)) throw new Error("sweep phase and final projection are inconsistent");
-	if (projection && (!ledger || !sameProjection(projection, buildProjection(feedback.generation, snapshot, ledger)))) {
+	if (projection && (!ledger || !isDeepStrictEqual(projection, buildProjection(feedback.generation, snapshot, ledger)))) {
 		throw new Error("final projection does not match feedback and ledger coverage");
 	}
 	return state;
@@ -505,13 +503,6 @@ function status(state: SweepState): SweepStatus {
 	};
 }
 
-function oneLine(output: string, label: string): string {
-	const normalized = output.replace(/\r\n/g, "\n");
-	const lines = normalized.endsWith("\n") ? normalized.slice(0, -1).split("\n") : normalized.split("\n");
-	if (lines.length !== 1 || !lines[0]) throw new Error(`${label} returned invalid output`);
-	return lines[0];
-}
-
 function onlyResolutionChanged(before: FeedbackSnapshot, after: FeedbackSnapshot, threadId: string): boolean {
 	if (feedbackContentFingerprint(before) !== feedbackContentFingerprint(after)) return false;
 	const beforeStates = before.reviewThreads.map(({ id, isResolved }) => ({ id, isResolved })).sort((left, right) => left.id.localeCompare(right.id));
@@ -564,7 +555,7 @@ export class PullRequestCommentSweep {
 	}
 
 	private async location(): Promise<{ root: string; id: string; path: string }> {
-		const top = oneLine((await runChecked(this.exec, "git", ["rev-parse", "--show-toplevel"], this.options())).stdout, "Git worktree root");
+		const top = parseSingleOutputLine((await runChecked(this.exec, "git", ["rev-parse", "--show-toplevel"], this.options())).stdout, "Git worktree root");
 		const root = await realpath(top);
 		const id = createHash("sha256").update(root).digest("hex");
 		return { root, id, path: join(extensionConfigDir("pi-pr", this.agentDir), "sweep", id, STATE_FILE) };
@@ -1016,7 +1007,7 @@ export class PullRequestCommentSweep {
 				throw new Error("Comment sweep is not ready to finalize");
 			}
 			const projection = parseProjection(projectionInput);
-			if (!sameProjection(projection, state.projection)) throw new Error("Final projection does not match the declared refreshed projection");
+			if (!isDeepStrictEqual(projection, state.projection)) throw new Error("Final projection does not match the declared refreshed projection");
 			const checks = parseChecks(checksInput);
 			if (state.attempts.resolutions.some(({ state: attempt }) => attempt !== "applied")) {
 				throw new Error("Comment sweep has unresolved or unknown mutation attempts");
@@ -1026,7 +1017,7 @@ export class PullRequestCommentSweep {
 			}
 			await this.freshProjection(state);
 			const alreadyChecked = state.attempts.finalize.state === "applied" &&
-				JSON.stringify(state.attempts.finalize.checks) === JSON.stringify(checks);
+				isDeepStrictEqual(state.attempts.finalize.checks, checks);
 			if (!alreadyChecked) {
 				state.attempts.finalize = { state: "attempting", checks };
 				await this.save(location, state);

package/extensions/pr-create.ts

@@ -173,9 +173,7 @@ export class PullRequestCreator {
 	private explicitBase?: string;
 
 	constructor(options: CreatePullRequestOptions) {
-		if (!options.target || options.target.remoteOid !== null && !requiredOid(options.target.remoteOid, "remote OID")) {
-			throw new TypeError("PR creation requires a validated creation target");
-		}
+		if (options.target.remoteOid !== null) requiredOid(options.target.remoteOid, "remote OID");
 		this.cwd = options.cwd;
 		this.target = { ...options.target };
 		this.noTarget = options.target.provenance === "inferred" && options.target.remoteOid === null;

package/extensions/pr-execution.ts

@@ -115,10 +115,8 @@ export async function withWorktreeLock<T>(
 		cwd: requiredText(cwd, "cwd"),
 		signal: options.signal,
 	});
-	const normalizedRoot = rootResult.stdout.replace(/\r\n/g, "\n");
-	const rootLines = (normalizedRoot.endsWith("\n") ? normalizedRoot.slice(0, -1) : normalizedRoot).split("\n");
-	if (rootLines.length !== 1 || !rootLines[0]) throw new Error("Git worktree root resolution returned invalid output");
-	const canonical = requiredText(await realpath(rootLines[0]), "canonical Git worktree root");
+	const root = parseSingleOutputLine(rootResult.stdout, "Git worktree root resolution");
+	const canonical = requiredText(await realpath(root), "canonical Git worktree root");
 	const lockNamespace = resolve(extensionConfigDir("pi-pr", options.agentDir));
 	const lockDirectory = join(lockNamespace, "worktree-locks");
 	const identity = createHash("sha256").update(canonical).digest("hex");

package/extensions/pr-github.ts

@@ -197,8 +197,6 @@ type PullRequestCandidate = {
 	headOid: string;
 };
 
-type SearchPullRequest = PullRequestCandidate;
-
 export type PullRequestPublication = {
 	number: number;
 	url: URL;
@@ -224,7 +222,7 @@ export type BranchUpstreamTarget = {
 };
 
 type SearchSelection =
-	| { kind: "candidate"; candidate: SearchPullRequest; pullRequest: ListedPullRequest | null }
+	| { kind: "candidate"; candidate: PullRequestCandidate; pullRequest: ListedPullRequest | null }
 	| { kind: "none" }
 	| { kind: "ambiguous"; urls: URL[] }
 	| { kind: "oid-mismatch"; urls: URL[] }
@@ -232,7 +230,7 @@ type SearchSelection =
 
 type SearchPage = {
 	totalCount: number;
-	candidates: SearchPullRequest[];
+	candidates: PullRequestCandidate[];
 	cursors: string[];
 	hasNextPage: boolean;
 	endCursor: string | null;
@@ -676,7 +674,7 @@ function listedPullRequest(value: unknown): ListedPullRequest | null {
 	};
 }
 
-function searchPullRequest(value: unknown, host: string): SearchPullRequest {
+function searchPullRequest(value: unknown, host: string): PullRequestCandidate {
 	if (!isRecord(value) || value.__typename !== "PullRequest") {
 		fail("Find pull requests", "invalid GitHub CLI output");
 	}
@@ -742,7 +740,7 @@ function parseSearchPage(output: string, pushTarget: Pick<PushTarget, "repositor
 		!Array.isArray(search.edges) || search.edges.length > PR_DISCOVERY_PAGE_SIZE ||
 		!isRecord(search.pageInfo)
 	) fail("Find pull requests", "invalid GitHub CLI output");
-	const candidates: SearchPullRequest[] = [];
+	const candidates: PullRequestCandidate[] = [];
 	const cursors: string[] = [];
 	for (const edge of search.edges) {
 		if (!isRecord(edge)) fail("Find pull requests", "invalid GitHub CLI output");
@@ -766,7 +764,7 @@ function parseSearchPage(output: string, pushTarget: Pick<PushTarget, "repositor
 	};
 }
 
-function matchingSearchPullRequests(candidates: SearchPullRequest[], pushTarget: PushTarget): SearchPullRequest[] {
+function matchingSearchPullRequests(candidates: PullRequestCandidate[], pushTarget: PushTarget): PullRequestCandidate[] {
 	return candidates.filter((candidate) =>
 		candidate.url.hostname.toLowerCase() === pushTarget.repository.host &&
 		candidate.headRepository !== null &&
@@ -775,7 +773,7 @@ function matchingSearchPullRequests(candidates: SearchPullRequest[], pushTarget:
 	);
 }
 
-function selectSearchPullRequest(candidates: SearchPullRequest[], pushTarget: PushTarget): SearchSelection {
+function selectSearchPullRequest(candidates: PullRequestCandidate[], pushTarget: PushTarget): SearchSelection {
 	const matching = matchingSearchPullRequests(candidates, pushTarget);
 	const open = matching.filter((candidate) => candidate.lifecycle === "open");
 	if (open.length > 1) return { kind: "ambiguous", urls: open.map(({ url }) => url) };
@@ -1681,9 +1679,9 @@ async function enumerateSearchPullRequests(
 	pi: Pick<ExtensionAPI, "exec">,
 	context: PullRequestLoadContext,
 	target: Pick<PushTarget, "repository" | "ref">,
-): Promise<SearchPullRequest[] | null> {
+): Promise<PullRequestCandidate[] | null> {
 	const [owner, name] = target.repository.nameWithOwner.split("/");
-	const candidates: SearchPullRequest[] = [];
+	const candidates: PullRequestCandidate[] = [];
 	const cursors = new Set<string>();
 	let totalCount: number | null = null;
 	let endCursor: string | null = null;

package/extensions/pr-routing.ts

@@ -71,7 +71,7 @@ export type FeedbackRouteBlocker =
 	| { kind: "head-not-equal"; relation: Exclude<LocalHeadRelation, "equal"> };
 type RouteDecision =
 	| { kind: "selected"; nextStep: NextStep }
-	| { kind: "feedback-blocked"; nextStep: "blocked"; blocker: FeedbackRouteBlocker };
+	| { kind: "feedback-blocked"; blocker: FeedbackRouteBlocker };
 
 function localMutationSafe(local: LocalMergeSafety): boolean {
 	return local.worktree === "clean" && local.head === "equal";
@@ -122,25 +122,24 @@ export function deriveRouteDecision(
 ): RouteDecision {
 	if (intent === "automatic") return { kind: "selected", nextStep: deriveAutomaticNextStep(discovery) };
 	if (discovery.kind === "blocked") {
-		return { kind: "feedback-blocked", nextStep: "blocked", blocker: { kind: "discovery-blocked" } };
+		return { kind: "feedback-blocked", blocker: { kind: "discovery-blocked" } };
 	}
 	if (discovery.kind !== "current") {
-		return { kind: "feedback-blocked", nextStep: "blocked", blocker: { kind: "pull-request-unavailable" } };
+		return { kind: "feedback-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" } };
+		return { kind: "feedback-blocked", blocker: { kind: "pull-request-not-open" } };
 	}
 	if (pullRequest.target.provenance !== "configured") {
-		return { kind: "feedback-blocked", nextStep: "blocked", blocker: { kind: "target-not-configured" } };
+		return { kind: "feedback-blocked", blocker: { kind: "target-not-configured" } };
 	}
 	if (pullRequest.local.worktree !== "clean") {
-		return { kind: "feedback-blocked", nextStep: "blocked", blocker: { kind: "worktree-dirty" } };
+		return { kind: "feedback-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 },
 		};
 	}
@@ -148,5 +147,5 @@ export function deriveRouteDecision(
 }
 
 export function deriveNextStep(discovery: PullRequestDiscovery<PullRequest & { target: PullRequestTarget }>): NextStep {
-	return deriveRouteDecision(discovery).nextStep;
+	return deriveAutomaticNextStep(discovery);
 }

package/extensions/pr-ui.ts

@@ -11,7 +11,7 @@ import {
 
 export type PrDisplayInput = PullRequest & {
 	number: number;
-	url: string | URL;
+	url: URL;
 	approved: boolean;
 	target: PullRequestTarget;
 };
@@ -140,7 +140,7 @@ export function projectPrDisplay(
 		nextStep,
 		footer: {
 			number: input.number,
-			url: typeof input.url === "string" ? input.url : input.url.href,
+			url: input.url.href,
 			...footerStatus(input),
 		},
 		widget: widgetText(input, nextStep),

package/extensions/pr-update-branch.ts

@@ -62,12 +62,9 @@ export class PullRequestBranchUpdater {
 	private readonly load: Load;
 
 	constructor(options: UpdateBranchOptions) {
-		if (!options.authority || options.authority.lifecycle !== "open" || options.authority.target.provenance !== "configured") {
+		if (!options.authority || options.authority.target.provenance !== "configured") {
 			throw new TypeError("Branch update requires a configured open pull request");
 		}
-		if (!options.authority.conditions.baseUpdateRequired && !options.authority.conditions.conflict) {
-			throw new TypeError("Pull request does not require a branch update");
-		}
 		this.cwd = options.cwd;
 		this.authority = cloneCurrentPullRequest(options.authority);
 		this.signal = options.signal;

package/extensions/pr.ts

@@ -26,7 +26,7 @@ import {
 	samePullRequestObservation,
 	type PullRequestObservation,
 } from "./pr-github.ts";
-import { isRecord, runChecked } from "./pr-execution.ts";
+import { isRecord, parseSingleOutputLine, runChecked } from "./pr-execution.ts";
 import {
 	discoveryIssueKey,
 	discoveryIssueMessage,
@@ -48,7 +48,7 @@ const GH_PR_CREATE = /(?:^|[;&|]\s*|\n\s*)gh\s+pr\s+create(?=\s|$|[;&|])/;
 const GIT_COMMIT = /(?:^|[;&|]\s*|\n\s*)git\s+commit(?=\s|$|[;&|])/;
 const GIT_PUSH = /(?:^|[;&|]\s*|\n\s*)git\s+push(?=\s|$|[;&|])/;
 const WORKFLOW_ROUTES = new Set(["create", "update-branch", "sweep", "fix-ci"]);
-const DELEGATED_TOOLS = new Set(["delegate_task", "delegate_flow", "delegate_flow_continue"]);
+const DELEGATED_TOOLS = new Set(["delegate_task"]);
 const CLOSED = { additionalProperties: false } as const;
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
 
@@ -171,10 +171,7 @@ type PullRequestExtensionDependencies = {
 
 async function canonicalWorktree(cwd: string, signal?: AbortSignal): Promise<string> {
 	const result = await runChecked(spawnBounded, "git", ["rev-parse", "--show-toplevel"], { cwd, signal });
-	const normalized = result.stdout.replace(/\r\n/g, "\n");
-	const lines = (normalized.endsWith("\n") ? normalized.slice(0, -1) : normalized).split("\n");
-	if (lines.length !== 1 || !lines[0]) throw new Error("Git worktree root resolution returned invalid output");
-	return await realpath(lines[0]);
+	return await realpath(parseSingleOutputLine(result.stdout, "Git worktree root resolution"));
 }
 
 function toolResult(value: unknown) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "6.0.3",
+  "version": "6.0.5",
   "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",
@@ -27,8 +27,8 @@
     "pack:check": "npm pack --dry-run"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.86.0",
-    "@earendil-works/pi-tui": "^0.86.0",
+    "@earendil-works/pi-coding-agent": ">=0.86.0 <0.88.0",
+    "@earendil-works/pi-tui": ">=0.86.0 <0.88.0",
     "typebox": "^1.3.15"
   },
   "dependencies": {
@@ -38,8 +38,8 @@
     "proper-lockfile": "^4.1.2"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "0.86.0",
-    "@earendil-works/pi-tui": "0.86.0",
+    "@earendil-works/pi-coding-agent": "0.87.0",
+    "@earendil-works/pi-tui": "0.87.0",
     "@types/proper-lockfile": "^4.1.4"
   },
   "repository": {

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

@@ -2,7 +2,7 @@
 
 import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
-import { chmod, mkdtemp, open, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
+import { chmod, mkdtemp, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 import { readTextFileBounded } from "@henryqw/pi-config-store";
@@ -118,28 +118,13 @@ async function requireCleanHead(cwd, signal, pullRequest, expectedHead = pullReq
 async function writeSnapshotAtomically(path, contents, signal) {
 	signal.throwIfAborted();
 	const temporaryPath = `${path}.${process.pid}.${randomUUID()}.tmp`;
-	let file;
-	let created = false;
 	try {
-		file = await open(temporaryPath, "wx", 0o600);
-		created = true;
-		signal.throwIfAborted();
-		if (process.platform !== "win32") await file.chmod(0o600);
-		signal.throwIfAborted();
-		await file.writeFile(contents, { encoding: "utf8", signal });
-		signal.throwIfAborted();
-		await file.sync();
-		signal.throwIfAborted();
-		await file.close();
-		file = undefined;
+		await writeFile(temporaryPath, contents, { encoding: "utf8", flag: "wx", mode: 0o600, flush: true, signal });
+		if (process.platform !== "win32") await chmod(temporaryPath, 0o600);
 		signal.throwIfAborted();
 		await rename(temporaryPath, path);
 	} catch (error) {
-		try {
-			await file?.close();
-		} finally {
-			if (created) await rm(temporaryPath, { force: true });
-		}
+		await rm(temporaryPath, { force: true });
 		throw error;
 	}
 }