@kud/gh-ink 0.13.0 → 0.15.0

package/dist/index.d.ts

@@ -76,12 +76,12 @@ type GHItem = {
     detail?: GHDetail;
     indent: boolean;
 };
-type JiraRow = {
-    kind: "jira";
+type TaskRow = {
+    kind: "task";
     key: string;
     summary: string;
     url: string;
-    jiraStatus: string;
+    status: string;
     age: string;
     indent: boolean;
     instanceKey?: string;
@@ -92,6 +92,19 @@ type JiraRow = {
      * separately instead of being smuggled past the truncation maths.
      */
     note?: string;
+    /**
+     * The Jira issue key behind this row, when one exists. Its PRESENCE is what
+     * turns on the ticket affordances — ↵ opens a menu led by `jira issue view`,
+     * and `t` transitions the issue. A row without it is just a task: ↵ opens its
+     * URL and nothing here shells out to `jira`.
+     *
+     * Separate from `key` because the two are not the same thing. `key` is the
+     * left column, and a caller is free to put anything legible there: cockpit
+     * puts the ticket key, `life` puts a Todoist project name. Reading the drill
+     * off `key` is what made `life` run `jira issue view "Maison       "` and
+     * label it "View ticket" on a surface that has never touched Jira.
+     */
+    ticket?: string;
 };
 type RepoHeader = {
     kind: "repo-header";
@@ -115,7 +128,7 @@ type SubgroupHeader = {
     age: string;
     indent: boolean;
 };
-type AnyItem = GHItem | JiraRow | RepoHeader | SubgroupHeader | ShowMore | ShowLess;
+type AnyItem = GHItem | TaskRow | RepoHeader | SubgroupHeader | ShowMore | ShowLess;
 type CiStatus = {
     job: string;
     buildNumber: number;
@@ -275,4 +288,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 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 };
+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 JiraTransition, type RepoHeader, type Section, type ShowLess, type ShowMore, type SubgroupHeader, type TaskRow, 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

@@ -607,7 +607,7 @@ var healthLegend = [
   ["closed", "Closed"]
 ];
 var CACHE_TTL_MS = 12e4;
-var CACHE_VERSION = 1;
+var CACHE_VERSION = 2;
 var cacheDir = () => join(process.env.XDG_CACHE_HOME || join(homedir(), ".cache"), "ambre");
 var cacheFile = (key) => join(cacheDir(), `${key.replace(/[^a-z0-9._-]/gi, "-")}.json`);
 var readCache = (key) => {
@@ -641,9 +641,9 @@ var invalidateCache = (key) => {
 // src/inbox/diff.ts
 var keyOf = (item) => {
   if (item.kind === "pr" || item.kind === "issue") return item.url;
-  if (item.kind === "jira") {
+  if (item.kind === "task") {
     const row = item;
-    return row.url || `jira:${row.key}`;
+    return row.url || `task:${row.key}`;
   }
   return null;
 };
@@ -659,9 +659,9 @@ var renderedState = (item) => {
       i.author ?? ""
     ].join("|");
   }
-  if (item.kind === "jira") {
+  if (item.kind === "task") {
     const j = item;
-    return [j.summary, j.jiraStatus].join("|");
+    return [j.summary, j.status].join("|");
   }
   return "";
 };
@@ -733,6 +733,15 @@ var transientOf = (transients, item) => {
   const key = keyOf(item);
   return key ? transients.get(key) : void 0;
 };
+var tabsOfMarks = (sections, marks) => {
+  const out = /* @__PURE__ */ new Map();
+  for (const section of sections)
+    for (const item of section.items) {
+      const key = keyOf(item);
+      if (key && marks.has(key)) out.set(key, section.id);
+    }
+  return out;
+};
 var quietly = $({ quiet: true });
 var relativeTime = (iso) => {
   const diff = (Date.now() - new Date(iso).getTime()) / 1e3;
@@ -881,7 +890,7 @@ var filterByOrigin = (sections, keep, isWorkRepo) => sections.map((s) => {
     (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header"
   )
 );
-var searchText = (i) => i.kind === "pr" || i.kind === "issue" ? `${i.title} ${i.repo} #${i.number}` : i.kind === "jira" ? `${i.summary} ${i.key}` : "";
+var searchText = (i) => i.kind === "pr" || i.kind === "issue" ? `${i.title} ${i.repo} #${i.number}` : i.kind === "task" ? `${i.summary} ${i.key}` : "";
 var filterBySearch = (sections, query) => {
   const q = query.trim().toLowerCase();
   if (!q) return sections;
@@ -1202,11 +1211,12 @@ var topLevelCount = (s) => s.items.filter(
   (i) => i.kind !== "repo-header" && i.kind !== "subgroup-header" && !i.indent
 ).length;
 var drillCmd = (item) => {
-  if (item.kind === "jira") return `jira issue view ${item.key}`;
+  if (item.kind === "task")
+    return item.ticket ? `jira issue view ${item.ticket}` : null;
   return null;
 };
 var drillLabel = (item) => {
-  if (item.kind === "jira") return "View ticket";
+  if (item.kind === "task") return "View ticket";
   if (item.kind === "issue") return "View issue";
   if (item.kind === "pr") return "Open PR";
   return "Drill in";
@@ -1228,7 +1238,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
     hint: "c",
     run: () => {
       clipboard(item.url);
-      const label = item.kind === "jira" ? item.key : `#${item.number}`;
+      const label = item.kind === "task" ? item.key : `#${item.number}`;
       showFlash(`\u2713 Copied URL for ${label}`);
     }
   };
@@ -1246,9 +1256,9 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
       }
     }
   } : null;
-  if (item.kind === "jira") {
+  if (item.kind === "task") {
     const base = drillAction ? [drillAction, open, copyUrl] : [open, copyUrl];
-    if (jiraTransitions && jiraTransitions.length > 0) {
+    if (item.ticket && jiraTransitions && jiraTransitions.length > 0) {
       base.push({
         label: "Move status",
         hint: "t",
@@ -1265,7 +1275,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
               hint: "",
               run: () => {
                 showFlash(`\u22EF ${label} \xB7 ${resolution}\u2026`);
-                void quietly`jira issue move ${item.key} ${state} --resolution ${resolution}`.then(() => {
+                void quietly`jira issue move ${item.ticket} ${state} --resolution ${resolution}`.then(() => {
                   showFlash(`\u2713 ${label} \xB7 ${resolution}`);
                   ext?.onActed?.();
                 }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
@@ -1276,7 +1286,7 @@ var buildActions = (item, login, showFlash, jiraBase, jiraKeyRe, jiraTransitions
             hint: "",
             run: () => {
               showFlash(`\u22EF Moving to ${label}\u2026`);
-              void quietly`jira issue move ${item.key} ${state}`.then(() => {
+              void quietly`jira issue move ${item.ticket} ${state}`.then(() => {
                 showFlash(`\u2713 Moved to ${label}`);
                 ext?.onActed?.();
               }).catch(() => showFlash(`\u2717 Move to ${label} failed`));
@@ -1604,7 +1614,7 @@ var ItemRow = ({
       /* @__PURE__ */ jsx(Text2, { dimColor: true, children: active ? "\u21B5 " : "  " }),
       /* @__PURE__ */ jsx(Text2, { dimColor: true, children: "show less" })
     ] });
-  if (item.kind === "jira") {
+  if (item.kind === "task") {
     const note = item.note ?? "";
     const titleMax2 = Math.max(20, COLS - item.key.length - note.length - 10);
     return /* @__PURE__ */ jsxs(Box, { marginTop: gap ? 1 : 0, children: [
@@ -1689,7 +1699,7 @@ var ActionMenu = ({
   actions,
   cursor
 }) => {
-  const title = item.kind === "jira" ? item.key : item.kind === "pr" || item.kind === "issue" ? `#${item.number}` : "";
+  const title = item.kind === "task" ? item.key : item.kind === "pr" || item.kind === "issue" ? `#${item.number}` : "";
   return /* @__PURE__ */ jsxs(
     Box,
     {
@@ -1946,7 +1956,8 @@ var BrowseScreen = ({
   initialIncludeWork,
   brand,
   mergedUrls,
-  transients
+  transients,
+  onTabChange
 }) => {
   const { rows } = useWindowSize();
   const [includeWork, setIncludeWork] = useState(
@@ -1962,6 +1973,9 @@ var BrowseScreen = ({
   const [viewStarts, setViewStarts] = useState({});
   const safeTabIdx = Math.min(tabIdx, Math.max(0, localSections.length - 1));
   const activeId = localSections[safeTabIdx]?.id ?? "";
+  useEffect(() => {
+    onTabChange?.(activeId);
+  }, [activeId]);
   const [flash, setFlash] = useState(null);
   const menu = useActionMenu();
   const [search, setSearch] = useState(null);
@@ -2037,7 +2051,7 @@ var BrowseScreen = ({
     setTimeout(() => setFlash(null), 2e3);
   };
   const [sparkFrame, setSparkFrame] = useState(0);
-  const sparkling = (mergedUrls?.length ?? 0) > 0 || (transients?.size ?? 0) > 0;
+  const sparkling = (mergedUrls?.length ?? 0) > 0 || !!transients?.size && section.items.some((item) => transientOf(transients, item));
   useEffect(() => {
     if (!sparkling) return;
     const id = setInterval(() => setSparkFrame((f) => f + 1), MERGED_FRAME_MS);
@@ -2222,6 +2236,12 @@ var BrowseScreen = ({
       return;
     if (key.return) {
       if (openDrillView(activeItem)) return;
+      if (activeItem.kind === "task" && !activeItem.ticket) {
+        void quietly`open ${activeItem.url}`.catch(() => {
+        });
+        showFlash("\u2197 Opened in browser");
+        return;
+      }
       openMenu();
       return;
     }
@@ -2236,13 +2256,13 @@ var BrowseScreen = ({
     if (input === "o") {
       quietly`open ${activeItem.url}`.catch(() => {
       });
-      const label = activeItem.kind === "jira" ? activeItem.key : `#${activeItem.number}`;
+      const label = activeItem.kind === "task" ? activeItem.key : `#${activeItem.number}`;
       showFlash(`\u2197 Opened ${label}`);
       return;
     }
     if (input === "c") {
       clipboard(activeItem.url);
-      const label = activeItem.kind === "jira" ? activeItem.key : `#${activeItem.number}`;
+      const label = activeItem.kind === "task" ? activeItem.key : `#${activeItem.number}`;
       showFlash(`\u2713 Copied URL for ${label}`);
       return;
     }
@@ -2261,7 +2281,7 @@ var BrowseScreen = ({
       showFlash(`\u2713 Copied ${activeItem.branch}`);
       return;
     }
-    if (activeItem.kind !== "jira") {
+    if (activeItem.kind !== "task") {
       if (input === "s" && activeItem.kind === "pr" && activeItem.branch) {
         const script = [
           "delay 0.5",
@@ -2286,8 +2306,8 @@ var BrowseScreen = ({
         return;
       }
     }
-    if (input === "t" && activeItem && activeItem.kind === "jira" && jiraTransitions && jiraTransitions.length > 0) {
-      const jiraKey = activeItem.key;
+    if (input === "t" && activeItem && activeItem.kind === "task" && activeItem.ticket && jiraTransitions && jiraTransitions.length > 0) {
+      const jiraKey = activeItem.ticket;
       const actions = jiraTransitions.map(
         ({ label, state, resolutions }) => resolutions && resolutions.length > 0 ? {
           label,
@@ -2414,16 +2434,16 @@ var BrowseScreen = ({
                   // the whole panel up a line instead of clipping.
                   i > 0 && (item.kind === "repo-header" || item.kind === "subgroup-header" || // A header is always followed by a blank line before its
                   // first child — in Other PRs that's "free" because the
-                  // child is itself a repo-header (gap above). A jira row
+                  // child is itself a repo-header (gap above). A task row
                   // has no such stand-in, so it needs this explicitly. Never
                   // applies between two tickets/PRs — only right after a
                   // header.
-                  item.kind === "jira" && ["repo-header", "subgroup-header"].includes(
+                  item.kind === "task" && ["repo-header", "subgroup-header"].includes(
                     section.items[viewStart + i - 1]?.kind
                   ))
                 )
               },
-              `${viewStart + i}:${item.kind === "jira" ? item.instanceKey ?? item.key : item.kind === "repo-header" ? `header:${item.repo}` : item.kind === "subgroup-header" ? `subgroup:${item.label}` : item.kind === "show-more" ? `show-more:${item.hidden[0]?.repo ?? i}` : item.kind === "show-less" ? `show-less:${item.toHide[0]?.repo ?? i}` : `${item.repo}/${item.number}`}`
+              `${viewStart + i}:${item.kind === "task" ? item.instanceKey ?? item.key : item.kind === "repo-header" ? `header:${item.repo}` : item.kind === "subgroup-header" ? `subgroup:${item.label}` : item.kind === "show-more" ? `show-more:${item.hidden[0]?.repo ?? i}` : item.kind === "show-less" ? `show-less:${item.toHide[0]?.repo ?? i}` : `${item.repo}/${item.number}`}`
             )) }),
             hasMore && /* @__PURE__ */ jsxs(Text2, { dimColor: true, children: [
               "  ",
@@ -2508,13 +2528,8 @@ var App = ({
   const displayedKey = useRef("");
   const displayedSections = useRef([]);
   const [transients, setTransients] = useState(NO_TRANSIENTS);
-  const transitTimer = useRef(null);
-  useEffect(
-    () => () => {
-      if (transitTimer.current) clearTimeout(transitTimer.current);
-    },
-    []
-  );
+  const transitTabs = useRef(/* @__PURE__ */ new Map());
+  const [visibleTab, setVisibleTab] = useState("");
   const showData = (sections, login) => {
     const before = displayedSections.current;
     displayedSections.current = sections;
@@ -2522,25 +2537,61 @@ var App = ({
     setPending(null);
     setFetchedAt(Date.now());
     if (before.length === 0) {
+      transitTabs.current = /* @__PURE__ */ new Map();
       setTransients(NO_TRANSIENTS);
       setState({ phase: "browse", sections, login });
       return;
     }
-    const { transients: marks, union } = diffSections(before, sections);
+    const { transients: fresh, union } = diffSections(before, sections);
+    const marks = new Map(fresh);
+    for (const [key, mark] of transients)
+      if (!marks.has(key)) marks.set(key, mark);
+    const tabs = tabsOfMarks(union, marks);
+    for (const key of [...marks.keys()]) if (!tabs.has(key)) marks.delete(key);
     if (marks.size === 0) {
+      transitTabs.current = /* @__PURE__ */ new Map();
+      setTransients(NO_TRANSIENTS);
       setState({ phase: "browse", sections, login });
       return;
     }
+    transitTabs.current = tabs;
     setTransients(marks);
     setState({ phase: "browse", sections: union, login });
-    if (transitTimer.current) clearTimeout(transitTimer.current);
-    transitTimer.current = setTimeout(() => {
-      setTransients(NO_TRANSIENTS);
-      setState(
-        (prev) => prev.phase === "browse" && prev.sections === union ? { ...prev, sections } : prev
-      );
-    }, TRANSIT_HOLD_MS);
   };
+  const settleTab = (tabId, marks) => {
+    const keys = [...transitTabs.current].filter(([, tab]) => tab === tabId).map(([key]) => key);
+    for (const key of keys) transitTabs.current.delete(key);
+    const gone = new Set(keys.filter((key) => marks.get(key) === "out"));
+    setTransients((prev) => {
+      const next = new Map(prev);
+      for (const key of keys) next.delete(key);
+      return next.size === 0 ? NO_TRANSIENTS : next;
+    });
+    setState(
+      (prev) => prev.phase !== "browse" ? prev : {
+        ...prev,
+        sections: prev.sections.map(
+          (section) => section.id !== tabId ? section : {
+            ...section,
+            items: section.items.filter((item) => {
+              const key = keyOf(item);
+              return !(key && gone.has(key));
+            })
+          }
+        )
+      }
+    );
+  };
+  useEffect(() => {
+    if (transients.size === 0) return;
+    if (state.phase !== "browse" || !visibleTab) return;
+    if (![...transitTabs.current.values()].includes(visibleTab)) return;
+    const timer = setTimeout(
+      () => settleTab(visibleTab, transients),
+      TRANSIT_HOLD_MS
+    );
+    return () => clearTimeout(timer);
+  }, [transients, visibleTab, state.phase]);
   const pendingSummary = useMemo(
     () => pending ? summariseDiff(
       diffSections(displayedSections.current, pending.sections).counts
@@ -2725,6 +2776,7 @@ var App = ({
         hidden: overlay !== null,
         mergedUrls,
         transients,
+        onTabChange: setVisibleTab,
         ciStatusState: hasCiStatus ? ciStatusState : void 0,
         ciJob,
         tabHelp,

package/package.json

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