@henryqw/pi-pr 1.0.0 → 2.0.0

package/README.md

@@ -70,7 +70,7 @@ Ordinary conversation comments do not trigger a route or block a merge. Changes
 
 ## Refresh
 
-The footer and widget load at session start and poll every 30 seconds. Polling updates presentation only and may be stale. Presentation uses route priority, so draft appears before running CI. `/pr` reads fresh state before routing or merging. The command is authoritative for actions.
+The footer and widget load at session start. They refresh after local commits, PR creation, and pushes, and poll every 30 seconds. Polling updates presentation only and may be stale. The create hint stays hidden until the local branch has a commit beyond its creation point. Presentation uses route priority, so draft appears before running CI. `/pr` reads fresh state before routing or merging. The command is authoritative for actions.
 
 ## Safety limits
 

package/extensions/pr-github.ts

@@ -1,9 +1,8 @@
-import { lstat } from "node:fs/promises";
-import { resolve } from "node:path";
 import type {
 	ExtensionAPI,
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+import { inspectLocalMergeSafety } from "./pr-merge.ts";
 import type {
 	CiStatus,
 	LocalMergeSafety,
@@ -110,7 +109,6 @@ type PushUrl = {
 
 type PushTarget = {
 	fetchSource: string;
-	headOid: string;
 	remoteHeadOid: string | null;
 	repository: PushRepository;
 	ref: string;
@@ -707,6 +705,29 @@ function parseMergeMethodSettings(output: string, rulesetMethods: MergeMethod[]
 	return { allowedMergeMethods, viewerDefaultMergeMethod };
 }
 
+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);
+}
+
 async function readPushTarget(
 	pi: Pick<ExtensionAPI, "exec">,
 	context: PullRequestLoadContext,
@@ -716,11 +737,6 @@ async function readPushTarget(
 		"Read current branch",
 		"branch",
 	);
-	const headOid = oid(
-		singleLine((await execute(pi, context, "Read current HEAD", "git", ["rev-parse", "--verify", "HEAD^{commit}"])).stdout, "Read current HEAD", "HEAD"),
-		"Read current HEAD",
-		"HEAD",
-	);
 	const pushReference = optionalPushReference(
 		(await execute(pi, context, "Read push target", "git", [
 			"for-each-ref",
@@ -771,7 +787,7 @@ async function readPushTarget(
 		if (remoteHead.code !== 0) commandFailure("Read remote push ref", remoteHead);
 		remoteHeadOid = parseRemotePushRef(remoteHead.stdout, push.ref);
 	}
-	return { fetchSource: pushUrl.fetchSource, headOid, remoteHeadOid, repository, ref: push.ref };
+	return { fetchSource: pushUrl.fetchSource, remoteHeadOid, repository, ref: push.ref };
 }
 
 async function readUnresolvedReviewThreads(
@@ -838,73 +854,6 @@ async function readRulesetBaseBranchPolicy(
 	return parseRulesetBaseBranchPolicy(result.stdout);
 }
 
-async function readLocalMergeSafety(
-	pi: Pick<ExtensionAPI, "exec">,
-	context: PullRequestLoadContext,
-	pushTarget: PushTarget,
-	pullRequestHead: string,
-): Promise<LocalMergeSafety> {
-	const status = await execute(pi, context, "Read worktree status", "git", [
-		"status",
-		"--porcelain=v1",
-		"--untracked-files=all",
-	]);
-	const operationStates = ["MERGE_HEAD", "rebase-merge", "rebase-apply", "CHERRY_PICK_HEAD", "REVERT_HEAD", "sequencer"];
-	const statePaths = lines(
-		(await execute(pi, context, "Read Git operation state", "git", [
-			"rev-parse",
-			...operationStates.flatMap((state) => ["--git-path", state]),
-		])).stdout,
-		"Read Git operation state",
-		"state path",
-	);
-	if (statePaths.length !== operationStates.length) fail("Read Git operation state", "invalid state paths");
-	let operationInProgress = false;
-	for (const [index, path] of statePaths.entries()) {
-		try {
-			await lstat(resolve(context.cwd, path));
-			operationInProgress = true;
-		} catch (error) {
-			if (isRecord(error) && error.code === "ENOENT") continue;
-			const code = isRecord(error) && typeof error.code === "string" ? error.code : "filesystem error";
-			fail("Read Git operation state", `cannot inspect ${operationStates[index]}: ${code}`);
-		}
-	}
-	const worktree = status.stdout === "" && !operationInProgress ? "clean" : "dirty";
-
-	await execute(pi, context, "Fetch pull request head", "git", [
-		"fetch",
-		"--no-write-fetch-head",
-		"--no-tags",
-		"--no-recurse-submodules",
-		pushTarget.fetchSource,
-		pullRequestHead,
-	]);
-	await execute(pi, context, "Verify pull request head", "git", ["cat-file", "-e", `${pullRequestHead}^{commit}`]);
-	if (pushTarget.headOid === pullRequestHead) return { worktree, head: "equal" };
-
-	const localIsAncestor = await invoke(pi, context, "Compare pull request head", "git", [
-		"merge-base",
-		"--is-ancestor",
-		pushTarget.headOid,
-		pullRequestHead,
-	]);
-	if (localIsAncestor.killed) commandFailure("Compare pull request head", localIsAncestor);
-	if (localIsAncestor.code === 0) return { worktree, head: "behind" };
-	if (localIsAncestor.code !== 1) commandFailure("Compare pull request head", localIsAncestor);
-
-	const pullRequestIsAncestor = await invoke(pi, context, "Compare pull request head", "git", [
-		"merge-base",
-		"--is-ancestor",
-		pullRequestHead,
-		pushTarget.headOid,
-	]);
-	if (pullRequestIsAncestor.killed) commandFailure("Compare pull request head", pullRequestIsAncestor);
-	if (pullRequestIsAncestor.code === 0) return { worktree, head: "ahead" };
-	if (pullRequestIsAncestor.code === 1) return { worktree, head: "diverged" };
-	return commandFailure("Compare pull request head", pullRequestIsAncestor);
-}
-
 async function readMergeMethods(
 	pi: Pick<ExtensionAPI, "exec">,
 	context: PullRequestLoadContext,
@@ -973,10 +922,20 @@ export async function loadCurrentPullRequest(
 		: false;
 	const requiresStrictStatusChecks = legacyStrict || (rulesetPolicy?.requiresStrictStatusChecks ?? false);
 	const pullRequestConditions = conditions(candidate, unresolvedThreads, requiresStrictStatusChecks);
-	const local = inspectedLocal ?? await readLocalMergeSafety(pi, context, pushTarget, candidate.head.oid);
 	const merge = candidate.lifecycle === "open"
 		? await readMergeMethods(pi, context, candidate, rulesetPolicy?.allowedMergeMethods ?? null)
 		: null;
+	const inspected = inspectedLocal ?? await inspectLocalMergeSafety({
+		exec: (command, args, options) => pi.exec(command, args, {
+			...options,
+			signal: context.signal,
+			timeout: EXEC_TIMEOUT_MS,
+		}),
+		cwd: context.cwd,
+		expectedHead: candidate.head.oid,
+		headFetchSource: pushTarget.fetchSource,
+	});
+	const local: LocalMergeSafety = { worktree: inspected.worktree, head: inspected.head };
 	return {
 		id: candidate.id,
 		number: candidate.number,

package/extensions/pr-ui.ts

@@ -65,9 +65,14 @@ function widgetText(input: PrDisplayInput, nextStep: NextStep): string | undefin
 	}
 }
 
-export function projectPrDisplay(input: PrDisplayInput | null): PrDisplay {
+export function projectPrDisplay(input: PrDisplayInput | null, hasLocalCommit = false): PrDisplay {
 	const nextStep = deriveNextStep(input);
-	if (input === null) return { nextStep, widget: "Run /pr to create pull request" };
+	if (input === null) {
+		return {
+			nextStep,
+			widget: hasLocalCommit ? "Run /pr to create pull request" : undefined,
+		};
+	}
 
 	const status = footerStatus(input, nextStep);
 	return {

package/extensions/pr.ts

@@ -4,7 +4,10 @@ import {
 	type ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 import { createPrCommandHandler } from "./pr-command.ts";
-import { loadCurrentPullRequest } from "./pr-github.ts";
+import {
+	hasLocalCommit,
+	loadCurrentPullRequest,
+} from "./pr-github.ts";
 import {
 	formatPrFooter,
 	formatPrWidget,
@@ -14,10 +17,12 @@ import {
 const POLL_INTERVAL_MS = 30_000;
 const UI_KEY = "pi-pr";
 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|$|[;&|])/;
 
 type PullRequestExtensionDependencies = {
 	loadCurrentPullRequest?: typeof loadCurrentPullRequest;
+	hasLocalCommit?: typeof hasLocalCommit;
 	createPrCommandHandler?: typeof createPrCommandHandler;
 };
 
@@ -26,6 +31,7 @@ export default function pullRequestExtension(
 	dependencies: PullRequestExtensionDependencies = {},
 ): void {
 	const load = dependencies.loadCurrentPullRequest ?? loadCurrentPullRequest;
+	const detectLocalCommit = dependencies.hasLocalCommit ?? hasLocalCommit;
 	const createCommandHandler = dependencies.createPrCommandHandler ?? createPrCommandHandler;
 	let context: ExtensionContext | undefined;
 	let timer: ReturnType<typeof setInterval> | undefined;
@@ -33,8 +39,12 @@ export default function pullRequestExtension(
 	let queued = false;
 	let refreshFailureReported = false;
 
-	const render = (ctx: ExtensionContext, pullRequest: Awaited<ReturnType<typeof loadCurrentPullRequest>>): void => {
-		const display = projectPrDisplay(pullRequest);
+	const render = (
+		ctx: ExtensionContext,
+		pullRequest: Awaited<ReturnType<typeof loadCurrentPullRequest>>,
+		localCommit: boolean,
+	): void => {
+		const display = projectPrDisplay(pullRequest, localCommit);
 		const footer = pullRequest === null ? undefined : formatPrFooter(display, ctx.ui.theme);
 		if (pullRequest !== null && footer === undefined) {
 			throw new Error("Current pull request display is missing a footer");
@@ -79,15 +89,17 @@ export default function pullRequestExtension(
 		active = controller;
 		try {
 			let pullRequest: Awaited<ReturnType<typeof loadCurrentPullRequest>>;
+			let localCommit = false;
 			try {
 				pullRequest = await load(pi, loadContext);
+				if (pullRequest === null) localCommit = await detectLocalCommit(pi, loadContext);
 			} catch (error) {
 				// Keep the last known display when lookup is unavailable.
 				if (!controller.signal.aborted && context === ctx) reportRefreshFailure(error);
 				return;
 			}
 			if (controller.signal.aborted || context !== ctx) return;
-			render(ctx, pullRequest);
+			render(ctx, pullRequest, localCommit);
 			refreshFailureReported = false;
 		} finally {
 			if (active !== controller) return;
@@ -116,7 +128,7 @@ export default function pullRequestExtension(
 	pi.on("tool_result", async (event, ctx) => {
 		if (!ctx.hasUI || event.isError || !isBashToolResult(event)) return;
 		const command = event.input.command;
-		if (typeof command === "string" && (GH_PR_CREATE.test(command) || GIT_PUSH.test(command))) {
+		if (typeof command === "string" && (GH_PR_CREATE.test(command) || GIT_COMMIT.test(command) || GIT_PUSH.test(command))) {
 			await refresh().catch(reportRefreshFailure);
 		}
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Run /pr to automatically choose the current pull request's next safe lifecycle step: create, update, address feedback, fix CI, or merge when ready.",
   "keywords": [
     "pi-package",
@@ -22,13 +22,13 @@
     "README.md"
   ],
   "scripts": {
-    "test": "node --test test/*.test.ts",
+    "test": "node --test test/*.test.ts && node skills/pi-pr-comment-sweep/scripts/pr-feedback.mjs self-test",
     "typecheck": "tsc --noEmit --allowImportingTsExtensions --target ES2022 --module NodeNext --moduleResolution NodeNext --skipLibCheck extensions/*.ts test/*.test.ts",
     "pack:check": "npm pack --dry-run"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.84.4",
-    "@earendil-works/pi-tui": "^0.84.4"
+    "@earendil-works/pi-coding-agent": "^0.85.0",
+    "@earendil-works/pi-tui": "^0.85.0"
   },
   "repository": {
     "type": "git",