@nanocollective/roster 0.1.0-alpha.4 → 0.1.0-alpha.5

package/dist/cli.js

@@ -4260,7 +4260,7 @@ query($owner:String!, $name:String!) {
     }
     pullRequests(states:OPEN, first:60, orderBy:{field:UPDATED_AT, direction:DESC}) {
       nodes {
-        number title body url state createdAt updatedAt isDraft
+        number title body url state createdAt updatedAt isDraft mergeable
         author { login }
         ${REACTIONS}
         labels(first:12) { nodes { name } }
@@ -4315,6 +4315,7 @@ async function fetchInbox(repos) {
           const item = shape(n, full, r.role, "pr");
           item.draft = n.isDraft;
           item.checks = rollup(n.commits?.nodes?.[0]?.commit?.statusCheckRollup?.state);
+          item.mergeable = n.mergeable;
           items.push(item);
         }
         const cutoff = Date.now() - CLOSED_DAYS * 864e5;
@@ -4853,12 +4854,14 @@ async function syncOne(path, dir) {
     await git4("pull", "--ff-only", "--quiet");
     return { ...base2, ahead, behind: 0, dirty, pulled: true };
   } catch (err) {
-    return { ...base2, error: firstLine2(err) };
+    return { ...base2, error: reason(err) };
   }
 }
-function firstLine2(e) {
-  const msg = e instanceof Error ? e.message : String(e);
-  const line = msg.split("\n").find((l) => l.trim()) ?? msg;
+function reason(e) {
+  const err = e;
+  const text = String(err?.stderr ?? "").trim() || String(err?.message ?? e);
+  const lines = text.split("\n").map((l) => l.trim()).filter(Boolean);
+  const line = lines.find((l) => !/^Command failed:/i.test(l)) ?? lines[0] ?? String(e);
   return line.length > 180 ? line.slice(0, 179) + "\u2026" : line;
 }
 

package/package.json

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

package/templates/portal/css/inbox.css

@@ -40,10 +40,22 @@
 .ist{display:inline-flex;--ic:12px}
 .ist.closed{color:var(--derived)} .ist.merged{color:var(--derived)}
 .ck.passing{color:var(--accent)} .ck.failing{color:var(--err)} .ck.pending{color:var(--warn)}
+/* Filled rather than outlined like the label chips beside it. A branch that no longer applies
+   to its base is the one state where a row can show green checks and still not be mergeable,
+   so it has to win the row it is in. */
+.chip.conflict{color:var(--err);border-color:color-mix(in srgb,var(--err) 50%,transparent);
+      background:color-mix(in srgb,var(--err) 14%,transparent)}
 
 /* ---------- thread ---------- */
 .thead{border-bottom:1px solid var(--line);padding-bottom:16px}
 .thead h3{margin:8px 0 0;font:600 17px/1.35 var(--sans);letter-spacing:-.012em;color:var(--ink)}
+/* The same fact as the chip, said in full, once, at the top of the thread it applies to.
+   Tight to the title and a clear gap above the buttons: it is a statement about this pull
+   request, not a caption on the controls. At an even 10/16 it read as the latter. */
+.tconflict{margin:4px 0 0;font:12.5px/1.5 var(--sans);color:var(--err)}
+/* A bottom margin here would collapse against the row's own 16px and change nothing, so the
+   extra room is put on the row. General sibling, not adjacent: labels can sit between them. */
+.tconflict ~ .tacts{margin-top:24px}
 .tlabels{margin-top:10px}
 .cmt{border-top:1px solid var(--line);padding:16px 0}
 .cmt.first{border-top:0}

package/templates/portal/css/layout.css

@@ -20,6 +20,17 @@
 
 .sect{padding:14px 20px 6px;font:600 10.5px var(--sans);letter-spacing:.09em;
       text-transform:uppercase;color:var(--ink-faint)}
+/* The Staff heading is also the fold for the list under it, so it is a button — and has to
+   go on reading as a heading rather than as a control. The caret and the 20px left padding
+   are the staff rows' own, so the two carets line up in one column. */
+.sectfold{display:flex;align-items:center;gap:7px;width:100%;background:none;border:0;
+      cursor:pointer;text-align:left;font:600 10.5px var(--sans);letter-spacing:.09em;
+      text-transform:uppercase;color:var(--ink-faint)}
+.sectfold:hover{color:var(--ink-dim)}
+.sectfold .caret{display:inline-flex;--ic:12px;flex:none;transition:transform .12s ease}
+.sectfold[aria-expanded="false"] .caret{transform:rotate(-90deg)}
+/* The count is a number, not a heading: mono, and none of the heading's letterspacing. */
+.sectfold .n{font:10.5px var(--mono);letter-spacing:0;text-transform:none;color:var(--ink-faint)}
 /* Flex, not block with a float. The icons are block-level SVGs and the trailing count has to
    sit hard right; `float` does neither of those inside a flex row, and did neither of them
    outside one once the icons arrived. */

package/templates/portal/index.html

@@ -46,7 +46,11 @@
       <span class="ic" data-icon="docs"></span> Docs
     </button>
 
-    <div class="sect">Staff</div>
+    <!-- The heading is the fold. Collapsed, it carries the count, because a hidden list still
+         has to say how much it is hiding. -->
+    <button class="sect sectfold" id="stafffold" aria-expanded="false" aria-controls="stafflist">
+      <span class="caret" data-icon="chevron"></span>Staff<span class="n" id="staffcount" hidden></span>
+    </button>
     <div id="stafflist"></div>
 
     <div class="sidefoot">

package/templates/portal/js/app.js

@@ -89,6 +89,7 @@ export async function boot() {
   }
   onRender(render);
   applyHash();
+  initStaffFold();
   paintSidebar();
 
   $("#inboxnav").onclick = () => { S.view = "inbox"; render(); };
@@ -180,6 +181,42 @@ function learnPeople() {
  */
 let paintedRoster = null;
 
+/**
+ * The Staff heading is a fold, and folded it carries the count.
+ *
+ * It starts folded, so the count is not decoration: a bare "STAFF" heading over nothing is how
+ * a loaded org would look if the export came back empty, and those two states have to be
+ * tellable apart at a glance. The count sits on the heading rather than beside it so there is
+ * one thing to click.
+ */
+let staffOpen = true;
+
+function paintStaffFold() {
+  const b = $("#stafffold");
+  if (b) b.setAttribute("aria-expanded", String(staffOpen));
+  const list = $("#stafflist");
+  if (list) list.hidden = !staffOpen;
+  const n = $("#staffcount");
+  if (n) {
+    n.textContent = "(" + (S.data?.staff?.length ?? 0) + ")";
+    n.hidden = staffOpen;
+  }
+}
+
+function initStaffFold() {
+  // Folded until you say otherwise: the count on the heading is enough to know the roster is
+  // there, and the four org-wide screens above it are where a session starts.
+  staffOpen = store("roster.staffopen") === "1";
+  paintStaffFold();
+  const b = $("#stafffold");
+  if (!b) return;
+  b.onclick = () => {
+    staffOpen = !staffOpen;
+    store("roster.staffopen", staffOpen ? "1" : "0");
+    paintStaffFold();
+  };
+}
+
 function paintSidebar() {
   const host = $("#stafflist");
   host.replaceChildren();
@@ -228,6 +265,9 @@ function paintSidebar() {
 
     host.append(head, views);
   }
+
+  // A refresh can hire or retire someone, and the folded heading is where that number shows.
+  paintStaffFold();
 }
 
 /** Which rows are lit, and which staff member is unfolded. */

package/templates/portal/js/state.js

@@ -36,7 +36,9 @@ export const S = {
   loadedAt: null,
 
   staffHandle: null,
-  view: "brain",
+  /* What is waiting on you, not whose brain you read last. The org-wide screens are where a
+     session starts, which is also why the Staff list below them opens folded. */
+  view: "inbox",
   /** The inbox filter box. Brain and "what changed" keep their own, below. */
   query: "",
 
@@ -73,9 +75,10 @@ export const S = {
 
 /* The sidebar badge counts open items, not everything loaded. Once the inbox could show
    closed work the two stopped being the same number, and a badge that says 135 when 34 things
-   need you is worse than no badge. */
+   need you is worse than no badge. Pull requests are excluded for the same reason: they are
+   Pending work's, and counting them here would bill you twice for the same pile. */
 export const openCount = () =>
-  (S.inbox?.items ?? []).filter((i) => i.state === "OPEN").length;
+  (S.inbox?.items ?? []).filter((i) => i.state === "OPEN" && i.kind !== "pr").length;
 
 /** The same, for the screen that is only pull requests. */
 export const openPrCount = () =>

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

@@ -113,7 +113,7 @@ function inboxScreen(m, opts) {
     className: "sub",
     textContent: opts.prs
       ? "Work the staff have finished and cannot land themselves."
-      : "Everything open across the org.",
+      : "Everything open across the org. Pull requests are in Pending work.",
   });
   m.append(sub);
 
@@ -126,13 +126,8 @@ function inboxScreen(m, opts) {
   scope.append(
     el("option", { value: "", textContent: "Everything" }),
     el("option", { value: "mine", textContent: "On " + humanLabel() }),
-    // Scoping pull requests to pull requests is not a filter, and a decision is not a PR.
-    ...(opts.prs
-      ? []
-      : [
-          el("option", { value: "decision", textContent: "Decisions" }),
-          el("option", { value: "pr", textContent: "Open work (PRs)" }),
-        ]),
+    // A decision is not a PR, so this one is only ever worth offering on the inbox.
+    ...(opts.prs ? [] : [el("option", { value: "decision", textContent: "Decisions" })]),
   );
   scope.value = opts.prs && S.inboxFilter !== "mine" ? "" : S.inboxFilter;
 
@@ -187,9 +182,9 @@ function inboxScreen(m, opts) {
       acted on, because only the already-loaded branch opened one. */
   function restore() {
     if (!S.inboxOpen) return;
-    // The two screens share one open thread. An issue carried over from the inbox is not on
-    // this one, so it is dropped rather than opened beside a list it is not in.
-    if (opts.prs && S.inboxOpen.kind !== "pr") {
+    // The two screens share one open thread, and each holds half the org. Whatever was open on
+    // the other one is not in this list, so it is dropped rather than opened beside it.
+    if (!!opts.prs !== (S.inboxOpen.kind === "pr")) {
       S.inboxOpen = null;
       writeHash(false);
       return;
@@ -251,9 +246,12 @@ function inboxScreen(m, opts) {
     const onAHuman = (i) => (i.assignees ?? []).some(isHuman);
 
     const whoseStaff = S.inboxStaff ? S.data.staff.find((s) => s.handle === S.inboxStaff) : null;
+    /* The two screens partition the org rather than overlap on it. Pending work is every pull
+       request; the inbox is everything else. An inbox that also listed the PRs said the same
+       thing twice and made the badge beside it a number you could not act on. */
     const mine = S.inbox.items
       .filter((i) => belongsTo(i, whoseStaff))
-      .filter((i) => !opts.prs || i.kind === "pr");
+      .filter((i) => (i.kind === "pr") === !!opts.prs);
     const isOpen = (i) => i.state === "OPEN";
     const scoped = mine.filter(
       S.inboxState === "closed" ? (i) => !isOpen(i) : S.inboxState === "all" ? () => true : isOpen,
@@ -265,12 +263,17 @@ function inboxScreen(m, opts) {
     );
     if (S.inboxFilter === "mine") items = items.filter(onAHuman);
     else if (S.inboxFilter === "decision") items = items.filter((i) => i.labels.includes("decision"));
-    else if (S.inboxFilter === "pr") items = items.filter((i) => i.kind === "pr");
+    /* `s=pr` was the inbox's "Open work (PRs)" scope, and Pending work is now that screen. An
+       old bookmark carrying it is ignored rather than honoured into an empty list. */
 
     const open = mine.filter(isOpen);
     const onYou = open.filter(onAHuman).length;
-    const prs = open.filter((i) => i.kind === "pr").length;
     const shut = mine.length - open.length;
+    /* Pending work owns the pull requests now, so this is a pointer to that screen rather than
+       a count of anything on this list. Scoped the same way, or the two would not add up. */
+    const prs = S.inbox.items.filter(
+      (i) => i.kind === "pr" && isOpen(i) && belongsTo(i, whoseStaff),
+    ).length;
     const where = whoseStaff
       ? " for <b>" + esc(whoseStaff.name) + "</b>"
       : " across " + (S.inbox.repos ?? []).length + " repos";
@@ -286,7 +289,7 @@ function inboxScreen(m, opts) {
             (failing ? " · " + failing + " failing" : "") +
             (S.inboxState === "all" ? " · " + shut + " closed or merged" : "")
           : open.length + " open" + where + " · <b>" + onYou + " on " +
-            esc(humanLabel()) + "</b> · " + prs + " waiting on a merge" +
+            esc(humanLabel()) + "</b> · " + prs + " in Pending work" +
             (S.inboxState === "all" ? " · " + shut + " closed" : "")) +
       (S.inbox.fetchedAt ? ' <span class="meta">· checked ' + ago(S.inbox.fetchedAt) + "</span>" : "");
 
@@ -324,6 +327,12 @@ function inboxScreen(m, opts) {
           '<span class="num">' + (i.kind === "pr" ? "PR " : "") + "#" + i.number + "</span>" +
           (i.checks && i.checks !== "none"
             ? '<span class="ck ' + i.checks + '">' + checkGlyph(i.checks) + "</span>" : "") +
+          /* Green checks on a branch that no longer applies is the one case where the row
+             reads as ready and is not. It has to say so here, not three clicks in. */
+          (i.mergeable === "CONFLICTING"
+            ? '<span class="chip conflict" title="This branch conflicts with its base">' +
+              "conflicts</span>"
+            : "") +
           // How much conversation is on a thread, which is most of what tells a live one from
           // something that was filed and never answered.
           (i.comments.length
@@ -365,6 +374,10 @@ function inboxScreen(m, opts) {
         ' · <span class="' + (item.state === "OPEN" ? "ok" : "") + '">' + esc(item.state) + "</span>" +
         " · " + esc(item.author) + " · " + ago(item.updatedAt) + "</div>" +
       "<h3>" + esc(item.title) + "</h3>" +
+      (item.mergeable === "CONFLICTING"
+        ? '<p class="tconflict">This branch conflicts with its base and cannot be merged ' +
+          "until someone rebases or merges the base into it.</p>"
+        : "") +
       (item.labels.length
         ? '<div class="row tlabels">' +
           item.labels.map((l) => '<span class="chip ' + tone(l) + '">' + esc(l) + "</span>").join("") +
@@ -527,8 +540,11 @@ function inboxScreen(m, opts) {
     b.onclick = async () => {
       b.disabled = true;
       try {
-        const r = await openReply(item, f);
-        if (r) b.textContent = r.warning ? "sent, with a warning" : "sent";
+        // Same reason as the header's Reply: the wait is after the box closes, not during it.
+        const r = await openReply(item, f, () => {
+          b.textContent = "Replying…";
+        });
+        b.textContent = r ? (r.warning ? "sent, with a warning" : "sent") : "Reply";
       } catch (e) {
         b.textContent = e.message;
       }
@@ -590,24 +606,43 @@ function inboxScreen(m, opts) {
     /* One button, because there was no way to tell the two apart. Reply reaches whoever you
        named in it; see `openReply`. */
     const reply = el("button", { className: "ghbtn primary", textContent: "Reply" });
+
+    /* Posting a comment is a round trip to GitHub through `gh`, and on a cold connection that
+       is seconds of a button that still says "Reply" and still takes clicks. Saying nothing
+       reads as a page that ignored you, which is how the same comment gets sent twice. */
+    const sending = (on) => {
+      busy(on, on ? "sending…" : "");
+      reply.textContent = on ? "Replying…" : "Reply";
+    };
+
     reply.onclick = async () => {
       let r;
       try {
-        r = await openReply(item, null);
+        r = await openReply(item, null, () => sending(true));
       } catch (e) {
+        sending(false);
         failed(e);
         return;
       }
-      if (!r) return;
+      // Closed the box without sending: nothing ever started, so there is nothing to put back.
+      if (!r) {
+        sending(false);
+        return;
+      }
       /* Repaint only when something was said on this thread, which is always true here: `ask`
          posts the comment too. A warning means the tracker issue went up and the comment did
          not, and then the status line is the only thing that says so. */
       if (r.warning) {
+        sending(false);
         status.className = "meta err";
         status.textContent = r.warning;
         return;
       }
+      /* Held across the reload as well as the post. The reply is not on screen until the
+         thread repaints, and a button that said "Reply" again before then would be claiming
+         it was done over a thread that still did not show it. */
       await reloadThread(item);
+      sending(false);
     };
     buttons.push(reply);
 
@@ -651,6 +686,12 @@ function inboxScreen(m, opts) {
        own settings. The server reads it from there. */
     if (item.kind === "pr" && item.state === "OPEN") {
       const merge = el("button", { className: "ghbtn", textContent: "Merge" });
+      /* A conflicted branch cannot be merged by anyone, so the button says why instead of
+         spending a round trip to come back with GitHub's version of the same sentence. */
+      if (item.mergeable === "CONFLICTING") {
+        merge.disabled = true;
+        merge.title = "This branch conflicts with its base";
+      }
       merge.onclick = async () => {
         if (!confirm("Merge " + item.repo + " #" + item.number + " into its base branch?")) return;
         busy(true, "merging…");
@@ -714,7 +755,15 @@ function inboxScreen(m, opts) {
  * @param anchor  the file this is about, when it was opened from a diff. Its hunk rides along.
  * @returns the result of the write, or null if nothing was written.
  */
-async function openReply(item, anchor) {
+/**
+ * @param onSend Called once, the moment the box is submitted and the writing starts.
+ *
+ * The dialog and the send are one `await` to whoever called this, so a caller cannot tell the
+ * two apart by itself — and the two want opposite things from a button. While the box is open
+ * you are still typing and the button has to stay as it was; once it closes there is a request
+ * in flight against GitHub that can take seconds, and that is what needs saying.
+ */
+async function openReply(item, anchor, onSend) {
   const key = item.repo + "#" + item.number + (anchor ? " · " + anchor.path : "");
   let deaf = null;
 
@@ -737,6 +786,7 @@ async function openReply(item, anchor) {
     },
   });
   if (!body) return null;
+  onSend?.();
 
   /* One press, both writes. `ask` posts the comment itself when told to, so these are not two
      requests racing: the tracker issue goes up first because it is the half that actually