@kud/gh-ink 0.9.1 → 0.11.0

package/dist/index.d.ts

@@ -20,8 +20,9 @@ type HealthPanelProps = {
     error: string | null;
     reload: () => void;
     onOpenCheck: (check: PrCheck) => void;
+    onMerged?: () => void;
 };
-declare const HealthPanel: ({ repo, number, data, error, reload, onOpenCheck, }: HealthPanelProps) => React.JSX.Element;
+declare const HealthPanel: ({ repo, number, data, error, reload, onOpenCheck, onMerged, }: HealthPanelProps) => React.JSX.Element;
 
 declare const renderMarkdown: (raw: string, width: number, fileLink?: (path: string, line?: number) => string) => StyledLine[];
 
@@ -67,6 +68,7 @@ type GHItem = {
     health: Health;
     author?: string;
     age: string;
+    activityAge?: string;
     ts: number;
     unresolved: number;
     conversation: number;
@@ -127,6 +129,12 @@ type DetailContext = {
     onBack: () => void;
     onRefresh: () => void;
     onRemove: (item: GHItem) => void;
+    /**
+     * The PR just merged from here. Returns to the list, marks the row merged for
+     * a few seconds, then drops it — distinct from onRemove, which drops it at
+     * once. Optional so a host that cannot merge need not implement it.
+     */
+    onMerged?: (item: GHItem) => void;
 };
 type Action = {
     label: string;

package/dist/index.js

@@ -452,7 +452,8 @@ var HealthPanel = ({
   data,
   error,
   reload,
-  onOpenCheck
+  onOpenCheck,
+  onMerged
 }) => {
   const [cursor, setCursor] = useState(0);
   const [note, setNote] = useState(null);
@@ -475,13 +476,14 @@ var HealthPanel = ({
     setNote(msg);
     setTimeout(() => setNote(null), 2500);
   };
-  const act = async (msg, run) => {
+  const act = async (msg, run, onSuccess) => {
     setBusy(true);
     setNote(`\u22EF ${msg}\u2026`);
     try {
       await run();
       flash(`\u2713 ${msg}`);
-      reload();
+      if (onSuccess) onSuccess();
+      else reload();
     } catch {
       flash(`\u2717 ${msg} failed`);
     } finally {
@@ -498,7 +500,7 @@ var HealthPanel = ({
     if (busy) return;
     if (confirm === "merge") {
       if (input === "y" || input === "Y")
-        void act("merge", () => mergePr(repo, number));
+        void act("merge", () => mergePr(repo, number), onMerged);
       setConfirm(null);
       return;
     }
@@ -733,7 +735,9 @@ var repoPriority = (repo) => {
 };
 var sortItems = (items) => [...items].sort((a, b) => {
   const pd = repoPriority(a.repo) - repoPriority(b.repo);
-  return pd !== 0 ? pd : a.repo.localeCompare(b.repo);
+  if (pd !== 0) return pd;
+  const rd = a.repo.localeCompare(b.repo);
+  return rd !== 0 ? rd : b.ts - a.ts;
 });
 var sortByRecency = (items) => [...items].sort((a, b) => b.ts - a.ts);
 var insertRepoHeaders = (items) => {
@@ -1444,11 +1448,17 @@ var RepoHeaderRow = ({ repo, gap }) => {
   const fill = Math.max(4, 46 - label.length);
   return /* @__PURE__ */ jsx(Box, { marginTop: gap ? 1 : 0, children: /* @__PURE__ */ jsx(Text2, { dimColor: true, children: "  " + label + "\u2500".repeat(fill) }) });
 };
+var MERGED_HOLD_MS = 3e3;
+var MERGED_FRAME_MS = 150;
+var MERGED_FRAMES = ["\u2726", "\u2727", "\u2736", "\u2727"];
+var MERGED_COLOUR = "#A371F7";
 var ItemRow = ({
   item,
   active,
   gap,
-  login
+  login,
+  merged,
+  sparkFrame = 0
 }) => {
   if (item.kind === "repo-header")
     return /* @__PURE__ */ jsx(RepoHeaderRow, { repo: item.repo, gap: gap ?? false });
@@ -1479,15 +1489,20 @@ var ItemRow = ({
       /* @__PURE__ */ jsx(Text2, { bold: active, children: truncate(item.summary, titleMax2) })
     ] });
   }
-  const { glyph: icon, color } = healthDisplay[item.health];
+  const { glyph: healthIcon, color: healthColor2 } = healthDisplay[item.health];
+  const icon = merged ? MERGED_FRAMES[sparkFrame % MERGED_FRAMES.length] : healthIcon;
+  const color = merged ? MERGED_COLOUR : healthColor2;
   const [turnIcon, turnColor] = !login || !item.lastActor ? [" ", "white"] : item.lastActor === login ? ["\u2192", "#888888"] : ["\u2190", "#FF8700"];
   const numStr = `#${item.number}`.padEnd(7);
   const showAuthor = !!item.author && item.author !== login;
   const unresolvedLabel = item.unresolved > 0 ? `\uF086 ${item.unresolved}` : "";
+  const ageLabel = item.activityAge && item.activityAge !== item.age ? `${item.activityAge} \xB7 ${item.age}` : item.age;
+  const mergedLabel = merged ? "MERGED" : "";
   const suffix = [
-    item.age || "",
+    ageLabel || "",
     unresolvedLabel,
-    showAuthor ? `by ${item.author}` : ""
+    showAuthor ? `by ${item.author}` : "",
+    mergedLabel
   ].filter(Boolean).join("  ");
   const repoLabel = item.indent ? item.repo : "";
   const fixedWidth = 2 + (item.indent ? 3 : 0) + 2 + 2 + 7 + repoLabel.length + suffix.length + 6;
@@ -1502,7 +1517,8 @@ var ItemRow = ({
     repoLabel ? /* @__PURE__ */ jsx(Text2, { dimColor: true, children: repoLabel }) : null,
     unresolvedLabel ? /* @__PURE__ */ jsx(Text2, { bold: true, color: "#FF8700", children: "  " + unresolvedLabel }) : null,
     showAuthor ? /* @__PURE__ */ jsx(Text2, { dimColor: true, italic: true, children: "  by " + item.author }) : null,
-    item.age ? /* @__PURE__ */ jsx(Text2, { dimColor: true, children: "  " + item.age }) : null
+    ageLabel ? /* @__PURE__ */ jsx(Text2, { dimColor: true, children: "  " + ageLabel }) : null,
+    mergedLabel ? /* @__PURE__ */ jsx(Text2, { bold: true, color: MERGED_COLOUR, children: "  " + mergedLabel }) : null
   ] });
 };
 var useActionMenu = () => {
@@ -1791,7 +1807,8 @@ var BrowseScreen = ({
   tabHelp,
   isWorkRepo,
   initialIncludeWork,
-  brand
+  brand,
+  mergedUrls
 }) => {
   const { rows } = useWindowSize();
   const [includeWork, setIncludeWork] = useState(
@@ -1881,6 +1898,13 @@ var BrowseScreen = ({
     setFlash(msg);
     setTimeout(() => setFlash(null), 2e3);
   };
+  const [sparkFrame, setSparkFrame] = useState(0);
+  const sparkling = (mergedUrls?.length ?? 0) > 0;
+  useEffect(() => {
+    if (!sparkling) return;
+    const id = setInterval(() => setSparkFrame((f) => f + 1), MERGED_FRAME_MS);
+    return () => clearInterval(id);
+  }, [sparkling]);
   useEffect(() => {
     if (refreshError) showFlash(`\u2717 ${refreshError.message}`);
   }, [refreshError]);
@@ -2246,6 +2270,8 @@ var BrowseScreen = ({
                 item,
                 active: viewStart + i === cursor,
                 login,
+                merged: (item.kind === "pr" || item.kind === "issue") && !!mergedUrls?.includes(item.url),
+                sparkFrame,
                 gap: viewStart + i > 0 && (item.kind === "repo-header" || item.kind === "subgroup-header" || // A header is always followed by a blank line before its
                 // first child — in Other PRs that's "free" because the
                 // child is itself a repo-header (gap above). A jira row
@@ -2412,6 +2438,9 @@ var App = ({
       clearInterval(id);
     };
   }, [hasCiStatus, ciFetcher, ciPollMs]);
+  const [mergedUrls, setMergedUrls] = useState([]);
+  const mergeTimers = useRef([]);
+  useEffect(() => () => mergeTimers.current.forEach(clearTimeout), []);
   if (state.phase === "loading" || state.phase === "empty" || state.phase === "failed")
     return /* @__PURE__ */ jsxs(
       Box,
@@ -2457,6 +2486,20 @@ var App = ({
     sections: withoutItem(state.sections, target),
     login: state.login
   });
+  const markMerged = (target) => {
+    toBrowse();
+    setMergedUrls(
+      (prev) => prev.includes(target.url) ? prev : [...prev, target.url]
+    );
+    mergeTimers.current.push(
+      setTimeout(() => {
+        setMergedUrls((prev) => prev.filter((u) => u !== target.url));
+        setState(
+          (s) => s.phase === "browse" ? { ...s, sections: withoutItem(s.sections, target) } : s
+        );
+      }, MERGED_HOLD_MS)
+    );
+  };
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(
       BrowseScreen,
@@ -2477,6 +2520,7 @@ var App = ({
         isWorkRepo,
         initialIncludeWork,
         hidden: overlay !== null,
+        mergedUrls,
         ciStatusState: hasCiStatus ? ciStatusState : void 0,
         ciJob,
         tabHelp,
@@ -2508,7 +2552,8 @@ var App = ({
       login: state.login,
       onBack: toBrowse,
       onRefresh: applyOrRefresh,
-      onRemove: removeAndReturn
+      onRemove: removeAndReturn,
+      onMerged: markMerged
     }),
     overlay?.kind === "ext" && extensions?.find((e) => e.id === overlay.extId)?.body(toBrowse, overlay.target)
   ] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/gh-ink",
-  "version": "0.9.1",
+  "version": "0.11.0",
   "description": "Ink components for rendering GitHub PR review comments and health — controlled, presentation-only, built on @kud/ink-ui and fed by @kud/gh.",
   "type": "module",
   "main": "dist/index.js",