@kud/gh-ink 0.33.0 → 0.35.0

package/dist/index.d.ts

@@ -140,7 +140,48 @@ type GHItem = {
      * handing back a `lastActor` that no longer claims a turn.
      */
     pinned?: boolean;
-    indent: 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.
+     *
+     * Always read it through `depthOf`, never off the row — `indent` is still a
+     * legal way to spell "depth 1", and that helper is the only place that knows
+     * both spellings. A site that reads `item.indent` directly prices a `depth: 2`
+     * row as top level, which is the bug this field exists to end rather than a
+     * new one to introduce.
+     */
+    depth?: number;
+    /**
+     * @deprecated Legacy spelling of `depth: 1`. Write `depth`; this is kept so
+     * every existing producer still typechecks, and it is read in exactly one
+     * place (`depthOf`). Due to be removed at the next major.
+     */
+    indent?: boolean;
 };
 type TaskRow = {
     kind: "task";
@@ -149,7 +190,12 @@ type TaskRow = {
     url: string;
     status: string;
     age: string;
-    indent: boolean;
+    /** 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`. */
+    indent?: boolean;
     instanceKey?: string;
     /**
      * Trailing annotation, rendered dim after the summary — a recurrence marker,
@@ -176,23 +222,35 @@ type RepoHeader = {
     kind: "repo-header";
     repo: string;
     age: string;
-    indent: boolean;
+    /** How deep this row hangs. See `GHItem.depth`; read it through `depthOf`. */
+    depth?: number;
+    /** @deprecated Legacy spelling of `depth: 1`. See `GHItem.indent`. */
+    indent?: boolean;
 };
 type ShowMore = {
     kind: "show-more";
     hidden: GHItem[];
-    indent: boolean;
+    /** How deep this row hangs. See `GHItem.depth`; read it through `depthOf`. */
+    depth?: number;
+    /** @deprecated Legacy spelling of `depth: 1`. See `GHItem.indent`. */
+    indent?: boolean;
 };
 type ShowLess = {
     kind: "show-less";
     toHide: GHItem[];
-    indent: boolean;
+    /** How deep this row hangs. See `GHItem.depth`; read it through `depthOf`. */
+    depth?: number;
+    /** @deprecated Legacy spelling of `depth: 1`. See `GHItem.indent`. */
+    indent?: boolean;
 };
 type SubgroupHeader = {
     kind: "subgroup-header";
     label: string;
     age: string;
-    indent: boolean;
+    /** How deep this row hangs. See `GHItem.depth`; read it through `depthOf`. */
+    depth?: number;
+    /** @deprecated Legacy spelling of `depth: 1`. See `GHItem.indent`. */
+    indent?: boolean;
 };
 type AnyItem = GHItem | TaskRow | RepoHeader | SubgroupHeader | ShowMore | ShowLess;
 type CiStatus = {
@@ -344,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

@@ -780,6 +780,11 @@ var tabsOfMarks = (sections, marks) => {
   return out;
 };
 var quietly = $({ quiet: true });
+var depthOf = (item) => {
+  if (!item) return 0;
+  if (typeof item.depth === "number") return Math.max(0, Math.floor(item.depth));
+  return item.indent === true ? 1 : 0;
+};
 var relativeTime = (iso) => {
   const diff = (Date.now() - new Date(iso).getTime()) / 1e3;
   if (diff < 3600) return `${Math.floor(diff / 60)}m`;
@@ -902,7 +907,7 @@ var insertRepoHeaders = (items) => {
   const result = [];
   let lastRepo = "";
   for (const item of items) {
-    if (!item.indent && item.repo !== lastRepo) {
+    if (depthOf(item) === 0 && item.repo !== lastRepo) {
       lastRepo = item.repo;
       result.push({
         kind: "repo-header",
@@ -1077,7 +1082,30 @@ var budgetNotice = (budget, now = Date.now()) => {
     critical: false
   };
 };
-var isChildRow = (item) => !!item && (item.kind === "show-more" || item.kind === "show-less" || "indent" in item && item.indent === true);
+var isLastAtDepth = (items, i) => {
+  const depth = depthOf(items[i]);
+  for (let j = i + 1; j < items.length; j += 1) {
+    const d = depthOf(items[j]);
+    if (d > depth) continue;
+    return d < depth;
+  }
+  return true;
+};
+var treePrefix = (items, i) => {
+  const depth = depthOf(items[i]);
+  if (depth === 0) return "";
+  const ancestorLast = [];
+  let level = depth - 1;
+  for (let j = i - 1; j >= 0 && level >= 1; j -= 1) {
+    if (depthOf(items[j]) === level) {
+      ancestorLast[level] = isLastAtDepth(items, j);
+      level -= 1;
+    }
+  }
+  let prefix = "";
+  for (let k = 1; k < depth; k += 1) prefix += ancestorLast[k] ? "   " : "\u2502  ";
+  return prefix + (isLastAtDepth(items, i) ? "\u2514\u2500 " : "\u251C\u2500 ");
+};
 var groupUrls = (items, i) => {
   const urls = [];
   for (let j = i + 1; j < items.length; j += 1) {
@@ -1095,11 +1123,13 @@ var groupUrls = (items, i) => {
 var treeUrls = (items, i) => {
   if (items[i]?.kind === "repo-header") return groupUrls(items, i);
   let root = i;
-  while (root > 0 && isChildRow(items[root])) root -= 1;
+  while (root > 0 && depthOf(items[root]) > 0 && items[root]?.kind !== "task")
+    root -= 1;
+  const rootDepth = depthOf(items[root]);
   const urls = [];
   for (let j = root; j < items.length; j += 1) {
     const item = items[j];
-    if (j > root && !isChildRow(item)) break;
+    if (j > root && depthOf(item) <= rootDepth) break;
     if (item.kind === "show-more") {
       for (const child of item.hidden) if (child.url) urls.push(child.url);
       continue;
@@ -1115,7 +1145,8 @@ var gapsAbove = (items, i) => {
   if (item.kind === "repo-header" || item.kind === "subgroup-header")
     return true;
   if (item.kind !== "task") return false;
-  return isChildRow(items[i + 1]) || isChildRow(items[i - 1]);
+  if (depthOf(item) > 0) return false;
+  return depthOf(items[i + 1]) > 0 || depthOf(items[i - 1]) > 0;
 };
 var fitCount = (items, start, budget) => {
   let lines = 0;
@@ -1360,7 +1391,7 @@ var Backdrop = ({
   }
 ) : children });
 var topLevelCount = (s) => s.items.filter(
-  (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header" && !i.indent
+  (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")
@@ -1608,7 +1639,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
       }
     });
     if (jiraBase && jiraKeyRe) {
-      const jiraKey = !item.indent ? item.title.match(jiraKeyRe)?.[0] : null;
+      const jiraKey = depthOf(item) === 0 ? item.title.match(jiraKeyRe)?.[0] : null;
       if (jiraKey) {
         actions.push({
           label: `Open ${jiraKey} in Jira`,
@@ -1776,13 +1807,14 @@ var CiStatusLine = ({
     status.age ? /* @__PURE__ */ jsx(Text2, { dimColor: true, children: "  " + status.age }) : null
   ] });
 };
+var FENCE_COLS = 46;
 var RepoHeaderRow = ({
   repo,
   gap,
   active
 }) => {
   const label = `\u2500\u2500 ${repo} `;
-  const fill = Math.max(4, 46 - label.length);
+  const fill = Math.max(4, FENCE_COLS - label.length);
   const rule = "\u2500".repeat(fill);
   return /* @__PURE__ */ jsxs(Box, { marginTop: gap ? 1 : 0, children: [
     /* @__PURE__ */ jsx(Text2, { color: "cyan", children: active ? "\u276F " : "  " }),
@@ -1821,7 +1853,7 @@ var ItemRow = ({
   merged,
   transient: refreshMark,
   leaving,
-  lastChild,
+  prefix = "",
   parent,
   sparkFrame = 0
 }) => {
@@ -1836,14 +1868,14 @@ var ItemRow = ({
   if (item.kind === "show-more")
     return /* @__PURE__ */ jsxs(Box, { children: [
       /* @__PURE__ */ jsx(Text2, { color: "cyan", children: active ? "\u276F " : "  " }),
-      /* @__PURE__ */ jsx(Text2, { dimColor: true, children: "\u2514\u2500 " }),
+      /* @__PURE__ */ jsx(Text2, { dimColor: true, children: prefix }),
       /* @__PURE__ */ jsx(Text2, { dimColor: true, children: active ? "\u21B5 " : "  " }),
       /* @__PURE__ */ jsx(Text2, { dimColor: true, children: `+${item.hidden.length} more` })
     ] });
   if (item.kind === "show-less")
     return /* @__PURE__ */ jsxs(Box, { children: [
       /* @__PURE__ */ jsx(Text2, { color: "cyan", children: active ? "\u276F " : "  " }),
-      /* @__PURE__ */ jsx(Text2, { dimColor: true, children: "\u2514\u2500 " }),
+      /* @__PURE__ */ jsx(Text2, { dimColor: true, children: prefix }),
       /* @__PURE__ */ jsx(Text2, { dimColor: true, children: active ? "\u21B5 " : "  " }),
       /* @__PURE__ */ jsx(Text2, { dimColor: true, children: "show less" })
     ] });
@@ -1853,10 +1885,11 @@ var ItemRow = ({
     const transitLabel2 = transient ? TRANSIT_LABEL[transient] : "";
     const titleMax2 = Math.max(
       20,
-      COLS - item.key.length - note.length - transitLabel2.length - 12
+      COLS - item.key.length - note.length - transitLabel2.length - prefix.length - 12
     );
     return /* @__PURE__ */ jsxs(Box, { marginTop: gap ? 1 : 0, children: [
       /* @__PURE__ */ jsx(Text2, { color: "cyan", children: active ? "\u276F " : "  " }),
+      /* @__PURE__ */ jsx(Text2, { dimColor: true, children: prefix }),
       /* @__PURE__ */ jsx(Text2, { dimColor: true, children: parent ? "\u252C " : "  " }),
       /* @__PURE__ */ jsx(Text2, { bold: true, color: transient ? TRANSIT_COLOUR[transient] : void 0, children: transitIcon + " " }),
       /* @__PURE__ */ jsx(Text2, { color: "#FF8700", bold: active, children: item.key + "  " }),
@@ -1891,12 +1924,12 @@ var ItemRow = ({
     mergedLabel,
     transitLabel
   ].filter(Boolean).join("  ");
-  const repoLabel = item.indent ? item.repo : "";
-  const fixedWidth = 2 + (item.indent ? 3 : 0) + 2 + 2 + 7 + repoLabel.length + suffix.length + 6;
+  const repoLabel = depthOf(item) > 0 ? item.repo : "";
+  const fixedWidth = 2 + prefix.length + 2 + 2 + 7 + repoLabel.length + suffix.length + 6;
   const titleMax = Math.max(20, COLS - fixedWidth);
   return /* @__PURE__ */ jsxs(Box, { children: [
     /* @__PURE__ */ jsx(Text2, { color: "cyan", children: active ? "\u276F " : "  " }),
-    item.indent ? /* @__PURE__ */ jsx(Text2, { dimColor: true, children: lastChild === false ? "\u251C\u2500 " : "\u2514\u2500 " }) : null,
+    /* @__PURE__ */ jsx(Text2, { dimColor: true, children: prefix }),
     /* @__PURE__ */ jsx(Text2, { color, bold: true, children: icon + " " }),
     /* @__PURE__ */ jsx(Text2, { color: turnColor, bold: turnIcon === "\u2190", children: turnIcon + " " }),
     /* @__PURE__ */ jsx(Text2, { color: "#FF8700", children: numStr }),
@@ -2545,7 +2578,12 @@ var BrowseScreen = ({
               {
                 kind: "show-less",
                 toHide: activeItem.hidden,
-                indent: true
+                // The depth of the row it replaces, never a constant. A
+                // collapsed row sitting under a story is at depth 2, and
+                // pinning it to 1 makes the walk in `treeUrls` stop one
+                // level early and drop every row it holds — silently, since
+                // nothing on screen reports what the clipboard missed.
+                depth: depthOf(activeItem)
               }
             ] : [i]
           )
@@ -2562,7 +2600,9 @@ var BrowseScreen = ({
               {
                 kind: "show-more",
                 hidden: activeItem.toHide,
-                indent: true
+                // Same reasoning as the show-less above: carry the depth
+                // of the row being replaced, not a constant.
+                depth: depthOf(activeItem)
               }
             ] : [i]
           )
@@ -2814,8 +2854,8 @@ 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),
-                lastChild: "indent" in item && item.indent ? !isChildRow(section.items[viewStart + i + 1]) : void 0,
-                parent: item.kind === "task" && isChildRow(section.items[viewStart + i + 1]),
+                prefix: treePrefix(section.items, viewStart + i),
+                parent: item.kind === "task" && depthOf(section.items[viewStart + i + 1]) > depthOf(item),
                 sparkFrame,
                 gap: i > 0 && gapsAbove(section.items, viewStart + i)
               },
@@ -3023,7 +3063,7 @@ var App = ({
       receive(fresh);
     }).catch((err) => {
       setRefreshing(false);
-      const message = err.message;
+      const message = explainGhAction(err);
       if (!displayedKey.current) {
         setState({ phase: "failed", message });
         return;

package/package.json

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