@sideboard-ai/core 0.1.81 → 0.1.84

package/dist/{chunk-P5VDPGAN.js → chunk-WJ5TINR6.js}

@@ -2,12 +2,12 @@
 
 import {
   ensureGlobalCoordinatorCwd
-} from "./chunk-4HJK57XU.js";
+} from "./chunk-NW7MEJHO.js";
 import {
   allocateTeamName,
   takenSlugsFromThread,
   teamSlugFromName
-} from "./chunk-FUUVPN4A.js";
+} from "./chunk-CKBIQ54F.js";
 import {
   createEmptyThread,
   listThreads,
@@ -17,7 +17,7 @@ import {
 import {
   resolveNewThreadOptions,
   resolveThreadDefaults
-} from "./chunk-XKNBSYA7.js";
+} from "./chunk-AY53MPDE.js";
 import {
   globalAgentCwd
 } from "./chunk-7MV3RXSC.js";

package/dist/{chunk-YVVXWWCC.js → chunk-XW47PL6A.js}

@@ -4,7 +4,7 @@ import {
 import {
   getGithubGitAuthMode,
   getGithubPat
-} from "./chunk-IFPN6TER.js";
+} from "./chunk-I3FRXL7J.js";
 import {
   listThreads
 } from "./chunk-FWJYLBO6.js";
@@ -882,11 +882,25 @@ function formatGhLandError(raw, opts) {
   }
   return detail || "Failed to create or update pull request";
 }
+function isPrNotMergeableError(text) {
+  return /not mergeable|cannot be cleanly created|cannot merge cleanly|Merge conflict|\bCONFLICTING\b|must be (updated|rebased)|branch is out of date|needs? to be (updated|rebased)|Resolve conflicts or update the branch/i.test(
+    text
+  );
+}
+function formatMergePrError(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return "gh pr merge failed";
+  if (isPrNotMergeableError(trimmed)) {
+    return "This pull request cannot merge cleanly into the base branch. Resolve conflicts or update the branch, then retry.";
+  }
+  return extractGhErrorDetail(trimmed) || trimmed;
+}
 function formatIpcInvokeError(err) {
   let msg = err instanceof Error ? err.message : String(err);
   msg = msg.replace(/^Error invoking remote method '[^']+':\s*/i, "");
   msg = msg.replace(/^ExecaError:\s*/i, "");
   msg = msg.replace(/^Error:\s*/i, "");
+  if (isPrNotMergeableError(msg)) return formatMergePrError(msg);
   return formatGhLandError(msg);
 }
 
@@ -1599,6 +1613,41 @@ ${result.stderr}`;
   ].slice(0, 20) : [];
   return { conflicting, base: baseName, files };
 }
+async function probeLocalMergeGate(cwd, gate) {
+  const mergeable = (gate?.mergeable ?? "").toUpperCase();
+  const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
+  const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
+  const inQueue = gate ? prIsInMergeQueue(gate) : false;
+  if (alreadyConflicting || inQueue) return { gate, files: [] };
+  try {
+    const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
+    if (local.conflicting) {
+      return {
+        gate: {
+          mergeable: "CONFLICTING",
+          mergeStateStatus: "DIRTY",
+          reviewDecision: gate?.reviewDecision ?? null,
+          baseRefName: local.base,
+          url: gate?.url ?? null,
+          isInMergeQueue: false
+        },
+        files: local.files
+      };
+    }
+    if (gate && (mergeable === "UNKNOWN" || mergeState === "UNKNOWN")) {
+      return {
+        gate: {
+          ...gate,
+          mergeable: gate.mergeable === "UNKNOWN" ? "MERGEABLE" : gate.mergeable,
+          mergeStateStatus: gate.mergeStateStatus === "UNKNOWN" ? "CLEAN" : gate.mergeStateStatus
+        },
+        files: []
+      };
+    }
+  } catch {
+  }
+  return { gate, files: [] };
+}
 async function getPrChecks(cwd, selector) {
   const slug = await resolveGithubRepoSlug(cwd);
   const args = [
@@ -1634,47 +1683,9 @@ async function getPrChecks(cwd, selector) {
     }
   }
   let gate = await fetchPrMergeGate(cwd, selector, slug);
-  const mergeable = (gate?.mergeable ?? "").toUpperCase();
-  const mergeState = (gate?.mergeStateStatus ?? "").toUpperCase();
-  const alreadyConflicting = mergeable === "CONFLICTING" || mergeState === "DIRTY";
-  const inQueue = gate ? prIsInMergeQueue(gate) : false;
-  const needsLocalProbe = !alreadyConflicting && !inQueue;
-  if (needsLocalProbe) {
-    try {
-      const local = await detectLocalMergeConflicts(cwd, gate?.baseRefName ?? null);
-      if (local.conflicting) {
-        const fileHint = local.files.length > 0 ? ` Conflicting paths: ${local.files.slice(0, 8).join(", ")}${local.files.length > 8 ? "\u2026" : ""}.` : "";
-        gate = {
-          mergeable: "CONFLICTING",
-          mergeStateStatus: "DIRTY",
-          reviewDecision: gate?.reviewDecision ?? null,
-          baseRefName: local.base,
-          url: gate?.url ?? null,
-          isInMergeQueue: false
-        };
-        const ciFailed2 = ciChecks.some((c) => c.bucket === "fail");
-        const review2 = (gate.reviewDecision ?? "").toUpperCase();
-        const hasReviewRow2 = review2 === "CHANGES_REQUESTED" || review2 === "REVIEW_REQUIRED";
-        const gateRows2 = buildMergeGateChecks(gate, {
-          suppressGenericBlocked: ciFailed2 || hasReviewRow2
-        }).map(
-          (row) => row.kind === "mergeability" && row.name === "Merge conflicts" ? {
-            ...row,
-            description: `${row.description ?? ""}${fileHint}`.trim()
-          } : row
-        );
-        return [...gateRows2, ...ciChecks];
-      }
-      if (gate && (mergeable === "UNKNOWN" || mergeState === "UNKNOWN")) {
-        gate = {
-          ...gate,
-          mergeable: gate.mergeable === "UNKNOWN" ? "MERGEABLE" : gate.mergeable,
-          mergeStateStatus: gate.mergeStateStatus === "UNKNOWN" ? "CLEAN" : gate.mergeStateStatus
-        };
-      }
-    } catch {
-    }
-  }
+  const probed = await probeLocalMergeGate(cwd, gate);
+  gate = probed.gate;
+  const fileHint = probed.files.length > 0 ? ` Conflicting paths: ${probed.files.slice(0, 8).join(", ")}${probed.files.length > 8 ? "\u2026" : ""}.` : "";
   if (!gate) {
     return ciChecks;
   }
@@ -1684,7 +1695,12 @@ async function getPrChecks(cwd, selector) {
   const gateRows = buildMergeGateChecks(gate, {
     // Avoid duplicating "blocked" when CI failures or review rows already explain it.
     suppressGenericBlocked: ciFailed || hasReviewRow
-  });
+  }).map(
+    (row) => fileHint && row.kind === "mergeability" && row.name === "Merge conflicts" ? {
+      ...row,
+      description: `${row.description ?? ""}${fileHint}`.trim()
+    } : row
+  );
   return [...gateRows, ...ciChecks];
 }
 async function getPrMeta(cwd, selector) {
@@ -1694,7 +1710,7 @@ async function getPrMeta(cwd, selector) {
     "view",
     selector,
     "--json",
-    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,isInMergeQueue,mergeStateStatus"
+    "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,isInMergeQueue,mergeStateStatus,mergeable"
   ];
   if (slug) viewArgs.push("--repo", slug);
   let { stdout, exitCode, stderr } = await gh(viewArgs, cwd, { reject: false });
@@ -1704,7 +1720,7 @@ async function getPrMeta(cwd, selector) {
       "view",
       selector,
       "--json",
-      "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,mergeStateStatus"
+      "number,title,url,state,isDraft,reviewDecision,baseRefName,headRefName,mergeStateStatus,mergeable"
     ];
     if (slug) retry.push("--repo", slug);
     ({ stdout, exitCode, stderr } = await gh(retry, cwd, { reject: false }));
@@ -1715,16 +1731,28 @@ async function getPrMeta(cwd, selector) {
   }
   try {
     const view = JSON.parse(stdout);
+    const gate = {
+      mergeable: typeof view.mergeable === "string" && view.mergeable ? view.mergeable : null,
+      mergeStateStatus: typeof view.mergeStateStatus === "string" && view.mergeStateStatus ? view.mergeStateStatus : null,
+      reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
+      baseRefName: String(view.baseRefName ?? ""),
+      url: String(view.url ?? ""),
+      isInMergeQueue: parseInMergeQueue(view)
+    };
+    const probed = await probeLocalMergeGate(cwd, gate);
+    const resolved = probed.gate ?? gate;
     return {
       number: Number(view.number),
       title: String(view.title ?? ""),
       url: String(view.url ?? ""),
       state: String(view.state ?? ""),
       isDraft: Boolean(view.isDraft),
-      reviewDecision: typeof view.reviewDecision === "string" && view.reviewDecision ? view.reviewDecision : null,
-      baseRefName: String(view.baseRefName ?? ""),
+      reviewDecision: resolved.reviewDecision,
+      baseRefName: resolved.baseRefName || String(view.baseRefName ?? ""),
       headRefName: String(view.headRefName ?? ""),
-      isInMergeQueue: parseInMergeQueue(view)
+      isInMergeQueue: Boolean(resolved.isInMergeQueue),
+      mergeable: resolved.mergeable,
+      mergeStateStatus: resolved.mergeStateStatus
     };
   } catch {
     return null;
@@ -2192,7 +2220,9 @@ async function mergePr(cwd, selector, opts) {
   if (slug) args.push("--repo", slug);
   const { exitCode, stderr, stdout } = await gh(args, cwd, { reject: false });
   if (exitCode !== 0) {
-    throw new Error(stderr.trim() || stdout.trim() || "gh pr merge failed");
+    throw new Error(
+      formatMergePrError(stderr.trim() || stdout.trim() || "gh pr merge failed")
+    );
   }
   const after = await gh(viewArgs, cwd, { reject: false });
   if (after.exitCode === 0 && after.stdout.trim()) {
@@ -2353,6 +2383,8 @@ export {
   formatRateLimitResetHint,
   extractGhErrorDetail,
   formatGhLandError,
+  isPrNotMergeableError,
+  formatMergePrError,
   formatIpcInvokeError,
   appendIndexedGitConfig,
   githubAgentGitEnv,

package/dist/{coordinator-prompt-NYNEFKIV.js → coordinator-prompt-DOIOSLUN.js}

@@ -9,12 +9,12 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-4HJK57XU.js";
-import "./chunk-FUUVPN4A.js";
+} from "./chunk-NW7MEJHO.js";
+import "./chunk-CKBIQ54F.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";
 import "./chunk-AE5VBOFE.js";
-import "./chunk-XKNBSYA7.js";
+import "./chunk-AY53MPDE.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";

package/dist/{coordinator-prompt-JQF72JKX.js → coordinator-prompt-RCTIIZ6C.js}

@@ -7,10 +7,11 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-CQBQWX73.js";
-import "./chunk-YVVXWWCC.js";
+} from "./chunk-JPHG2KCC.js";
+import "./chunk-XW47PL6A.js";
 import "./chunk-FKOIHGKV.js";
-import "./chunk-IFPN6TER.js";
+import "./chunk-I3FRXL7J.js";
+import "./chunk-5KLC2MWZ.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-FWJYLBO6.js";
 import "./chunk-77WWLBCI.js";

package/dist/{global-workspace-NUMUJRWG.js → global-workspace-33BIG7KK.js}

@@ -16,13 +16,13 @@ import {
   orchestratorSessionPoisonedByBuiltins,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-P5VDPGAN.js";
-import "./chunk-4HJK57XU.js";
-import "./chunk-FUUVPN4A.js";
+} from "./chunk-WJ5TINR6.js";
+import "./chunk-NW7MEJHO.js";
+import "./chunk-CKBIQ54F.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-7FD7COKE.js";
 import "./chunk-AE5VBOFE.js";
-import "./chunk-XKNBSYA7.js";
+import "./chunk-AY53MPDE.js";
 import "./chunk-NSTQ6QKD.js";
 import "./chunk-KGZBYWZ3.js";
 import {

package/dist/{global-workspace-DZM4ZFGU.js → global-workspace-73OAKD3C.js}

@@ -14,11 +14,12 @@ import {
   orchestratorSessionPoisonedByBuiltins,
   slackCoordinatorSourceRef,
   takenTeamSlugsForOrchestration
-} from "./chunk-6F2TQFJE.js";
-import "./chunk-CQBQWX73.js";
-import "./chunk-YVVXWWCC.js";
+} from "./chunk-OIEFHOP7.js";
+import "./chunk-JPHG2KCC.js";
+import "./chunk-XW47PL6A.js";
 import "./chunk-FKOIHGKV.js";
-import "./chunk-IFPN6TER.js";
+import "./chunk-I3FRXL7J.js";
+import "./chunk-5KLC2MWZ.js";
 import "./chunk-JT7R45JB.js";
 import "./chunk-FWJYLBO6.js";
 import "./chunk-77WWLBCI.js";