@sideboard-ai/core 0.1.67 → 0.1.71

package/dist/{chunk-LW5CMQGZ.js → chunk-OE7YBB5X.js}

@@ -10,7 +10,7 @@ import {
   gh,
   git,
   resolveGhAuthToken
-} from "./chunk-FGDJOJ2L.js";
+} from "./chunk-AE5VBOFE.js";
 import {
   worktreesRoot
 } from "./chunk-7MV3RXSC.js";
@@ -882,6 +882,10 @@ function formatGhLandError(raw, opts) {
 }
 
 // src/git/pr-gates.ts
+function prIsInMergeQueue(gate) {
+  if (gate.isInMergeQueue) return true;
+  return (gate.mergeStateStatus ?? "").toUpperCase() === "QUEUED";
+}
 function buildMergeGateChecks(gate, opts = {}) {
   const rows = [];
   const base = gate.baseRefName?.trim() || "the base branch";
@@ -891,7 +895,8 @@ function buildMergeGateChecks(gate, opts = {}) {
   const review = (gate.reviewDecision ?? "").toUpperCase();
   const suppressBlocked = opts.suppressGenericBlocked !== false;
   const conflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
-  if (conflicting) {
+  const inQueue = prIsInMergeQueue(gate);
+  if (conflicting && !inQueue) {
     rows.push({
       name: "Merge conflicts",
       state: mergeable === "CONFLICTING" ? "CONFLICTING" : mergeState || "DIRTY",
@@ -903,6 +908,18 @@ function buildMergeGateChecks(gate, opts = {}) {
       workflow: "mergeability",
       kind: "mergeability"
     });
+  } else if (inQueue) {
+    rows.push({
+      name: "Merge queue",
+      state: "QUEUED",
+      bucket: "pending",
+      startedAt: null,
+      completedAt: null,
+      link,
+      description: `This pull request is in the GitHub merge queue for ${base}.`,
+      workflow: "mergeability",
+      kind: "mergeability"
+    });
   } else if (mergeState === "BEHIND") {
     rows.push({
       name: "Branch behind",
@@ -1241,7 +1258,7 @@ async function originGhRepoEnv(cwd) {
   const slug = await resolveGithubRepoSlug(cwd);
   return slug ? { GH_REPO: slug } : {};
 }
-async function resolveDefaultBranch(repoPath) {
+async function resolveDefaultBranch(repoPath, opts) {
   const viaOrigin = await git(
     ["symbolic-ref", "refs/remotes/origin/HEAD"],
     repoPath,
@@ -1250,22 +1267,24 @@ async function resolveDefaultBranch(repoPath) {
   if (viaOrigin.exitCode === 0 && viaOrigin.stdout.trim()) {
     return viaOrigin.stdout.trim().replace(/^refs\/remotes\/origin\//, "");
   }
-  const slug = await resolveGithubRepoSlug(repoPath);
-  const viaGh = await gh(
-    [
-      "repo",
-      "view",
-      ...slug ? ["--repo", slug] : [],
-      "--json",
-      "defaultBranchRef",
-      "--jq",
-      ".defaultBranchRef.name"
-    ],
-    repoPath,
-    { reject: false }
-  );
-  if (viaGh.exitCode === 0 && viaGh.stdout.trim()) {
-    return viaGh.stdout.trim();
+  if (opts?.network !== false) {
+    const slug = await resolveGithubRepoSlug(repoPath);
+    const viaGh = await gh(
+      [
+        "repo",
+        "view",
+        ...slug ? ["--repo", slug] : [],
+        "--json",
+        "defaultBranchRef",
+        "--jq",
+        ".defaultBranchRef.name"
+      ],
+      repoPath,
+      { reject: false, timeoutMs: 8e3 }
+    );
+    if (viaGh.exitCode === 0 && viaGh.stdout.trim()) {
+      return viaGh.stdout.trim();
+    }
   }
   for (const candidate of ["main", "master"]) {
     const check = await git(
@@ -1406,10 +1425,21 @@ async function fetchPrMergeGate(cwd, selector, slug) {
     "view",
     selector,
     "--json",
-    "mergeable,mergeStateStatus,reviewDecision,baseRefName,url"
+    "mergeable,mergeStateStatus,reviewDecision,baseRefName,url,isInMergeQueue"
   ];
   if (slug) args.push("--repo", slug);
-  const { stdout, exitCode, stderr } = await gh(args, cwd, { reject: false });
+  let { stdout, exitCode, stderr } = await gh(args, cwd, { reject: false });
+  if (exitCode !== 0 && isUnknownJsonField(stderr, "isInMergeQueue")) {
+    const retry = [
+      "pr",
+      "view",
+      selector,
+      "--json",
+      "mergeable,mergeStateStatus,reviewDecision,baseRefName,url"
+    ];
+    if (slug) retry.push("--repo", slug);
+    ({ stdout, exitCode, stderr } = await gh(retry, cwd, { reject: false }));
+  }
   if (exitCode !== 0 || !stdout.trim()) {
     if (/no pull requests found/i.test(stderr)) return null;
     return null;
@@ -1421,12 +1451,22 @@ async function fetchPrMergeGate(cwd, selector, slug) {
       mergeStateStatus: typeof view.mergeStateStatus === "string" && view.mergeStateStatus ? view.mergeStateStatus : null,
       reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
       baseRefName: typeof view.baseRefName === "string" && view.baseRefName ? view.baseRefName : null,
-      url: typeof view.url === "string" && view.url ? view.url : null
+      url: typeof view.url === "string" && view.url ? view.url : null,
+      isInMergeQueue: parseInMergeQueue(view)
     };
   } catch {
     return null;
   }
 }
+function isUnknownJsonField(stderr, field) {
+  return new RegExp(`unknown json field[^\\n]*${field}`, "i").test(stderr);
+}
+function parseInMergeQueue(view) {
+  return prIsInMergeQueue({
+    isInMergeQueue: view.isInMergeQueue === true,
+    mergeStateStatus: typeof view.mergeStateStatus === "string" ? view.mergeStateStatus : null
+  });
+}
 async function detectLocalMergeConflicts(cwd, baseRefName) {
   const baseName = (baseRefName?.trim() || await resolveDefaultBranch(cwd)).replace(
     /^origin\//,
@@ -1487,7 +1527,8 @@ async function getPrChecks(cwd, selector) {
   const mergeable = (gate?.mergeable ?? "").toUpperCase();
   const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
   const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
-  const needsLocalProbe = !alreadyConflicting;
+  const inQueue = gate ? prIsInMergeQueue(gate) : false;
+  const needsLocalProbe = !alreadyConflicting && !inQueue;
   if (needsLocalProbe) {
     try {
       const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
@@ -1498,7 +1539,8 @@ async function getPrChecks(cwd, selector) {
           mergeStateStatus: "DIRTY",
           reviewDecision: gate?.reviewDecision ?? null,
           baseRefName: local.base,
-          url: gate?.url ?? null
+          url: gate?.url ?? null,
+          isInMergeQueue: false
         };
         const ciFailed2 = ciChecks.some((c) => c.bucket === "fail");
         const review2 = (gate.reviewDecision ?? "").toUpperCase();
@@ -1542,10 +1584,21 @@ async function getPrMeta(cwd, selector) {
     "view",
     selector,
     "--json",
-    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName"
+    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,isInMergeQueue,mergeStateStatus"
   ];
   if (slug) viewArgs.push("--repo", slug);
-  const { stdout, exitCode, stderr } = await gh(viewArgs, cwd, { reject: false });
+  let { stdout, exitCode, stderr } = await gh(viewArgs, cwd, { reject: false });
+  if (exitCode !== 0 && isUnknownJsonField(stderr, "isInMergeQueue")) {
+    const retry = [
+      "pr",
+      "view",
+      selector,
+      "--json",
+      "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,mergeStateStatus"
+    ];
+    if (slug) retry.push("--repo", slug);
+    ({ stdout, exitCode, stderr } = await gh(retry, cwd, { reject: false }));
+  }
   if (exitCode !== 0 || !stdout.trim()) {
     if (/no pull requests found/i.test(stderr)) return null;
     return null;
@@ -1560,7 +1613,8 @@ async function getPrMeta(cwd, selector) {
       isDraft: Boolean(view.isDraft),
       reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
       baseRefName: String(view.baseRefName ?? ""),
-      headRefName: String(view.headRefName ?? "")
+      headRefName: String(view.headRefName ?? ""),
+      isInMergeQueue: parseInMergeQueue(view)
     };
   } catch {
     return null;
@@ -1917,11 +1971,11 @@ async function listWorktrees(repoPath) {
   return entries;
 }
 async function isDirty(worktreePath) {
-  const { stdout } = await git(["status", "--porcelain", "-uall"], worktreePath);
+  const { stdout } = await git(["status", "--porcelain"], worktreePath);
   for (const line of stdout.split("\n")) {
     if (!line.trim()) continue;
     const rel = porcelainStatusPath(line);
-    if (!rel || isSideboardScratchPath(rel)) continue;
+    if (!rel || isSideboardScratchPath(rel) || rel === ".sideboard") continue;
     return true;
   }
   return false;