@d3lm/pr-stats 0.2.5 → 0.2.6

package/README.md

@@ -1,6 +1,6 @@
 # pr-stats
 
-An interactive terminal UI, built with [OpenTUI](https://github.com/anomalyco/opentui) and React, that shows statistics for a GitHub user, e.g., time to review, size of authored PRs, or comments received on them. It works with any repository your GitHub login can see. It has a queue tab for the open PRs awaiting your review, a Your PRs tab that splits into your open PRs and a merged-and-closed report, chart tabs for the review-time, size, and comments reports, and a live options modal.
+An interactive terminal UI, built with [OpenTUI](https://github.com/anomalyco/opentui) and React, that shows statistics for a GitHub user, e.g., time to review, size of authored PRs, or comments received on them. It works with any repository your GitHub login can see. It has a queue tab for the open PRs on your reviewing plate, split into those awaiting your review and those you already reviewed, a Your PRs tab that splits into your open PRs and a merged-and-closed report, chart tabs for the review-time, size, and comments reports, and a live options modal.
 
 ![pr-stats](./assets/screenshot.png)
 
@@ -25,7 +25,7 @@ You can also run it without installing through `npx @d3lm/pr-stats`. The bunx eq
 pr-stats
 ```
 
-Without flags, it looks at PRs from the last 90 days across all repositories you can access. It opens on a tab that lists the open PRs awaiting your review with how long each has been waiting. The Your PRs tab next to it has two sub-tabs, which the `t` key switches. The first lists your own authored PRs that are still open with their age and size. The second charts how your authored PRs got created, merged, and closed, telling a merge apart from a close without one, with time-to-merge percentiles, a histogram and trend, a merge-time heatmap, weekly created and merged volumes, an outcome gauge, and the most recently merged and closed PRs. The remaining tabs hold the time-to-review report, the PR size report, and the comments report with a histogram of comments per PR, a scatter of comments against PR size, and the most commented PRs. When the data spans multiple repos, every tab opens on a repo picker that drills into one repo or the aggregate across all of them, and on the two queue lists the `g` key groups the aggregate list by repo.
+Without flags, it looks at PRs from the last 90 days across all repositories you can access. It opens on a tab with two lists, the open PRs awaiting your review with how long each has been waiting, and below them the open PRs you already reviewed or commented on with how long ago that was, so a PR stays visible until it merges or closes. A fresh review request moves a PR from the reviewing list back into the awaiting one. The Your PRs tab next to it has two sub-tabs, which the `t` key switches. The first lists your own authored PRs that are still open with their age and size. The second charts how your authored PRs got created, merged, and closed, telling a merge apart from a close without one, with time-to-merge percentiles, a histogram and trend, a merge-time heatmap, weekly created and merged volumes, an outcome gauge, and the most recently merged and closed PRs. The remaining tabs hold the time-to-review report, the PR size report, and the comments report with a histogram of comments per PR, a scatter of comments against PR size, and the most commented PRs. When the data spans multiple repos, every tab opens on a repo picker that drills into one repo or the aggregate across all of them, and on the two queue lists the `g` key groups the aggregate list by repo.
 
 Node gates the FFI that OpenTUI renders through behind the `--experimental-ffi` flag, and the launcher re-executes itself with that flag when it is missing, so a plain `pr-stats` works without extra flags on both runtimes.
 

package/dist/tui-app.mjs

@@ -787,6 +787,24 @@ function computeReviewStats(results, { targetHours, now = /* @__PURE__ */ new Da
     }
   }
   pending.sort((a, b) => a.requestedAt.getTime() - b.requestedAt.getTime());
+  const pendingKeys = new Set(pending.map((entry) => `${entry.pr.repo}#${entry.pr.number}`));
+  const latestReviews = /* @__PURE__ */ new Map();
+  for (const result of results) {
+    if (result.kind !== "reviewed" && result.kind !== "unrequested" || result.pr.state !== "open") {
+      continue;
+    }
+    const key = `${result.pr.repo}#${result.pr.number}`;
+    if (pendingKeys.has(key)) {
+      continue;
+    }
+    const latest = latestReviews.get(key);
+    if (latest === void 0 || result.reviewedAt > latest.reviewedAt) {
+      latestReviews.set(key, { pr: result.pr, reviewedAt: result.reviewedAt });
+    }
+  }
+  const reviewing = [...latestReviews.values()].map(({ pr, reviewedAt }) => {
+    return { pr, reviewedAt, hours: durationHours(reviewedAt, now) };
+  }).toSorted((a, b) => a.reviewedAt.getTime() - b.reviewedAt.getTime());
   const expired = results.filter((result) => result.kind === "pending" && result.pr.state !== "open");
   const unrequested = results.filter((result) => result.kind === "unrequested");
   const allHours = reviewed.map((result) => result.hours);
@@ -798,7 +816,7 @@ function computeReviewStats(results, { targetHours, now = /* @__PURE__ */ new Da
   }
   const byRepo = [...hoursByRepo.entries()].toSorted((a, b) => b[1].length - a[1].length);
   const misses = targetHours === void 0 ? [] : reviewed.filter((result) => result.hours > targetHours).toSorted((a, b) => b.hours - a.hours);
-  return { reviewed, pending, expired, unrequested, allHours, byRepo, misses };
+  return { reviewed, pending, reviewing, expired, unrequested, allHours, byRepo, misses };
 }
 function computeSizeStats(sizes, { sizeTarget } = {}) {
   const metrics = [
@@ -948,7 +966,7 @@ function toPrRows(entries, leads) {
 
 // src/tui/views/queue.ts
 function queueRows(view) {
-  return view.lists.flatMap((list) => list.rows);
+  return view.sections.flatMap((section) => [...section.rows, ...section.lists.flatMap((list) => list.rows)]);
 }
 function groupedLists(entries, rowsOf2) {
   const groups = /* @__PURE__ */ new Map();
@@ -962,23 +980,26 @@ function groupedLists(entries, rowsOf2) {
   });
 }
 function buildPendingReviewView(raw, repo = null, grouped = false) {
-  const { pending } = computeReviewStats(raw.reviewResults, { now: raw.fetchedAt });
-  const entries = repo === null ? pending : pending.filter((entry) => entry.pr.repo === repo);
-  if (entries.length === 0) {
-    return { empty: "No PRs are awaiting your review.", lists: [] };
-  }
-  if (repo === null && grouped) {
-    return { empty: null, lists: groupedLists(entries, rowsOf) };
-  }
+  const stats = computeReviewStats(raw.reviewResults, { now: raw.fetchedAt });
+  const awaiting = repo === null ? stats.pending : stats.pending.filter((entry) => entry.pr.repo === repo);
+  const reviewing = repo === null ? stats.reviewing : stats.reviewing.filter((entry) => entry.pr.repo === repo);
+  if (awaiting.length === 0 && reviewing.length === 0) {
+    return { empty: "No PRs are awaiting your review, and none you reviewed are still open.", sections: [] };
+  }
+  const split = repo === null && grouped;
+  const sectionOf = (title, entries) => split ? { title, rows: [], lists: groupedLists(entries, rowsOf) } : { title, rows: rowsOf(entries), lists: [] };
   return {
     empty: null,
-    lists: [{ title: `Open and awaiting your review (n=${entries.length})`, rows: rowsOf(entries) }]
+    sections: [
+      ...awaiting.length === 0 ? [] : [sectionOf(`Awaiting your review (n=${awaiting.length})`, awaiting)],
+      ...reviewing.length === 0 ? [] : [sectionOf(`Reviewing (n=${reviewing.length})`, reviewing)]
+    ]
   };
 }
 function buildOpenAuthoredView(raw, repo = null, grouped = false) {
   const open = raw.sizes.filter((entry) => entry.pr.state === "open" && (repo === null || entry.pr.repo === repo)).toSorted((a, b) => a.pr.createdAt.getTime() - b.pr.createdAt.getTime());
   if (open.length === 0) {
-    return { empty: "No open authored PRs found.", lists: [] };
+    return { empty: "No open authored PRs found.", sections: [] };
   }
   const rowsOf2 = (group) => {
     const ages = group.map((entry) => durationLead({ hours: durationHours(entry.pr.createdAt, raw.fetchedAt) }));
@@ -990,13 +1011,11 @@ function buildOpenAuthoredView(raw, repo = null, grouped = false) {
       )
     );
   };
+  const title = `Your open authored PRs (n=${open.length})`;
   if (repo === null && grouped) {
-    return { empty: null, lists: groupedLists(open, rowsOf2) };
+    return { empty: null, sections: [{ title, rows: [], lists: groupedLists(open, rowsOf2) }] };
   }
-  return {
-    empty: null,
-    lists: [{ title: `Your open authored PRs (n=${open.length})`, rows: rowsOf2(open) }]
-  };
+  return { empty: null, sections: [{ title, rows: rowsOf2(open), lists: [] }] };
 }
 function rowsOf(group) {
   return toPrRows(
@@ -1210,7 +1229,7 @@ function QueuePanel({
   heading,
   warning,
   empty,
-  lists,
+  sections,
   cursor,
   onRefClick
 }) {
@@ -1237,10 +1256,57 @@ function QueuePanel({
   }
   const offsets = [];
   let total = 0;
-  for (const list of lists) {
-    offsets.push(total);
-    total += list.rows.length;
-  }
+  for (const section of sections) {
+    const entry = { rows: total, lists: [] };
+    total += section.rows.length;
+    for (const list of section.lists) {
+      entry.lists.push(total);
+      total += list.rows.length;
+    }
+    offsets.push(entry);
+  }
+  const renderRow = (row, index, indent) => {
+    const isSelected = index === cursor;
+    const bg = isSelected ? theme.selectedBg : void 0;
+    const refStart = indent.length + 2 + row.lead.length + 2;
+    return /* @__PURE__ */ jsxs5(
+      "text",
+      {
+        id: `queue-row-${index}`,
+        wrapMode: "none",
+        onMouseDown: onRefClick === null ? void 0 : (event) => {
+          lastDown.current = event.button === 0 ? { x: event.x, y: event.y } : null;
+        },
+        onMouseUp: onRefClick === null ? void 0 : (event) => {
+          const down = lastDown.current;
+          lastDown.current = null;
+          if (event.button !== 0 || down?.x !== event.x || down.y !== event.y) {
+            return;
+          }
+          const local = event.currentTarget === null ? -1 : event.x - event.currentTarget.x;
+          if (local >= refStart && local < refStart + row.ref.length) {
+            onRefClick(row);
+          }
+        },
+        children: [
+          /* @__PURE__ */ jsxs5("span", { fg: theme.accent, children: [
+            indent,
+            isSelected ? "\u25B8 " : "  "
+          ] }),
+          /* @__PURE__ */ jsxs5("span", { fg: theme.text, bg, children: [
+            row.lead,
+            "  "
+          ] }),
+          onRefClick === null ? /* @__PURE__ */ jsx6("a", { href: row.url, fg: theme.accent, bg, children: row.ref }) : /* @__PURE__ */ jsx6("span", { fg: theme.accent, bg, children: row.ref }),
+          /* @__PURE__ */ jsxs5("span", { fg: theme.text, bg, children: [
+            "  ",
+            row.title
+          ] })
+        ]
+      },
+      row.url
+    );
+  };
   return /* @__PURE__ */ jsxs5("box", { flexGrow: 1, flexDirection: "column", children: [
     header,
     /* @__PURE__ */ jsxs5(
@@ -1253,49 +1319,19 @@ function QueuePanel({
         verticalScrollbarOptions: overlayScrollbar,
         children: [
           warning !== null && /* @__PURE__ */ jsx6("text", { wrapMode: "word", fg: theme.warn, marginTop: 1, children: warning }),
-          lists.map((list, listIndex) => /* @__PURE__ */ jsxs5("box", { flexDirection: "column", marginTop: 1, children: [
-            /* @__PURE__ */ jsx6("text", { wrapMode: "none", fg: theme.accent, children: list.title }),
-            list.rows.map((row, rowIndex) => {
-              const index = offsets[listIndex] + rowIndex;
-              const isSelected = index === cursor;
-              const bg = isSelected ? theme.selectedBg : void 0;
-              const refStart = 2 + row.lead.length + 2;
-              return /* @__PURE__ */ jsxs5(
-                "text",
-                {
-                  id: `queue-row-${index}`,
-                  wrapMode: "none",
-                  onMouseDown: onRefClick === null ? void 0 : (event) => {
-                    lastDown.current = event.button === 0 ? { x: event.x, y: event.y } : null;
-                  },
-                  onMouseUp: onRefClick === null ? void 0 : (event) => {
-                    const down = lastDown.current;
-                    lastDown.current = null;
-                    if (event.button !== 0 || down?.x !== event.x || down.y !== event.y) {
-                      return;
-                    }
-                    const local = event.currentTarget === null ? -1 : event.x - event.currentTarget.x;
-                    if (local >= refStart && local < refStart + row.ref.length) {
-                      onRefClick(row);
-                    }
-                  },
-                  children: [
-                    /* @__PURE__ */ jsx6("span", { fg: theme.accent, children: isSelected ? "\u25B8 " : "  " }),
-                    /* @__PURE__ */ jsxs5("span", { fg: theme.text, bg, children: [
-                      row.lead,
-                      "  "
-                    ] }),
-                    onRefClick === null ? /* @__PURE__ */ jsx6("a", { href: row.url, fg: theme.accent, bg, children: row.ref }) : /* @__PURE__ */ jsx6("span", { fg: theme.accent, bg, children: row.ref }),
-                    /* @__PURE__ */ jsxs5("span", { fg: theme.text, bg, children: [
-                      "  ",
-                      row.title
-                    ] })
-                  ]
-                },
-                row.url
-              );
-            })
-          ] }, list.title))
+          sections.map((section, sectionIndex) => /* @__PURE__ */ jsxs5("box", { flexDirection: "column", marginTop: 1, children: [
+            /* @__PURE__ */ jsx6("text", { wrapMode: "none", fg: theme.accent, children: section.title }),
+            section.rows.map((row, rowIndex) => renderRow(row, offsets[sectionIndex].rows + rowIndex, "")),
+            section.lists.map((list, listIndex) => /* @__PURE__ */ jsxs5("box", { flexDirection: "column", marginTop: listIndex > 0 ? 1 : 0, children: [
+              /* @__PURE__ */ jsxs5("text", { wrapMode: "none", fg: theme.accent, children: [
+                "  ",
+                list.title
+              ] }),
+              list.rows.map(
+                (row, rowIndex) => renderRow(row, offsets[sectionIndex].lists[listIndex] + rowIndex, "  ")
+              )
+            ] }, list.title))
+          ] }, section.title))
         ]
       }
     )
@@ -1482,7 +1518,7 @@ function QueueTab({
       heading: repos.length > 0 ? scope.repo ?? (grouped ? "All repos \xB7 grouped by repo" : "All repos") : null,
       warning,
       empty: view.empty,
-      lists: view.lists,
+      sections: view.sections,
       cursor: Math.min(rowCursor, queueRows(view).length - 1),
       onRefClick
     }
@@ -2993,6 +3029,62 @@ function ColorRow({
   ] }) });
 }
 
+// src/tui/components/Modals.tsx
+import { jsx as jsx14 } from "@opentui/react/jsx-runtime";
+function Modals({
+  ui,
+  options,
+  saved: saved2,
+  noCache: noCache2,
+  copyLinks: copyLinks2,
+  themeState,
+  onDraft,
+  onSubmitField,
+  onSubmitThemeColor
+}) {
+  if (ui.modal === "options") {
+    return /* @__PURE__ */ jsx14(
+      OptionsModal,
+      {
+        options,
+        saved: saved2,
+        selected: ui.selectedField,
+        editing: ui.editing,
+        fieldError: ui.fieldError,
+        onDraft,
+        onSubmit: onSubmitField
+      }
+    );
+  }
+  if (ui.modal === "settings") {
+    return /* @__PURE__ */ jsx14(
+      SettingsModal,
+      {
+        selected: ui.selectedSetting,
+        cacheAction: ui.cacheAction,
+        noCache: noCache2,
+        copyLinks: copyLinks2,
+        preset: themeState.preset
+      }
+    );
+  }
+  if (ui.modal === "theme") {
+    return /* @__PURE__ */ jsx14(
+      ThemeModal,
+      {
+        selected: ui.selectedThemeColor,
+        editing: ui.editing,
+        error: ui.themeColorError,
+        cacheAction: ui.cacheAction,
+        overrides: themeState.preset === "custom" ? themeState.overrides : {},
+        onDraft,
+        onSubmit: onSubmitThemeColor
+      }
+    );
+  }
+  return null;
+}
+
 // src/tui/hooks/useDeferredLoading.ts
 import { useEffect as useEffect4, useRef as useRef3, useState as useState2 } from "react";
 function useDeferredLoading(isLoading, { showDelay = 300, minDuration = 500 } = {}) {
@@ -3379,7 +3471,10 @@ function classifyPr(pr, details, user) {
     (node) => node?.author?.login === user && node.submittedAt ? [new Date(node.submittedAt)] : []
   );
   if (requests.length === 0) {
-    return reviews.length > 0 ? [{ kind: "unrequested", pr }] : [{ kind: "inaccessible", pr }];
+    if (reviews.length === 0) {
+      return [{ kind: "inaccessible", pr }];
+    }
+    return [{ kind: "unrequested", pr, reviewedAt: new Date(Math.max(...reviews.map((review) => review.getTime()))) }];
   }
   const events = [
     ...requests.map((at) => {
@@ -3492,6 +3587,9 @@ function reviveRawData(data) {
       if (result.kind === "reviewed") {
         return { ...result, pr, requestedAt: new Date(result.requestedAt), reviewedAt: new Date(result.reviewedAt) };
       }
+      if (result.kind === "unrequested") {
+        return { ...result, pr, reviewedAt: new Date(result.reviewedAt) };
+      }
       return { ...result, pr };
     }),
     sizes: data.sizes.map((entry) => {
@@ -3518,6 +3616,9 @@ function loadSnapshot(options) {
     return null;
   }
   const data = reviveRawData(stored.data);
+  if (data.reviewResults.some((result) => result.kind === "unrequested" && Number.isNaN(result.reviewedAt.getTime()))) {
+    return null;
+  }
   if (sinceIso === data.sinceIso) {
     return data;
   }
@@ -3726,24 +3827,42 @@ function buildSizeRepoOptions(raw) {
     })
   ];
 }
-function pendingDetail(count2) {
-  return `${count2} ${count2 === 1 ? "PR" : "PRs"} awaiting your review`;
+function pendingDetail(counts) {
+  const awaiting = `${counts.awaiting} ${counts.awaiting === 1 ? "PR" : "PRs"} awaiting your review`;
+  return awaiting + (counts.reviewing > 0 ? `, ${counts.reviewing} reviewing` : "");
 }
 function buildPendingRepoOptions(raw) {
-  const countByRepo = /* @__PURE__ */ new Map();
+  const countsByRepo = /* @__PURE__ */ new Map();
+  const countsOf = (repo) => {
+    const counts = countsByRepo.get(repo) ?? { awaiting: 0, reviewing: 0 };
+    countsByRepo.set(repo, counts);
+    return counts;
+  };
   for (const result of raw.reviewResults) {
-    const pending = result.kind === "pending" && result.pr.state === "open" ? 1 : 0;
-    countByRepo.set(result.pr.repo, (countByRepo.get(result.pr.repo) ?? 0) + pending);
+    countsOf(result.pr.repo);
   }
-  if (countByRepo.size < 2) {
+  if (countsByRepo.size < 2) {
     return [];
   }
-  const entries = [...countByRepo.entries()].toSorted((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));
-  const total = entries.reduce((sum, [, count2]) => sum + count2, 0);
+  const stats = computeReviewStats(raw.reviewResults, { now: raw.fetchedAt });
+  for (const entry of stats.pending) {
+    countsOf(entry.pr.repo).awaiting += 1;
+  }
+  for (const entry of stats.reviewing) {
+    countsOf(entry.pr.repo).reviewing += 1;
+  }
+  const entries = [...countsByRepo.entries()].toSorted(
+    (a, b) => b[1].awaiting - a[1].awaiting || b[1].reviewing - a[1].reviewing || a[0].localeCompare(b[0])
+  );
+  const totals = { awaiting: 0, reviewing: 0 };
+  for (const [, counts] of entries) {
+    totals.awaiting += counts.awaiting;
+    totals.reviewing += counts.reviewing;
+  }
   return [
-    { repo: null, label: "All repos", detail: pendingDetail(total) },
-    ...entries.map(([repo, count2]) => {
-      return { repo, label: repo, detail: pendingDetail(count2) };
+    { repo: null, label: "All repos", detail: pendingDetail(totals) },
+    ...entries.map(([repo, counts]) => {
+      return { repo, label: repo, detail: pendingDetail(counts) };
     })
   ];
 }
@@ -5351,7 +5470,7 @@ function createClipboardCopier(renderer2) {
 }
 
 // src/tui/App.tsx
-import { jsx as jsx14, jsxs as jsxs13 } from "@opentui/react/jsx-runtime";
+import { jsx as jsx15, jsxs as jsxs13 } from "@opentui/react/jsx-runtime";
 function App({
   initial: initial2,
   initialSaved = null,
@@ -5473,9 +5592,9 @@ function App({
   });
   const capWarning = raw?.searchCapped ? "Warning, a search hit the 1000 result cap, so data may be incomplete. Narrow since or repos." : null;
   return /* @__PURE__ */ jsxs13("box", { flexDirection: "column", width: "100%", height: "100%", backgroundColor: theme.bg, children: [
-    /* @__PURE__ */ jsx14(Header, { options, raw, error, spinning: showLoad }),
-    /* @__PURE__ */ jsx14(TabBar, { tab: browse.tab }),
-    /* @__PURE__ */ jsx14(
+    /* @__PURE__ */ jsx15(Header, { options, raw, error, spinning: showLoad }),
+    /* @__PURE__ */ jsx15(TabBar, { tab: browse.tab }),
+    /* @__PURE__ */ jsx15(
       MainPanel,
       {
         views,
@@ -5494,7 +5613,7 @@ function App({
         onRefClick: copyLinks2 ? copyRow : null
       }
     ),
-    /* @__PURE__ */ jsx14(
+    /* @__PURE__ */ jsx15(
       Footer,
       {
         width,
@@ -5509,42 +5628,20 @@ function App({
         stale
       }
     ),
-    ui.modal === "options" && /* @__PURE__ */ jsx14(
-      OptionsModal,
+    /* @__PURE__ */ jsx15(
+      Modals,
       {
+        ui,
         options,
         saved: saved2,
-        selected: ui.selectedField,
-        editing: ui.editing,
-        fieldError: ui.fieldError,
-        onDraft: (value2) => {
-          draftRef.current = value2;
-        },
-        onSubmit: commitField
-      }
-    ),
-    ui.modal === "settings" && /* @__PURE__ */ jsx14(
-      SettingsModal,
-      {
-        selected: ui.selectedSetting,
-        cacheAction: ui.cacheAction,
         noCache: noCache2,
         copyLinks: copyLinks2,
-        preset: themeState.preset
-      }
-    ),
-    ui.modal === "theme" && /* @__PURE__ */ jsx14(
-      ThemeModal,
-      {
-        selected: ui.selectedThemeColor,
-        editing: ui.editing,
-        error: ui.themeColorError,
-        cacheAction: ui.cacheAction,
-        overrides: themeState.preset === "custom" ? themeState.overrides : {},
+        themeState,
         onDraft: (value2) => {
           draftRef.current = value2;
         },
-        onSubmit: commitThemeColor
+        onSubmitField: commitField,
+        onSubmitThemeColor: commitThemeColor
       }
     )
   ] });
@@ -5590,7 +5687,7 @@ function bootstrap() {
 }
 
 // src/tui/main.tsx
-import { jsx as jsx15 } from "@opentui/react/jsx-runtime";
+import { jsx as jsx16 } from "@opentui/react/jsx-runtime";
 var { initial, saved, noCache, copyLinks, theme: theme2 } = bootstrap();
 var exitSignals = ["SIGINT", "SIGTERM", "SIGQUIT", "SIGABRT", "SIGHUP", "SIGBREAK", "SIGBUS"];
 var renderer = await createCliRenderer({ exitOnCtrlC: true, exitSignals });
@@ -5601,7 +5698,7 @@ for (const signal of ["SIGTERM", "SIGHUP"]) {
   });
 }
 createRoot(renderer).render(
-  /* @__PURE__ */ jsx15(
+  /* @__PURE__ */ jsx16(
     App,
     {
       initial,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3lm/pr-stats",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "GitHub PR stats in an interactive terminal UI, via the gh CLI or an access token",
   "type": "module",
   "author": "Dominic Elm",