@zixt/host 0.0.57 → 0.0.58

package/dist/index.js

@@ -31,7 +31,7 @@ import { homedir } from "node:os";
 // package.json
 var package_default = {
   name: "@zixt/host",
-  version: "0.0.57",
+  version: "0.0.58",
   type: "module",
   exports: {
     ".": "./src/client.ts",
@@ -34693,9 +34693,8 @@ async function pullRequestBaseRepositories(gitCommand, cwd, checkoutRepository,
   add(checkoutRepository);
   return repositories;
 }
-function parsePullRequest(output, expectedBaseRepository, expectedHeadRepository, expectedHeadBranch) {
+function parsePullRequest(value, expectedBaseRepository, expectedHeadRepository, expectedHeadBranch) {
   try {
-    const value = JSON.parse(output);
     const state = typeof value["state"] === "string" ? value["state"].toLowerCase() : "";
     const number4 = Number(value["number"]);
     const location = canonicalPullRequestLocation(value["url"], number4);
@@ -34718,10 +34717,41 @@ function parsePullRequest(output, expectedBaseRepository, expectedHeadRepository
     return void 0;
   }
 }
+var PULL_REQUEST_LIST_LIMIT = 20;
+var PULL_REQUEST_STATE_RANK = {
+  // A still-open pull request is the branch's current truth even when an
+  // earlier one from the same branch already merged; a closed one is the
+  // weakest evidence because it says only that somebody gave up on it.
+  open: 3,
+  merged: 2,
+  closed: 1
+};
+function selectPullRequest(output, expectedBaseRepository, expectedHeadRepository, expectedHeadBranch) {
+  let value;
+  try {
+    value = JSON.parse(output);
+  } catch {
+    return void 0;
+  }
+  if (!Array.isArray(value)) return void 0;
+  let best;
+  for (const entry of value.slice(0, PULL_REQUEST_LIST_LIMIT)) {
+    if (!entry || typeof entry !== "object" || Array.isArray(entry)) continue;
+    const parsed = parsePullRequest(
+      entry,
+      expectedBaseRepository,
+      expectedHeadRepository,
+      expectedHeadBranch
+    );
+    if (!parsed) continue;
+    if (!best || PULL_REQUEST_STATE_RANK[parsed.state] > PULL_REQUEST_STATE_RANK[best.state] || PULL_REQUEST_STATE_RANK[parsed.state] === PULL_REQUEST_STATE_RANK[best.state] && parsed.number > best.number) {
+      best = parsed;
+    }
+  }
+  return best;
+}
 async function pullRequest(command, gitCommand, repositoryCwd, commandCwd, repository, branch, signal) {
   if (!command || !repository || !branch) return void 0;
-  const headOwner = repository.split("/")[0];
-  const selector = `${headOwner}:${branch}`;
   const baseRepositories = await pullRequestBaseRepositories(
     gitCommand,
     repositoryCwd,
@@ -34734,10 +34764,15 @@ async function pullRequest(command, gitCommand, repositoryCwd, commandCwd, repos
       [
         ...command.prefixArgs ?? [],
         "pr",
-        "view",
-        selector,
+        "list",
         "--repo",
         baseRepository,
+        "--head",
+        branch,
+        "--state",
+        "all",
+        "--limit",
+        String(PULL_REQUEST_LIST_LIMIT),
         "--json",
         "number,title,url,state,isDraft,baseRefName,headRefName,headRepository,headRepositoryOwner"
       ],
@@ -34746,7 +34781,7 @@ async function pullRequest(command, gitCommand, repositoryCwd, commandCwd, repos
       signal
     );
     if (!output) continue;
-    const parsed = parsePullRequest(output, baseRepository, repository, branch);
+    const parsed = selectPullRequest(output, baseRepository, repository, branch);
     if (parsed) return parsed;
   }
   return void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zixt/host",
-  "version": "0.0.57",
+  "version": "0.0.58",
   "type": "module",
   "exports": {
     ".": "./src/client.ts",