@kud/gh-ink 0.73.0 → 0.74.0

package/dist/index.d.ts

@@ -526,6 +526,27 @@ declare const writeCache: (key: string, data: {
     sidebar?: Rails;
 }) => void;
 
+/**
+ * What an action did to a row, said before the server has agreed to it.
+ *
+ * Three shapes cover every action the inbox takes on a row: it leaves the list
+ * (close, done), it changes tab (a Jira move), or it changes in place (labels,
+ * assignee, read). A patch names the END STATE rather than the step that gets
+ * there, which is what lets it be reapplied on top of every fetch: "SHOP-1234
+ * belongs in review, wearing In Review" is as true on the third fetch as on the
+ * first, where "move it one tab right" would walk it off the board.
+ */
+type Patch = {
+    kind: "remove";
+} | {
+    kind: "move";
+    toSection: string;
+    fields?: Record<string, unknown>;
+} | {
+    kind: "mutate";
+    fields: Record<string, unknown>;
+};
+
 type DetailContext = {
     item: GHItem;
     kind: "pr" | "issue";
@@ -629,6 +650,25 @@ type TabForStatus = (to: {
     name: string;
     category?: string;
 }) => string | null;
+/**
+ * What a move hands back when the screen took it optimistically: the request's
+ * two possible answers, reported so the pending patch can stop showing `◌` or
+ * be marked failed. Absent when the move was not taken optimistically, and the
+ * caller falls back to its own flashes.
+ */
+type OptimisticHandle = {
+    settled: () => void;
+    failed: (err: unknown) => void;
+};
+/**
+ * A row action said ahead of the server: the end state it leaves the row in,
+ * and the verb the failure line names it by — `close` reads back as
+ * "Couldn't close #412".
+ */
+type OptimisticChange = {
+    patch: Patch;
+    action: string;
+};
 /**
  * Resolve the live transitions for a ticket, called lazily when its move
  * submenu opens — never at board fetch, where one call per visible ticket
@@ -766,6 +806,15 @@ declare const buildActions: (item: AnyItem, login: string, showFlash: (msg: stri
      * the settlement signal.
      */
     onSettled?: (item: GHItem, result: SettledResult) => void;
+    /**
+     * Take the row's action ahead of the server — see `OptimisticChange`. A
+     * handle back means the row is already where the action puts it, so the
+     * request's answer goes to the handle and a failure goes ONLY there: the
+     * failed patch has its own sticky line with `w` beside it, and a flash
+     * naming the same failure would be a second voice saying it less well.
+     * Absent, every action keeps the pessimistic shape it had.
+     */
+    optimistic?: (item: AnyItem, change: OptimisticChange) => OptimisticHandle | undefined;
     /**
      * Open the ticket's move submenu through the live-transitions hook. Passed
      * by the browse screen (which owns the menu the rows open into) only when

package/dist/index.js

@@ -1054,9 +1054,9 @@ var PrRow = ({
           justifyContent: "flex-end",
           flexShrink: 0,
           children: sizeParts ? /* @__PURE__ */ jsxs(Text3, { children: [
-            /* @__PURE__ */ jsx(Text3, { color: colors.success, children: sizeParts.added }),
+            /* @__PURE__ */ jsx(Text3, { color: colors.added, children: sizeParts.added }),
             " ",
-            /* @__PURE__ */ jsx(Text3, { color: colors.error, children: sizeParts.removed })
+            /* @__PURE__ */ jsx(Text3, { color: colors.removed, children: sizeParts.removed })
           ] }) : null
         }
       ) : null,
@@ -1335,20 +1335,12 @@ var lookupRows = (claim, lookup, query, start, openUrl) => {
   if (lookup?.phase === "failed")
     return {
       exclusive: true,
-      rows: [
-        {
-          id: "launcher:retry",
-          title: `Couldn't look up ${claim.label}: ${lookup.message}`,
-          label: /* @__PURE__ */ jsxs(Text3, { color: colors.error, children: [
-            "\u2717 couldn't look up ",
-            claim.label,
-            " \xB7 ",
-            lookup.message
-          ] }),
-          run: () => start(query, claim),
-          keepOpen: true
-        }
-      ]
+      rows: [],
+      message: {
+        text: `couldn't look up ${claim.label} \xB7 ${lookup.message} \xB7 \u21B5 retry`,
+        tone: "error",
+        onSubmit: () => start(query, claim)
+      }
     };
   const rows = [
     {
@@ -1696,6 +1688,7 @@ var failureNotice = (failed) => {
 };
 var quietly = $({ quiet: true });
 var isMenuGap = (row) => "gap" in row;
+var rowLabelOf = (item) => item.kind === "task" ? item.ticket ?? item.key : item.kind === "pr" || item.kind === "issue" ? `#${item.number}` : "";
 var jiraMovesCache = /* @__PURE__ */ new Map();
 var cachedJiraMoves = (ticket, status) => {
   const entry = jiraMovesCache.get(ticket);
@@ -2297,6 +2290,19 @@ var workCount = (s) => {
   }
   return n;
 };
+var countedSections = (sections, departing) => {
+  if (!departing?.size) return sections;
+  const sent = new Set(sections.map((s) => s.id));
+  return sections.map((s) => {
+    const items = s.items.filter((item) => {
+      const key = keyOf(item);
+      if (!key || !departing.has(key)) return true;
+      const to = departing.get(key);
+      return to != null && (to === s.id || !sent.has(to));
+    });
+    return items.length === s.items.length ? s : { ...s, items };
+  });
+};
 var drillCmd = (item) => {
   if (item.kind === "task")
     return item.ticket ? `jira issue view ${item.ticket}` : null;
@@ -2360,6 +2366,7 @@ var openInJira = (jiraBase, key, showFlash) => {
   });
   showFlash(`\u2197 Opened ${key} in Jira`);
 };
+var REMOVE_ME_AS_REVIEWER = "Remove me as reviewer";
 var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions, onRefresh, onRemove, onOpenView, ext) => {
   if (item.kind === "repo-header" || item.kind === "subgroup-header" || item.kind === "show-more" || item.kind === "show-less")
     return [];
@@ -2464,6 +2471,32 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
   }
   const actions = drillAction ? [drillAction, open, copyUrl] : [open, copyUrl];
   const closing = [];
+  const removeAhead = (opts) => {
+    const row = item;
+    const held = ext?.optimistic?.(row, {
+      patch: { kind: "remove" },
+      action: opts.action
+    });
+    onRemove?.(row);
+    showFlash(opts.taking);
+    void opts.request().then(
+      () => {
+        held?.settled();
+        if (opts.done) showFlash(opts.done);
+        if (held || opts.refreshes) ext?.onActed?.();
+        if (opts.settles) ext?.onSettled?.(row, { ok: true });
+      },
+      (e) => {
+        if (held) held.failed(e);
+        else {
+          showFlash(opts.refused(e));
+          onRefresh?.();
+        }
+        if (opts.settles)
+          ext?.onSettled?.(row, { ok: false, reason: firstLine(e) });
+      }
+    );
+  };
   actions.push({
     label: "Copy repo name",
     hint: "r",
@@ -2486,7 +2519,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
   });
   if (item.kind === "pr" && item.standing === "queued" && login) {
     actions.push({
-      label: "Remove me as reviewer",
+      label: REMOVE_ME_AS_REVIEWER,
       hint: "x",
       // Quiet, beside Unsubscribe: both are "less of this PR for me" — no more
       // review requests, no more notifications. Guarded by the caller's own
@@ -2494,25 +2527,17 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
       // review request there is no such row, and none is invented here.
       group: "quiet",
       icon: "\uF468",
-      run: () => {
-        onRemove?.(item);
-        showFlash(`\u22EF Removing you from #${item.number}\u2026`);
-        void quietly`gh pr edit ${item.number} --repo ${item.repo} --remove-reviewer ${login}`.then(
-          () => {
-            showFlash(`\u2713 Removed you as reviewer on #${item.number}`);
-            ext?.onActed?.();
-            ext?.onSettled?.(item, { ok: true });
-          },
-          (e) => {
-            showFlash(`\u2717 #${item.number}: ${explainGhAction(e)}`);
-            onRefresh?.();
-            ext?.onSettled?.(item, {
-              ok: false,
-              reason: firstLine(e)
-            });
-          }
-        );
-      }
+      // Optimistic, the same shape Close uses. A row that lingers for a round
+      // trip reads as a broken keypress.
+      run: () => removeAhead({
+        action: "remove you from",
+        request: () => quietly`gh pr edit ${item.number} --repo ${item.repo} --remove-reviewer ${login}`,
+        taking: `\u22EF Removing you from #${item.number}\u2026`,
+        done: `\u2713 Removed you as reviewer on #${item.number}`,
+        refused: (e) => `\u2717 #${item.number}: ${explainGhAction(e)}`,
+        settles: true,
+        refreshes: true
+      })
     });
   }
   if (item.kind === "pr" && item.branch) {
@@ -2584,23 +2609,13 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
           label: `Close #${item.number}`,
           hint: "",
           group: "confirm",
-          run: () => {
-            onRemove?.(item);
-            showFlash(`\u2713 Closed #${item.number}`);
-            void quietly`gh issue close ${item.number} --repo ${item.repo}`.then(
-              () => {
-                ext?.onSettled?.(item, { ok: true });
-              },
-              (e) => {
-                showFlash(`\u2717 Close failed \u2014 restoring #${item.number}`);
-                onRefresh?.();
-                ext?.onSettled?.(item, {
-                  ok: false,
-                  reason: firstLine(e)
-                });
-              }
-            );
-          }
+          run: () => removeAhead({
+            action: "close",
+            request: () => quietly`gh issue close ${item.number} --repo ${item.repo}`,
+            taking: `\u2713 Closed #${item.number}`,
+            refused: () => `\u2717 Close failed \u2014 restoring #${item.number}`,
+            settles: true
+          })
         },
         { label: "Cancel", hint: "", group: "confirm", run: () => {
         } }
@@ -2651,23 +2666,13 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
           label: `Close #${item.number}`,
           hint: "",
           group: "confirm",
-          run: () => {
-            onRemove?.(item);
-            showFlash(`\u2713 Closed #${item.number}`);
-            void quietly`gh pr close ${item.number} --repo ${item.repo}`.then(
-              () => {
-                ext?.onSettled?.(item, { ok: true });
-              },
-              (e) => {
-                showFlash(`\u2717 Close failed \u2014 restoring #${item.number}`);
-                onRefresh?.();
-                ext?.onSettled?.(item, {
-                  ok: false,
-                  reason: firstLine(e)
-                });
-              }
-            );
-          }
+          run: () => removeAhead({
+            action: "close",
+            request: () => quietly`gh pr close ${item.number} --repo ${item.repo}`,
+            taking: `\u2713 Closed #${item.number}`,
+            refused: () => `\u2717 Close failed \u2014 restoring #${item.number}`,
+            settles: true
+          })
         },
         { label: "Cancel", hint: "", group: "confirm", run: () => {
         } }
@@ -2688,16 +2693,23 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
             label: `Close #${item.number} and delete ${item.branch}`,
             hint: "",
             group: "confirm",
-            run: () => {
-              onRemove?.(item);
-              showFlash(`\u2713 Closed #${item.number} and deleted ${item.branch}`);
-              void quietly`gh pr close ${item.number} --repo ${item.repo}`.then(
-                () => quietly`gh api -X DELETE ${`repos/${item.repo}/git/refs/heads/${item.branch}`}`
-              ).catch(() => {
-                showFlash(`\u2717 Close + delete failed \u2014 restoring`);
-                onRefresh?.();
-              });
-            }
+            // The patch covers the close and nothing else. A branch that will
+            // not delete leaves a PR that IS closed, so reporting "Couldn't
+            // close #412" and offering `w` would restore a row the server no
+            // longer has; the branch gets its own flash instead.
+            run: () => removeAhead({
+              action: "close",
+              request: async () => {
+                await quietly`gh pr close ${item.number} --repo ${item.repo}`;
+                void quietly`gh api -X DELETE ${`repos/${item.repo}/git/refs/heads/${item.branch}`}`.catch(
+                  () => showFlash(
+                    `\u2717 Closed #${item.number}, but couldn't delete ${item.branch}`
+                  )
+                );
+              },
+              taking: `\u2713 Closed #${item.number} and deleted ${item.branch}`,
+              refused: () => `\u2717 Close + delete failed \u2014 restoring`
+            })
           },
           { label: "Cancel", hint: "", group: "confirm", run: () => {
           } }
@@ -2983,7 +2995,7 @@ var ItemRow = ({
   const icon = merged ? {
     glyph: MERGED_FRAMES[sparkFrame % MERGED_FRAMES.length],
     color: MERGED_COLOUR
-  } : transient ? {
+  } : pending ? { glyph: PENDING_GLYPH, color: colors.muted } : transient ? {
     glyph: isDeparture(transient) ? TRANSIT_OUT_FRAMES[rampAt(TRANSIT_OUT_FRAMES.length)] : isArrival(transient) ? TRANSIT_IN_FRAMES[rampAt(TRANSIT_IN_FRAMES.length)] : displayFor(item.health).glyph,
     color: TRANSIT_COLOUR[transient]
   } : void 0;
@@ -3043,17 +3055,18 @@ var useActionMenu = () => {
   };
   const handleKey = (key) => {
     if (!actions) return false;
+    const live = (n) => n >= 0 && n < actions.length && !isMenuGap(actions[n]);
     if (key.upArrow)
       setCursor((c) => {
         let n = c - 1;
         while (n > 0 && isMenuGap(actions[n])) n -= 1;
-        return isMenuGap(actions[n]) ? c : n;
+        return live(n) ? n : c;
       });
     if (key.downArrow)
       setCursor((c) => {
         let n = c + 1;
         while (n < actions.length - 1 && isMenuGap(actions[n])) n += 1;
-        return isMenuGap(actions[n]) ? c : n;
+        return live(n) ? n : c;
       });
     if (key.return) {
       const row = actions[cursor];
@@ -3453,6 +3466,8 @@ var BrowseScreen = ({
   sidebar,
   liveLabel,
   optimisticMove,
+  optimistic,
+  departing,
   pendingKeys,
   failure,
   onRestore
@@ -3578,6 +3593,14 @@ var BrowseScreen = ({
     const timer = setTimeout(() => setDismissedSeq(seq), FAILURE_NOTICE_MS);
     return () => clearTimeout(timer);
   }, [failure?.seq]);
+  const counted = useMemo(
+    () => countedSections(localSections, departing),
+    [localSections, departing]
+  );
+  const countOf = (id) => {
+    const s = counted.find((c) => c.id === id);
+    return s ? workCount(s) : 0;
+  };
   const markedTabs = useMemo(() => {
     const out = /* @__PURE__ */ new Set();
     if (!transients?.size) return out;
@@ -3713,31 +3736,34 @@ var BrowseScreen = ({
       optimistic: optimisticMove ? (to) => optimisticMove(task, to) : void 0
     });
   };
+  const actionsFor = (item, flash2) => buildActions(
+    item,
+    login,
+    flash2,
+    jiraBase,
+    jiraKeyRe,
+    jiraTransitions,
+    onRefresh,
+    dismissItem,
+    openDrillView,
+    {
+      extensions,
+      onOpenExt,
+      onActed,
+      onSettled,
+      optimistic,
+      onOpenMove: jiraTransitionsFor ? openMoveFor : void 0
+    }
+  );
   const openMenu = () => {
     if (!activeItem || activeItem.kind === "repo-header" || activeItem.kind === "subgroup-header")
       return;
-    const actions = buildActions(
-      activeItem,
-      login,
-      (msg) => {
+    menu.open(
+      actionsFor(activeItem, (msg) => {
         menu.close();
         showFlash(msg);
-      },
-      jiraBase,
-      jiraKeyRe,
-      jiraTransitions,
-      onRefresh,
-      dismissItem,
-      openDrillView,
-      {
-        extensions,
-        onOpenExt,
-        onActed,
-        onSettled,
-        onOpenMove: jiraTransitionsFor ? openMoveFor : void 0
-      }
+      })
     );
-    menu.open(actions);
   };
   useInput((input, key) => {
     const idleFor = Date.now() - lastKeyAt.current;
@@ -4029,20 +4055,7 @@ var BrowseScreen = ({
       return;
     }
     if (input === "x" && activeItem.kind === "pr" && activeItem.standing === "queued" && login) {
-      dismissItem(activeItem);
-      showFlash(`\u22EF Removing you from #${activeItem.number}\u2026`);
-      void quietly`gh pr edit ${activeItem.number} --repo ${activeItem.repo} --remove-reviewer ${login}`.then(
-        () => {
-          showFlash(`\u2713 Removed you as reviewer on #${activeItem.number}`);
-          onActed?.();
-          onSettled?.(activeItem, { ok: true });
-        },
-        (e) => {
-          showFlash(`\u2717 #${activeItem.number}: ${explainGhAction(e)}`);
-          onRefresh?.();
-          onSettled?.(activeItem, { ok: false, reason: firstLine(e) });
-        }
-      );
+      actionsFor(activeItem, showFlash).find((a) => a.label === REMOVE_ME_AS_REVIEWER)?.run();
       return;
     }
     if (input === "b" && activeItem.kind === "pr" && activeItem.branch) {
@@ -4331,7 +4344,7 @@ var BrowseScreen = ({
           InboxHeader,
           {
             brand,
-            sections: localSections,
+            sections: counted,
             login,
             scopeLabel: overlayOpen ? chrome?.scope ?? origin?.label : origin?.label,
             budgetLabel: budgetNotice(budget)?.label,
@@ -4363,7 +4376,7 @@ var BrowseScreen = ({
             items: localSections.map((s) => ({
               value: s.id,
               label: s.label,
-              count: workCount(s),
+              count: countOf(s.id),
               /*
                * The denominator, and only where it can still be true.
                *
@@ -4835,6 +4848,26 @@ var App = ({
       phase: "inflight"
     });
   } : void 0;
+  const optimistic = (item, change) => {
+    const key = keyOf(item);
+    if (!key) return void 0;
+    return hold(key, {
+      patch: change.patch,
+      action: change.action,
+      label: rowLabelOf(item),
+      since: Date.now(),
+      phase: "inflight"
+    });
+  };
+  const departing = useMemo(
+    () => new Map(
+      [...overrides.current].flatMap(
+        ([key, { patch }]) => patch.kind === "remove" ? [[key, null]] : patch.kind === "move" ? [[key, patch.toSection]] : []
+      )
+    ),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [overrideRev]
+  );
   const restore = () => {
     const newest = failedOverrides(overrides.current)[0];
     if (!newest) return;
@@ -5070,6 +5103,8 @@ var App = ({
       jiraTransitions,
       jiraTransitionsFor,
       optimisticMove,
+      optimistic,
+      departing,
       pendingKeys,
       failure,
       onRestore: restore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/gh-ink",
-  "version": "0.73.0",
+  "version": "0.74.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.36.0 <1",
+    "@kud/ink-ui": ">=0.38.0 <1",
     "ink": ">=7",
     "react": ">=19"
   },
@@ -54,7 +54,7 @@
     "zx": "8.8.5"
   },
   "devDependencies": {
-    "@kud/ink-ui": "0.36.0",
+    "@kud/ink-ui": "0.38.0",
     "@types/node": "22.20.1",
     "@types/react": "19.2.17",
     "ink": "7.1.0",