@kud/gh-ink 0.45.1 → 0.45.3

package/dist/index.d.ts

@@ -279,24 +279,52 @@ declare const runInPaneHorizontal: (cmd: string) => Promise<void>;
 declare const runHere: (cmd: string) => void;
 declare const COLS: number;
 /**
- * What the tab badge and the header total both count: rows that are somebody's
- * work, at the top level.
+ * What the tab badge and the header total both count.
  *
- * The exclusions are two different kinds of thing. Headers and the
- * show-more/show-less affordances are furniture — not entities at all, which is
- * why the search and repo filters drop them too. This function used to exclude
- * only the two header kinds while its three siblings excluded all four, so a
- * collapsed tail sitting at the top level counted as an item.
- * `role: "container"` rows ARE entities, selectable and openable; they simply
- * are not work. An epic is the case that forced the distinction: real, owned,
- * and on screen until it closes, but the work is the stories under it, and
+ * ONE INVARIANT: a piece of work counts once, at whatever depth the board
+ * happens to file it. Everything below follows from that, and the name says so
+ * because the old one — `workCount` — read as a fact about the tree and so
+ * nobody re-asked whether the tree still meant what it had when it was written.
+ * It did not, and the count silently went to zero.
+ *
+ * Furniture never counts: headers and the show-more/show-less affordances are
+ * not entities at all, which is why the search and repo filters drop them too.
+ * `role: "container"` rows ARE entities, selectable and openable; they are
+ * simply not work. An epic is the case that forced the distinction — real,
+ * owned, on screen until it closes, but the work is the stories under it, and
  * counting it as well reported five things to do where there were four.
  *
+ * Everything else counts when it is a LEAF — when nothing hangs under it. That
+ * is the only predicate under which the invariant holds. A PR on a tab of its
+ * own counts one; the same PR after its ticket becomes parseable, so that it now
+ * hangs under a story, still counts one. Counting every non-container row would
+ * make that transition raise the total, which is the epic bug one level down:
+ * nothing was created, the board merely got tidier, and the header claims you
+ * have more to do.
+ *
+ * It also settles the 0-to-1 case in the right direction. A story with no PR is
+ * its own leaf and counts one — a ticket in review with nothing to show is real
+ * work, arguably the most actionable row on the board. It gains its first PR and
+ * still counts one: the story stops being the item and its PR becomes the item.
+ * A row earns container-hood by HAVING children, which is why this lives in the
+ * predicate rather than in a flag the host has to remember to set.
+ *
+ * A collapsed tail contributes what it HIDES, and that line is load-bearing:
+ * pressing return on a `show-more` splices its rows into `items` in place, so
+ * without it the badge would rise on expanding and fall on collapsing — a key
+ * that only changes what is drawn would change how much work you have. With it,
+ * collapsed contributes `hidden.length` and expanded contributes the same rows
+ * as leaves, and the number holds still.
+ *
+ * Leaf-ness is read off the RENDERED list, so a search that hides a story's PRs
+ * turns that story back into a leaf and it counts itself. That is deliberate:
+ * the badge describes what is on screen to act on.
+ *
  * One function, both consumers, on purpose. The badge and the whole-board total
  * are the same claim at two scales; computed apart they drift, and a header that
  * disagrees with the sum of its own tabs is worse than either number alone.
  */
-declare const topLevelCount: (s: Section) => number;
+declare const workCount: (s: Section) => number;
 declare const drillCmd: (item: AnyItem) => string | null;
 declare const explainGhAction: (e: unknown) => string;
 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?: {
@@ -418,4 +446,4 @@ declare const matchesFilter: (repo: string, filter: RepoFilter) => boolean;
  */
 declare const parsePatterns: (value: string) => string[];
 
-export { type Action, ActionMenu, App, COLS, CiStatusLine, type CiStatusState, CommentsPanel, type CommentsPanelProps, type DetailContext, type ExplainSection, type ExtensionTarget, HealthPanel, type HealthPanelProps, type InboxBudget, type InboxExtension, type JiraTransition, type RepoFilter, SIDEBAR_COLS, SidePanel, type Sidebar, type SidebarRow, budgetNotice, buildActions, buildCheckoutCmd, clipboard, counts, drillCmd, explainGhAction, explainItem, fitCount, gapsAbove, healthColor, healthDisplay, healthGlyph, healthLegend, itermRun, jumpToRepo, jumpToRepoPane, matchesFilter, maxViewStart, moveCursor, openInTab, parsePatterns, railCapacity, readCache, renderMarkdown, reposInSections, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, signatureOf, toCiStatusState, topLevelCount, truncate, useActionMenu, windowCount, withHeaders, withoutItem, writeCache };
+export { type Action, ActionMenu, App, COLS, CiStatusLine, type CiStatusState, CommentsPanel, type CommentsPanelProps, type DetailContext, type ExplainSection, type ExtensionTarget, HealthPanel, type HealthPanelProps, type InboxBudget, type InboxExtension, type JiraTransition, type RepoFilter, SIDEBAR_COLS, SidePanel, type Sidebar, type SidebarRow, budgetNotice, buildActions, buildCheckoutCmd, clipboard, counts, drillCmd, explainGhAction, explainItem, fitCount, gapsAbove, healthColor, healthDisplay, healthGlyph, healthLegend, itermRun, jumpToRepo, jumpToRepoPane, matchesFilter, maxViewStart, moveCursor, openInTab, parsePatterns, railCapacity, readCache, renderMarkdown, reposInSections, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, signatureOf, toCiStatusState, truncate, useActionMenu, windowCount, withHeaders, withoutItem, workCount, writeCache };

package/dist/index.js

@@ -1352,9 +1352,23 @@ var Backdrop = ({
     children
   }
 ) : children });
-var topLevelCount = (s) => s.items.filter(
-  (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header" && i.kind !== "show-more" && i.kind !== "show-less" && !("role" in i && i.role === "container") && depthOf(i) === 0
-).length;
+var workCount = (s) => {
+  let n = 0;
+  for (let i = 0; i < s.items.length; i++) {
+    const item = s.items[i];
+    if (!item) continue;
+    if (item.kind === "show-more") {
+      n += item.hidden.length;
+      continue;
+    }
+    if (item.kind === "repo-header" || item.kind === "subgroup-header" || item.kind === "show-less")
+      continue;
+    if ("role" in item && item.role === "container") continue;
+    if (depthOf(s.items[i + 1]) > depthOf(item)) continue;
+    n += 1;
+  }
+  return n;
+};
 var drillCmd = (item) => {
   if (item.kind === "task")
     return item.ticket ? `jira issue view ${item.ticket}` : null;
@@ -1701,7 +1715,7 @@ var InboxHeader = ({
   appliedSummary,
   fetchedAt
 }) => {
-  const total = sections.reduce((n, s) => n + topLevelCount(s), 0);
+  const total = sections.reduce((n, s) => n + workCount(s), 0);
   const countSeg = loading ? "      loading\u2026  " : quiet ? "  " : `  ${String(total).padStart(3)} item${total !== 1 ? "s" : ""}  \xB7  `;
   const userSeg = loading || quiet ? "" : `@${login}  `;
   const workLabel = scopeLabel ? `  ${scopeLabel}  ` : "";
@@ -1786,14 +1800,20 @@ var RepoHeaderRow = ({
     /* @__PURE__ */ jsx(Text3, { dimColor: !active, children: " " + rule })
   ] });
 };
-var MERGED_HOLD_MS = 5e3;
+var MERGED_HOLD_MS = 3e3;
 var MERGED_FRAME_MS = 150;
 var MERGED_FRAMES = ["\u2726", "\u2727", "\u2736", "\u2727"];
 var MERGED_COLOUR = "#A371F7";
 var TRANSIT_HOLD_MS = 7e3;
-var TRANSIT_FRAME_TICKS = 3;
-var PULSE_SETTLE_MS = 6e4;
+var TRANSIT_FRAME_TICKS = 2;
+var TRANSIT_FRAME_MS = MERGED_FRAME_MS * TRANSIT_FRAME_TICKS;
+var rampFrame = (len, loopFrame, transitAt, now = Date.now()) => transitAt == null ? loopFrame % len : Math.max(
+  0,
+  Math.min(len - 1, Math.floor((now - transitAt) / TRANSIT_FRAME_MS))
+);
+var PULSE_SETTLE_MS = 12e3;
 var PULSE_MAX_FRAMES = Math.ceil(PULSE_SETTLE_MS / MERGED_FRAME_MS);
+var PULSE_IDLE_MS = 6e4;
 var PULSE_SETTLED_FRAME = 3;
 var NO_TRANSIENTS = /* @__PURE__ */ new Map();
 var NO_HOLDS = /* @__PURE__ */ new Map();
@@ -1825,6 +1845,7 @@ var ItemRow = ({
   merged,
   transient: refreshMark,
   leaving,
+  transitAt,
   prefix = "",
   parent,
   sparkFrame = 0,
@@ -1833,6 +1854,7 @@ var ItemRow = ({
   const backdropped = useBackdropped();
   const transient = leaving ? "out" : refreshMark;
   const transitFrame = Math.floor(sparkFrame / TRANSIT_FRAME_TICKS);
+  const rampAt = (len) => rampFrame(len, transitFrame, transitAt);
   const farewellLabel = leaving ? TRANSIT_LABEL.out : "";
   if (item.kind === "repo-header")
     return /* @__PURE__ */ jsx(RepoHeaderRow, { repo: item.repo, gap: gap ?? false, active });
@@ -1857,7 +1879,7 @@ var ItemRow = ({
     ] });
   if (item.kind === "task") {
     const note = item.note ?? "";
-    const transitIcon = !transient ? " " : isDeparture(transient) ? TRANSIT_OUT_FRAMES[transitFrame % TRANSIT_OUT_FRAMES.length] : isArrival(transient) ? TRANSIT_IN_FRAMES[transitFrame % TRANSIT_IN_FRAMES.length] : "\u25C9";
+    const transitIcon = !transient ? " " : isDeparture(transient) ? TRANSIT_OUT_FRAMES[rampAt(TRANSIT_OUT_FRAMES.length)] : isArrival(transient) ? TRANSIT_IN_FRAMES[rampAt(TRANSIT_IN_FRAMES.length)] : "\u25C9";
     const titleMax2 = Math.max(
       1,
       cols - item.key.length - note.length - (item.pill ? pillWidth(item.pill) + 1 : 0) - (farewellLabel ? pillWidth(farewellLabel) + 2 : 0) - prefix.length - 12
@@ -1889,7 +1911,7 @@ var ItemRow = ({
     ] });
   }
   const { glyph: healthIcon, color: healthColor2 } = healthDisplay[item.health];
-  const icon = merged ? MERGED_FRAMES[sparkFrame % MERGED_FRAMES.length] : transient && isDeparture(transient) ? TRANSIT_OUT_FRAMES[transitFrame % TRANSIT_OUT_FRAMES.length] : transient && isArrival(transient) ? TRANSIT_IN_FRAMES[transitFrame % TRANSIT_IN_FRAMES.length] : healthIcon;
+  const icon = merged ? MERGED_FRAMES[sparkFrame % MERGED_FRAMES.length] : transient && isDeparture(transient) ? TRANSIT_OUT_FRAMES[rampAt(TRANSIT_OUT_FRAMES.length)] : transient && isArrival(transient) ? TRANSIT_IN_FRAMES[rampAt(TRANSIT_IN_FRAMES.length)] : healthIcon;
   const color = merged ? MERGED_COLOUR : transient ? TRANSIT_COLOUR[transient] : healthColor2;
   const spokeLast = !!login && !!item.lastActor && item.lastActor === login;
   const [turnIcon, turnColor] = item.pinned ? [PIN_MARK, "#FF8700"] : !login || !item.lastActor ? [" ", "white"] : spokeLast ? ["\u2192", "#888888"] : ["\u2190", "#FF8700"];
@@ -2311,6 +2333,7 @@ var BrowseScreen = ({
   brand,
   mergedUrls,
   leavingUrls,
+  transitSince,
   onLeave,
   transients,
   onTabChange,
@@ -2414,7 +2437,7 @@ var BrowseScreen = ({
         out.add(s.id);
     return out;
   }, [localSections, transients]);
-  const [railOpen, setRailOpen] = useState(true);
+  const [railOpen, setRailOpen] = useState(false);
   const showRail = railOpen && !!sidebar;
   const [railFocus, setRailFocus] = useState(false);
   const [railCursor, setRailCursor] = useState(0);
@@ -2434,20 +2457,28 @@ var BrowseScreen = ({
     mergedUrls?.length ?? 0,
     leavingUrls?.length ?? 0
   ].join("|") : "";
+  const [pulseArm, setPulseArm] = useState(0);
+  const lastKeyAt = useRef(Date.now());
+  const pulseKey = sparkKey ? `${sparkKey}#${pulseArm}` : "";
+  const [pulseSettled, setPulseSettled] = useState(false);
   useEffect(() => {
-    if (!sparkKey) return;
+    if (!pulseKey) return;
+    setPulseSettled(false);
     let frames = 0;
     const id = setInterval(() => {
       frames += 1;
       if (frames >= PULSE_MAX_FRAMES) {
         clearInterval(id);
-        setSparkFrame(PULSE_SETTLED_FRAME);
+        setPulseSettled(true);
         return;
       }
       setSparkFrame((f) => f + 1);
     }, MERGED_FRAME_MS);
     return () => clearInterval(id);
-  }, [sparkKey]);
+  }, [pulseKey]);
+  useEffect(() => {
+    if (sparkKey) setPulseArm((n) => n + 1);
+  }, [tabIdx]);
   useEffect(() => {
     if (refreshError) showFlash(`\u2717 ${refreshError.message}`);
   }, [refreshError]);
@@ -2482,6 +2513,9 @@ var BrowseScreen = ({
     menu.open(actions);
   };
   useInput((input, key) => {
+    const idleFor = Date.now() - lastKeyAt.current;
+    lastKeyAt.current = Date.now();
+    if (idleFor >= PULSE_IDLE_MS && sparkKey) setPulseArm((n) => n + 1);
     if (hidden) return;
     if (key.ctrl || key.meta) return;
     if (help) {
@@ -2940,12 +2974,16 @@ var BrowseScreen = ({
             items: localSections.map((s) => ({
               value: s.id,
               label: s.label,
-              count: topLevelCount(s),
+              count: workCount(s),
               // Its own cell, always two wide, so news arriving never slides the
               // bar — and free to animate for exactly that reason.
               // The ticker undivided — see TAB_PULSE. The row marks' /3 buys quiet
               // for motion sitting beside text, and this is not that.
-              marker: tabMarker(markedTabs, s.id, sparkFrame),
+              marker: tabMarker(
+                markedTabs,
+                s.id,
+                pulseSettled ? PULSE_SETTLED_FRAME : sparkFrame
+              ),
               markerColor: "#FF8700"
             }))
           }
@@ -2979,6 +3017,7 @@ var BrowseScreen = ({
                       merged: (item.kind === "pr" || item.kind === "issue") && !!mergedUrls?.includes(item.url),
                       leaving: (item.kind === "pr" || item.kind === "issue") && !!leavingUrls?.includes(item.url),
                       transient: transientOf(transients, item, section.id),
+                      transitAt: "url" in item ? transitSince?.get(item.url) : void 0,
                       prefix: treePrefix(section.items, viewStart + i),
                       parent: item.kind === "task" && depthOf(section.items[viewStart + i + 1]) > depthOf(item),
                       sparkFrame,
@@ -3316,8 +3355,24 @@ var App = ({
   const [skippedForBudget, setSkippedForBudget] = useState(false);
   const [mergedUrls, setMergedUrls] = useState([]);
   const [leavingUrls, setLeavingUrls] = useState([]);
+  const leavingSince = useRef(/* @__PURE__ */ new Map());
+  const transitSince = useMemo(() => {
+    const out = new Map(leavingSince.current);
+    for (const [url, tab] of transitTabs.current) {
+      const at = heldSince.get(tab);
+      if (at != null && !out.has(url)) out.set(url, at);
+    }
+    return out;
+  }, [heldSince, transients, leavingUrls]);
   const holdTimers = useRef([]);
   useEffect(() => () => holdTimers.current.forEach(clearTimeout), []);
+  const holdFor = (fn, ms) => {
+    const id = setTimeout(() => {
+      holdTimers.current = holdTimers.current.filter((t) => t !== id);
+      fn();
+    }, ms);
+    holdTimers.current.push(id);
+  };
   if (state.phase === "loading" || state.phase === "empty" || state.phase === "failed")
     return /* @__PURE__ */ jsxs(
       Box,
@@ -3367,31 +3422,30 @@ var App = ({
   const toBrowse = () => setState({ phase: "browse", sections: state.sections, login: state.login });
   const markLeaving = (target) => {
     if (state.phase !== "browse") toBrowse();
+    if (!leavingSince.current.has(target.url))
+      leavingSince.current.set(target.url, Date.now());
     setLeavingUrls(
       (prev) => prev.includes(target.url) ? prev : [...prev, target.url]
     );
-    holdTimers.current.push(
-      setTimeout(() => {
-        setLeavingUrls((prev) => prev.filter((u) => u !== target.url));
-        setState(
-          (s) => s.phase === "browse" ? { ...s, sections: withoutItem(s.sections, target) } : s
-        );
-      }, LEAVING_HOLD_MS)
-    );
+    holdFor(() => {
+      leavingSince.current.delete(target.url);
+      setLeavingUrls((prev) => prev.filter((u) => u !== target.url));
+      setState(
+        (s) => s.phase === "browse" ? { ...s, sections: withoutItem(s.sections, target) } : s
+      );
+    }, LEAVING_HOLD_MS);
   };
   const markMerged = (target) => {
     toBrowse();
     setMergedUrls(
       (prev) => prev.includes(target.url) ? prev : [...prev, target.url]
     );
-    holdTimers.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)
-    );
+    holdFor(() => {
+      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(
@@ -3417,6 +3471,7 @@ var App = ({
         hidden: overlay !== null,
         mergedUrls,
         leavingUrls,
+        transitSince,
         onLeave: markLeaving,
         transients,
         onTabChange: setVisibleTab,
@@ -3473,4 +3528,4 @@ var matchesFilter = (repo, filter) => {
 };
 var parsePatterns = (value) => value.split(",").map((p) => p.trim()).filter(Boolean);
 
-export { ActionMenu, App, COLS, CiStatusLine, CommentsPanel, HealthPanel, SIDEBAR_COLS, SidePanel, budgetNotice, buildActions, buildCheckoutCmd, clipboard, counts, drillCmd, explainGhAction, explainItem, fitCount, gapsAbove, healthColor, healthDisplay, healthGlyph, healthLegend, itermRun, jumpToRepo, jumpToRepoPane, matchesFilter, maxViewStart, moveCursor, openInTab, parsePatterns, railCapacity, readCache, renderMarkdown, reposInSections, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, signatureOf, toCiStatusState, topLevelCount, truncate2 as truncate, useActionMenu, windowCount, withHeaders, withoutItem, writeCache };
+export { ActionMenu, App, COLS, CiStatusLine, CommentsPanel, HealthPanel, SIDEBAR_COLS, SidePanel, budgetNotice, buildActions, buildCheckoutCmd, clipboard, counts, drillCmd, explainGhAction, explainItem, fitCount, gapsAbove, healthColor, healthDisplay, healthGlyph, healthLegend, itermRun, jumpToRepo, jumpToRepoPane, matchesFilter, maxViewStart, moveCursor, openInTab, parsePatterns, railCapacity, readCache, renderMarkdown, reposInSections, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, signatureOf, toCiStatusState, truncate2 as truncate, useActionMenu, windowCount, withHeaders, withoutItem, workCount, writeCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/gh-ink",
-  "version": "0.45.1",
+  "version": "0.45.3",
   "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",