@nanocollective/roster 0.1.0-alpha.42 → 0.1.0-alpha.43

package/dist/cli.js

@@ -5356,11 +5356,56 @@ async function act(req) {
     if (!flag) throw new Error(`unknown merge method "${req.mergeMethod}"`);
     const args = ["pr", "merge", n, "--repo", repo, flag];
     if (req.body?.trim() && how !== "rebase") args.push("--body", req.body.trim());
-    await run3("gh", args, { encoding: "utf8" });
+    try {
+      await run3("gh", args, { encoding: "utf8" });
+    } catch (err) {
+      throw new Error(whyNotMerged(errText(err), await prState(repo, n)));
+    }
     return { ok: true, action, mergedBy: how };
   }
   throw new Error(`unknown action "${action}"`);
 }
+function whyNotMerged(ghError, pr) {
+  const checks = pr?.statusCheckRollup ?? [];
+  const name = (c) => c.name || c.context || "a check";
+  const running = checks.filter(
+    (c) => c.status && c.status !== "COMPLETED" || c.state === "PENDING" || c.state === "EXPECTED"
+  );
+  const failing = checks.filter(
+    (c) => ["FAILURE", "TIMED_OUT", "CANCELLED", "ACTION_REQUIRED", "ERROR"].includes(
+      String(c.conclusion || c.state || "")
+    )
+  );
+  const list = (cs) => cs.map(name).join(", ");
+  if (pr?.mergeStateStatus === "BLOCKED" && failing.length)
+    return `Not merged: checks failed (${list(failing)}).`;
+  if (pr?.mergeStateStatus === "BLOCKED" && running.length)
+    return `Not merged: checks are still running (${list(running)}). Merge again once they pass.`;
+  if (pr?.mergeStateStatus === "BLOCKED")
+    return "Not merged: the branch rules require something first, such as a review. Open it in GitHub to see what.";
+  if (pr?.mergeStateStatus === "BEHIND")
+    return "Not merged: the branch is behind its base, and the branch rules require it to be up to date.";
+  if (pr?.mergeStateStatus === "DIRTY") return "Not merged: the branch conflicts with its base.";
+  const line = ghError.split("\n").map((l) => l.replace(/^[!X✗]\s*/, "").trim()).find((l) => l && !l.startsWith("Command failed") && !/--auto|--admin/.test(l));
+  return `Not merged: ${line ?? "GitHub refused it without saying why."}`;
+}
+function errText(err) {
+  const e = err;
+  return `${e?.stderr ?? ""}
+${e?.message ?? ""}`;
+}
+async function prState(repo, n) {
+  try {
+    const { stdout } = await run3(
+      "gh",
+      ["pr", "view", n, "--repo", repo, "--json", "mergeStateStatus,statusCheckRollup"],
+      { encoding: "utf8" }
+    );
+    return JSON.parse(stdout);
+  } catch {
+    return null;
+  }
+}
 async function mergeMethodFor(repo) {
   try {
     const { stdout } = await run3(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanocollective/roster",
-  "version": "0.1.0-alpha.42",
+  "version": "0.1.0-alpha.43",
   "description": "An agent-run org, powered by GitHub. Scaffold AI staff members whose brain is a repo.",
   "type": "module",
   "bin": {

package/templates/portal/js/views/inbox.js

@@ -627,10 +627,11 @@ function inboxScreen(m, opts) {
       status.textContent = msg ?? "";
       status.className = "meta";
     };
+    // busy(false) clears the status line, so it goes first: the other way round wiped the
+    // error as it was written, and a refused merge looked like nothing happening at all.
     const failed = (e) => {
-      status.textContent = e.message;
-      status.className = "meta err";
       busy(false);
+      status.textContent = e.message;
       status.className = "meta err";
     };