@nanocollective/roster 0.1.0-alpha.39 → 0.1.0-alpha.40

package/dist/cli.js

@@ -5552,7 +5552,6 @@ var TIMELINE_PR = `
   }
 `;
 var CLOSED_FIRST = 30;
-var CLOSED_TIMELINE = 40;
 var CLOSED_DAYS = 45;
 var ISSUE_TYPES = `[ISSUE_COMMENT, CROSS_REFERENCED_EVENT, REFERENCED_EVENT, CLOSED_EVENT,
   REOPENED_EVENT, LABELED_EVENT, UNLABELED_EVENT, ASSIGNED_EVENT, UNASSIGNED_EVENT,
@@ -5561,58 +5560,46 @@ var PR_TYPES = `[ISSUE_COMMENT, CROSS_REFERENCED_EVENT, REFERENCED_EVENT, CLOSED
   REOPENED_EVENT, MERGED_EVENT, LABELED_EVENT, UNLABELED_EVENT, ASSIGNED_EVENT,
   UNASSIGNED_EVENT, RENAMED_TITLE_EVENT, PULL_REQUEST_REVIEW, READY_FOR_REVIEW_EVENT,
   REVIEW_REQUESTED_EVENT]`;
+var LIGHT = `number title url state createdAt updatedAt
+        author { login }
+        labels(first:12) { nodes { name } }
+        assignees(first:8) { nodes { login } }
+        comments { totalCount }`;
+var LIGHT_PR = `${LIGHT} isDraft mergeable
+        commits(last:1) { nodes { commit { statusCheckRollup { state } } } }`;
 var QUERY = `
 query($owner:String!, $name:String!) {
   repository(owner:$owner, name:$name) {
-    issues(states:OPEN, first:60, orderBy:{field:UPDATED_AT, direction:DESC}) {
-      nodes {
+    issues(states:OPEN, first:60, orderBy:{field:UPDATED_AT, direction:DESC}) { nodes { ${LIGHT} } }
+    pullRequests(states:OPEN, first:60, orderBy:{field:UPDATED_AT, direction:DESC}) { nodes { ${LIGHT_PR} } }
+    closedIssues: issues(states:CLOSED, first:${CLOSED_FIRST}, orderBy:{field:UPDATED_AT, direction:DESC}) {
+      nodes { ${LIGHT} }
+    }
+    closedPullRequests: pullRequests(
+      states:[CLOSED, MERGED], first:${CLOSED_FIRST}, orderBy:{field:UPDATED_AT, direction:DESC}
+    ) { nodes { ${LIGHT_PR} } }
+  }
+}`;
+var THREAD_QUERY = `
+query($owner:String!, $name:String!, $number:Int!) {
+  repository(owner:$owner, name:$name) {
+    issueOrPullRequest(number:$number) {
+      ... on Issue {
         number title body url state createdAt updatedAt
         author { login }
         ${REACTIONS}
         labels(first:12) { nodes { name } }
         assignees(first:8) { nodes { login } }
-        timelineItems(last:80, itemTypes:${ISSUE_TYPES}) { nodes { ${TIMELINE_COMMON} } }
+        timelineItems(last:100, itemTypes:${ISSUE_TYPES}) { nodes { ${TIMELINE_COMMON} } }
       }
-    }
-    pullRequests(states:OPEN, first:60, orderBy:{field:UPDATED_AT, direction:DESC}) {
-      nodes {
+      ... on PullRequest {
         number title body url state createdAt updatedAt isDraft mergeable
         author { login }
         ${REACTIONS}
         labels(first:12) { nodes { name } }
         assignees(first:8) { nodes { login } }
         commits(last:1) { nodes { commit { statusCheckRollup { state } } } }
-        timelineItems(last:80, itemTypes:${PR_TYPES}) {
-          nodes { ${TIMELINE_COMMON} ${TIMELINE_PR} }
-        }
-      }
-    }
-    closedIssues: issues(
-      states:CLOSED, first:${CLOSED_FIRST}, orderBy:{field:UPDATED_AT, direction:DESC}
-    ) {
-      nodes {
-        number title body url state createdAt updatedAt
-        author { login }
-        ${REACTIONS}
-        labels(first:12) { nodes { name } }
-        assignees(first:8) { nodes { login } }
-        timelineItems(last:${CLOSED_TIMELINE}, itemTypes:${ISSUE_TYPES}) {
-          nodes { ${TIMELINE_COMMON} }
-        }
-      }
-    }
-    closedPullRequests: pullRequests(
-      states:[CLOSED, MERGED], first:${CLOSED_FIRST}, orderBy:{field:UPDATED_AT, direction:DESC}
-    ) {
-      nodes {
-        number title body url state createdAt updatedAt isDraft
-        author { login }
-        ${REACTIONS}
-        labels(first:12) { nodes { name } }
-        assignees(first:8) { nodes { login } }
-        timelineItems(last:${CLOSED_TIMELINE}, itemTypes:${PR_TYPES}) {
-          nodes { ${TIMELINE_COMMON} ${TIMELINE_PR} }
-        }
+        timelineItems(last:100, itemTypes:${PR_TYPES}) { nodes { ${TIMELINE_COMMON} ${TIMELINE_PR} } }
       }
     }
   }
@@ -5680,6 +5667,9 @@ function shape(n, repo, role, kind) {
     url: n.url,
     state: n.state ?? "OPEN",
     comments: events.filter((e) => e.type === "comment").map((e) => ({ author: e.actor, createdAt: e.createdAt, body: e.body ?? "" })),
+    // From the list, the count comes without the comments; from a thread, they are counted.
+    commentCount: n.comments?.totalCount ?? events.filter((e) => e.type === "comment").length,
+    partial: !n.timelineItems,
     events,
     reactions: reactions(n)
   };
@@ -5794,13 +5784,31 @@ function event(e) {
 }
 async function fetchThread(repo, number, kind) {
   const [owner, name] = repo.split("/");
-  const data = await query(owner, name);
-  const lists = kind === "pr" ? [data?.pullRequests?.nodes, data?.closedPullRequests?.nodes] : [data?.issues?.nodes, data?.closedIssues?.nodes];
-  for (const nodes of lists) {
-    const found = (nodes ?? []).find((n) => n.number === number);
-    if (found) return shape(found, repo, "", kind);
-  }
-  throw new Error(`${repo}#${number} was not found in ${repo}`);
+  const { stdout } = await run4(
+    "gh",
+    [
+      "api",
+      "graphql",
+      "-f",
+      `query=${THREAD_QUERY}`,
+      "-F",
+      `owner=${owner}`,
+      "-F",
+      `name=${name}`,
+      "-F",
+      `number=${number}`
+    ],
+    { maxBuffer: 64 * 1024 * 1024 }
+  );
+  const n = JSON.parse(stdout)?.data?.repository?.issueOrPullRequest;
+  if (!n) throw new Error(`${repo}#${number} was not found in ${repo}`);
+  const item = shape(n, repo, "", kind);
+  if (kind === "pr") {
+    item.draft = n.isDraft;
+    item.checks = rollup(n.commits?.nodes?.[0]?.commit?.statusCheckRollup?.state);
+    item.mergeable = n.mergeable;
+  }
+  return item;
 }
 function rollup(state) {
   if (!state) return "none";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanocollective/roster",
-  "version": "0.1.0-alpha.39",
+  "version": "0.1.0-alpha.40",
   "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

@@ -92,6 +92,10 @@ export function belongsTo(item, s) {
   return false;
 }
 
+/* Threads read so far, by repo#number, kept for the session. Each is reused while its
+   updatedAt matches the list's, so a thread is fetched again only when it has changed. */
+const THREADS = new Map();
+
 export const viewInbox = (m) => inboxScreen(m, {});
 
 /**
@@ -337,9 +341,9 @@ function inboxScreen(m, opts) {
             : "") +
           // 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
-            ? '<span class="cc" title="' + i.comments.length + ' comments">' +
-              iconHTML("review") + i.comments.length + "</span>"
+          ((i.commentCount ?? i.comments.length)
+            ? '<span class="cc" title="' + (i.commentCount ?? i.comments.length) + ' comments">' +
+              iconHTML("review") + (i.commentCount ?? i.comments.length) + "</span>"
             : "") +
           chips +
           '<span class="when">' + ago(i.updatedAt) + "</span>" +
@@ -378,6 +382,36 @@ function inboxScreen(m, opts) {
       post({ thread, ref: item.repo + "#" + item.number }, "/api/notifications/read").catch(() => {});
     }
 
+    /* The list carries no bodies or timelines (carrying them cost most of an hour's GitHub
+       allowance per load), so a thread is read when it is opened, and kept until GitHub says
+       it has changed. Reopening one costs nothing. */
+    if (item.partial) {
+      const key = item.repo + "#" + item.number;
+      const kept = THREADS.get(key);
+      const keep = { role: item.role, unread: item.unread };
+      if (kept && kept.updatedAt === item.updatedAt) {
+        Object.assign(item, kept, keep, { partial: false });
+      } else {
+        viewer.dataset.want = key;
+        viewer.replaceChildren(...skeleton("head", 1), ...skeleton("line", 8));
+        getThread(item.repo, item.number, item.kind)
+          .then((fresh) => {
+            if (!fresh || fresh.error) throw new Error(fresh?.error ?? "could not read it");
+            THREADS.set(key, fresh);
+            Object.assign(item, fresh, keep, { partial: false });
+          })
+          .catch((e) => {
+            item.partial = false;
+            item.loadError = String(e.message || e);
+          })
+          .finally(() => {
+            // Somebody may have opened another thread while this one was loading.
+            if (viewer.dataset.want === key) openThread(ref);
+          });
+        return;
+      }
+    }
+
     const head = el("div", { className: "thead" });
     head.innerHTML =
       '<div class="meta">' + esc(item.repo) + " · " + (item.kind === "pr" ? "PR " : "") + "#" + item.number +
@@ -406,6 +440,11 @@ function inboxScreen(m, opts) {
        for a wrapper that would only ever hold one thing. */
     const pane = item.kind === "pr" ? el("div") : viewer;
     if (item.kind === "pr") viewer.append(prTabs(item, pane), pane);
+    if (item.loadError) {
+      pane.append(el("p", { className: "err", textContent: "Couldn't load the conversation: " + item.loadError }));
+      delete item.loadError;
+      item.partial = true; // so opening it again tries again
+    }
     conversation(pane, item);
     viewer.scrollTop = 0;
   }
@@ -762,7 +801,12 @@ function inboxScreen(m, opts) {
         const at = S.inbox.items.findIndex(
           (i) => i.repo === item.repo && i.number === item.number,
         );
-        if (at >= 0) S.inbox.items[at] = { ...S.inbox.items[at], ...fresh };
+        if (at >= 0) {
+          const old = S.inbox.items[at];
+          THREADS.set(item.repo + "#" + item.number, fresh);
+          // A single thread does not know which part of the org it is in, or whether it is unread.
+          S.inbox.items[at] = { ...old, ...fresh, role: old.role, unread: old.unread, partial: false };
+        }
       }
     } catch {
       /* the comment posted; a stale pane is not worth an error */