@kud/gh-ink 0.3.0 → 0.4.0

package/dist/index.d.ts

@@ -33,11 +33,16 @@ declare const healthGlyph: (h: Health) => string;
 declare const healthColor: (h: Health) => string;
 declare const healthLegend: [Health, string][];
 
+type ExtensionTarget = {
+    item?: AnyItem;
+    ciJob?: string;
+    login: string;
+};
 interface InboxExtension {
     id: string;
     title: string;
     key: string;
-    body: (onExit: () => void, target?: string) => ReactNode;
+    body: (onExit: () => void, target?: ExtensionTarget) => ReactNode;
 }
 
 type GHDetail = {
@@ -233,4 +238,4 @@ declare const writeCache: (key: string, data: {
     login: string;
 }) => void;
 
-export { type Action, ActionMenu, type AnyItem, App, COLS, type CiStatus, CiStatusLine, type CiStatusState, CommentsPanel, type CommentsPanelProps, type DetailContext, type ExplainSection, type GHDetail, type GHItem, HealthPanel, type HealthPanelProps, type InboxExtension, type JiraRow, type JiraTransition, type RepoHeader, type Section, type ShowLess, type ShowMore, type SubgroupHeader, buildActions, buildCheckoutCmd, clipboard, drillCmd, explainItem, filterByOrigin, filterByRepos, filterBySearch, fitCount, healthColor, healthDisplay, healthGlyph, healthLegend, insertRepoHeaders, itermRun, jumpToRepo, jumpToRepoPane, layoutGHItems, maxViewStart, moveCursor, openInTab, readCache, relativeTime, renderMarkdown, repoPriority, reposInSections, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, sortByRecency, sortItems, toCiStatusState, topLevelCount, truncate, useActionMenu, windowCount, withHeaders, withoutItem, writeCache };
+export { type Action, ActionMenu, type AnyItem, App, COLS, type CiStatus, CiStatusLine, type CiStatusState, CommentsPanel, type CommentsPanelProps, type DetailContext, type ExplainSection, type ExtensionTarget, type GHDetail, type GHItem, HealthPanel, type HealthPanelProps, type InboxExtension, type JiraRow, type JiraTransition, type RepoHeader, type Section, type ShowLess, type ShowMore, type SubgroupHeader, buildActions, buildCheckoutCmd, clipboard, drillCmd, explainItem, filterByOrigin, filterByRepos, filterBySearch, fitCount, healthColor, healthDisplay, healthGlyph, healthLegend, insertRepoHeaders, itermRun, jumpToRepo, jumpToRepoPane, layoutGHItems, maxViewStart, moveCursor, openInTab, readCache, relativeTime, renderMarkdown, repoPriority, reposInSections, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, sortByRecency, sortItems, toCiStatusState, topLevelCount, truncate, useActionMenu, windowCount, withHeaders, withoutItem, writeCache };

package/dist/index.js

@@ -1,6 +1,6 @@
 import React2, { useState, useRef, useEffect } from 'react';
 import { useWindowSize, useInput, Text, Box } from 'ink';
-import { colors, ScrollView, TextInput, LoadingScreen, Switch, Tabs, FooterHints } from '@kud/ink-ui';
+import { colors, ScrollView, TextInput, LoadingScreen, Switch, useListCursor, Tabs, FooterHints } from '@kud/ink-ui';
 import { isPassCheck, isFailCheck, resolveThread, unresolveThread, replyToThread, rerunFailedRun, mergePr, reRequestReviewer } from '@kud/gh';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { $ } from 'zx';
@@ -622,6 +622,7 @@ var writeCache = (key, data) => {
   } catch {
   }
 };
+var quietly = $({ quiet: true });
 var relativeTime = (iso) => {
   const diff = (Date.now() - new Date(iso).getTime()) / 1e3;
   if (diff < 3600) return `${Math.floor(diff / 60)}m`;
@@ -847,6 +848,12 @@ var maxViewStart = (items, budget) => {
     start++;
   return start;
 };
+var firstSelectable = (section) => Math.max(
+  0,
+  section.items.findIndex(
+    (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header"
+  )
+);
 var withHeaders = (items, idx) => {
   let start = idx;
   while (start > 0 && (items[start - 1].kind === "repo-header" || items[start - 1].kind === "subgroup-header"))
@@ -1065,7 +1072,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
     label: "Open in browser",
     hint: "o",
     run: () => {
-      $`open ${item.url}`.catch(() => {
+      quietly`open ${item.url}`.catch(() => {
       });
       showFlash("\u2197 Opened in browser");
     }
@@ -1112,7 +1119,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
               hint: "",
               run: () => {
                 showFlash(`\u22EF ${label} \xB7 ${resolution}\u2026`);
-                void $`jira issue move ${item.key} ${state} --resolution ${resolution}`.then(() => {
+                void quietly`jira issue move ${item.key} ${state} --resolution ${resolution}`.then(() => {
                   showFlash(`\u2713 ${label} \xB7 ${resolution}`);
                   setTimeout(() => onRefresh?.(), 1500);
                 }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
@@ -1123,7 +1130,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
             hint: "",
             run: () => {
               showFlash(`\u22EF Moving to ${label}\u2026`);
-              void $`jira issue move ${item.key} ${state}`.then(() => {
+              void quietly`jira issue move ${item.key} ${state}`.then(() => {
                 showFlash(`\u2713 Moved to ${label}`);
                 setTimeout(() => onRefresh?.(), 1500);
               }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
@@ -1204,7 +1211,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
           run: () => {
             onRemove?.(item);
             showFlash(`\u2713 Closed #${item.number}`);
-            void $`gh issue close ${item.number} --repo ${item.repo}`.catch(
+            void quietly`gh issue close ${item.number} --repo ${item.repo}`.catch(
               () => {
                 showFlash(`\u2717 Close failed \u2014 restoring #${item.number}`);
                 onRefresh?.();
@@ -1241,7 +1248,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
           label: `Open ${jiraKey} in Jira`,
           hint: "t",
           run: () => {
-            $`open ${jiraBase}/${jiraKey}`.catch(() => {
+            quietly`open ${jiraBase}/${jiraKey}`.catch(() => {
             });
             showFlash(`\u2197 Opened ${jiraKey} in Jira`);
           }
@@ -1260,10 +1267,12 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
           run: () => {
             onRemove?.(item);
             showFlash(`\u2713 Closed #${item.number}`);
-            void $`gh pr close ${item.number} --repo ${item.repo}`.catch(() => {
-              showFlash(`\u2717 Close failed \u2014 restoring #${item.number}`);
-              onRefresh?.();
-            });
+            void quietly`gh pr close ${item.number} --repo ${item.repo}`.catch(
+              () => {
+                showFlash(`\u2717 Close failed \u2014 restoring #${item.number}`);
+                onRefresh?.();
+              }
+            );
           }
         },
         { label: "Cancel", hint: "", run: () => {
@@ -1283,8 +1292,8 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
             run: () => {
               onRemove?.(item);
               showFlash(`\u2713 Closed #${item.number} and deleted ${item.branch}`);
-              void $`gh pr close ${item.number} --repo ${item.repo}`.then(
-                () => $`gh api -X DELETE ${`repos/${item.repo}/git/refs/heads/${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?.();
@@ -1648,6 +1657,7 @@ var RepoPicker = ({
     }
   );
 };
+var extensionFor = (input, extensions) => input ? extensions?.find((e) => e.key === input) : void 0;
 var BrowseScreen = ({
   sections,
   login,
@@ -1663,6 +1673,7 @@ var BrowseScreen = ({
   onOpenPr,
   onOpenIssue,
   onOpenExt,
+  extensions,
   ciStatusState,
   ciJob,
   tabHelp,
@@ -1679,25 +1690,17 @@ var BrowseScreen = ({
   const [localSections, setLocalSections] = useState(initialSections);
   const [tabIdx, setTabIdx] = useState(0);
   const [cursors, setCursors] = useState(
-    initialSections.map(
-      (s) => Math.max(
-        0,
-        s.items.findIndex(
-          (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header"
-        )
-      )
-    )
-  );
-  const [viewStarts, setViewStarts] = useState(
-    initialSections.map(() => 0)
+    () => Object.fromEntries(initialSections.map((s) => [s.id, firstSelectable(s)]))
   );
+  const [viewStarts, setViewStarts] = useState({});
+  const safeTabIdx = Math.min(tabIdx, Math.max(0, localSections.length - 1));
+  const activeId = localSections[safeTabIdx]?.id ?? "";
   const [flash, setFlash] = useState(null);
   const menu = useActionMenu();
   const [search, setSearch] = useState(null);
   const [searchInput, setSearchInput] = useState(false);
   const [repoFilter, setRepoFilter] = useState(/* @__PURE__ */ new Set());
   const [repoPicker, setRepoPicker] = useState(false);
-  const [repoCursor, setRepoCursor] = useState(0);
   const [help, setHelp] = useState(false);
   const [explain, setExplain] = useState(false);
   const filterActive = search != null || repoFilter.size > 0;
@@ -1710,8 +1713,8 @@ var BrowseScreen = ({
     rows - 10 - (filterActive ? 2 : 0) - (reserveCiRow ? 2 : 0)
   );
   useEffect(() => {
-    setCursors((p) => p.map((c, i) => i === tabIdx ? 0 : c));
-    setViewStarts((p) => p.map((v, i) => i === tabIdx ? 0 : v));
+    setCursors((p) => ({ ...p, [activeId]: 0 }));
+    setViewStarts((p) => ({ ...p, [activeId]: 0 }));
   }, [search]);
   useEffect(() => {
     setLocalSections(applyWork(sections, includeWork));
@@ -1719,20 +1722,30 @@ var BrowseScreen = ({
   useEffect(() => {
     setTabIdx((prev) => Math.min(prev, Math.max(0, localSections.length - 1)));
     setCursors(
-      (prev) => localSections.map((s, i) => {
-        const c = Math.min(prev[i] ?? 0, s.items.length - 1);
-        if (c < 0) return 0;
-        return s.items[c]?.kind === "repo-header" || s.items[c]?.kind === "subgroup-header" ? moveCursor(s.items, c, 1) : c;
-      })
+      (prev) => Object.fromEntries(
+        localSections.map((s) => {
+          const c = Math.min(
+            prev[s.id] ?? firstSelectable(s),
+            s.items.length - 1
+          );
+          if (c < 0) return [s.id, 0];
+          return [
+            s.id,
+            s.items[c]?.kind === "repo-header" || s.items[c]?.kind === "subgroup-header" ? moveCursor(s.items, c, 1) : c
+          ];
+        })
+      )
     );
     setViewStarts(
-      (prev) => localSections.map(
-        (s, i) => Math.min(prev[i] ?? 0, maxViewStart(s.items, listHeight))
+      (prev) => Object.fromEntries(
+        localSections.map((s) => [
+          s.id,
+          Math.min(prev[s.id] ?? 0, maxViewStart(s.items, listHeight))
+        ])
       )
     );
   }, [localSections, listHeight]);
   const removeItemFromSections = (target) => setLocalSections((prev) => withoutItem(prev, target));
-  const safeTabIdx = Math.min(tabIdx, Math.max(0, localSections.length - 1));
   const rawSection = localSections[safeTabIdx] ?? {
     id: "empty",
     label: "",
@@ -1742,8 +1755,12 @@ var BrowseScreen = ({
   const filtered = repoFilter.size > 0 ? filterByRepos(searched, repoFilter) : searched;
   const section = filterActive ? { ...rawSection, items: filtered[0]?.items ?? [] } : rawSection;
   const allRepos = reposInSections(localSections);
-  const cursor = cursors[safeTabIdx] ?? 0;
-  const viewStart = viewStarts[safeTabIdx] ?? 0;
+  const { cursor: repoCursor, setCursor: setRepoCursor } = useListCursor(
+    allRepos.length,
+    { vimKeys: false, isActive: repoPicker }
+  );
+  const cursor = cursors[activeId] ?? 0;
+  const viewStart = viewStarts[activeId] ?? 0;
   const visibleCount = windowCount(section.items, viewStart, listHeight);
   const visibleItems = section.items.slice(viewStart, viewStart + visibleCount);
   const hasMore = viewStart + visibleCount < section.items.length;
@@ -1798,9 +1815,6 @@ var BrowseScreen = ({
     }
     if (repoPicker) {
       if (key.escape || key.return) return setRepoPicker(false);
-      if (key.upArrow) return setRepoCursor((c) => Math.max(0, c - 1));
-      if (key.downArrow)
-        return setRepoCursor((c) => Math.min(allRepos.length - 1, c + 1));
       if (input === "a") return setRepoFilter(/* @__PURE__ */ new Set());
       if (input === " ") {
         const repo = allRepos[repoCursor];
@@ -1848,16 +1862,16 @@ var BrowseScreen = ({
     if (key.upArrow) {
       const next = moveCursor(section.items, cursor, -1);
       const newVs = Math.min(viewStart, withHeaders(section.items, next));
-      setCursors((p) => p.map((c, i) => i === tabIdx ? next : c));
-      setViewStarts((p) => p.map((v, i) => i === tabIdx ? newVs : v));
+      setCursors((p) => ({ ...p, [activeId]: next }));
+      setViewStarts((p) => ({ ...p, [activeId]: newVs }));
     }
     if (key.downArrow) {
       const next = moveCursor(section.items, cursor, 1);
       let newVs = viewStart;
       while (next >= newVs + windowCount(section.items, newVs, listHeight))
         newVs++;
-      setCursors((p) => p.map((c, i) => i === tabIdx ? next : c));
-      setViewStarts((p) => p.map((v, i) => i === tabIdx ? newVs : v));
+      setCursors((p) => ({ ...p, [activeId]: next }));
+      setViewStarts((p) => ({ ...p, [activeId]: newVs }));
     }
     if (key.leftArrow) setTabIdx((i) => Math.max(0, i - 1));
     if (key.rightArrow)
@@ -1873,12 +1887,20 @@ var BrowseScreen = ({
     }
     if (workToggle && input === "w") {
       const next = !includeWork;
+      const nextSections = applyWork(sections, next);
+      const keptIdx = nextSections.findIndex((s) => s.id === activeId);
       setIncludeWork(next);
-      setLocalSections(applyWork(sections, next));
+      setLocalSections(nextSections);
+      if (keptIdx >= 0) setTabIdx(keptIdx);
       return;
     }
-    if (input === "J" && ciStatus) {
-      onOpenExt?.("jenkins", ciStatus.job);
+    const ext = extensionFor(input, extensions);
+    if (ext) {
+      onOpenExt?.(ext.id, {
+        item: activeItem ?? void 0,
+        ciJob: ciStatus?.job,
+        login
+      });
       return;
     }
     if (!activeItem || activeItem.kind === "repo-header" || activeItem.kind === "subgroup-header")
@@ -1934,7 +1956,7 @@ var BrowseScreen = ({
       return;
     }
     if (input === "o") {
-      $`open ${activeItem.url}`.catch(() => {
+      quietly`open ${activeItem.url}`.catch(() => {
       });
       const label = activeItem.kind === "jira" ? activeItem.key : `#${activeItem.number}`;
       showFlash(`\u2197 Opened ${label}`);
@@ -2000,7 +2022,7 @@ var BrowseScreen = ({
             run: () => {
               menu.close();
               showFlash(`\u22EF ${label} \xB7 ${resolution}\u2026`);
-              $`jira issue move ${jiraKey} ${state} --resolution ${resolution}`.then(() => {
+              quietly`jira issue move ${jiraKey} ${state} --resolution ${resolution}`.then(() => {
                 showFlash(`\u2713 ${label} \xB7 ${resolution}`);
                 setTimeout(() => onRefresh?.(), 1500);
               }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
@@ -2012,7 +2034,7 @@ var BrowseScreen = ({
           run: () => {
             menu.close();
             showFlash(`\u22EF Moving to ${label}\u2026`);
-            $`jira issue move ${jiraKey} ${state}`.then(() => {
+            quietly`jira issue move ${jiraKey} ${state}`.then(() => {
               showFlash(`\u2713 Moved to ${label}`);
               setTimeout(() => onRefresh?.(), 1500);
             }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
@@ -2352,7 +2374,8 @@ var App = ({
           target,
           sections: state.sections,
           login: state.login
-        })
+        }),
+        extensions
       }
     ),
     (overlay?.kind === "pr" || overlay?.kind === "issue") && detailFor?.({

package/package.json

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