@kud/gh-ink 0.34.0 → 0.36.0

package/dist/index.d.ts

@@ -140,6 +140,31 @@ type GHItem = {
      * handing back a `lastActor` that no longer claims a turn.
      */
     pinned?: boolean;
+    /**
+     * What this row STANDS FOR, when that differs from what it is. Absent means
+     * the row is a unit of work and is counted as one.
+     *
+     * `"container"` marks a row that exists to carry context rather than to be
+     * done: the initiative a story hangs under, drawn as a real row because it is
+     * still selectable, openable, and worth seeing until it closes — but not
+     * itself a thing on anyone's plate. Four stories under one container is four
+     * items, not five.
+     *
+     * Deliberately not `uncounted`. A host knows what a row IS; it should not have
+     * to know what the tab badge does with that, and a field named after one
+     * consumer starts lying the moment a second one reads it.
+     *
+     * Orthogonal to `depth`, which says where the row hangs rather than what it
+     * stands for. A container is a genuine depth-0 row with genuine depth-1
+     * children; spelling it as a depth would mean lying about the tree to fix a
+     * number, and every site that draws indentation reads that lie as truth.
+     *
+     * A union with one member rather than a boolean. `indent` was a boolean that
+     * turned out to need a scalar, and widening it cost a deprecation that is
+     * still in this file. Adding a second role here is additive; turning a boolean
+     * into a union is not.
+     */
+    role?: "container";
     /**
      * How deep this row hangs in the tree: 0 top level, 1 a child, 2 a
      * grandchild. Absent means 0.
@@ -165,6 +190,8 @@ type TaskRow = {
     url: string;
     status: string;
     age: string;
+    /** What this row stands for. See `GHItem.role`. */
+    role?: "container";
     /** How deep this row hangs. See `GHItem.depth`; read it through `depthOf`. */
     depth?: number;
     /** @deprecated Legacy spelling of `depth: 1`. See `GHItem.indent`. */
@@ -375,6 +402,24 @@ declare const openInTab: (cmd: string) => Promise<void>;
 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.
+ *
+ * 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
+ * counting it as well reported five things to do where there were four.
+ *
+ * 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 drillCmd: (item: AnyItem) => string | null;
 declare const explainGhAction: (e: unknown) => string;

package/dist/index.js

@@ -676,6 +676,9 @@ var invalidateCache = (key) => {
 };
 
 // src/inbox/diff.ts
+var MARK_SEP = "\0";
+var markKey = (sectionId, rowKey) => `${sectionId}${MARK_SEP}${rowKey}`;
+var rowKeyOfMark = (mark) => mark.slice(mark.indexOf(MARK_SEP) + 1);
 var keyOf = (item) => {
   if (item.kind === "pr" || item.kind === "issue") return item.url;
   if (item.kind === "task") {
@@ -707,11 +710,27 @@ var indexRows = (sections) => {
   for (const section of sections) {
     section.items.forEach((item, index) => {
       const key = keyOf(item);
-      if (key) out.set(key, { item, sectionId: section.id, index });
+      if (key)
+        out.set(markKey(section.id, key), {
+          item,
+          sectionId: section.id,
+          index
+        });
     });
   }
   return out;
 };
+var rowsOf = (index) => {
+  const out = /* @__PURE__ */ new Map();
+  for (const [mark, placed] of index) {
+    const key = rowKeyOfMark(mark);
+    const seen = out.get(key);
+    if (seen) seen.add(placed.sectionId);
+    else out.set(key, /* @__PURE__ */ new Set([placed.sectionId]));
+  }
+  return out;
+};
+var sameSections = (a, b) => a.size === b.size && [...a].every((id) => b.has(id));
 var spliceBack = (next, leaving) => {
   if (leaving.length === 0) return next;
   const bySection = /* @__PURE__ */ new Map();
@@ -732,30 +751,43 @@ var spliceBack = (next, leaving) => {
 var diffSections = (prev, next) => {
   const before = indexRows(prev);
   const after = indexRows(next);
+  const boardBefore = rowsOf(before);
+  const boardAfter = rowsOf(after);
   const transients = /* @__PURE__ */ new Map();
   const leaving = [];
-  for (const [key] of after) if (!before.has(key)) transients.set(key, "in");
-  for (const [key, was] of before) {
-    const now = after.get(key);
+  for (const [mark] of after)
+    if (!before.has(mark))
+      transients.set(
+        mark,
+        boardBefore.has(rowKeyOfMark(mark)) ? "moved-in" : "in"
+      );
+  for (const [mark, was] of before) {
+    const now = after.get(mark);
     if (!now) {
-      transients.set(key, "out");
+      transients.set(
+        mark,
+        boardAfter.has(rowKeyOfMark(mark)) ? "moved-out" : "out"
+      );
       leaving.push(was);
     } else if (renderedState(was.item) !== renderedState(now.item)) {
-      transients.set(key, "changed");
+      transients.set(mark, "changed");
     }
   }
   let added = 0;
   let removed = 0;
-  let changed = 0;
-  for (const [, kind] of transients) {
-    if (kind === "in") added++;
-    else if (kind === "out") removed++;
-    else changed++;
+  const changedRows = /* @__PURE__ */ new Set();
+  for (const [mark, kind] of transients)
+    if (kind === "changed") changedRows.add(rowKeyOfMark(mark));
+  for (const [key, sections] of boardAfter) {
+    const had = boardBefore.get(key);
+    if (!had) added += 1;
+    else if (!sameSections(had, sections)) changedRows.add(key);
   }
+  for (const key of boardBefore.keys()) if (!boardAfter.has(key)) removed += 1;
   return {
     transients,
     union: spliceBack(next, leaving),
-    counts: { added, removed, changed }
+    counts: { added, removed, changed: changedRows.size }
   };
 };
 var summariseDiff = (counts) => {
@@ -765,17 +797,19 @@ var summariseDiff = (counts) => {
   if (counts.changed) parts.push(`${counts.changed} moved`);
   return parts.join(" \xB7 ");
 };
-var transientOf = (transients, item) => {
+var transientOf = (transients, item, sectionId) => {
   if (!transients?.size) return void 0;
   const key = keyOf(item);
-  return key ? transients.get(key) : void 0;
+  return key ? transients.get(markKey(sectionId, key)) : void 0;
 };
 var tabsOfMarks = (sections, marks) => {
   const out = /* @__PURE__ */ new Map();
   for (const section of sections)
     for (const item of section.items) {
       const key = keyOf(item);
-      if (key && marks.has(key)) out.set(key, section.id);
+      if (!key) continue;
+      const mark = markKey(section.id, key);
+      if (marks.has(mark)) out.set(mark, section.id);
     }
   return out;
 };
@@ -1391,7 +1425,7 @@ var Backdrop = ({
   }
 ) : children });
 var topLevelCount = (s) => s.items.filter(
-  (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header" && depthOf(i) === 0
+  (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 drillCmd = (item) => {
   if (item.kind === "task")
@@ -1835,13 +1869,26 @@ var TRANSIT_IN_FRAMES = ["\xB7", "\u25CB", "\u25CE", "\u25C9"];
 var TRANSIT_COLOUR = {
   in: "#3FB950",
   out: "#8B949E",
-  changed: "#FF8700"
+  changed: "#FF8700",
+  // A move is neither an arrival nor a departure, so it takes the colour of the
+  // third thing that can happen to a row you already had: it changed. Both ends
+  // of one move wear the same colour and the same word, which is what lets you
+  // recognise the row you just watched leave when you land on the tab it went to.
+  "moved-in": "#FF8700",
+  "moved-out": "#FF8700"
 };
 var TRANSIT_LABEL = {
   in: "NEW",
   out: "GONE",
-  changed: "UPDATED"
-};
+  changed: "UPDATED",
+  // Never GONE. The row is still on the board, one tab over, and telling you it
+  // has gone is the marker lying about work you still own — which was the whole
+  // failure: an epic moving tab said nothing at all and simply vanished.
+  "moved-in": "MOVED",
+  "moved-out": "MOVED"
+};
+var isDeparture = (t) => t === "out" || t === "moved-out";
+var isArrival = (t) => t === "in" || t === "moved-in";
 var LEAVING_HOLD_MS = 2500;
 var TAB_MARK = "\u25CF";
 var tabLabel = (label, marked, id) => marked.size === 0 ? label : `${marked.has(id) ? TAB_MARK : " "} ${label}`;
@@ -1881,7 +1928,7 @@ var ItemRow = ({
     ] });
   if (item.kind === "task") {
     const note = item.note ?? "";
-    const transitIcon = !transient ? " " : transient === "out" ? TRANSIT_OUT_FRAMES[sparkFrame % TRANSIT_OUT_FRAMES.length] : transient === "in" ? TRANSIT_IN_FRAMES[sparkFrame % TRANSIT_IN_FRAMES.length] : "\u25C9";
+    const transitIcon = !transient ? " " : isDeparture(transient) ? TRANSIT_OUT_FRAMES[sparkFrame % TRANSIT_OUT_FRAMES.length] : isArrival(transient) ? TRANSIT_IN_FRAMES[sparkFrame % TRANSIT_IN_FRAMES.length] : "\u25C9";
     const transitLabel2 = transient ? TRANSIT_LABEL[transient] : "";
     const titleMax2 = Math.max(
       20,
@@ -1896,8 +1943,8 @@ var ItemRow = ({
       /* @__PURE__ */ jsx(
         Text2,
         {
-          bold: active || transient === "in",
-          dimColor: transient === "out",
+          bold: active || !!transient && isArrival(transient),
+          dimColor: !!transient && isDeparture(transient),
           strikethrough: transient === "out",
           children: truncate(item.summary, titleMax2)
         }
@@ -1907,7 +1954,7 @@ var ItemRow = ({
     ] });
   }
   const { glyph: healthIcon, color: healthColor2 } = healthDisplay[item.health];
-  const icon = merged ? MERGED_FRAMES[sparkFrame % MERGED_FRAMES.length] : transient === "out" ? TRANSIT_OUT_FRAMES[sparkFrame % TRANSIT_OUT_FRAMES.length] : transient === "in" ? TRANSIT_IN_FRAMES[sparkFrame % TRANSIT_IN_FRAMES.length] : healthIcon;
+  const icon = merged ? MERGED_FRAMES[sparkFrame % MERGED_FRAMES.length] : transient && isDeparture(transient) ? TRANSIT_OUT_FRAMES[sparkFrame % TRANSIT_OUT_FRAMES.length] : transient && isArrival(transient) ? TRANSIT_IN_FRAMES[sparkFrame % 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"];
@@ -1936,8 +1983,8 @@ var ItemRow = ({
     /* @__PURE__ */ jsx(
       Text2,
       {
-        bold: active || transient === "in",
-        dimColor: transient === "out",
+        bold: active || !!transient && isArrival(transient),
+        dimColor: !!transient && isDeparture(transient),
         strikethrough: transient === "out",
         children: truncate(item.title, titleMax) + "  "
       }
@@ -2379,11 +2426,12 @@ var BrowseScreen = ({
     const out = /* @__PURE__ */ new Set();
     if (!transients?.size) return out;
     for (const s of localSections)
-      if (s.items.some((item) => transientOf(transients, item))) out.add(s.id);
+      if (s.items.some((item) => transientOf(transients, item, s.id)))
+        out.add(s.id);
     return out;
   }, [localSections, transients]);
   const [sparkFrame, setSparkFrame] = useState(0);
-  const sparkling = (mergedUrls?.length ?? 0) > 0 || (leavingUrls?.length ?? 0) > 0 || !!transients?.size && section.items.some((item) => transientOf(transients, item));
+  const sparkling = (mergedUrls?.length ?? 0) > 0 || (leavingUrls?.length ?? 0) > 0 || !!transients?.size && section.items.some((item) => transientOf(transients, item, section.id));
   useEffect(() => {
     if (!sparkling) return;
     const id = setInterval(() => setSparkFrame((f) => f + 1), MERGED_FRAME_MS);
@@ -2853,7 +2901,7 @@ var BrowseScreen = ({
                 login,
                 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),
+                transient: transientOf(transients, item, section.id),
                 prefix: treePrefix(section.items, viewStart + i),
                 parent: item.kind === "task" && depthOf(section.items[viewStart + i + 1]) > depthOf(item),
                 sparkFrame,
@@ -2986,7 +3034,12 @@ var App = ({
   const settleTab = (tabId, marks) => {
     const keys = [...transitTabs.current].filter(([, tab]) => tab === tabId).map(([key]) => key);
     for (const key of keys) transitTabs.current.delete(key);
-    const gone = new Set(keys.filter((key) => marks.get(key) === "out"));
+    const gone = new Set(
+      keys.filter((key) => {
+        const mark = marks.get(key);
+        return !!mark && isDeparture(mark);
+      }).map(rowKeyOfMark)
+    );
     setTransients((prev) => {
       const next = new Map(prev);
       for (const key of keys) next.delete(key);

package/package.json

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