@kud/gh-ink 0.75.1 → 0.76.0

package/dist/index.d.ts

@@ -196,7 +196,11 @@ declare const SidePanel: ({ sidebar, liveLabel, width, height, focused, cursor,
 type FocusSlot = {
     /** The mark in front of the row, accent by default. */
     mark?: string;
-    /** The mark's colour. Defaults to the accent. */
+    /**
+     * The mark's colour in the list gutter (`focusCellFor`). Defaults to the
+     * accent. The ready row's pill takes its accent from its own
+     * `variant="accent"`, so this never reaches the pill.
+     */
     markColor?: string;
     /** What the row is a slot OF, in the host's words: `focus`, say. */
     label: string;
@@ -422,9 +426,10 @@ type LayoutInput = Pick<PrRowProps, "item" | "login" | "cols" | "prefix" | "unif
 };
 /**
  * Which trailing columns the section has to give up, so that every row gives up
- * the same ones. Each row is laid out alone and the drops are unioned: if any
- * row needs its size cell gone to keep a readable title, the size column goes
- * for all of them.
+ * the same ones. Drops come from two places: width pressure — each row is laid
+ * out alone and the drops are unioned, so if any row needs its size cell gone
+ * to keep a readable title, the size column goes for all of them — and
+ * emptiness, where no row in the section fills the column at all.
  *
  * Forcing a drop on a row that did not need it only ever hands that row more
  * room, so it can never push the row further down the ladder than it went on

package/dist/index.js

@@ -1,6 +1,6 @@
-import React2, { createContext, useState, useRef, useContext, useEffect, useCallback, useMemo } from 'react';
+import React5, { createContext, useState, useRef, useContext, useEffect, useCallback, useMemo } from 'react';
 import { useWindowSize, useInput, Text, Box } from 'ink';
-import { colors, ScrollView, TextInput, Pill, getIconMode, FooterHints, useAppKeys, LoadingScreen, StatusMessage, useFilterMode, useListCursor, CommandPalette, Tabs, ProgressBar, pillWidth } from '@kud/ink-ui';
+import { colors, ScrollView, TextInput, Pill, getIconMode, FooterHints, useAppKeys, LoadingScreen, pillWidth, StatusMessage, useFilterMode, useListCursor, CommandPalette, Tabs, ProgressBar } from '@kud/ink-ui';
 import { isPassCheck, isFailCheck, isInconclusiveCheck, resolveThread, unresolveThread, replyToThread, rerunFailedRun, mergePr, reRequestReviewer, parseRef, formatRef, fetchItemNode } from '@kud/gh';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { PIN_MARK, sizeOf, sizePartsOf, depthOf, impliedLabels, labelPriority, checkoutDirs, profileOf, inboxConfig, relativeTime, filterBySearch, filterByRepos, filterByOrigin, refCandidates, resolveRef } from '@kud/gh-workflow';
@@ -444,7 +444,7 @@ var Summary = ({
   /* @__PURE__ */ jsx(Text, { children: "  " }),
   /* @__PURE__ */ jsx(Text, { bold: true, children: label.padEnd(10) }),
   /* @__PURE__ */ jsx(Text, { children: icon + "  " }),
-  parts.map(([text, color], i) => /* @__PURE__ */ jsxs(React2.Fragment, { children: [
+  parts.map(([text, color], i) => /* @__PURE__ */ jsxs(React5.Fragment, { children: [
     i > 0 && /* @__PURE__ */ jsx(Text, { dimColor: true, children: " \xB7 " }),
     /* @__PURE__ */ jsx(Text, { color, children: text })
   ] }, text + i))
@@ -857,15 +857,28 @@ var trailingColumnsOf = (items) => items.reduce(
   { author: 0, threads: 0, size: 0, age: 0 }
 );
 var numberColumnsOf = (items) => items.reduce((w, item) => Math.max(w, cellsOf(`#${item.number}`)), 0) + 2;
-var sectionShedOf = (rows, context) => rows.reduce((shed, row) => {
-  const { givingUp } = layoutOf({ ...context, ...row });
-  return {
-    author: shed.author || givingUp.author,
-    threads: shed.threads || givingUp.threads,
-    size: shed.size || givingUp.size,
-    age: shed.age || givingUp.age
+var sectionShedOf = (rows, context) => {
+  const noAuthor = rows.every(
+    ({ item }) => !item.author || item.author === context.login
+  );
+  const noThreads = rows.every(({ item }) => !threadsLabelOf(item));
+  const empty = {
+    ...noAuthor ? { author: true } : {},
+    ...noThreads ? { threads: true } : {}
   };
-}, {});
+  return rows.reduce(
+    (shed, row) => {
+      const { givingUp } = layoutOf({ ...context, ...row });
+      return {
+        author: shed.author || givingUp.author,
+        threads: shed.threads || givingUp.threads,
+        size: shed.size || givingUp.size,
+        age: shed.age || givingUp.age
+      };
+    },
+    { ...empty }
+  );
+};
 var layoutOf = ({
   item,
   login,
@@ -1068,7 +1081,7 @@ var PrRow = ({
         /* @__PURE__ */ jsx(Text3, { color: colors.secondary, children: agePair.activity }),
         /* @__PURE__ */ jsx(Text3, { dimColor: true, children: ` (${agePair.lifetime})` })
       ] }) : ageLabel2 ? /* @__PURE__ */ jsx(Text3, { color: colors.secondary, children: ageLabel2 }) : null }) : null,
-      backdropped ? null : announcements.map((a) => /* @__PURE__ */ jsxs(React2.Fragment, { children: [
+      backdropped ? null : announcements.map((a) => /* @__PURE__ */ jsxs(React5.Fragment, { children: [
         /* @__PURE__ */ jsx(Text3, { children: "  " }),
         /* @__PURE__ */ jsx(Pill, { color: a.color, children: a.label })
       ] }, a.label))
@@ -1102,12 +1115,14 @@ var ageLabel = (at, now = Date.now()) => {
   if (m < 60) return `${m}m`;
   return `${Math.round(m / 60)}h`;
 };
-var itemText = (item) => `${stripGlyph(item.state)[0]}${item.alarm ? ` ${ALARM}` : ""} ${item.key}`;
+var itemText = (item) => item.state === "fail" ? `${stripGlyph("fail")[0]} ${item.key}` : `${stripGlyph(item.state)[0]}${item.alarm ? ` ${ALARM}` : ""} ${item.key}`;
+var itemWidth = (item) => item.state === "fail" ? pillWidth(itemText(item)) : itemText(item).length;
 var stripLayout = (strip, width, now = Date.now()) => {
   const age = ageLabel(strip.at, now);
   const fixed = 2 + strip.title.length + 2 + (age ? age.length + 3 : 0);
   const full = strip.items.map(itemText).join("  ");
-  if (fixed + full.length <= width)
+  const fullWidth = strip.items.reduce((n, item) => n + itemWidth(item), 0) + Math.max(0, strip.items.length - 1) * 2;
+  if (fixed + fullWidth <= width)
     return { parts: strip.items, summary: full, age };
   const sorted = [...strip.items].sort(
     (a, b) => SEVERITY[a.state] - SEVERITY[b.state]
@@ -1122,13 +1137,13 @@ var stripLayout = (strip, width, now = Date.now()) => {
     const rest = bad.slice(n);
     const counts2 = ["fail", "warn", "unknown"].map((s) => tally(rest.filter((i) => i.state === s).length, s)).filter(Boolean);
     text = [tally(ok, "ok"), ...counts2, ...named.map(itemText)].filter(Boolean).join(" \xB7 ");
-    if (fixed + text.length <= width) break;
+    const textWidth = text.length + 2 * named.filter((i) => i.state === "fail").length;
+    if (fixed + textWidth <= width) break;
   }
   return { parts: null, summary: text, age };
 };
 var nameStyle = (item) => {
-  if (item.state === "fail" || item.alarm)
-    return { color: colors.error, bold: true };
+  if (item.alarm) return { color: colors.error, bold: true };
   if (item.state === "unknown") return { dimColor: true };
   return {};
 };
@@ -1152,9 +1167,14 @@ var StatusStripLine = ({
   return /* @__PURE__ */ jsxs(Box, { marginBottom: 1, children: [
     /* @__PURE__ */ jsx(Text, { dimColor: true, children: `  ${strip.title}  ` }),
     parts ? parts.map((item, i) => {
+      if (item.state === "fail")
+        return /* @__PURE__ */ jsxs(React5.Fragment, { children: [
+          i > 0 ? /* @__PURE__ */ jsx(Text, { children: "  " }) : null,
+          /* @__PURE__ */ jsx(Pill, { variant: "error", tone: "solid", children: itemText(item) })
+        ] }, item.key);
       const [glyph, color] = stripGlyph(item.state);
-      const asking = item.state === "fail" || item.state === "warn";
-      return /* @__PURE__ */ jsxs(React2.Fragment, { children: [
+      const asking = item.state === "warn";
+      return /* @__PURE__ */ jsxs(React5.Fragment, { children: [
         i > 0 ? /* @__PURE__ */ jsx(Text, { children: "  " }) : null,
         /* @__PURE__ */ jsx(
           Text,
@@ -1707,7 +1727,7 @@ var cells = (s) => [...s].length;
 var titleBudgetOf = (focus, label, width, jumpKey) => {
   const hint = jumpKey ? jumpKey : void 0;
   const mark = focus.mark ?? FOCUS_MARK;
-  const head = 2 + cells(mark) + 1 + cells(label) + 2 + (focus.marker ? cells(focus.marker) + 1 : 0) + cells(focus.ref) + 2;
+  const head = 2 + pillWidth(`${mark} ${label}`) + 2 + (focus.marker ? cells(focus.marker) + 1 : 0) + cells(focus.ref) + 2;
   const hintCells = hint ? 3 + cells(hint) + 5 : 0;
   const tail = 3 + cells(focus.reason);
   const titleMax = width - head - tail - hintCells;
@@ -1747,8 +1767,8 @@ var FocusSlotLine = ({
   const { title, reason, hint } = titleBudgetOf(focus, label, width, jumpKey);
   return /* @__PURE__ */ jsxs(Box, { marginBottom: 1, children: [
     /* @__PURE__ */ jsx(Text, { children: "  " }),
-    /* @__PURE__ */ jsx(Text, { color: focus.markColor ?? colors.accent, bold: true, children: `${mark} ` }),
-    /* @__PURE__ */ jsx(Text, { dimColor: true, children: `${label}  ` }),
+    /* @__PURE__ */ jsx(Pill, { variant: "accent", tone: "tonal", children: `${mark} ${label}` }),
+    /* @__PURE__ */ jsx(Text, { children: "  " }),
     focus.marker ? /* @__PURE__ */ jsx(Text, { children: `${focus.marker} ` }) : null,
     /* @__PURE__ */ jsx(Text, { color: focusRefColor(focus), bold: true, children: `${focus.ref}  ` }),
     /* @__PURE__ */ jsx(Text, { bold: true, children: title }),
@@ -4728,7 +4748,15 @@ var App = ({
   onSettled
 }) => {
   const { rows } = useWindowSize();
-  const [state, setState] = useState({ phase: "loading" });
+  const [launchCache] = useState(() => cacheKey ? readCache(cacheKey) : null);
+  const launchPainted = !!launchCache && launchCache.sections.length > 0;
+  const [state, setState] = useState(
+    () => launchPainted && launchCache ? {
+      phase: "browse",
+      sections: launchCache.sections,
+      login: launchCache.login
+    } : { phase: "loading" }
+  );
   const browsePeel = useRef(null);
   const drillPeel = useRef(null);
   const [typing, setTyping] = useState(false);
@@ -4758,7 +4786,9 @@ var App = ({
   });
   const [pending, setPending] = useState(null);
   const [refreshing, setRefreshing] = useState(false);
-  const [fetchedAt, setFetchedAt] = useState(null);
+  const [fetchedAt, setFetchedAt] = useState(
+    launchPainted && launchCache ? launchCache.at : null
+  );
   const [refreshError, setRefreshError] = useState(null);
   const [ciStatusState, setCiStatusState] = useState({
     kind: "loading"
@@ -4777,8 +4807,12 @@ var App = ({
     if (prev.kind !== "ready") return next;
     return stripSignature(prev.strip) === stripSignature(strip) ? prev : next;
   });
-  const displayedKey = useRef("");
-  const displayedSections = useRef([]);
+  const displayedKey = useRef(
+    launchPainted && launchCache ? signatureOf(launchCache.sections) : ""
+  );
+  const displayedSections = useRef(
+    launchPainted && launchCache ? launchCache.sections : []
+  );
   const [transients, setTransients] = useState(NO_TRANSIENTS);
   const transitTabs = useRef(/* @__PURE__ */ new Map());
   const [heldSince, setHeldSince] = useState(NO_HOLDS);
@@ -5043,21 +5077,7 @@ var App = ({
     setTimeout(() => applyOrRefresh(), 1500);
   };
   useEffect(() => {
-    const cached = cacheKey ? readCache(cacheKey) : null;
-    const painted = !!cached && cached.sections.length > 0;
-    if (painted && cached) {
-      displayedKey.current = signatureOf(cached.sections);
-      displayedSections.current = cached.sections;
-      setFetchedAt(cached.at);
-      if (cached.sidebar) setSidebar(cached.sidebar);
-      if (cached.focus !== void 0) setFocus(cached.focus);
-      setState({
-        phase: "browse",
-        sections: cached.sections,
-        login: cached.login
-      });
-    }
-    if (!painted || !isFresh(cached)) revalidate();
+    if (!launchPainted || !isFresh(launchCache)) revalidate();
   }, []);
   useEffect(() => {
     if (!hasCiStatus || !ciFetcher) return;
@@ -5133,8 +5153,12 @@ var App = ({
     () => cacheKey ? readCache(cacheKey)?.budget ?? null : null
   );
   const [appliedSummary, setAppliedSummary] = useState("");
-  const [sidebar, setSidebar] = useState(void 0);
-  const [focus, setFocus] = useState(void 0);
+  const [sidebar, setSidebar] = useState(
+    launchPainted ? launchCache?.sidebar : void 0
+  );
+  const [focus, setFocus] = useState(
+    launchPainted ? launchCache?.focus : void 0
+  );
   const [skippedForBudget, setSkippedForBudget] = useState(false);
   const [mergedUrls, setMergedUrls] = useState([]);
   const [leavingUrls, setLeavingUrls] = useState([]);
@@ -5202,7 +5226,7 @@ var App = ({
               flexDirection: "column",
               minHeight: Math.max(
                 5,
-                rows - 6 - (hasCiStatus ? 2 : 0) - (hasStrip ? 2 : 0) - (hasFocusSlot ? 2 : 0)
+                rows - 5 - (hasCiStatus ? 2 : 0) - (hasStrip ? 2 : 0) - (hasFocusSlot ? 2 : 0)
               ),
               children: state.phase === "loading" ? /* @__PURE__ */ jsx(LoadingScreen, { label: `Fetching ${title}\u2026` }) : /* @__PURE__ */ jsx(
                 NoRowsScreen,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/gh-ink",
-  "version": "0.75.1",
+  "version": "0.76.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",
@@ -44,7 +44,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@kud/ink-ui": ">=0.39.0 <1",
+    "@kud/ink-ui": ">=0.41.0 <1",
     "ink": ">=7",
     "react": ">=19"
   },
@@ -54,7 +54,7 @@
     "zx": "8.8.5"
   },
   "devDependencies": {
-    "@kud/ink-ui": "0.39.0",
+    "@kud/ink-ui": "0.41.0",
     "@types/node": "22.20.1",
     "@types/react": "19.2.17",
     "ink": "7.1.0",