stim 1.20.2 → 1.22.0

package/dist/{pull-request-CQ8sPbZa.mjs → pull-request-W1IuLXDt.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-DqKo9GKJ.mjs";
-import { n as gitAsync, r as gitQuiet } from "./git-DDfFzkMm.mjs";
+import { r as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { c as gitQuiet, l as gitQuietAsync, r as childEnvironment, s as gitAsync, t as runOperationFile } from "./operation-exec-BW0em61G.mjs";
 //#region src/workspace/pull-request.ts
 const GH_TIMEOUT_MS = 2e4;
 const GH_ENV = {
@@ -81,16 +81,8 @@ function headRepoOf(pull) {
 	const name = pull.headRepository?.name;
 	return owner && name ? `${owner.toLowerCase()}/${name.toLowerCase()}` : null;
 }
-/**
-* Picks the pull request that describes `head` among those `gh pr list --head <branch>` returned. One whose head is
-* `head` wins, then one whose head contains `head`, then one whose head `head` contains. An open one wins a tier,
-* then the newest. A pull request unrelated to `head` is from an earlier use of the branch name and is ignored. A
-* cross-repository pull request is kept only when its head repository is one of `ownRepos` (this checkout's own git
-* remotes, lowercased "owner/name"); otherwise it only shares the branch name with a stranger's fork and is ignored.
-* `isAncestor(a, b)` answers whether commit `a` is an ancestor of commit `b`, and false when git cannot tell.
-*/
-function selectPullRequest(pulls, head, isAncestor, ownRepos = /* @__PURE__ */ new Set()) {
-	const known = pulls.flatMap((pull) => {
+function knownPullRequests(pulls, ownRepos) {
+	return pulls.flatMap((pull) => {
 		if (!pull || typeof pull !== "object") return [];
 		const state = stateOf(pull.state);
 		if (!state || !pull.headRefOid) return [];
@@ -103,6 +95,17 @@ function selectPullRequest(pulls, head, isAncestor, ownRepos = /* @__PURE__ */ n
 			state
 		}];
 	});
+}
+/**
+* Picks the pull request that describes `head` among those `gh pr list --head <branch>` returned. One whose head is
+* `head` wins, then one whose head contains `head`, then one whose head `head` contains. An open one wins a tier,
+* then the newest. A pull request unrelated to `head` is from an earlier use of the branch name and is ignored. A
+* cross-repository pull request is kept only when its head repository is one of `ownRepos` (this checkout's own git
+* remotes, lowercased "owner/name"); otherwise it only shares the branch name with a stranger's fork and is ignored.
+* `isAncestor(a, b)` answers whether commit `a` is an ancestor of commit `b`, and false when git cannot tell.
+*/
+function selectPullRequest(pulls, head, isAncestor, ownRepos = /* @__PURE__ */ new Set()) {
+	const known = knownPullRequests(pulls, ownRepos);
 	const tiers = [
 		known.filter(({ pull }) => pull.headRefOid === head),
 		known.filter(({ pull }) => pull.headRefOid !== head && isAncestor(head, pull.headRefOid)),
@@ -159,7 +162,9 @@ function parseRemoteRepo(url) {
 	return owner && name ? `${owner.toLowerCase()}/${name.toLowerCase()}` : null;
 }
 function localRemoteRepos(cwd) {
-	const out = gitQuiet(cwd, ["remote", "-v"]);
+	return remoteRepos(gitQuiet(cwd, ["remote", "-v"]));
+}
+function remoteRepos(out) {
 	const repos = /* @__PURE__ */ new Set();
 	for (const line of out ? out.split("\n") : []) {
 		const url = /^\S+\s+(\S+)\s+\((?:fetch|push)\)$/.exec(line)?.[1];
@@ -168,6 +173,33 @@ function localRemoteRepos(cwd) {
 	}
 	return repos;
 }
+function gitExecution(operation) {
+	return {
+		...operation ? childEnvironment(operation.env) : {},
+		signal: operation?.signal,
+		declareFor: operation,
+		cwd: operation?.cwd,
+		killSignal: "SIGKILL"
+	};
+}
+async function selectPullRequestAsync(cwd, pulls, head, ownRepos, operation) {
+	const options = gitExecution(operation);
+	const ancestors = /* @__PURE__ */ new Map();
+	for (const { pull } of knownPullRequests(pulls, ownRepos)) {
+		if (pull.headRefOid === head) continue;
+		for (const [a, b] of [[head, pull.headRefOid], [pull.headRefOid, head]]) {
+			const key = `${a}:${b}`;
+			if (!ancestors.has(key)) ancestors.set(key, await gitQuietAsync(cwd, [
+				"merge-base",
+				"--is-ancestor",
+				a,
+				b
+			], options) !== null);
+		}
+	}
+	operation?.signal.throwIfAborted();
+	return selectPullRequest(pulls, head, (a, b) => ancestors.get(`${a}:${b}`) ?? false, ownRepos);
+}
 /**
 * Asks GitHub, through `gh`, which pull requests have `branch` as their head, run from `cwd` so `gh` picks the
 * repository from its remotes. Each call is one fixed `gh pr list` invocation. Once `gh` is missing, signed out or
@@ -211,6 +243,50 @@ function pullRequestLookup() {
 		return { pullRequest: Array.isArray(pulls) ? selectPullRequest(pulls, head, ancestry(cwd), localRemoteRepos(cwd)) : null };
 	};
 }
+/** The same branch and commit lookup as `pullRequestLookup`, with nonblocking Git and GitHub probes. */
+function pullRequestLookupAsync(operation) {
+	let unavailable;
+	return async (cwd, branch, head) => {
+		const exec = getExecutor();
+		operation?.signal.throwIfAborted();
+		if (unavailable === void 0) unavailable = exec.findExecutable("gh") ? null : "gh is not installed";
+		if (unavailable) return { unavailable };
+		let out;
+		try {
+			out = await runOperationFile(operation, exec, "gh", [
+				"pr",
+				"list",
+				"--head",
+				branch,
+				"--state",
+				"all",
+				"--limit",
+				"20",
+				"--json",
+				GH_FIELDS
+			], {
+				cwd,
+				timeoutMs: GH_TIMEOUT_MS,
+				env: GH_ENV
+			});
+		} catch (error) {
+			if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+			operation?.signal.throwIfAborted();
+			const failure = ghFailure(error, "gh pr list");
+			if (failure.sticky) unavailable = failure.unavailable;
+			return { unavailable: failure.unavailable };
+		}
+		let pulls;
+		try {
+			pulls = JSON.parse(out);
+		} catch {
+			return { unavailable: "gh pr list printed no JSON" };
+		}
+		if (!Array.isArray(pulls)) return { pullRequest: null };
+		const ownRepos = remoteRepos(await gitQuietAsync(cwd, ["remote", "-v"], gitExecution(operation)));
+		return { pullRequest: await selectPullRequestAsync(cwd, pulls, head, ownRepos, operation) };
+	};
+}
 function branchesQuery(count, detail) {
 	const variables = Array.from({ length: count }, (_, i) => `, $b${i}: String!`).join("");
 	const nodes = `${GH_SCALAR_FIELDS.replaceAll(",", " ")} ${GH_GRAPHQL_REPO_SELECTION}` + (detail ? ` ${GH_DETAIL_FIELDS}` : "");
@@ -223,9 +299,10 @@ function branchesQuery(count, detail) {
 * out or times out, every later call through the same function answers `unavailable` without running it again.
 * With `detail`, it also asks for each pull request's title, review decision and head commit check counts.
 */
-function pullRequestLookups({ detail = false } = {}) {
+function pullRequestLookups({ detail = false, operation } = {}) {
 	let unavailable;
 	return async (repo, queries) => {
+		operation?.signal.throwIfAborted();
 		const exec = getExecutor();
 		if (unavailable === void 0) unavailable = exec.findExecutable("gh") ? null : "gh is not installed";
 		const all = (lookup) => queries.map(() => lookup);
@@ -243,12 +320,14 @@ function pullRequestLookups({ detail = false } = {}) {
 		args.push("-f", `query=${branchesQuery(queries.length, detail)}`);
 		let out;
 		try {
-			out = await exec.runFileAsync("gh", args, {
+			out = await runOperationFile(operation, exec, "gh", args, {
 				cwd: repo,
 				timeoutMs: GH_TIMEOUT_MS,
 				env: GH_ENV
 			});
 		} catch (error) {
+			if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+			operation?.signal.throwIfAborted();
 			const failure = ghFailure(error, "gh api graphql");
 			if (failure.sticky) unavailable = failure.unavailable;
 			return all({ unavailable: failure.unavailable });
@@ -260,11 +339,14 @@ function pullRequestLookups({ detail = false } = {}) {
 			return all({ unavailable: "gh api graphql printed no JSON" });
 		}
 		if (!found) return all({ unavailable: "gh api graphql printed no repository" });
-		const ownRepos = localRemoteRepos(repo);
-		return queries.map(({ cwd, head }, i) => {
+		const ownRepos = remoteRepos(await gitQuietAsync(repo, ["remote", "-v"], gitExecution(operation)));
+		const results = [];
+		for (const [i, { cwd, head }] of queries.entries()) {
+			operation?.signal.throwIfAborted();
 			const pulls = found[`b${i}`]?.nodes;
-			return { pullRequest: Array.isArray(pulls) ? selectPullRequest(pulls, head, ancestry(cwd), ownRepos) : null };
-		});
+			results.push({ pullRequest: Array.isArray(pulls) ? await selectPullRequestAsync(cwd, pulls, head, ownRepos, operation) : null });
+		}
+		return results;
 	};
 }
 /** The merged or closed pull request whose commits include HEAD, which makes the worktree removable. */
@@ -306,4 +388,4 @@ function worktreePullRequests() {
 	};
 }
 //#endregion
-export { pullRequestLookup as a, worktreePullRequests as c, parseRemoteRepo as i, describePullRequest as n, pullRequestLookups as o, endedPullRequest as r, selectPullRequest as s, checkCounts as t };
+export { pullRequestLookup as a, selectPullRequest as c, parseRemoteRepo as i, worktreePullRequests as l, describePullRequest as n, pullRequestLookupAsync as o, endedPullRequest as r, pullRequestLookups as s, checkCounts as t };

package/dist/pull-request-eODyIqZF.d.mts

@@ -0,0 +1,124 @@
+import { StimContext } from "@stim-cli/core";
+//#region src/workspace/pull-request.d.ts
+interface GhPullRequest {
+  number: number;
+  state: string;
+  url: string;
+  headRefOid: string;
+  mergedAt: string | null;
+  closedAt: string | null;
+  isCrossRepository?: boolean;
+  isDraft?: boolean;
+  headRepository?: {
+    name?: string | null;
+  } | null;
+  headRepositoryOwner?: {
+    login?: string | null;
+  } | null;
+  title?: string;
+  reviewDecision?: string | null;
+  commits?: {
+    nodes?: {
+      commit?: {
+        statusCheckRollup?: GhCheckRollup | null;
+      };
+    }[];
+  };
+}
+interface GhStateCount {
+  state: string;
+  count: number;
+}
+interface GhCheckRollup {
+  contexts?: {
+    checkRunCountsByState?: GhStateCount[];
+    statusContextCountsByState?: GhStateCount[];
+  };
+}
+interface CheckCounts {
+  passing: number;
+  failing: number;
+  pending: number;
+}
+/**
+ * The pull request whose head branch is the worktree's branch and whose commits include the worktree's HEAD.
+ * `containsHead` is false when the pull request's head is an ancestor of HEAD: HEAD has commits the pull request
+ * never had. `endedAt` is when it was merged or closed, in epoch milliseconds, and null while it is open.
+ */
+interface PullRequestFact {
+  number: number;
+  state: "open" | "merged" | "closed";
+  draft: boolean;
+  url: string;
+  head: string;
+  containsHead: boolean;
+  endedAt: number | null;
+  /** Present when the lookup asked for detail. */
+  title?: string;
+  reviewDecision?: "approved" | "changes-requested" | "review-required" | null;
+  checks?: CheckCounts | null;
+}
+/** Sums a head commit's check runs and commit statuses by outcome; null when the commit has no checks. */
+declare function checkCounts(rollup: GhCheckRollup | null | undefined): CheckCounts | null;
+type PullRequestLookup = {
+  pullRequest: PullRequestFact | null;
+} | {
+  unavailable: string;
+};
+/**
+ * Picks the pull request that describes `head` among those `gh pr list --head <branch>` returned. One whose head is
+ * `head` wins, then one whose head contains `head`, then one whose head `head` contains. An open one wins a tier,
+ * then the newest. A pull request unrelated to `head` is from an earlier use of the branch name and is ignored. A
+ * cross-repository pull request is kept only when its head repository is one of `ownRepos` (this checkout's own git
+ * remotes, lowercased "owner/name"); otherwise it only shares the branch name with a stranger's fork and is ignored.
+ * `isAncestor(a, b)` answers whether commit `a` is an ancestor of commit `b`, and false when git cannot tell.
+ */
+declare function selectPullRequest(pulls: readonly GhPullRequest[], head: string, isAncestor: (ancestor: string, descendant: string) => boolean, ownRepos?: ReadonlySet<string>): PullRequestFact | null;
+/**
+ * "owner/name", lowercased, parsed out of a git remote URL, or null when it doesn't match: https, `ssh://`, or
+ * scp-like (`[user@]host:owner/name`, which also covers an `~/.ssh/config` host alias in place of `user@host`).
+ */
+declare function parseRemoteRepo(url: string): string | null;
+/**
+ * Asks GitHub, through `gh`, which pull requests have `branch` as their head, run from `cwd` so `gh` picks the
+ * repository from its remotes. Each call is one fixed `gh pr list` invocation. Once `gh` is missing, signed out or
+ * times out, every later lookup through the same function answers `unavailable` without running it again.
+ */
+declare function pullRequestLookup(): (cwd: string, branch: string, head: string) => PullRequestLookup;
+/** The same branch and commit lookup as `pullRequestLookup`, with nonblocking Git and GitHub probes. */
+declare function pullRequestLookupAsync(operation?: StimContext): (cwd: string, branch: string, head: string) => Promise<PullRequestLookup>;
+/** A worktree whose pull request {@link pullRequestLookups} looks up: its path, branch and HEAD commit. */
+interface PullRequestQuery {
+  cwd: string;
+  branch: string;
+  head: string;
+}
+/**
+ * {@link pullRequestLookup} for every branch of one repository in one fixed `gh api graphql` call run from `repo`,
+ * which asks for the same 20 newest pull requests of each head branch that `gh pr list --head` returns. `gh` fills
+ * `{owner}` and `{repo}` from the remotes of `repo`; branch names travel as variables. Once `gh` is missing, signed
+ * out or times out, every later call through the same function answers `unavailable` without running it again.
+ * With `detail`, it also asks for each pull request's title, review decision and head commit check counts.
+ */
+declare function pullRequestLookups({ detail, operation }?: {
+  detail?: boolean;
+  operation?: StimContext;
+}): (repo: string, queries: readonly PullRequestQuery[]) => Promise<PullRequestLookup[]>;
+/** The merged or closed pull request whose commits include HEAD, which makes the worktree removable. */
+declare function endedPullRequest(lookup: PullRequestLookup | null): PullRequestFact | null;
+/** "PR #123 merged", for reports. */
+declare function describePullRequest(pr: Pick<PullRequestFact, "number" | "state">): string;
+/** A linked worktree whose pull request {@link worktreePullRequests} looks up. */
+interface WorktreeBranch {
+  path: string;
+  branch: string;
+  repository: string;
+}
+/**
+ * Looks up the pull request of each worktree's branch and HEAD, with one {@link pullRequestLookups} call per
+ * repository. The map holds null for a worktree without one, and leaves out a worktree whose HEAD git cannot read
+ * or whose lookup was unavailable.
+ */
+declare function worktreePullRequests(): (worktrees: readonly WorktreeBranch[]) => Promise<Map<string, PullRequestFact | null>>;
+//#endregion
+export { PullRequestLookup as a, checkCounts as c, parseRemoteRepo as d, pullRequestLookup as f, worktreePullRequests as g, selectPullRequest as h, PullRequestFact as i, describePullRequest as l, pullRequestLookups as m, GhCheckRollup as n, PullRequestQuery as o, pullRequestLookupAsync as p, GhPullRequest as r, WorktreeBranch as s, CheckCounts as t, endedPullRequest as u };

package/dist/pull-requests.d.mts

@@ -1,120 +1,2 @@
-//#region src/workspace/pull-request.d.ts
-interface GhPullRequest {
-  number: number;
-  state: string;
-  url: string;
-  headRefOid: string;
-  mergedAt: string | null;
-  closedAt: string | null;
-  isCrossRepository?: boolean;
-  isDraft?: boolean;
-  headRepository?: {
-    name?: string | null;
-  } | null;
-  headRepositoryOwner?: {
-    login?: string | null;
-  } | null;
-  title?: string;
-  reviewDecision?: string | null;
-  commits?: {
-    nodes?: {
-      commit?: {
-        statusCheckRollup?: GhCheckRollup | null;
-      };
-    }[];
-  };
-}
-interface GhStateCount {
-  state: string;
-  count: number;
-}
-interface GhCheckRollup {
-  contexts?: {
-    checkRunCountsByState?: GhStateCount[];
-    statusContextCountsByState?: GhStateCount[];
-  };
-}
-interface CheckCounts {
-  passing: number;
-  failing: number;
-  pending: number;
-}
-/**
- * The pull request whose head branch is the worktree's branch and whose commits include the worktree's HEAD.
- * `containsHead` is false when the pull request's head is an ancestor of HEAD: HEAD has commits the pull request
- * never had. `endedAt` is when it was merged or closed, in epoch milliseconds, and null while it is open.
- */
-interface PullRequestFact {
-  number: number;
-  state: "open" | "merged" | "closed";
-  draft: boolean;
-  url: string;
-  head: string;
-  containsHead: boolean;
-  endedAt: number | null;
-  /** Present when the lookup asked for detail. */
-  title?: string;
-  reviewDecision?: "approved" | "changes-requested" | "review-required" | null;
-  checks?: CheckCounts | null;
-}
-/** Sums a head commit's check runs and commit statuses by outcome; null when the commit has no checks. */
-declare function checkCounts(rollup: GhCheckRollup | null | undefined): CheckCounts | null;
-type PullRequestLookup = {
-  pullRequest: PullRequestFact | null;
-} | {
-  unavailable: string;
-};
-/**
- * Picks the pull request that describes `head` among those `gh pr list --head <branch>` returned. One whose head is
- * `head` wins, then one whose head contains `head`, then one whose head `head` contains. An open one wins a tier,
- * then the newest. A pull request unrelated to `head` is from an earlier use of the branch name and is ignored. A
- * cross-repository pull request is kept only when its head repository is one of `ownRepos` (this checkout's own git
- * remotes, lowercased "owner/name"); otherwise it only shares the branch name with a stranger's fork and is ignored.
- * `isAncestor(a, b)` answers whether commit `a` is an ancestor of commit `b`, and false when git cannot tell.
- */
-declare function selectPullRequest(pulls: readonly GhPullRequest[], head: string, isAncestor: (ancestor: string, descendant: string) => boolean, ownRepos?: ReadonlySet<string>): PullRequestFact | null;
-/**
- * "owner/name", lowercased, parsed out of a git remote URL, or null when it doesn't match: https, `ssh://`, or
- * scp-like (`[user@]host:owner/name`, which also covers an `~/.ssh/config` host alias in place of `user@host`).
- */
-declare function parseRemoteRepo(url: string): string | null;
-/**
- * Asks GitHub, through `gh`, which pull requests have `branch` as their head, run from `cwd` so `gh` picks the
- * repository from its remotes. Each call is one fixed `gh pr list` invocation. Once `gh` is missing, signed out or
- * times out, every later lookup through the same function answers `unavailable` without running it again.
- */
-declare function pullRequestLookup(): (cwd: string, branch: string, head: string) => PullRequestLookup;
-/** A worktree whose pull request {@link pullRequestLookups} looks up: its path, branch and HEAD commit. */
-interface PullRequestQuery {
-  cwd: string;
-  branch: string;
-  head: string;
-}
-/**
- * {@link pullRequestLookup} for every branch of one repository in one fixed `gh api graphql` call run from `repo`,
- * which asks for the same 20 newest pull requests of each head branch that `gh pr list --head` returns. `gh` fills
- * `{owner}` and `{repo}` from the remotes of `repo`; branch names travel as variables. Once `gh` is missing, signed
- * out or times out, every later call through the same function answers `unavailable` without running it again.
- * With `detail`, it also asks for each pull request's title, review decision and head commit check counts.
- */
-declare function pullRequestLookups({ detail }?: {
-  detail?: boolean;
-}): (repo: string, queries: readonly PullRequestQuery[]) => Promise<PullRequestLookup[]>;
-/** The merged or closed pull request whose commits include HEAD, which makes the worktree removable. */
-declare function endedPullRequest(lookup: PullRequestLookup | null): PullRequestFact | null;
-/** "PR #123 merged", for reports. */
-declare function describePullRequest(pr: Pick<PullRequestFact, "number" | "state">): string;
-/** A linked worktree whose pull request {@link worktreePullRequests} looks up. */
-interface WorktreeBranch {
-  path: string;
-  branch: string;
-  repository: string;
-}
-/**
- * Looks up the pull request of each worktree's branch and HEAD, with one {@link pullRequestLookups} call per
- * repository. The map holds null for a worktree without one, and leaves out a worktree whose HEAD git cannot read
- * or whose lookup was unavailable.
- */
-declare function worktreePullRequests(): (worktrees: readonly WorktreeBranch[]) => Promise<Map<string, PullRequestFact | null>>;
-//#endregion
-export { CheckCounts, GhCheckRollup, GhPullRequest, PullRequestFact, PullRequestLookup, PullRequestQuery, WorktreeBranch, checkCounts, describePullRequest, endedPullRequest, parseRemoteRepo, pullRequestLookup, pullRequestLookups, selectPullRequest, worktreePullRequests };
+import { a as PullRequestLookup, c as checkCounts, d as parseRemoteRepo, f as pullRequestLookup, g as worktreePullRequests, h as selectPullRequest, i as PullRequestFact, l as describePullRequest, m as pullRequestLookups, n as GhCheckRollup, o as PullRequestQuery, p as pullRequestLookupAsync, r as GhPullRequest, s as WorktreeBranch, t as CheckCounts, u as endedPullRequest } from "./pull-request-eODyIqZF.mjs";
+export { CheckCounts, GhCheckRollup, GhPullRequest, PullRequestFact, PullRequestLookup, PullRequestQuery, WorktreeBranch, checkCounts, describePullRequest, endedPullRequest, parseRemoteRepo, pullRequestLookup, pullRequestLookupAsync, pullRequestLookups, selectPullRequest, worktreePullRequests };

package/dist/pull-requests.mjs

@@ -1,2 +1,2 @@
-import { a as pullRequestLookup, c as worktreePullRequests, i as parseRemoteRepo, n as describePullRequest, o as pullRequestLookups, r as endedPullRequest, s as selectPullRequest, t as checkCounts } from "./pull-request-CQ8sPbZa.mjs";
-export { checkCounts, describePullRequest, endedPullRequest, parseRemoteRepo, pullRequestLookup, pullRequestLookups, selectPullRequest, worktreePullRequests };
+import { a as pullRequestLookup, c as selectPullRequest, i as parseRemoteRepo, l as worktreePullRequests, n as describePullRequest, o as pullRequestLookupAsync, r as endedPullRequest, s as pullRequestLookups, t as checkCounts } from "./pull-request-W1IuLXDt.mjs";
+export { checkCounts, describePullRequest, endedPullRequest, parseRemoteRepo, pullRequestLookup, pullRequestLookupAsync, pullRequestLookups, selectPullRequest, worktreePullRequests };