@kud/gh-ink 0.72.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";
@@ -604,10 +625,50 @@ type JiraTransition = {
 type JiraAvailableTransition = {
     id: string;
     name: string;
+    /**
+     * The status the transition lands on. `category` is Jira's status category
+     * (`new`, `indeterminate`, `done`) where the host has it — the one field a
+     * `tabForStatus` can map without knowing every workflow's status names.
+     */
     to: {
         name: string;
+        category?: string;
     };
 };
+/**
+ * Which tab a ticket belongs in once it lands on `to`, as the host lays its
+ * tabs out — the section id, or null when the ticket leaves the board or the
+ * host cannot say. Only the host knows: one board files by status category,
+ * another by a status-to-column table, and the inbox has neither.
+ *
+ * Supplying it makes a move optimistic: the row goes to that tab the moment
+ * the move is chosen instead of at the next fetch. Null keeps the move
+ * pessimistic, exactly as it is without the prop — a row guessed off the board
+ * that turns out to still be on it is worse than one that waits for the fetch.
+ */
+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
@@ -745,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
@@ -810,7 +880,7 @@ declare const ActionMenu: ({ item, actions, cursor, cols, }: {
     cols?: number;
 }) => React.JSX.Element;
 declare const signatureOf: (sections: Section[]) => string;
-declare const App: ({ fetcher, cacheKey, title, detailFor, origin, jiraBase, jiraKeyRe, jiraSetupHint, jiraTransitions, jiraTransitionsFor, hasCiStatus, ciJob, ciFetcher, ciPollMs, stripFetcher, stripLabel, stripPollMs, watchPath, watchDebounceMs, watchJitterMs, extensions, tabHelp, emptyHint, liveLabel, onSettled, }: {
+declare const App: ({ fetcher, cacheKey, title, detailFor, origin, jiraBase, jiraKeyRe, jiraSetupHint, jiraTransitions, jiraTransitionsFor, tabForStatus, hasCiStatus, ciJob, ciFetcher, ciPollMs, stripFetcher, stripLabel, stripPollMs, watchPath, watchDebounceMs, watchJitterMs, extensions, tabHelp, emptyHint, liveLabel, onSettled, }: {
     fetcher: () => Promise<{
         sections: Section[];
         login: string;
@@ -851,6 +921,12 @@ declare const App: ({ fetcher, cacheKey, title, detailFor, origin, jiraBase, jir
     jiraSetupHint?: string;
     jiraTransitions?: JiraTransition[];
     jiraTransitionsFor?: JiraTransitionsFor;
+    /**
+     * Which tab a moved ticket lands in — see TabForStatus. Supplying it makes
+     * moves through `jiraTransitionsFor` optimistic; leaving it out keeps every
+     * move waiting on the next fetch, as before.
+     */
+    tabForStatus?: TabForStatus;
     hasCiStatus?: boolean;
     ciJob?: string;
     ciFetcher?: () => Promise<CiStatus | null>;
@@ -919,4 +995,4 @@ declare const matchesFilter: (repo: string, filter: RepoFilter) => boolean;
  */
 declare const parsePatterns: (value: string) => string[];
 
-export { type Action, type ActionGroup, ActionMenu, App, COLS, type ChromeHints, type ChromeSpec, type ChromeState, CiStatusLine, type CiStatusState, type Command, CommentsPanel, type CommentsPanelProps, type DetailContext, type ExplainSection, type ExtensionTarget, HealthPanel, type HealthPanelProps, type InboxBudget, type InboxExtension, type JiraAvailableTransition, type JiraTransition, type JiraTransitionsFor, type LiveLabel, LookupMiss, MIN_SIDEBAR_COLS, type MenuGap, type MenuRow, PrRow, type PrRowProps, type Rails, type RepoFilter, type RowAnnouncement, type RowMotion, SIDEBAR_COLS, type SettledResult, SidePanel, type Sidebar, type SidebarRow, type StatusStrip, StatusStripLine, type StripItem, type StripState, type StripStatusState, type TrailingColumns, type TrailingShed, ageLabel, budgetNotice, buildActions, buildCheckoutCmd, clipboard, counts, drillCmd, explainGhAction, explainItem, fitCount, gapsAbove, healthColor, healthDisplay, healthGlyph, healthLegend, isMenuGap, itermRun, jumpToRepo, jumpToRepoPane, matchesFilter, maxViewStart, menuRowsOf, menuTone, moveCursor, numberColumnsOf, openInTab, parsePatterns, railCapacity, railHeights, railRowsOf, railWidth, railsOf, readCache, renderMarkdown, reposInSections, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, sectionShedOf, signatureOf, stripGlyph, stripLayout, stripSignature, toCiStatusState, trailingColumnsOf, truncate, useActionMenu, useChrome, windowCount, withHeaders, withoutItem, workCount, writeCache };
+export { type Action, type ActionGroup, ActionMenu, App, COLS, type ChromeHints, type ChromeSpec, type ChromeState, CiStatusLine, type CiStatusState, type Command, CommentsPanel, type CommentsPanelProps, type DetailContext, type ExplainSection, type ExtensionTarget, HealthPanel, type HealthPanelProps, type InboxBudget, type InboxExtension, type JiraAvailableTransition, type JiraTransition, type JiraTransitionsFor, type LiveLabel, LookupMiss, MIN_SIDEBAR_COLS, type MenuGap, type MenuRow, PrRow, type PrRowProps, type Rails, type RepoFilter, type RowAnnouncement, type RowMotion, SIDEBAR_COLS, type SettledResult, SidePanel, type Sidebar, type SidebarRow, type StatusStrip, StatusStripLine, type StripItem, type StripState, type StripStatusState, type TabForStatus, type TrailingColumns, type TrailingShed, ageLabel, budgetNotice, buildActions, buildCheckoutCmd, clipboard, counts, drillCmd, explainGhAction, explainItem, fitCount, gapsAbove, healthColor, healthDisplay, healthGlyph, healthLegend, isMenuGap, itermRun, jumpToRepo, jumpToRepoPane, matchesFilter, maxViewStart, menuRowsOf, menuTone, moveCursor, numberColumnsOf, openInTab, parsePatterns, railCapacity, railHeights, railRowsOf, railWidth, railsOf, readCache, renderMarkdown, reposInSections, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, sectionShedOf, signatureOf, stripGlyph, stripLayout, stripSignature, toCiStatusState, trailingColumnsOf, truncate, useActionMenu, useChrome, windowCount, withHeaders, withoutItem, workCount, writeCache };

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,
@@ -1180,7 +1180,7 @@ var searchBarState = ({
   glyph: searchGlyph(nerd),
   glyphColor: typing ? colors.info : colors.muted,
   caret: typing,
-  hints: typing ? "\u2191\u2193 move \xB7 \u21B5 keep \xB7 esc clear" : "filtered \xB7 keys active \xB7 esc clear"
+  hints: typing ? "\u2191\u2193 move \xB7 \u21B5/esc done \xB7 \u2303u clear" : "filtered \xB7 keys active \xB7 esc clear"
 });
 var InboxChromeContext = createContext(null);
 var useChrome = (spec) => {
@@ -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 = [
     {
@@ -1468,11 +1460,11 @@ var indexRows = (sections) => {
 };
 var rowsOf = (index) => {
   const out = /* @__PURE__ */ new Map();
-  for (const [mark, placed] of index) {
+  for (const [mark, placed2] 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]));
+    if (seen) seen.add(placed2.sectionId);
+    else out.set(key, /* @__PURE__ */ new Set([placed2.sectionId]));
   }
   return out;
 };
@@ -1627,8 +1619,76 @@ var reconcile = (prev, fresh, now, holdMs = HOLD_MS) => {
   }
   return out;
 };
+
+// src/inbox/overrides.ts
+var OVERRIDE_HOLD_MS = 3e4;
+var withFields = (item, fields) => fields ? { ...item, ...fields } : item;
+var placed = (item, fields) => {
+  const row = withFields(item, fields);
+  return { ...row, depth: 0, indent: false };
+};
+var applyOne = (sections, key, patch) => {
+  const found = sections.flatMap((s) => s.items).find((item) => keyOf(item) === key);
+  if (!found) return sections;
+  if (patch.kind === "mutate")
+    return sections.map((s) => ({
+      ...s,
+      items: s.items.map(
+        (item) => keyOf(item) === key ? withFields(item, patch.fields) : item
+      )
+    }));
+  const without = sections.map((s) => ({
+    ...s,
+    items: s.items.filter((item) => keyOf(item) !== key)
+  }));
+  if (patch.kind === "remove") return without;
+  if (!without.some((s) => s.id === patch.toSection))
+    return sections.map((s) => ({
+      ...s,
+      items: s.items.map(
+        (item) => keyOf(item) === key ? withFields(item, patch.fields) : item
+      )
+    }));
+  return without.map(
+    (s) => s.id === patch.toSection ? { ...s, items: [...s.items, placed(found, patch.fields)] } : s
+  );
+};
+var applyOverrides = (sections, overrides) => [...overrides].reduce(
+  (out, [key, override]) => applyOne(out, key, override.patch),
+  sections
+);
+var fieldsMatch = (item, fields) => !fields || Object.entries(fields).every(
+  ([name, value]) => item[name] === value
+);
+var agrees = (sections, key, patch) => {
+  const at = sections.flatMap(
+    (s) => s.items.filter((item) => keyOf(item) === key).map((item) => ({ s, item }))
+  );
+  if (patch.kind === "remove") return at.length === 0;
+  if (at.length === 0) return false;
+  if (patch.kind === "mutate")
+    return at.every(({ item }) => fieldsMatch(item, patch.fields));
+  return at.some(
+    ({ s, item }) => s.id === patch.toSection && fieldsMatch(item, patch.fields)
+  );
+};
+var pruneOverrides = (overrides, fresh, now, holdMs = OVERRIDE_HOLD_MS) => new Map(
+  [...overrides].filter(([key, override]) => {
+    if (override.phase !== "sent") return true;
+    if (now - override.since > holdMs) return false;
+    return !agrees(fresh, key, override.patch);
+  })
+);
+var failedOverrides = (overrides) => [...overrides].filter(([, o]) => o.phase === "failed").sort(([, a], [, b]) => (b.failure?.seq ?? 0) - (a.failure?.seq ?? 0));
+var failureNotice = (failed) => {
+  const newest = failed[0]?.[1];
+  if (!newest) return null;
+  const more = failed.length > 1 ? `  +${failed.length - 1} more` : "";
+  return `\u2717 Couldn't ${newest.action} ${newest.label}: ${newest.failure?.reason ?? "no reason reported"}${more}  w restore`;
+};
 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);
@@ -1646,43 +1706,56 @@ var orderJiraMoves = (available, configured) => {
     if (!live) continue;
     known.add(live.name);
     ordered.push(
-      resolutions && resolutions.length > 0 ? { label, transition: live.name, resolutions } : { label, transition: live.name }
+      resolutions && resolutions.length > 0 ? { label, transition: live.name, resolutions, to: live.to } : { label, transition: live.name, to: live.to }
     );
   }
-  const rest = available.filter((t) => !known.has(t.name)).sort((a, b) => a.name.localeCompare(b.name)).map((t) => ({ label: t.name, transition: t.name }));
+  const rest = available.filter((t) => !known.has(t.name)).sort((a, b) => a.name.localeCompare(b.name)).map((t) => ({ label: t.name, transition: t.name, to: t.to }));
   return [...ordered, ...rest];
 };
-var jiraMoveActions = (ticket, moves, showFlash, onActed) => moves.map(
-  ({ label, transition, resolutions }) => resolutions && resolutions.length > 0 ? {
-    label,
-    hint: "",
-    run: () => {
-    },
-    subActions: resolutions.map((resolution) => ({
-      label: resolution,
+var jiraMoveActions = (ticket, moves, showFlash, onActed, optimistic) => {
+  const execute = (to, request, done, failed) => {
+    const held = to ? optimistic?.(to) : void 0;
+    void request().then(() => {
+      invalidateJiraMoves(ticket);
+      held?.settled();
+      showFlash(done);
+      onActed?.();
+    }).catch((err) => held ? held.failed(err) : showFlash(failed));
+  };
+  return moves.map(
+    ({ label, transition, resolutions, to }) => resolutions && resolutions.length > 0 ? {
+      label,
+      hint: "",
+      run: () => {
+      },
+      subActions: resolutions.map((resolution) => ({
+        label: resolution,
+        hint: "",
+        run: () => {
+          showFlash(`\u22EF ${label} \xB7 ${resolution}\u2026`);
+          execute(
+            to,
+            () => quietly`jira issue move ${ticket} ${transition} --resolution ${resolution}`,
+            `\u2713 ${label} \xB7 ${resolution}`,
+            `\u2717 Move to ${label} failed`
+          );
+        }
+      }))
+    } : {
+      label,
       hint: "",
       run: () => {
-        showFlash(`\u22EF ${label} \xB7 ${resolution}\u2026`);
-        void quietly`jira issue move ${ticket} ${transition} --resolution ${resolution}`.then(() => {
-          invalidateJiraMoves(ticket);
-          showFlash(`\u2713 ${label} \xB7 ${resolution}`);
-          onActed?.();
-        }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
+        showFlash(`\u22EF Moving to ${label}\u2026`);
+        execute(
+          to,
+          () => quietly`jira issue move ${ticket} ${transition}`,
+          `\u2713 Moved to ${label}`,
+          `\u2717 Move to ${label} failed`
+        );
       }
-    }))
-  } : {
-    label,
-    hint: "",
-    run: () => {
-      showFlash(`\u22EF Moving to ${label}\u2026`);
-      void quietly`jira issue move ${ticket} ${transition}`.then(() => {
-        invalidateJiraMoves(ticket);
-        showFlash(`\u2713 Moved to ${label}`);
-        onActed?.();
-      }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
     }
-  }
-);
+  );
+};
 var jiraLoadingActions = () => [
   { label: "Loading transitions\u2026", hint: "", tone: "dim", run: () => {
   } }
@@ -1696,12 +1769,13 @@ var openJiraMoves = (deps) => {
     open,
     isOpen,
     showFlash,
-    onActed
+    onActed,
+    optimistic
   } = deps;
   const openOrdered = (moves) => {
     const ordered = orderJiraMoves(moves, configured);
     open(
-      ordered.length > 0 ? jiraMoveActions(ticket, ordered, showFlash, onActed) : [
+      ordered.length > 0 ? jiraMoveActions(ticket, ordered, showFlash, onActed, optimistic) : [
         {
           label: "No transitions available",
           hint: "",
@@ -2194,7 +2268,7 @@ var ROW_MAX_COLS = 140;
 var OVERLAY_BG = "#22222e";
 var SELECTION_BG = "#16161f";
 var selectionBackground = (active, backdropped) => active && !backdropped ? SELECTION_BG : void 0;
-var TICKET_KEY_COLOUR = "#FFCB6B";
+var TICKET_KEY_COLOUR = colors.ticket;
 var taskKeyStyle = () => ({
   color: TICKET_KEY_COLOUR,
   bold: true
@@ -2216,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;
@@ -2279,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 [];
@@ -2383,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",
@@ -2405,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
@@ -2413,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) {
@@ -2503,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: () => {
         } }
@@ -2570,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: () => {
         } }
@@ -2607,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: () => {
           } }
@@ -2778,6 +2871,8 @@ var PULSE_IDLE_MS = 6e4;
 var PULSE_SETTLED_FRAME = 3;
 var NO_TRANSIENTS = /* @__PURE__ */ new Map();
 var NO_HOLDS = /* @__PURE__ */ new Map();
+var PENDING_GLYPH = "\u25CC";
+var FAILURE_NOTICE_MS = 8e3;
 var TRANSIT_OUT_FRAMES = ["\u25C9", "\u25CE", "\u25CB", "\xB7"];
 var TRANSIT_IN_FRAMES = ["\xB7", "\u25CB", "\u25CE", "\u25C9"];
 var TRANSIT_COLOUR = {
@@ -2806,6 +2901,7 @@ var ItemRow = ({
   merged,
   transient: refreshMark,
   leaving,
+  pending,
   transitAt,
   prefix = "",
   parent,
@@ -2856,7 +2952,7 @@ var ItemRow = ({
     ] });
   if (item.kind === "task") {
     const note = item.note ?? "";
-    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 transitIcon = pending ? PENDING_GLYPH : !transient ? " " : isDeparture(transient) ? TRANSIT_OUT_FRAMES[rampAt(TRANSIT_OUT_FRAMES.length)] : isArrival(transient) ? TRANSIT_IN_FRAMES[rampAt(TRANSIT_IN_FRAMES.length)] : "\u25C9";
     const titleMax = Math.max(
       1,
       cols - item.key.length - note.length - (item.pill ? pillWidth(item.pill) + 1 : 0) - (farewellLabel ? pillWidth(farewellLabel) + 2 : 0) - prefix.length - (markerCols > 0 ? markerCols + 1 : 0) - 12
@@ -2865,7 +2961,7 @@ var ItemRow = ({
       /* @__PURE__ */ jsx(Text3, { color: colors.info, children: active ? "\u276F " : "  " }),
       /* @__PURE__ */ jsx(Text3, { dimColor: true, children: prefix }),
       /* @__PURE__ */ jsx(Text3, { dimColor: true, children: parent ? "\u252C " : "  " }),
-      /* @__PURE__ */ jsx(Text3, { bold: true, color: transient ? TRANSIT_COLOUR[transient] : void 0, children: transitIcon + " " }),
+      pending ? /* @__PURE__ */ jsx(Text3, { dimColor: true, children: transitIcon + " " }) : /* @__PURE__ */ jsx(Text3, { bold: true, color: transient ? TRANSIT_COLOUR[transient] : void 0, children: transitIcon + " " }),
       markerCols > 0 ? /* @__PURE__ */ jsx(Text3, { color: item.markerColor, children: (item.marker ?? "").padEnd(markerCols) + " " }) : null,
       /* @__PURE__ */ jsx(Text3, { ...taskKeyStyle(), children: item.key + "  " }),
       /* @__PURE__ */ jsx(
@@ -2899,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;
@@ -2959,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];
@@ -3159,6 +3256,7 @@ var HelpModal = ({
     ["/", "search"],
     ["f", "filter by repo"],
     ["r", "refresh"],
+    ["w", "restore a change that failed"],
     ...extensionLegend(extensions),
     ["?", "this help"],
     ["q", "quit"]
@@ -3366,7 +3464,13 @@ var BrowseScreen = ({
   transients,
   onTabChange,
   sidebar,
-  liveLabel
+  liveLabel,
+  optimisticMove,
+  optimistic,
+  departing,
+  pendingKeys,
+  failure,
+  onRestore
 }) => {
   const { rows } = useWindowSize();
   const applyWork = (secs) => origin ? filterByOrigin(secs, origin.show, origin.match, login) : secs;
@@ -3481,6 +3585,22 @@ var BrowseScreen = ({
     if (flashTimer.current) clearTimeout(flashTimer.current);
     flashTimer.current = setTimeout(() => setFlash(null), 1500);
   };
+  const [dismissedSeq, setDismissedSeq] = useState(null);
+  const noticeUp = !!failure && dismissedSeq !== failure.seq;
+  useEffect(() => {
+    if (!failure) return;
+    const seq = failure.seq;
+    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;
@@ -3506,6 +3626,7 @@ var BrowseScreen = ({
     if (repoPicker) return setRepoPicker(false), true;
     if (railActive) return setRailFocus(false), true;
     if (menu.actions !== null) return menu.close(), true;
+    if (noticeUp && failure) return setDismissedSeq(failure.seq), true;
     if (search != null) return filter.clear(), true;
     if (repoFilter.size > 0) return setRepoFilter(/* @__PURE__ */ new Set()), true;
     return false;
@@ -3611,34 +3732,38 @@ var BrowseScreen = ({
       open: (rows2) => menu.open(rows2),
       isOpen: () => menuActionsRef.current !== null,
       showFlash,
-      onActed
+      onActed,
+      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;
@@ -3687,6 +3812,10 @@ var BrowseScreen = ({
       return;
     }
     if (searchInput && !key.upArrow && !key.downArrow) return;
+    if (input === "w" && failure && onRestore) {
+      onRestore();
+      return;
+    }
     if (input === "f" && allRepos.length > 0) {
       setRepoCursor(0);
       setRepoPicker(true);
@@ -3926,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) {
@@ -4228,7 +4344,7 @@ var BrowseScreen = ({
           InboxHeader,
           {
             brand,
-            sections: localSections,
+            sections: counted,
             login,
             scopeLabel: overlayOpen ? chrome?.scope ?? origin?.label : origin?.label,
             budgetLabel: budgetNotice(budget)?.label,
@@ -4260,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.
                *
@@ -4334,6 +4450,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),
+                          pending: !!pendingKeys?.has(keyOf(item) ?? ""),
                           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),
@@ -4382,7 +4499,7 @@ var BrowseScreen = ({
             }
           ) : null
         ] }),
-        /* @__PURE__ */ jsx(Box, { marginTop: 1, children: flash ? /* @__PURE__ */ jsx(Text3, { color: colors.success, children: flash }) : overlayOpen ? (
+        /* @__PURE__ */ jsx(Box, { marginTop: 1, children: noticeUp && failure ? /* @__PURE__ */ jsx(Text3, { color: colors.error, children: failure.notice }) : flash ? /* @__PURE__ */ jsx(Text3, { color: colors.success, children: flash }) : overlayOpen ? (
           // The overlay's own verbs, plus the way back. `page="nested"` is what
           // appends `⌫ back` and `q quit`, so a body passes only its own keys
           // through `useChrome` — the same contract ink-ui's `Page` offers its
@@ -4431,6 +4548,7 @@ var App = ({
   jiraSetupHint,
   jiraTransitions,
   jiraTransitionsFor,
+  tabForStatus,
   hasCiStatus,
   ciJob,
   ciFetcher,
@@ -4506,12 +4624,14 @@ var App = ({
   const transitTabs = useRef(/* @__PURE__ */ new Map());
   const [heldSince, setHeldSince] = useState(NO_HOLDS);
   const [visibleTab, setVisibleTab] = useState("");
-  const showData = (sections, login) => {
+  const showData = (sections, login, fetched = true) => {
     const before = displayedSections.current;
     displayedSections.current = sections;
     displayedKey.current = signatureOf(sections);
-    setPending(null);
-    setFetchedAt(Date.now());
+    if (fetched) {
+      setPending(null);
+      setFetchedAt(Date.now());
+    }
     if (before.length === 0) {
       transitTabs.current = /* @__PURE__ */ new Map();
       setTransients(NO_TRANSIENTS);
@@ -4600,7 +4720,7 @@ var App = ({
     if (new Date(known.resetAt).getTime() <= Date.now()) return true;
     return known.remaining >= Math.max(known.cost, 1) * 2;
   };
-  const revalidate = (manual = false) => {
+  const revalidate = (manual = false, apply = false) => {
     const gated = !manual && !!displayedKey.current;
     if (gated && !canAffordAuto()) {
       setSkippedForBudget(true);
@@ -4624,7 +4744,7 @@ var App = ({
       setFetchedAt(Date.now());
       setRefreshError(null);
       if (hasCiStatus) applyCiStatus(fresh.ciStatus ?? null);
-      receive(fresh);
+      receive(fresh, apply);
     }).catch((err) => {
       setRefreshing(false);
       const message = explainGhAction(err);
@@ -4635,8 +4755,22 @@ var App = ({
       setRefreshError({ message, at: Date.now() });
     });
   };
-  const receive = (fresh) => {
+  const receive = (truth, apply = false) => {
+    overrides.current = pruneOverrides(
+      overrides.current,
+      truth.sections,
+      Date.now()
+    );
+    setOverrideRev((n) => n + 1);
+    const fresh = {
+      ...truth,
+      sections: applyOverrides(truth.sections, overrides.current)
+    };
     const freshKey = signatureOf(fresh.sections);
+    if (apply && displayedKey.current) {
+      showData(fresh.sections, fresh.login);
+      return;
+    }
     if (!displayedKey.current) {
       if (fresh.sections.length === 0) {
         setState({ phase: "empty" });
@@ -4656,6 +4790,94 @@ var App = ({
     if (pending) showData(pending.sections, pending.login);
     else revalidate(true);
   };
+  const overrides = useRef(/* @__PURE__ */ new Map());
+  const [overrideRev, setOverrideRev] = useState(0);
+  const failureSeq = useRef(0);
+  const pendingKeys = useMemo(
+    () => new Set(
+      [...overrides.current].filter(([, o]) => o.phase === "inflight").map(([key]) => key)
+    ),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [overrideRev]
+  );
+  const failure = useMemo(() => {
+    const failed = failedOverrides(overrides.current);
+    const notice = failureNotice(failed);
+    const seq = failed[0]?.[1].failure?.seq;
+    return notice && seq != null ? { notice, seq } : void 0;
+  }, [overrideRev]);
+  const hold = (key, override) => {
+    overrides.current = new Map(overrides.current).set(key, override);
+    setOverrideRev((n) => n + 1);
+    const one = /* @__PURE__ */ new Map([[key, override]]);
+    if (state.phase === "browse")
+      showData(
+        applyOverrides(displayedSections.current, one),
+        state.login,
+        false
+      );
+    setPending(
+      (p) => p ? { ...p, sections: applyOverrides(p.sections, one) } : p
+    );
+    const answer = (next) => {
+      if (overrides.current.get(key) !== override) return;
+      overrides.current = new Map(overrides.current).set(key, {
+        ...override,
+        ...next
+      });
+      setOverrideRev((n) => n + 1);
+    };
+    return {
+      // Answered yes: only now does the hold clock matter — see OVERRIDE_HOLD_MS.
+      settled: () => answer({ phase: "sent", since: Date.now() }),
+      failed: (err) => answer({
+        phase: "failed",
+        failure: { reason: explainGhAction(err), seq: ++failureSeq.current }
+      })
+    };
+  };
+  const optimisticMove = tabForStatus ? (task, to) => {
+    const key = keyOf(task);
+    const toSection = tabForStatus(to);
+    if (!key || !toSection) return void 0;
+    return hold(key, {
+      patch: { kind: "move", toSection, fields: { status: to.name } },
+      action: "move",
+      label: task.ticket ?? task.key,
+      since: Date.now(),
+      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;
+    const next = new Map(overrides.current);
+    next.delete(newest[0]);
+    overrides.current = next;
+    setOverrideRev((n) => n + 1);
+    if (cacheKey) invalidateCache(cacheKey);
+    revalidate(true, true);
+  };
   const onActed = () => {
     if (cacheKey) invalidateCache(cacheKey);
     setTimeout(() => applyOrRefresh(), 1500);
@@ -4880,6 +5102,12 @@ var App = ({
       jiraSetupHint,
       jiraTransitions,
       jiraTransitionsFor,
+      optimisticMove,
+      optimistic,
+      departing,
+      pendingKeys,
+      failure,
+      onRestore: restore,
       onRefresh: applyOrRefresh,
       onActed,
       onSettled,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/gh-ink",
-  "version": "0.72.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.33.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.35.0",
+    "@kud/ink-ui": "0.38.0",
     "@types/node": "22.20.1",
     "@types/react": "19.2.17",
     "ink": "7.1.0",