@kud/gh-ink 0.7.1 → 0.8.1

package/dist/index.d.ts

@@ -177,6 +177,14 @@ declare const drillCmd: (item: AnyItem) => string | null;
 declare const buildActions: (item: AnyItem, login: string, showFlash: (msg: string) => void, jiraBase?: string, jiraKeyRe?: RegExp, jiraTransitions?: JiraTransition[], onRefresh?: () => void, onRemove?: (item: GHItem) => void, onOpenView?: (item: AnyItem) => boolean, ext?: {
     extensions?: InboxExtension[];
     onOpenExt?: (id: string, target: ExtensionTarget) => void;
+    /**
+     * A mutation landed. Drops the cached glance now and schedules the refresh,
+     * replacing a bare `setTimeout(onRefresh, 1500)` at each call site.
+     *
+     * Both halves matter and only one is visible: the delay lets GitHub settle,
+     * the drop stops the pre-action cache outliving a quit inside that window.
+     */
+    onActed?: () => void;
 }) => Action[];
 type CiStatusState = {
     kind: "loading";

package/dist/index.js

@@ -5,7 +5,7 @@ import { isPassCheck, isFailCheck, resolveThread, unresolveThread, replyToThread
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { $ } from 'zx';
 import { spawn } from 'child_process';
-import { readFileSync, mkdirSync, writeFileSync, existsSync, readdirSync, statSync } from 'fs';
+import { readFileSync, mkdirSync, writeFileSync, existsSync, readdirSync, statSync, rmSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 
@@ -604,21 +604,34 @@ var healthLegend = [
   ["merged", "Merged"],
   ["closed", "Closed"]
 ];
+var CACHE_TTL_MS = 12e4;
+var CACHE_VERSION = 1;
 var cacheDir = () => join(process.env.XDG_CACHE_HOME || join(homedir(), ".cache"), "ambre");
 var cacheFile = (key) => join(cacheDir(), `${key.replace(/[^a-z0-9._-]/gi, "-")}.json`);
 var readCache = (key) => {
   try {
     const raw = JSON.parse(readFileSync(cacheFile(key), "utf8"));
+    if (raw?.version !== CACHE_VERSION) return null;
     if (!Array.isArray(raw?.sections)) return null;
     return { sections: raw.sections, login: raw.login ?? "", at: raw.at ?? 0 };
   } catch {
     return null;
   }
 };
+var isFresh = (cached, now = Date.now()) => !!cached && now - cached.at < CACHE_TTL_MS;
 var writeCache = (key, data) => {
   try {
     mkdirSync(cacheDir(), { recursive: true });
-    writeFileSync(cacheFile(key), JSON.stringify({ ...data, at: Date.now() }));
+    writeFileSync(
+      cacheFile(key),
+      JSON.stringify({ version: CACHE_VERSION, ...data, at: Date.now() })
+    );
+  } catch {
+  }
+};
+var invalidateCache = (key) => {
+  try {
+    rmSync(cacheFile(key), { force: true });
   } catch {
   }
 };
@@ -1052,6 +1065,7 @@ var FRAME_COLOR = "gray";
 var FRAME_PAD_X = 1;
 var FRAME_CHROME_COLS = 2 + FRAME_PAD_X * 2;
 var COLS = (process.stdout.columns ?? 120) - FRAME_CHROME_COLS;
+var MODAL_CHROME_COLS = 2 + 1 * 2;
 var topLevelCount = (s) => s.items.filter(
   (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header" && !i.indent
 ).length;
@@ -1121,7 +1135,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
                 showFlash(`\u22EF ${label} \xB7 ${resolution}\u2026`);
                 void quietly`jira issue move ${item.key} ${state} --resolution ${resolution}`.then(() => {
                   showFlash(`\u2713 ${label} \xB7 ${resolution}`);
-                  setTimeout(() => onRefresh?.(), 1500);
+                  ext?.onActed?.();
                 }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
               }
             }))
@@ -1132,7 +1146,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
               showFlash(`\u22EF Moving to ${label}\u2026`);
               void quietly`jira issue move ${item.key} ${state}`.then(() => {
                 showFlash(`\u2713 Moved to ${label}`);
-                setTimeout(() => onRefresh?.(), 1500);
+                ext?.onActed?.();
               }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
             }
           }
@@ -1528,12 +1542,55 @@ var TURN_LEGEND = [
   ["\u2190", "#FF8700", "They spoke last \xB7 your turn"],
   ["\u2192", "#888888", "You spoke last \xB7 waiting on them"]
 ];
+var CELL_GUTTER = 2;
+var COL_GAP = 3;
+var cellWidthOf = (col) => Math.max(0, ...col.rows.map((r) => r.cell.length)) + CELL_GUTTER;
+var widthOf = (col) => Math.max(
+  col.title.length,
+  ...col.rows.map((r) => cellWidthOf(col) + r.label.length)
+);
+var groupWidth = (group) => Math.max(0, ...group.map(widthOf));
+var layoutWidth = (groups) => groups.reduce((total, g) => total + groupWidth(g), 0) + COL_GAP * Math.max(0, groups.length - 1);
+var legendLayout = (cols, available) => {
+  const across = cols.map((c) => [c]);
+  if (layoutWidth(across) <= available) return across;
+  const stacked = [cols.slice(0, -1), cols.slice(-1)];
+  if (layoutWidth(stacked) <= available) return stacked;
+  return [cols];
+};
+var LegendGroup = ({
+  group,
+  width,
+  marginRight
+}) => /* @__PURE__ */ jsx(Box, { flexDirection: "column", width, marginRight, children: group.map((col, index) => {
+  const cellWidth = cellWidthOf(col);
+  return /* @__PURE__ */ jsxs(
+    Box,
+    {
+      flexDirection: "column",
+      marginTop: index === 0 ? 0 : 1,
+      children: [
+        /* @__PURE__ */ jsx(Text, { bold: true, dimColor: true, children: col.title }),
+        col.rows.map((row) => /* @__PURE__ */ jsxs(Box, { children: [
+          /* @__PURE__ */ jsx(Text, { color: row.color, bold: row.bold, children: row.cell.padEnd(cellWidth) }),
+          /* @__PURE__ */ jsx(Text, { wrap: "truncate-end", children: row.label })
+        ] }, col.title + row.cell + row.label))
+      ]
+    },
+    col.title
+  );
+}) });
 var HelpModal = ({
   workToggle,
   extensions,
   hasJira,
   tabHelp
 }) => {
+  const { columns } = useWindowSize();
+  const available = Math.max(
+    20,
+    columns - FRAME_CHROME_COLS - MODAL_CHROME_COLS
+  );
   const keys = [
     ["\u2191 \u2193", "navigate"],
     ["\u2190 \u2192 \xB7 tab", "switch tab"],
@@ -1555,6 +1612,49 @@ var HelpModal = ({
     ["?", "this help"],
     ["q", "quit"]
   ];
+  const statusColumn = {
+    title: "Status",
+    rows: [
+      ...healthLegend.map(([health, label]) => ({
+        cell: healthDisplay[health].glyph,
+        color: healthDisplay[health].color,
+        bold: true,
+        label
+      })),
+      ...TURN_LEGEND.map(([cell, color, label]) => ({
+        cell,
+        color,
+        bold: true,
+        label
+      })),
+      {
+        cell: "\uF086",
+        color: "#FF8700",
+        bold: true,
+        label: "Open-thread count"
+      }
+    ]
+  };
+  const cols = [
+    statusColumn,
+    ...tabHelp ? [
+      {
+        title: "Tabs",
+        rows: tabHelp.map(([tab, meaning]) => ({
+          cell: tab,
+          color: "#FF8700",
+          label: meaning
+        }))
+      }
+    ] : [],
+    {
+      title: "Keys",
+      rows: keys.map(([key, label]) => ({ cell: key, color: "cyan", label }))
+    }
+  ];
+  const groups = legendLayout(cols, available);
+  const widths = groups.map((g) => Math.min(groupWidth(g), available));
+  const contentWidth = Math.min(available, layoutWidth(groups));
   return /* @__PURE__ */ jsxs(
     Box,
     {
@@ -1562,42 +1662,18 @@ var HelpModal = ({
       borderStyle: "round",
       borderColor: "cyan",
       paddingX: 1,
+      width: contentWidth + MODAL_CHROME_COLS,
       children: [
         /* @__PURE__ */ jsx(Text, { color: "cyan", bold: true, children: "Legend" }),
-        /* @__PURE__ */ jsxs(Box, { marginTop: 1, children: [
-          /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginRight: 3, minWidth: 26, children: [
-            /* @__PURE__ */ jsx(Text, { bold: true, dimColor: true, children: "Status" }),
-            healthLegend.map(([health, label]) => {
-              const { glyph: icon, color } = healthDisplay[health];
-              return /* @__PURE__ */ jsxs(Box, { children: [
-                /* @__PURE__ */ jsx(Text, { color, bold: true, children: icon + " " }),
-                /* @__PURE__ */ jsx(Text, { children: " " + label })
-              ] }, health);
-            }),
-            TURN_LEGEND.map(([icon, color, label]) => /* @__PURE__ */ jsxs(Box, { children: [
-              /* @__PURE__ */ jsx(Text, { color, bold: true, children: icon + " " }),
-              /* @__PURE__ */ jsx(Text, { children: " " + label })
-            ] }, icon)),
-            /* @__PURE__ */ jsxs(Box, { children: [
-              /* @__PURE__ */ jsx(Text, { bold: true, color: "#FF8700", children: "\uF086 " }),
-              /* @__PURE__ */ jsx(Text, { children: " Open-thread count" })
-            ] })
-          ] }),
-          tabHelp ? /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginRight: 3, minWidth: 30, children: [
-            /* @__PURE__ */ jsx(Text, { bold: true, dimColor: true, children: "Tabs" }),
-            tabHelp.map(([tab, meaning]) => /* @__PURE__ */ jsxs(Box, { children: [
-              /* @__PURE__ */ jsx(Text, { color: "#FF8700", children: tab.padEnd(10) }),
-              /* @__PURE__ */ jsx(Text, { children: meaning })
-            ] }, tab))
-          ] }) : null,
-          /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-            /* @__PURE__ */ jsx(Text, { bold: true, dimColor: true, children: "Keys" }),
-            keys.map(([k, label]) => /* @__PURE__ */ jsxs(Box, { children: [
-              /* @__PURE__ */ jsx(Text, { color: "cyan", children: k.padEnd(11) }),
-              /* @__PURE__ */ jsx(Text, { children: label })
-            ] }, k))
-          ] })
-        ] }),
+        /* @__PURE__ */ jsx(Box, { marginTop: 1, width: contentWidth, children: groups.map((group, index) => /* @__PURE__ */ jsx(
+          LegendGroup,
+          {
+            group,
+            width: widths[index],
+            marginRight: index === groups.length - 1 ? 0 : COL_GAP
+          },
+          group[0]?.title ?? index
+        )) }),
         tabHelp ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Each item lands in the FIRST tab that claims it, so counts are residuals rather than totals." }) : null,
         /* @__PURE__ */ jsx(Text, { dimColor: true, children: "esc \xB7 ? close" })
       ]
@@ -1673,6 +1749,7 @@ var BrowseScreen = ({
   jiraKeyRe,
   jiraTransitions,
   onRefresh,
+  onActed,
   refreshing,
   hasPending,
   fetchedAt,
@@ -1807,7 +1884,7 @@ var BrowseScreen = ({
       onRefresh,
       removeItemFromSections,
       openDrillView,
-      { extensions, onOpenExt }
+      { extensions, onOpenExt, onActed }
     );
     menu.open(actions);
   };
@@ -2037,7 +2114,7 @@ var BrowseScreen = ({
               showFlash(`\u22EF ${label} \xB7 ${resolution}\u2026`);
               quietly`jira issue move ${jiraKey} ${state} --resolution ${resolution}`.then(() => {
                 showFlash(`\u2713 ${label} \xB7 ${resolution}`);
-                setTimeout(() => onRefresh?.(), 1500);
+                onActed?.();
               }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
             }
           }))
@@ -2049,7 +2126,7 @@ var BrowseScreen = ({
             showFlash(`\u22EF Moving to ${label}\u2026`);
             quietly`jira issue move ${jiraKey} ${state}`.then(() => {
               showFlash(`\u2713 Moved to ${label}`);
-              setTimeout(() => onRefresh?.(), 1500);
+              onActed?.();
             }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
           }
         }
@@ -2280,9 +2357,14 @@ var App = ({
     if (pending) showData(pending.sections, pending.login);
     else revalidate(true);
   };
+  const onActed = () => {
+    if (cacheKey) invalidateCache(cacheKey);
+    setTimeout(() => applyOrRefresh(), 1500);
+  };
   useEffect(() => {
     const cached = cacheKey ? readCache(cacheKey) : null;
-    if (cached && cached.sections.length > 0) {
+    const painted = !!cached && cached.sections.length > 0;
+    if (painted && cached) {
       displayedKey.current = signatureOf(cached.sections);
       setFetchedAt(cached.at);
       setState({
@@ -2291,7 +2373,7 @@ var App = ({
         login: cached.login
       });
     }
-    revalidate();
+    if (!painted || !isFresh(cached)) revalidate();
   }, []);
   useEffect(() => {
     if (!hasCiStatus || !ciFetcher) return;
@@ -2358,6 +2440,7 @@ var App = ({
         jiraKeyRe,
         jiraTransitions,
         onRefresh: applyOrRefresh,
+        onActed,
         refreshing,
         hasPending: pending !== null,
         fetchedAt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/gh-ink",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "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",
@@ -48,7 +48,7 @@
     "react": ">=19"
   },
   "dependencies": {
-    "@kud/gh": "0.5.0",
+    "@kud/gh": "0.5.1",
     "@kud/ink-ui": "0.14.0",
     "zx": "8.8.5"
   },