@henryqw/pi-pr 4.0.9 → 4.0.10

package/README.md

@@ -36,6 +36,8 @@ GitHub, use the network, or write files.
 
 **Requires.** [`@henryqw/pi-herdr`](https://pi.henry.wang/extensions/pi-herdr) is the shared Herdr CLI client. It installs with this package.
 
+**Uses.** [`@henryqw/pi-process`](https://pi.henry.wang/packages/pi-process) runs bounded child processes. It installs with this package.
+
 **Improves.** [`@henryqw/pi-footer`](https://pi.henry.wang/extensions/pi-footer) shows current-branch pull-request status in the footer.
 
 ## Use

package/extensions/pr-ci.ts

@@ -1,5 +1,6 @@
 import { createHash } from "node:crypto";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { spawnBounded, type Exec, type ExecOptions } from "@henryqw/pi-process";
 import {
 	loadCurrentPullRequest,
 	readValidatedRemoteAuthority,
@@ -15,10 +16,7 @@ import {
 	requiredOid,
 	requiredText,
 	runChecked,
-	spawnBounded,
 	withWorktreeLock,
-	type Exec,
-	type ExecOptions,
 } from "./pr-execution.ts";
 
 const PAGE_BYTES = 512 * 1024;

package/extensions/pr-comment-sweep.ts

@@ -2,6 +2,7 @@ import { createHash, randomUUID } from "node:crypto";
 import { realpath, rm } from "node:fs/promises";
 import { join } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { spawnBounded, type Exec, type ExecOptions } from "@henryqw/pi-process";
 import {
 	extensionConfigDir,
 	readTextFileBounded,
@@ -36,11 +37,8 @@ import {
 	requiredOid,
 	requiredText,
 	runChecked,
-	spawnBounded,
 	withWorktreeLock,
 	type AttemptState,
-	type Exec,
-	type ExecOptions,
 } from "./pr-execution.ts";
 
 export const SWEEP_RECOVERY_MAX_BYTES = 1024 * 1024;

package/extensions/pr-create.ts

@@ -1,4 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { spawnBounded, type Exec, type ExecOptions } from "@henryqw/pi-process";
 import {
 	branchTrackingRef,
 	fetchBranchTrackingRef,
@@ -29,10 +30,7 @@ import {
 	requiredOid,
 	requiredText,
 	runChecked,
-	spawnBounded,
 	withWorktreeLock,
-	type Exec,
-	type ExecOptions,
 } from "./pr-execution.ts";
 
 const MAX_TITLE_BYTES = 256;

package/extensions/pr-execution.ts

@@ -1,49 +1,21 @@
 import { createHash } from "node:crypto";
 import { lstat, mkdir, realpath } from "node:fs/promises";
 import { join, resolve } from "node:path";
-import { spawn } from "node:child_process";
 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 DEFAULT_EXEC_TIMEOUT_MS = 30_000;
-export const DEFAULT_OUTPUT_LIMIT_BYTES = 64 * 1024;
 export const MAX_CONFLICT_PATHS = 128;
 export const MAX_CONFLICT_PATH_BYTES = 1_024;
 export 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"];
-const PROCESS_TERMINATION_GRACE_MS = 250;
 const WORKTREE_LOCK_OPTIONS = { realpath: false, stale: 30_000, update: 5_000, retries: 0 } as const;
 
-export type ExecResult = {
-	stdout: string;
-	stderr: string;
-	code: number;
-	killed: boolean;
-	stdoutTruncated?: boolean;
-};
-
-export type ExecOptions = {
-	cwd: string;
-	signal?: AbortSignal;
-	timeoutMs?: number;
-	stdoutLimitBytes?: number;
-	stdoutTailBytes?: number;
-	stderrLimitBytes?: number;
-	stdin?: string;
-};
-
-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`);
-	return value;
-}
-
 export function requiredText(value: unknown, label: string): string {
 	if (typeof value !== "string" || !value || value.trim() !== value || /[\u0000-\u001f\u007f]/.test(value)) {
 		throw new TypeError(`${label} must be a non-empty string`);
@@ -57,167 +29,6 @@ export function requiredOid(value: unknown, label: string): string {
 	return parsed;
 }
 
-function validatedArguments(args: string[]): string[] {
-	if (!Array.isArray(args) || args.some((arg) => typeof arg !== "string" || arg.includes("\0"))) {
-		throw new TypeError("command arguments must be an array of strings without NUL bytes");
-	}
-	return args;
-}
-
-function decode(chunks: Buffer[], bytes: number, label: string): string {
-	try {
-		return new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(Buffer.concat(chunks, bytes));
-	} catch {
-		throw new Error(`${label} was not valid UTF-8`);
-	}
-}
-
-/** Run one argv-only child process with bounded streaming output, cancellation, and a deadline. */
-export const spawnBounded: Exec = async (command, args, options) => {
-	requiredText(command, "command");
-	validatedArguments(args);
-	requiredText(options.cwd, "cwd");
-	options.signal?.throwIfAborted();
-	const timeoutMs = positiveInteger(options.timeoutMs ?? DEFAULT_EXEC_TIMEOUT_MS, "timeoutMs");
-	const stdoutLimit = positiveInteger(options.stdoutLimitBytes ?? DEFAULT_OUTPUT_LIMIT_BYTES, "stdoutLimitBytes");
-	const stdoutTailLimit = options.stdoutTailBytes === undefined
-		? undefined
-		: positiveInteger(options.stdoutTailBytes, "stdoutTailBytes");
-	const stderrLimit = positiveInteger(options.stderrLimitBytes ?? DEFAULT_OUTPUT_LIMIT_BYTES, "stderrLimitBytes");
-	if (options.stdin !== undefined && typeof options.stdin !== "string") throw new TypeError("stdin must be a string");
-
-	return await new Promise<ExecResult>((resolve, reject) => {
-		const child = spawn(command, args, {
-			cwd: options.cwd,
-			detached: process.platform !== "win32",
-			env: process.env,
-			stdio: ["pipe", "pipe", "pipe"],
-		});
-		const childPid = child.pid;
-		const processGroup = process.platform !== "win32" && typeof childPid === "number" &&
-			Number.isSafeInteger(childPid) && childPid > 0 ? childPid : null;
-		const stdout: Buffer[] = [];
-		const stderr: Buffer[] = [];
-		const stdoutDecoder = stdoutTailLimit === undefined
-			? undefined
-			: new TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
-		let stdoutBytes = 0;
-		let stdoutTruncated = false;
-		let stderrBytes = 0;
-		let failure: Error | undefined;
-		let killed = false;
-		let settled = false;
-		let killTimer: ReturnType<typeof setTimeout> | undefined;
-
-		const signalChild = (signal: NodeJS.Signals): void => {
-			if (processGroup !== null) {
-				try {
-					process.kill(-processGroup, signal);
-					killed = true;
-					return;
-				} catch (error) {
-					if (error && typeof error === "object" && (error as NodeJS.ErrnoException).code === "ESRCH") return;
-				}
-			}
-			killed = child.kill(signal) || killed;
-		};
-		const stop = (error: Error): void => {
-			if (failure) return;
-			failure = error;
-			signalChild("SIGTERM");
-			killTimer = setTimeout(() => signalChild("SIGKILL"), PROCESS_TERMINATION_GRACE_MS);
-		};
-		const appendTail = (text: string): void => {
-			if (!text || stdoutTailLimit === undefined) return;
-			const chunk = Buffer.from(text, "utf8");
-			stdout.push(chunk);
-			stdoutBytes += chunk.length;
-			if (stdoutBytes <= stdoutTailLimit) return;
-			stdoutTruncated = true;
-			let remove = stdoutBytes - stdoutTailLimit;
-			while (remove > 0) {
-				const first = stdout[0]!;
-				if (first.length <= remove) {
-					stdout.shift();
-					stdoutBytes -= first.length;
-					remove -= first.length;
-					continue;
-				}
-				let start = remove;
-				while (start < first.length && (first[start]! & 0xc0) === 0x80) start += 1;
-				stdout[0] = Buffer.from(first.subarray(start));
-				stdoutBytes -= start;
-				remove = 0;
-			}
-		};
-		const decodeTail = (chunk?: Buffer): void => {
-			if (!stdoutDecoder) return;
-			try {
-				appendTail(chunk === undefined ? stdoutDecoder.decode() : stdoutDecoder.decode(chunk, { stream: true }));
-			} catch {
-				stop(new Error(`${command} stdout was not valid UTF-8`));
-			}
-		};
-		const timer = setTimeout(() => stop(new Error(`${command} timed out after ${timeoutMs}ms`)), timeoutMs);
-		const abort = (): void => stop(options.signal?.reason instanceof Error
-			? options.signal.reason
-			: new DOMException("The operation was aborted", "AbortError"));
-		options.signal?.addEventListener("abort", abort, { once: true });
-		if (options.signal?.aborted) abort();
-
-		child.stdout.on("data", (chunk: Buffer) => {
-			if (failure) return;
-			if (stdoutDecoder) {
-				decodeTail(chunk);
-				return;
-			}
-			stdoutBytes += chunk.length;
-			if (stdoutBytes > stdoutLimit) {
-				stop(new Error(`${command} stdout exceeded ${stdoutLimit} bytes`));
-				return;
-			}
-			stdout.push(chunk);
-		});
-		child.stderr.on("data", (chunk: Buffer) => {
-			if (failure) return;
-			stderrBytes += chunk.length;
-			if (stderrBytes > stderrLimit) {
-				stop(new Error(`${command} stderr exceeded ${stderrLimit} bytes`));
-				return;
-			}
-			stderr.push(chunk);
-		});
-		child.once("error", stop);
-		child.once("close", (code, signal) => {
-			if (settled) return;
-			settled = true;
-			clearTimeout(timer);
-			if (killTimer !== undefined && processGroup === null) clearTimeout(killTimer);
-			options.signal?.removeEventListener("abort", abort);
-			if (!failure && stdoutDecoder) decodeTail();
-			if (failure) {
-				reject(failure);
-				return;
-			}
-			try {
-				resolve({
-					stdout: stdoutDecoder
-						? Buffer.concat(stdout, stdoutBytes).toString("utf8")
-						: decode(stdout, stdoutBytes, `${command} stdout`),
-					stderr: decode(stderr, stderrBytes, `${command} stderr`),
-					code: code ?? 1,
-					killed: killed || signal !== null,
-					...(stdoutDecoder ? { stdoutTruncated } : {}),
-				});
-			} catch (error) {
-				reject(error);
-			}
-		});
-		if (options.stdin === undefined) child.stdin.end();
-		else child.stdin.end(options.stdin, "utf8");
-	});
-};
-
 export function commandText(command: string, args: readonly string[]): string {
 	return [command, ...args].join(" ");
 }

package/extensions/pr-feedback.ts

@@ -1,10 +1,9 @@
 import { createHash } from "node:crypto";
+import type { Exec, ExecOptions } from "@henryqw/pi-process";
 import {
 	runChecked,
 	requiredOid,
 	requiredText,
-	type Exec,
-	type ExecOptions,
 } from "./pr-execution.ts";
 import type { CurrentPullRequest } from "./pr-github.ts";
 

package/extensions/pr-merge.ts

@@ -1,10 +1,10 @@
+import type { Exec } from "@henryqw/pi-process";
 import {
 	inspectWorktree,
 	readHead,
 	requiredOid,
 	requiredText,
 	runChecked,
-	type Exec,
 } from "./pr-execution.ts";
 import type { LocalMergeSafety } from "./pr-routing.ts";
 

package/extensions/pr-update-branch.ts

@@ -1,4 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { spawnBounded, type Exec, type ExecOptions } from "@henryqw/pi-process";
 import {
 	loadCurrentPullRequest,
 	samePullRequestSnapshot,
@@ -15,10 +16,7 @@ import {
 	requiredOid,
 	resolveRepositoryFetchSource,
 	runChecked,
-	spawnBounded,
 	withWorktreeLock,
-	type Exec,
-	type ExecOptions,
 } from "./pr-execution.ts";
 
 export type UpdateBranchPhase = "ready" | "conflict-awaiting-user" | "verified" | "published" | "blocked";

package/extensions/pr.ts

@@ -1,4 +1,5 @@
 import { randomUUID } from "node:crypto";
+import { spawnBounded } from "@henryqw/pi-process";
 import { realpath } from "node:fs/promises";
 import {
 	isBashToolResult,
@@ -26,7 +27,7 @@ import {
 	samePullRequestObservation,
 	type PullRequestObservation,
 } from "./pr-github.ts";
-import { runChecked, spawnBounded } from "./pr-execution.ts";
+import { runChecked } from "./pr-execution.ts";
 import {
 	discoveryIssueKey,
 	discoveryIssueMessage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "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",
@@ -34,6 +34,7 @@
   "dependencies": {
     "@henryqw/pi-config-store": "^1.1.0",
     "@henryqw/pi-herdr": "^0.4.5",
+    "@henryqw/pi-process": "^0.1.0",
     "proper-lockfile": "^4.1.2"
   },
   "devDependencies": {

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

@@ -17,10 +17,10 @@ import {
 	loadCurrentPullRequest,
 	samePullRequestSnapshot,
 } from "../../../extensions/pr-github.ts";
+import { spawnBounded } from "@henryqw/pi-process";
 import {
 	inspectWorktree,
 	readHead,
-	spawnBounded,
 } from "../../../extensions/pr-execution.ts";
 
 class UsageError extends Error {}