@henryqw/pi-pr 5.0.2 → 6.0.1

package/extensions/pr-ci.ts

@@ -92,7 +92,7 @@ type CiSnapshot = {
 	failures: FailureIdentity[];
 };
 
-export type CiFailureEvidence = {
+type CiFailureEvidence = {
 	checkRuns: Array<{ id: number; name: string; conclusion: string }>;
 	checkSuite: { id: number };
 	run: { id: number; url: string; attempt: number };
@@ -101,20 +101,18 @@ export type CiFailureEvidence = {
 	log: { scope: "job"; text: string; truncated: boolean };
 };
 
-export type CiEvidence = {
+type CiEvidence = {
 	fingerprint: string;
 	pullRequest: { number: number; url: string; headOid: string };
 	failures: CiFailureEvidence[];
 };
 
-export type CiPushAttempt = "before-launch" | "applied" | "not-applied" | "unknown";
-export type CiFixPhase = "ready" | "collecting" | "collected" | "published" | "blocked";
+type CiPushAttempt = "before-launch" | "applied" | "not-applied" | "unknown";
+type CiFixPhase = "ready" | "collecting" | "collected" | "published" | "blocked";
 
-export type CiFixState = {
+type CiFixState = {
 	phase: CiFixPhase;
 	pushAttempt: CiPushAttempt;
-	fingerprint?: string;
-	repairHead?: string;
 };
 
 export type PullRequestCiFixOptions = {
@@ -126,7 +124,7 @@ export type PullRequestCiFixOptions = {
 	loadCurrentPullRequest?: Load;
 };
 
-export type CiPublishResult = {
+type CiPublishResult = {
 	kind: "published";
 	head: string;
 	attempt: "applied";
@@ -193,21 +191,11 @@ function actionsUrl(authority: CurrentPullRequest, suffix: string): string {
 }
 
 function tailUtf8(value: string, limit: number): { text: string; truncated: boolean } {
-	const total = Buffer.byteLength(value, "utf8");
-	if (total <= limit) return { text: value, truncated: false };
-	let start = value.length;
-	let bytes = 0;
-	while (start > 0) {
-		let previous = start - 1;
-		if (previous > 0 && value.charCodeAt(previous) >= 0xdc00 && value.charCodeAt(previous) <= 0xdfff &&
-			value.charCodeAt(previous - 1) >= 0xd800 && value.charCodeAt(previous - 1) <= 0xdbff) previous -= 1;
-		const character = value.slice(previous, start);
-		const size = Buffer.byteLength(character, "utf8");
-		if (bytes + size > limit) break;
-		bytes += size;
-		start = previous;
-	}
-	return { text: value.slice(start), truncated: true };
+	const bytes = Buffer.from(value, "utf8");
+	if (bytes.length <= limit) return { text: value, truncated: false };
+	let start = bytes.length - limit;
+	while (start < bytes.length && (bytes[start]! & 0xc0) === 0x80) start += 1;
+	return { text: bytes.subarray(start).toString("utf8"), truncated: true };
 }
 
 function failureEvidence(
@@ -669,7 +657,6 @@ export class PullRequestCiFixer {
 				throw new Error("Failed-CI evidence was replaced or became stale during collection");
 			}
 			this.collectedFingerprint = after.fingerprint;
-			this.state.fingerprint = after.fingerprint;
 			this.state.phase = "collected";
 			return {
 				fingerprint: after.fingerprint,
@@ -721,7 +708,6 @@ export class PullRequestCiFixer {
 			throw new Error("CI repair HEAD must be a new descendant of the frozen pull request head");
 		}
 		if (await readHead(this.exec, this.options()) !== repairHead) throw new Error("CI repair HEAD changed before push");
-		this.state.repairHead = repairHead;
 		return repairHead;
 	}
 

package/extensions/pr-command.ts

@@ -18,19 +18,19 @@ import {
 	type RouteIntent,
 } from "./pr-routing.ts";
 
-export type WorkflowNextStep = Extract<NextStep, "create" | "update-branch" | "sweep" | "fix-ci">;
+type WorkflowNextStep = Extract<NextStep, "create" | "update-branch" | "sweep" | "fix-ci">;
 
-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" },
+const WORKFLOWS: Record<WorkflowNextStep, string> = {
+	create: "skill:pi-pr-create",
+	"update-branch": "skill:pi-pr-update-branch",
+	sweep: "skill:pi-pr-comment-sweep",
+	"fix-ci": "skill:pi-pr-fix-ci",
 };
-export type WorkflowReservation =
+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 WorkflowLaunchAction = "prepare" | "merge" | "start" | "resume" | "collect";
+type WorkflowReservationResult = { runId: string; action: WorkflowLaunchAction };
 
 type PrCommandPi = Pick<ExtensionAPI, "exec" | "getCommands" | "sendUserMessage">;
 export type PrCommandInvocation = ((nextStep: NextStep) => void) & {
@@ -120,11 +120,11 @@ function workflowReservation(
 function packageWorkflowCommand(pi: PrCommandPi, route: WorkflowNextStep) {
 	const workflow = WORKFLOWS[route];
 	const command = pi.getCommands().find((candidate) =>
-		candidate.name === workflow.command &&
+		candidate.name === workflow &&
 		candidate.source === "skill" &&
 		candidate.sourceInfo.origin === "package"
 	);
-	if (!command) throw new Error(`${workflow.command} failed: bundled workflow is unavailable`);
+	if (!command) throw new Error(`${workflow} failed: bundled workflow is unavailable`);
 	return command;
 }
 

package/extensions/pr-comment-sweep.ts

@@ -52,21 +52,21 @@ const CHECK_ARGUMENTS_MAX_BYTES = 32 * 1024;
 const ATTEMPT_STATES = new Set<AttemptState>(["none", "attempting", "applied", "blocked", "unknown"]);
 const DISPOSITIONS = ["addressed", "non-actionable", "blocked"] as const;
 
-export type SweepDisposition = (typeof DISPOSITIONS)[number];
+type SweepDisposition = (typeof DISPOSITIONS)[number];
 export type SweepLedgerEntry = {
 	id: string;
 	kind: FeedbackKind;
 	disposition: SweepDisposition;
 	note: string;
 };
-export type SweepRunGuard = {
+type SweepRunGuard = {
 	epoch: number;
 	runId: string;
 	generation: number;
 	fingerprint: string;
 };
-export type SweepCheck = { command: string; args: string[] };
-export type SweepFinalProjection = {
+type SweepCheck = { command: string; args: string[] };
+type SweepFinalProjection = {
 	generation: number;
 	contentFingerprint: string;
 	items: Array<{ id: string; kind: FeedbackKind }>;
@@ -88,7 +88,7 @@ export type SweepStatus = {
 		finalize: AttemptState;
 	};
 };
-export type SweepPhase = "triage" | "recorded" | "published" | "refresh-pending" | "refreshed" | "resolving" | "resolved";
+type SweepPhase = "triage" | "recorded" | "published" | "refresh-pending" | "refreshed" | "resolving" | "resolved";
 
 type SweepAuthority = ReturnType<typeof authorityFromCurrent>;
 type ResolutionAttempt = {

package/extensions/pr-create.ts

@@ -26,11 +26,13 @@ import {
 	isAncestor,
 	isRecord,
 	parseNulPaths,
+	parseSingleOutputLine,
 	readHead,
 	readRemoteOid,
 	requiredOid,
 	requiredText,
 	runChecked,
+	validateResolvedConflictPaths,
 	withWorktreeLock,
 } from "./pr-execution.ts";
 
@@ -41,7 +43,7 @@ const CREATE_PULL_REQUEST_MUTATION = "mutation($repositoryId:ID!,$baseRefName:St
 
 type Load = typeof loadCurrentPullRequest;
 
-export type CreateBaseAuthority = {
+type CreateBaseAuthority = {
 	host: string;
 	repository: string;
 	ref: string;
@@ -49,7 +51,7 @@ export type CreateBaseAuthority = {
 	fetchSource: string;
 };
 
-export type CreatePhase = "unprepared" | "prepared" | "conflict-awaiting-user" | "verified" | "pushed" | "published" | "blocked";
+type CreatePhase = "unprepared" | "prepared" | "conflict-awaiting-user" | "verified" | "pushed" | "published" | "blocked";
 
 type CrossRepositoryCreateAuthority = {
 	baseRepositoryId: string;
@@ -57,17 +59,15 @@ type CrossRepositoryCreateAuthority = {
 	headOwnerType: "Organization" | "User";
 };
 
-export type CreatePullRequestState = {
+type CreatePullRequestState = {
 	phase: CreatePhase;
 	base?: CreateBaseAuthority;
 	createAuthority?: CrossRepositoryCreateAuthority;
-	mergeHead?: string;
 	publicationHead?: string;
 	conflict?: { paths: string[]; statusBaseline: string; originalHead: string };
-	url?: string;
 };
 
-export type CreatePullRequestResult =
+type CreatePullRequestResult =
 	| { kind: "prepared"; base: CreateBaseAuthority; mergeBase: string }
 	| { kind: "verified"; head: string; fastForward: boolean }
 	| { kind: "conflict"; paths: string[] }
@@ -89,13 +89,6 @@ function sameTarget(left: PullRequestTarget, right: PullRequestTarget, expectedR
 		left.fetchSource === right.fetchSource && right.remoteOid === expectedRemoteOid;
 }
 
-function line(output: string, label: string): string {
-	const normalized = output.replace(/\r\n/g, "\n");
-	const values = normalized.endsWith("\n") ? normalized.slice(0, -1).split("\n") : normalized.split("\n");
-	if (values.length !== 1 || !values[0]) throw new Error(`${label} returned invalid output`);
-	return values[0];
-}
-
 function graphQlResponse(output: string, action: string): Record<string, unknown> {
 	let value: unknown;
 	try {
@@ -166,15 +159,6 @@ function parseCreatedUrl(output: string, host: string, baseRepository: string):
 	return url;
 }
 
-function resolvedPaths(paths: readonly string[], expected: readonly string[]): string[] {
-	if (!Array.isArray(paths)) throw new TypeError("resolvedPaths must be an array");
-	const parsed = parseNulPaths(`${paths.join("\0")}${paths.length ? "\0" : ""}`, "Resolved conflict paths");
-	if (expected.some((path) => !parsed.includes(path))) {
-		throw new Error("Resolved paths must include every original conflict path");
-	}
-	return parsed;
-}
-
 export class PullRequestCreator {
 	readonly state: CreatePullRequestState = { phase: "unprepared" };
 
@@ -218,7 +202,7 @@ export class PullRequestCreator {
 		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");
+		const branch = parseSingleOutputLine((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;
 	}
@@ -298,7 +282,7 @@ export class PullRequestCreator {
 	private async verifyMerge(originalHead: string): Promise<{ head: string; fastForward: boolean }> {
 		const base = this.state.base!;
 		const head = await readHead(this.exec, this.options());
-		const commits = line((await runChecked(this.exec, "git", ["rev-list", "--parents", "-n", "1", head], this.options())).stdout, "merge parents")
+		const commits = parseSingleOutputLine((await runChecked(this.exec, "git", ["rev-list", "--parents", "-n", "1", head], this.options())).stdout, "merge parents")
 			.split(" ").map((value, index) => requiredOid(value, index ? "merge parent" : "merged HEAD"));
 		if (commits[0] !== head) throw new Error("PR creation merge verification returned a different HEAD");
 		let fastForward = false;
@@ -308,14 +292,13 @@ export class PullRequestCreator {
 		}
 		await this.requireCleanHead();
 		this.state.phase = "verified";
-		this.state.mergeHead = head;
 		delete this.state.conflict;
 		return { head, fastForward };
 	}
 
 	private async captureConflict(originalHead: string): Promise<string[]> {
 		const base = this.state.base!;
-		const mergeHead = requiredOid(line((await runChecked(this.exec, "git", ["rev-parse", "--verify", "MERGE_HEAD^{commit}"], this.options())).stdout, "MERGE_HEAD"), "MERGE_HEAD");
+		const mergeHead = requiredOid(parseSingleOutputLine((await runChecked(this.exec, "git", ["rev-parse", "--verify", "MERGE_HEAD^{commit}"], this.options())).stdout, "MERGE_HEAD"), "MERGE_HEAD");
 		if (mergeHead !== base.oid) throw new Error("Failed merge did not retain the frozen base");
 		const paths = parseNulPaths((await runChecked(this.exec, "git", ["diff", "--name-only", "-z", "--diff-filter=U"], this.options())).stdout, "Unmerged paths");
 		if (!paths.length) throw new Error("git merge failed without bounded unmerged paths");
@@ -335,7 +318,6 @@ export class PullRequestCreator {
 			const originalHead = await this.requireCleanHead();
 			if (await isAncestor(this.exec, this.options(), this.state.base!.oid, originalHead)) {
 				this.state.phase = "verified";
-				this.state.mergeHead = originalHead;
 				return { kind: "verified", head: originalHead, fastForward: false };
 			}
 			this.state.phase = "blocked";
@@ -358,12 +340,12 @@ export class PullRequestCreator {
 		if (this.state.phase !== "conflict-awaiting-user" || !this.state.conflict || !this.state.base) {
 			throw new Error("PR creation has no conflict awaiting continuation");
 		}
-		const paths = resolvedPaths(pathsInput, this.state.conflict.paths);
+		const paths = validateResolvedConflictPaths(pathsInput, this.state.conflict.paths);
 		return await withWorktreeLock(this.cwd, async () => {
 			await this.freshNone();
 			if (await this.liveBase() !== this.state.base!.oid) throw new Error("PR creation cancelled: frozen base moved");
 			if (await readHead(this.exec, this.options()) !== this.state.conflict!.originalHead) throw new Error("PR creation merge HEAD changed");
-			const mergeHead = requiredOid(line((await runChecked(this.exec, "git", ["rev-parse", "--verify", "MERGE_HEAD^{commit}"], this.options())).stdout, "MERGE_HEAD"), "MERGE_HEAD");
+			const mergeHead = requiredOid(parseSingleOutputLine((await runChecked(this.exec, "git", ["rev-parse", "--verify", "MERGE_HEAD^{commit}"], this.options())).stdout, "MERGE_HEAD"), "MERGE_HEAD");
 			if (mergeHead !== this.state.base!.oid) throw new Error("PR creation merge context changed");
 			const status = await runChecked(this.exec, "git", ["status", "--porcelain=v2", "-z", "--untracked-files=all"], this.options());
 			assertOnlyDeclaredStatusChanged(this.state.conflict!.statusBaseline, status.stdout, paths);
@@ -433,7 +415,7 @@ export class PullRequestCreator {
 	private async publishedAuthority(): Promise<void> {
 		const head = this.state.publicationHead!;
 		if (this.noTarget && !this.noTargetUpstreamConfigured) {
-			const branch = line((await runChecked(this.exec, "git", ["branch", "--show-current"], this.options())).stdout, "current branch");
+			const branch = parseSingleOutputLine((await runChecked(this.exec, "git", ["branch", "--show-current"], this.options())).stdout, "current branch");
 			const authority = await readValidatedRemoteAuthority(this.pi(), this.context(), this.target.remote);
 			if (branch !== this.target.branch || authority.host !== this.target.host ||
 				authority.repository.toLowerCase() !== this.target.repository.toLowerCase() ||
@@ -522,7 +504,6 @@ export class PullRequestCreator {
 				throw new Error("Published pull request did not retain canonical identity, title, and body");
 			}
 			this.state.phase = "published";
-			this.state.url = after.url.href;
 			return { kind: "published", url: after.url.href };
 		}, { agentDir: this.agentDir, signal: this.signal });
 	}

package/extensions/pr-execution.ts

@@ -6,9 +6,9 @@ import { extensionConfigDir } from "@henryqw/pi-config-store";
 import { spawnBounded, type Exec, type ExecOptions, type ExecResult } from "@henryqw/pi-process";
 import { lock } from "proper-lockfile";
 
-export const MAX_CONFLICT_PATHS = 128;
-export const MAX_CONFLICT_PATH_BYTES = 1_024;
-export const MAX_CONFLICT_PATHS_BYTES = 32 * 1024;
+const MAX_CONFLICT_PATHS = 128;
+const MAX_CONFLICT_PATH_BYTES = 1_024;
+const MAX_CONFLICT_PATHS_BYTES = 32 * 1024;
 
 const OID = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
 const GIT_OPERATION_STATES = ["MERGE_HEAD", "rebase-merge", "rebase-apply", "CHERRY_PICK_HEAD", "REVERT_HEAD", "sequencer"];
@@ -34,8 +34,11 @@ export function requiredOid(value: unknown, label: string): string {
 	return parsed;
 }
 
-export function commandText(command: string, args: readonly string[]): string {
-	return [command, ...args].join(" ");
+export function parseSingleOutputLine(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];
 }
 
 export function extensionExecApi(exec: Exec, cwd: string, signal?: AbortSignal): Pick<ExtensionAPI, "exec"> {
@@ -58,7 +61,7 @@ export async function runChecked(
 	const result = await exec(command, args, options);
 	if (result.killed || !allowedCodes.includes(result.code)) {
 		const detail = result.stderr.trim() || result.stdout.trim() || (result.killed ? "command was killed" : `exit code ${result.code}`);
-		throw new Error(`${commandText(command, args)} failed: ${detail}`);
+		throw new Error(`${[command, ...args].join(" ")} failed: ${detail}`);
 	}
 	return result;
 }
@@ -162,6 +165,15 @@ export function parseNulPaths(output: string, label: string): string[] {
 	return paths;
 }
 
+export function validateResolvedConflictPaths(paths: readonly string[], expected: readonly string[]): string[] {
+	if (!Array.isArray(paths)) throw new TypeError("resolvedPaths must be an array");
+	const parsed = parseNulPaths(`${paths.join("\0")}${paths.length ? "\0" : ""}`, "Resolved conflict paths");
+	if (expected.some((path) => !parsed.includes(path))) {
+		throw new Error("Resolved paths must include every original conflict path");
+	}
+	return parsed;
+}
+
 function statusPath(record: string): { path: string; rename: boolean } {
 	if (record.startsWith("? ") || record.startsWith("! ")) return { path: record.slice(2), rename: false };
 	const fields = record[0] === "1" ? 8 : record[0] === "2" ? 9 : record[0] === "u" ? 10 : 0;

package/extensions/pr-feedback.ts

@@ -9,7 +9,7 @@ import {
 import type { CurrentPullRequest } from "./pr-github.ts";
 
 export const FEEDBACK_API_PAGE_MAX_BYTES = 512 * 1024;
-export const FEEDBACK_MAX_PAGES = 100;
+const FEEDBACK_MAX_PAGES = 100;
 export const FEEDBACK_MAX_RECORDS = 1_000;
 export const FEEDBACK_SNAPSHOT_MAX_BYTES = 1024 * 1024;
 
@@ -33,15 +33,15 @@ query ThreadReplies($threadId:ID!,$cursor:String){node(id:$threadId){... on Pull
 const RESOLVE_THREAD_MUTATION = `
 mutation ResolveThread($threadId:ID!){resolveReviewThread(input:{threadId:$threadId}){thread{id isResolved}}}`;
 
-export type FeedbackAuthor = { login: string } | null;
-export type FeedbackComment = {
+type FeedbackAuthor = { login: string } | null;
+type FeedbackComment = {
 	id: string;
 	url: string;
 	body: string;
 	createdAt: string;
 	author: FeedbackAuthor;
 };
-export type FeedbackReview = {
+type FeedbackReview = {
 	id: string;
 	url: string;
 	state: string;
@@ -49,7 +49,7 @@ export type FeedbackReview = {
 	submittedAt: string | null;
 	author: FeedbackAuthor;
 };
-export type FeedbackThread = {
+type FeedbackThread = {
 	id: string;
 	isResolved: boolean;
 	isOutdated: boolean;
@@ -77,7 +77,7 @@ export type FeedbackSnapshot = {
 	reviewThreads: FeedbackThread[];
 };
 export type FeedbackKind = "conversation_comment" | "review" | "thread" | "thread_comment";
-export type FeedbackEntry = {
+type FeedbackEntry = {
 	id: string;
 	kind: FeedbackKind;
 	node: FeedbackComment | FeedbackReview | FeedbackThread;
@@ -91,7 +91,7 @@ export type FeedbackItem =
 		kind: "thread_comment";
 		parentThread: { id: string; isResolved: boolean; isOutdated: boolean; path: string | null; line: number | null };
 	});
-export type FeedbackClientOptions = {
+type FeedbackClientOptions = {
 	exec: Exec;
 	cwd: string;
 	signal?: AbortSignal;

package/extensions/pr-github.ts

@@ -78,7 +78,7 @@ export class GitHubRateLimitError extends PullRequestLoadError {
 	}
 }
 
-export type PullRequestRef = {
+type PullRequestRef = {
 	repository: string;
 	ref: string;
 	oid: string;
@@ -118,7 +118,7 @@ export type PullRequestObservation = {
 
 export type PullRequestLoadContext = Pick<ExtensionContext, "cwd" | "signal">;
 
-export type PullRequestCreationPreflight = {
+type PullRequestCreationPreflight = {
 	head: string;
 	base: {
 		host: string;
@@ -187,7 +187,7 @@ type LinkConfiguration = {
 	mirror: string[];
 };
 
-export type PullRequestCandidate = {
+type PullRequestCandidate = {
 	number: number;
 	url: URL;
 	lifecycle: PullRequestLifecycle;
@@ -209,7 +209,7 @@ export type PullRequestPublication = {
 	body: string;
 };
 
-export type ValidatedRemoteAuthority = {
+type ValidatedRemoteAuthority = {
 	fetchSource: string;
 	host: string;
 	repository: string;

package/extensions/pr-merge.ts

@@ -11,18 +11,18 @@ import type { LocalMergeSafety } from "./pr-routing.ts";
 
 const MERGE_PULL_REQUEST_MUTATION = "mutation($pullRequestId:ID!,$expectedHeadOid:GitObjectID!,$mergeMethod:PullRequestMergeMethod!){mergePullRequest(input:{pullRequestId:$pullRequestId,expectedHeadOid:$expectedHeadOid,mergeMethod:$mergeMethod}){pullRequest{id state}}}";
 
-export type InspectLocalMergeSafetyInput = {
+type InspectLocalMergeSafetyInput = {
 	exec: Exec;
 	cwd: string;
 	expectedHead: string;
 	headFetchSource: string;
 };
 
-export type InspectedLocalMergeSafety = LocalMergeSafety & {
+type InspectedLocalMergeSafety = LocalMergeSafety & {
 	headOid: string;
 };
 
-export type ExecuteGitHubMergeInput = InspectLocalMergeSafetyInput & {
+type ExecuteGitHubMergeInput = InspectLocalMergeSafetyInput & {
 	pullRequestId: string;
 	hostname: string;
 	expectedBase: {

package/extensions/pr-routing.ts

@@ -1,9 +1,9 @@
 export type PullRequestLifecycle = "open" | "merged" | "closed";
 export type CiStatus = "none" | "running" | "success" | "failure" | "failure-blocked";
 export type ReviewReadiness = "ready" | "pending";
-export type PolicyReadiness = "ready" | "pending";
-export type LocalWorktree = "clean" | "dirty";
-export type LocalHeadRelation = "equal" | "behind" | "ahead" | "diverged";
+type PolicyReadiness = "ready" | "pending";
+type LocalWorktree = "clean" | "dirty";
+type LocalHeadRelation = "equal" | "behind" | "ahead" | "diverged";
 
 export type PullRequestConditions = {
 	draft: boolean;
@@ -69,7 +69,7 @@ export type FeedbackRouteBlocker =
 	| { kind: "target-not-configured" }
 	| { kind: "worktree-dirty" }
 	| { kind: "head-not-equal"; relation: Exclude<LocalHeadRelation, "equal"> };
-export type RouteDecision =
+type RouteDecision =
 	| { kind: "selected"; nextStep: NextStep }
 	| { kind: "feedback-blocked"; nextStep: "blocked"; blocker: FeedbackRouteBlocker };
 

package/extensions/pr-ui.ts

@@ -18,7 +18,7 @@ export type PrDisplayInput = PullRequest & {
 
 export type PrStatusColor = "accent" | "warning" | "success" | "error" | "dim";
 
-export type PrFooter = {
+type PrFooter = {
 	number?: number;
 	url?: string;
 	text: string;

package/extensions/pr-update-branch.ts

@@ -12,23 +12,25 @@ import {
 	inspectWorktree,
 	isAncestor,
 	parseNulPaths,
+	parseSingleOutputLine,
 	readHead,
 	readRemoteOid,
 	requiredOid,
 	resolveRepositoryFetchSource,
 	runChecked,
+	validateResolvedConflictPaths,
 	withWorktreeLock,
 } from "./pr-execution.ts";
 
-export type UpdateBranchPhase = "ready" | "conflict-awaiting-user" | "verified" | "published" | "blocked";
+type UpdateBranchPhase = "ready" | "conflict-awaiting-user" | "verified" | "published" | "blocked";
 
-export type UpdateBranchState = {
+type UpdateBranchState = {
 	phase: UpdateBranchPhase;
 	verifiedHead?: string;
 	conflict?: { paths: string[]; statusBaseline: string };
 };
 
-export type UpdateBranchResult =
+type UpdateBranchResult =
 	| { kind: "verified"; head: string; fastForward: boolean }
 	| { kind: "conflict"; paths: string[] }
 	| { kind: "published"; head: string };
@@ -49,23 +51,6 @@ function sameAuthority(frozen: CurrentPullRequest, fresh: CurrentPullRequest): b
 		fresh.lifecycle === "open" && (fresh.conditions.baseUpdateRequired || fresh.conditions.conflict);
 }
 
-function singleLine(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 validateDeclaredPaths(paths: readonly string[], expected: readonly string[]): string[] {
-	if (!Array.isArray(paths)) throw new TypeError("resolvedPaths must be an array");
-	const encoded = `${paths.join("\0")}${paths.length ? "\0" : ""}`;
-	const parsed = parseNulPaths(encoded, "Resolved conflict paths");
-	if (expected.some((path) => !parsed.includes(path))) {
-		throw new Error("Resolved paths must include every original conflict path");
-	}
-	return parsed;
-}
-
 export class PullRequestBranchUpdater {
 	readonly state: UpdateBranchState = { phase: "ready" };
 
@@ -108,7 +93,7 @@ export class PullRequestBranchUpdater {
 		if (discovery.kind !== "current" || !sameAuthority(this.authority, discovery.pullRequest)) {
 			throw new Error("Branch update cancelled: frozen pull request authority changed");
 		}
-		const branch = singleLine((await runChecked(this.exec, "git", ["branch", "--show-current"], this.execOptions())).stdout, "current branch");
+		const branch = parseSingleOutputLine((await runChecked(this.exec, "git", ["branch", "--show-current"], this.execOptions())).stdout, "current branch");
 		if (branch !== this.authority.target.branch) throw new Error("Branch update cancelled: current branch changed");
 		if (requireClean && await inspectWorktree(this.exec, this.execOptions()) !== "clean") {
 			throw new Error("Branch update cancelled: worktree is dirty or a Git operation is in progress");
@@ -120,7 +105,7 @@ export class PullRequestBranchUpdater {
 
 	private async verifyMerge(originalHead: string): Promise<{ head: string; fastForward: boolean }> {
 		const head = await readHead(this.exec, this.execOptions());
-		const parentsOutput = singleLine((await runChecked(this.exec, "git", ["rev-list", "--parents", "-n", "1", "HEAD"], this.execOptions())).stdout, "merge parents");
+		const parentsOutput = parseSingleOutputLine((await runChecked(this.exec, "git", ["rev-list", "--parents", "-n", "1", "HEAD"], this.execOptions())).stdout, "merge parents");
 		const commits = parentsOutput.split(" ").map((value, index) => requiredOid(value, index === 0 ? "merged HEAD" : "merge parent"));
 		if (commits[0] !== head) throw new Error("Branch update merge verification returned a different HEAD");
 		let fastForward = false;
@@ -139,7 +124,7 @@ export class PullRequestBranchUpdater {
 	}
 
 	private async captureConflict(): Promise<string[]> {
-		const mergeHead = requiredOid(singleLine((await runChecked(this.exec, "git", ["rev-parse", "--verify", "MERGE_HEAD^{commit}"], this.execOptions())).stdout, "MERGE_HEAD"), "MERGE_HEAD");
+		const mergeHead = requiredOid(parseSingleOutputLine((await runChecked(this.exec, "git", ["rev-parse", "--verify", "MERGE_HEAD^{commit}"], this.execOptions())).stdout, "MERGE_HEAD"), "MERGE_HEAD");
 		if (mergeHead !== this.authority.base.oid) throw new Error("Failed merge did not retain the frozen base");
 		const paths = parseNulPaths((await runChecked(this.exec, "git", ["diff", "--name-only", "-z", "--diff-filter=U"], this.execOptions())).stdout, "Unmerged paths");
 		if (!paths.length) throw new Error("git merge failed without bounded unmerged paths");
@@ -189,10 +174,10 @@ export class PullRequestBranchUpdater {
 		if (this.state.phase !== "conflict-awaiting-user" || !this.state.conflict) {
 			throw new Error("Branch update has no conflict awaiting continuation");
 		}
-		const paths = validateDeclaredPaths(resolvedPaths, this.state.conflict.paths);
+		const paths = validateResolvedConflictPaths(resolvedPaths, this.state.conflict.paths);
 		return await withWorktreeLock(this.cwd, async () => {
 			await this.freshAuthority(this.authority.head.oid, false);
-			const mergeHead = requiredOid(singleLine((await runChecked(this.exec, "git", ["rev-parse", "--verify", "MERGE_HEAD^{commit}"], this.execOptions())).stdout, "MERGE_HEAD"), "MERGE_HEAD");
+			const mergeHead = requiredOid(parseSingleOutputLine((await runChecked(this.exec, "git", ["rev-parse", "--verify", "MERGE_HEAD^{commit}"], this.execOptions())).stdout, "MERGE_HEAD"), "MERGE_HEAD");
 			if (mergeHead !== this.authority.base.oid) throw new Error("Branch update merge context changed");
 			const status = await runChecked(this.exec, "git", ["status", "--porcelain=v2", "-z", "--untracked-files=all"], this.execOptions());
 			assertOnlyDeclaredStatusChanged(this.state.conflict!.statusBaseline, status.stdout, paths);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "5.0.2",
+  "version": "6.0.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",
@@ -27,17 +27,19 @@
     "pack:check": "npm pack --dry-run"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.85.1",
-    "@earendil-works/pi-tui": "^0.85.1",
+    "@earendil-works/pi-coding-agent": "^0.86.0",
+    "@earendil-works/pi-tui": "^0.86.0",
     "typebox": "^1.3.15"
   },
   "dependencies": {
-    "@henryqw/pi-config-store": "^1.1.0",
+    "@henryqw/pi-config-store": "^2.0.0",
     "@henryqw/pi-herdr": "^0.4.5",
     "@henryqw/pi-process": "^0.1.0",
     "proper-lockfile": "^4.1.2"
   },
   "devDependencies": {
+    "@earendil-works/pi-coding-agent": "0.86.0",
+    "@earendil-works/pi-tui": "0.86.0",
     "@types/proper-lockfile": "^4.1.4"
   },
   "repository": {