@henryqw/pi-pr 3.1.2 → 3.1.4

package/README.md

@@ -21,10 +21,13 @@ keeps the complete JSON output. Read one item with
 `pr-feedback.mjs show --snapshot FILE --id ID`.
 
 `show` prints one JSON record with its exact stored body and fields. A thread
-record includes child IDs without child bodies. A nested comment includes only
-its parent thread's ID, state, and location. Missing, unknown, duplicate, or
-ambiguous IDs fail. `show` does not run Git, call GitHub, use the network, or
-write files.
+record includes child IDs without child bodies. Treat that record as a container.
+Inspect the `thread_comment` IDs directly. Do not call `show` on the parent only
+to find children. Show the parent only when it has no child, or when you need
+parent-level metadata. Issue independent `show` lookups in one tool-call round.
+A nested comment includes only its parent thread's ID, state, and location.
+Missing, unknown, duplicate, or ambiguous IDs fail. `show` does not run Git, call
+GitHub, use the network, or write files.
 
 ## Works with
 
@@ -73,9 +76,9 @@ Multiple candidate remotes, multiple matching PRs, OID mismatches, and unsafe Gi
 
 The creation workflow repeats destination, remote OID, PR, and configuration checks immediately before pushing. It pushes to the saved validated URL, not a mutable remote name. Every push uses the saved remote OID as an exact lease. Existing refs must also be ancestors of the captured local OID. A missing ref uses an empty lease as a create-only compare-and-swap.
 
-After a `/pr` create workflow settles, the extension waits for a refresh that finds an open current PR. It then prefixes the Herdr workspace label with `#<number> • `.
+After a `/pr` create workflow settles, the extension waits for a refresh that finds a configured current PR. It then prefixes the Herdr workspace label with `#<number> • `.
 
-Failed or empty discovery leaves one rename pending for a later refresh. Closed or merged historical matches do not trigger it.
+Failed or empty discovery leaves one rename pending for a later refresh. A restored configured PR completes the rename even when GitHub reports it as merged or closed.
 
 It removes repeated leading `#<number> • ` prefixes and legacy trailing ` · PR #<number>` suffixes before adding one current prefix. The remaining workspace name must be non-empty. This requires `HERDR_ENV=1` and a non-empty, trimmed `HERDR_WORKSPACE_ID`.
 
@@ -106,12 +109,20 @@ The comment sweep resolves its bundled helper and references from the installed
 
 The footer and widget load at session start. A directory outside a Git worktree stays silent and does not start polling. The UI shows `PR · status unavailable` for other discovery failures and reports only a generic error.
 
-They refresh after local commits, PR creation, pushes, and each dispatched workflow settles. They also refresh after any successful delegated task settles. Active Git worktrees poll every 30 seconds. Polling updates presentation only and may be stale.
+They refresh after local commits, PR creation, pushes, and each dispatched workflow settles. During creation, intermediate refreshes wait until the workflow settles. They also refresh after any successful delegated task settles. Active Git worktrees poll every 30 seconds. Polling updates presentation only and may be stale.
 
 The create widget stays hidden until the local branch has a commit beyond its creation point. Any displayed widget clears as soon as `/pr` starts. A dispatched workflow keeps it hidden until the agent settles. A direct merge, no-action route, or failed command refreshes the widget when the handler finishes.
 
 Presentation uses route priority, so draft appears before running CI. `/pr` reads fresh state before routing or merging. The command is authoritative for actions.
 
+### Session identity
+
+The extension records one configured PR identity in the Pi session. It stores only the PR URL, number, host, head identity, and configured target identity. It does not store lifecycle, CI, review, readiness, or base state. Repeated polling does not add duplicate entries, and no repository cache file is created.
+
+Normal discovery always runs first. If the configured remote ref was deleted, the footer and `/pr` may reload the exact observed PR URL. The current host, repository, branch, remote, ref, and local HEAD must still match the observation. Repository names use case-insensitive GitHub matching.
+
+The GitHub response must match the observed URL, host, repository, head ref, head OID, and PR number. GitHub supplies fresh mutable state. Invalid session data is ignored. A failed GitHub lookup stops routing and cannot start PR creation.
+
 ## Limits and recovery
 
 - `/pr` takes no arguments and does not open a browser.

package/extensions/pr-github.ts

@@ -95,6 +95,12 @@ export type CurrentPullRequest = PullRequest & {
 
 export type CurrentPullRequestDiscovery = PullRequestDiscovery<CurrentPullRequest>;
 
+export type PullRequestObservation = {
+	pullRequest: { url: string; number: number; host: string };
+	head: PullRequestRef;
+	target: { repository: string; branch: string; remote: string; ref: string };
+};
+
 export type PullRequestLoadContext = Pick<ExtensionContext, "cwd" | "signal">;
 
 type CommandOutput = {
@@ -423,6 +429,67 @@ function parsePullRequestUrl(value: unknown, number: number): { url: URL; reposi
 	};
 }
 
+export function parsePullRequestObservation(value: unknown): PullRequestObservation | null {
+	try {
+		if (!isRecord(value) || !isRecord(value.pullRequest) || !isRecord(value.head) || !isRecord(value.target)) {
+			return null;
+		}
+		const number = value.pullRequest.number;
+		if (typeof number !== "number" || !Number.isSafeInteger(number) || number <= 0) return null;
+		const parsedUrl = parsePullRequestUrl(value.pullRequest.url, number).url;
+		const host = text(value.pullRequest.host, "Read pull request observation", "host").toLowerCase();
+		if (parsedUrl.hostname.toLowerCase() !== host) return null;
+		return {
+			pullRequest: { url: parsedUrl.href, number, host },
+			head: {
+				repository: repositoryName(value.head.repository, "Read pull request observation", "head repository"),
+				ref: text(value.head.ref, "Read pull request observation", "head ref"),
+				oid: oid(value.head.oid, "Read pull request observation", "head OID"),
+			},
+			target: {
+				repository: repositoryName(value.target.repository, "Read pull request observation", "target repository"),
+				branch: text(value.target.branch, "Read pull request observation", "target branch"),
+				remote: text(value.target.remote, "Read pull request observation", "target remote"),
+				ref: text(value.target.ref, "Read pull request observation", "target ref"),
+			},
+		};
+	} catch (error) {
+		if (error instanceof PullRequestLoadError) return null;
+		throw error;
+	}
+}
+
+export function pullRequestObservation(pullRequest: CurrentPullRequest): PullRequestObservation | null {
+	if (pullRequest.target.provenance !== "configured") return null;
+	return {
+		pullRequest: {
+			url: pullRequest.url.href,
+			number: pullRequest.number,
+			host: pullRequest.host,
+		},
+		head: { ...pullRequest.head },
+		target: {
+			repository: pullRequest.target.repository,
+			branch: pullRequest.target.branch,
+			remote: pullRequest.target.remote,
+			ref: pullRequest.target.ref,
+		},
+	};
+}
+
+export function samePullRequestObservation(
+	left: PullRequestObservation | undefined,
+	right: PullRequestObservation,
+): boolean {
+	return left !== undefined && left.pullRequest.url === right.pullRequest.url &&
+		left.pullRequest.number === right.pullRequest.number && left.pullRequest.host === right.pullRequest.host &&
+		normalizeRepository(left.head.repository) === normalizeRepository(right.head.repository) &&
+		left.head.ref === right.head.ref && left.head.oid === right.head.oid &&
+		normalizeRepository(left.target.repository) === normalizeRepository(right.target.repository) &&
+		left.target.branch === right.target.branch && left.target.remote === right.target.remote &&
+		left.target.ref === right.target.ref;
+}
+
 function lifecycle(value: unknown): PullRequestLifecycle {
 	if (value === "OPEN") return "open";
 	if (value === "MERGED") return "merged";
@@ -1332,6 +1399,45 @@ async function loadPullRequestDetails(
 	};
 }
 
+async function loadObservedPullRequest(
+	pi: Pick<ExtensionAPI, "exec">,
+	context: PullRequestLoadContext,
+	pushTarget: PushTarget,
+	observation: PullRequestObservation | null,
+	inspectedLocal?: LocalMergeSafety,
+): Promise<CurrentPullRequest | null> {
+	if (
+		observation === null || observation.pullRequest.host !== pushTarget.repository.host ||
+		normalizeRepository(observation.target.repository) !== pushTarget.repository.normalizedName ||
+		observation.target.branch !== pushTarget.branch || observation.target.remote !== pushTarget.remote ||
+		observation.target.ref !== pushTarget.ref
+	) return null;
+
+	const localHead = oid(singleLine((await execute(pi, context, "Read local HEAD", "git", [
+		"rev-parse", "--verify", "HEAD^{commit}",
+	])).stdout, "Read local HEAD", "OID"), "Read local HEAD", "OID");
+	if (localHead !== observation.head.oid) return null;
+
+	const loaded = await execute(pi, context, "Load observed pull request", "gh", [
+		"pr",
+		"view",
+		observation.pullRequest.url,
+		"--json",
+		PR_FIELDS,
+	]);
+	const candidate = parseLoadedPullRequest(loaded.stdout, new URL(observation.pullRequest.url));
+	if (candidate === null) fail("Load observed pull request", "pull request head repository is unavailable");
+	if (
+		candidate.number !== observation.pullRequest.number ||
+		candidate.url.hostname.toLowerCase() !== observation.pullRequest.host ||
+		normalizeRepository(candidate.head.repository) !== normalizeRepository(observation.head.repository) ||
+		normalizeRepository(candidate.head.repository) !== pushTarget.repository.normalizedName ||
+		candidate.head.ref !== observation.head.ref || candidate.head.ref !== pushTarget.ref ||
+		candidate.head.oid !== observation.head.oid
+	) return null;
+	return loadPullRequestDetails(pi, context, candidate, pushTarget, inspectedLocal);
+}
+
 async function searchPullRequests(
 	pi: Pick<ExtensionAPI, "exec">,
 	context: PullRequestLoadContext,
@@ -1399,6 +1505,7 @@ export async function loadCurrentPullRequest(
 	pi: Pick<ExtensionAPI, "exec">,
 	context: PullRequestLoadContext,
 	inspectedLocal?: LocalMergeSafety,
+	observed?: unknown,
 ): Promise<CurrentPullRequestDiscovery> {
 	const read = await readPushTarget(pi, context);
 	if (read.kind === "inactive") return { kind: "inactive" };
@@ -1430,6 +1537,19 @@ export async function loadCurrentPullRequest(
 	}
 
 	const search = await searchPullRequests(pi, context, pushTarget);
+	if (
+		pushTarget.provenance === "configured" && pushTarget.remoteHeadOid === null &&
+		(search.kind === "none" || search.kind === "target-invalid")
+	) {
+		const restored = await loadObservedPullRequest(
+			pi,
+			context,
+			pushTarget,
+			parsePullRequestObservation(observed),
+			inspectedLocal,
+		);
+		if (restored !== null) return { kind: "current", pullRequest: restored };
+	}
 	if (search.kind === "ambiguous") {
 		return {
 			kind: "blocked",

package/extensions/pr.ts

@@ -8,6 +8,10 @@ import { createPrCommandHandler } from "./pr-command.ts";
 import {
 	hasLocalCommit,
 	loadCurrentPullRequest,
+	parsePullRequestObservation,
+	pullRequestObservation,
+	samePullRequestObservation,
+	type PullRequestObservation,
 } from "./pr-github.ts";
 import {
 	discoveryIssueKey,
@@ -22,6 +26,7 @@ import {
 const POLL_INTERVAL_MS = 30_000;
 const HERDR_TIMEOUT_MS = 10_000;
 const UI_KEY = "pi-pr";
+const OBSERVATION_ENTRY = "pi-pr-observation";
 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|$|[;&|])/;
@@ -51,6 +56,14 @@ function parseWorkspaceLabel(response: Record<string, unknown>, workspaceId: str
 	return label;
 }
 
+function latestObservation(ctx: ExtensionContext): PullRequestObservation | undefined {
+	for (const entry of [...ctx.sessionManager.getBranch()].reverse()) {
+		if (entry.type !== "custom" || entry.customType !== OBSERVATION_ENTRY) continue;
+		const observation = parsePullRequestObservation(entry.data);
+		if (observation !== null) return observation;
+	}
+}
+
 export default function pullRequestExtension(
 	pi: ExtensionAPI,
 	dependencies: PullRequestExtensionDependencies = {},
@@ -86,10 +99,24 @@ export default function pullRequestExtension(
 		signal.throwIfAborted();
 	};
 
-	const load = dependencies.loadCurrentPullRequest ?? loadCurrentPullRequest;
+	const discover = dependencies.loadCurrentPullRequest ?? loadCurrentPullRequest;
 	const detectLocalCommit = dependencies.hasLocalCommit ?? hasLocalCommit;
 	const createCommandHandler = dependencies.createPrCommandHandler ?? createPrCommandHandler;
 	let context: ExtensionContext | undefined;
+	let observation: PullRequestObservation | undefined;
+	const load: typeof loadCurrentPullRequest = async (api, loadContext, inspectedLocal) => {
+		const generation = sessionGeneration;
+		const discovery = await discover(api, loadContext, inspectedLocal, observation);
+		if (generation !== sessionGeneration) return discovery;
+		if (discovery.kind === "current") {
+			const current = pullRequestObservation(discovery.pullRequest);
+			if (current !== null && !samePullRequestObservation(observation, current)) {
+				pi.appendEntry(OBSERVATION_ENTRY, current);
+				observation = current;
+			}
+		}
+		return discovery;
+	};
 	let sessionGeneration = 0;
 	let timer: ReturnType<typeof setInterval> | undefined;
 	let active: AbortController | undefined;
@@ -164,6 +191,7 @@ export default function pullRequestExtension(
 	const stop = (): void => {
 		sessionGeneration += 1;
 		context = undefined;
+		observation = undefined;
 		queued = false;
 		refreshFailureReported = false;
 		displayEstablished = false;
@@ -203,7 +231,7 @@ export default function pullRequestExtension(
 
 	const refresh = async (): Promise<void> => {
 		const ctx = context;
-		if (!ctx) return;
+		if (!ctx || [...activeInvocations.values()].includes("create-workflow")) return;
 		const generation = sessionGeneration;
 		if (active) {
 			queued = true;
@@ -240,10 +268,7 @@ export default function pullRequestExtension(
 			refreshFailureReported = false;
 
 			const pullRequest = discovery.kind === "current" ? discovery.pullRequest : undefined;
-			if (
-				pendingWorkspaceRename && pullRequest?.lifecycle === "open" &&
-				pullRequest.target.provenance === "configured"
-			) {
+			if (pendingWorkspaceRename && pullRequest?.target.provenance === "configured") {
 				pendingWorkspaceRename = false;
 				const workspaceId = process.env.HERDR_WORKSPACE_ID?.trim();
 				if (process.env.HERDR_ENV === "1" && workspaceId) {
@@ -279,6 +304,7 @@ export default function pullRequestExtension(
 	pi.on("session_start", async (_event, ctx) => {
 		stop();
 		const generation = sessionGeneration;
+		observation = latestObservation(ctx);
 		if (!ctx.hasUI) return;
 		context = ctx;
 		await refresh();
@@ -318,7 +344,7 @@ export default function pullRequestExtension(
 		}
 	});
 
-	const commandHandler = createCommandHandler(pi);
+	const commandHandler = createCommandHandler(pi, { loadCurrentPullRequest: load });
 	pi.registerCommand("pr", {
 		description: "[instructions] — Run the current branch pull request next step",
 		handler: async (args, ctx) => {

package/package.json

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

package/skills/pi-pr-comment-sweep/SKILL.md

@@ -33,13 +33,17 @@ Run standalone; never invoke, defer to, or modify Shipyard.
 
 2. Initial fetch prints a compact index of every feedback ID. Later fetches into
    a copied snapshot print compact indexes of additions, edits, and state changes.
-   The snapshot remains complete. For each non-obvious item, inspect only that item:
+   The snapshot remains complete. A thread record with child IDs is a container:
+   inspect `thread_comment` IDs directly. Do not call `show` on the parent solely
+   to discover its children. Show the parent only if it has no child or parent-level
+   metadata is actually needed. For each non-obvious item, inspect only that item:
 
    ```bash
    node "<skill>/scripts/pr-feedback.mjs" show --snapshot "$SNAPSHOT" --id "$ID"
    ```
 
-   Always inspect every unresolved feedback item before triage. Never
+   Issue independent `show` lookups in one tool-call round. Always inspect every
+   unresolved feedback item before triage. Never
    read or print the whole raw snapshot when `show` provides the bounded lookup.
    Follow [Thread triage](<skill>/references/thread-triage.md>) and ledger every item as
    `actionable`, `non-actionable`, or `blocked`, with terse evidence, smallest