@kud/gh-cockpit 0.5.6 → 0.6.0

package/dist/{chunk-6FVWJ3OY.js → chunk-6DVOSLNG.js}

@@ -113,7 +113,8 @@ var AiLauncher = ({
   item,
   login,
   prompt,
-  onBack
+  onBack,
+  peelRef
 }) => {
   const [agents, setAgents] = useState(null);
   const [step, setStep] = useState("agent");
@@ -155,15 +156,19 @@ var AiLauncher = ({
       setNote(`\u2717 ${e.message}`);
     }
   };
+  useEffect(() => {
+    if (!peelRef) return;
+    peelRef.current = () => {
+      if (step !== "place") return false;
+      setStep("agent");
+      setCursor(0);
+      return true;
+    };
+    return () => {
+      peelRef.current = null;
+    };
+  });
   useInput((input, key) => {
-    if (key.escape || input === "q") {
-      if (step === "place") {
-        setStep("agent");
-        setCursor(0);
-        return;
-      }
-      return onBack();
-    }
     if (key.return) {
       if (step === "agent") {
         setAgent((agents ?? [])[safeCursor] ?? null);
@@ -182,7 +187,7 @@ var AiLauncher = ({
       hints: [
         ["\u2191\u2193", "nav"],
         ["\u21B5", step === "agent" ? "choose" : "launch"],
-        ["q/esc", step === "place" ? "back" : "close"]
+        ["esc", step === "place" ? "back" : "close"]
       ],
       children: !agents ? /* @__PURE__ */ jsx(Text, { color: colors.info, children: "Detecting agents\u2026" }) : /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
         list.map((row, i) => /* @__PURE__ */ jsxs(Box, { children: [

package/dist/extensions/index.js

@@ -1,4 +1,4 @@
-import { AiLauncher, seedPromptFor, CopyPromptNotice } from '../chunk-6FVWJ3OY.js';
+import { AiLauncher, seedPromptFor, CopyPromptNotice } from '../chunk-6DVOSLNG.js';
 import { useEffect } from 'react';
 import { jsx } from 'react/jsx-runtime';
 

package/dist/index.d.ts

@@ -147,7 +147,7 @@ declare const DrillView: ({ title, subtitle, hints, children, }: {
 }) => React.JSX.Element;
 
 type Tab = "health" | "conversation";
-declare const PrView: ({ item, login, onBack, defaultTab, onRefresh, onRemove, onMerged, }: {
+declare const PrView: ({ item, login, onBack, defaultTab, onRefresh, onRemove, onMerged, registerPeel, onTyping, }: {
     item: GHItem;
     login: string;
     onBack: () => void;
@@ -155,9 +155,11 @@ declare const PrView: ({ item, login, onBack, defaultTab, onRefresh, onRemove, o
     onRefresh?: () => void;
     onRemove?: (item: GHItem) => void;
     onMerged?: (item: GHItem) => void;
+    registerPeel?: (peel: (() => boolean) | null) => void;
+    onTyping?: (typing: boolean) => void;
 }) => React.JSX.Element;
 
-declare const IssueView: ({ item, login, onBack, }: {
+declare const IssueView: ({ item, login, onBack, registerPeel, onTyping, }: {
     item: {
         number: number;
         repo: string;
@@ -167,6 +169,8 @@ declare const IssueView: ({ item, login, onBack, }: {
     };
     login: string;
     onBack: () => void;
+    registerPeel?: (peel: (() => boolean) | null) => void;
+    onTyping?: (typing: boolean) => void;
 }) => React.JSX.Element;
 
 export { type CheckDrill, type CheckDrillContext, type CockpitArgs, type CockpitConfig, DrillView, IssueView, PrView, type PromptContext, type PromptForms, type TabSearch, type TabSpec, checkDrillFor, computeHealth, defineCockpit, detailFor, hasPatterns, parseArgs, registerCheckDrills, registerPrompts, signalPath, withRetry };

package/dist/index.js

@@ -1,11 +1,11 @@
-import { useActionMenu, buildActions, AiLauncher, seedPromptFor, CopyPromptNotice, DrillView, ActionMenu, resolveRepoPath, openInTab } from './chunk-6FVWJ3OY.js';
-export { ActionMenu, App, COLS, CiStatusLine, CommentsPanel, DrillView, HealthPanel, MIN_SIDEBAR_COLS, PIN_MARK, SIDEBAR_COLS, SidePanel, bandOf, budgetNotice, buildActions, buildCheckoutCmd, buildInboxQueries, buildInboxQuery, checkoutDirs, clipboard, computeHealth, configureInbox, counts, drillCmd, explainGhAction, explainItem, filterByOrigin, filterByRepos, filterBySearch, fitCount, gapsAbove, healthColor, healthDisplay, healthGlyph, healthLegend, impliedLabels, inboxConfig, insertRepoHeaders, itermRun, jumpToRepo, jumpToRepoPane, labelPriority, layoutGHItems, matchesFilter, maxViewStart, mergeInboxData, moveCursor, openInTab, parsePatterns, profileOf, railCapacity, railWidth, readCache, registerPrompts, relativeTime, renderMarkdown, repoPriority, reposInSections, resetInboxConfig, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, signalPath, signatureOf, sortByRecency, sortItems, toCiStatusState, toGHItem, truncate, useActionMenu, whoseMove, windowCount, withHeaders, withRetry, withoutItem, workCount, writeCache } from './chunk-6FVWJ3OY.js';
+import { useActionMenu, buildActions, AiLauncher, seedPromptFor, CopyPromptNotice, DrillView, ActionMenu, resolveRepoPath, openInTab } from './chunk-6DVOSLNG.js';
+export { ActionMenu, App, COLS, CiStatusLine, CommentsPanel, DrillView, HealthPanel, MIN_SIDEBAR_COLS, PIN_MARK, SIDEBAR_COLS, SidePanel, bandOf, budgetNotice, buildActions, buildCheckoutCmd, buildInboxQueries, buildInboxQuery, checkoutDirs, clipboard, computeHealth, configureInbox, counts, drillCmd, explainGhAction, explainItem, filterByOrigin, filterByRepos, filterBySearch, fitCount, gapsAbove, healthColor, healthDisplay, healthGlyph, healthLegend, impliedLabels, inboxConfig, insertRepoHeaders, itermRun, jumpToRepo, jumpToRepoPane, labelPriority, layoutGHItems, matchesFilter, maxViewStart, mergeInboxData, moveCursor, openInTab, parsePatterns, profileOf, railCapacity, railWidth, readCache, registerPrompts, relativeTime, renderMarkdown, repoPriority, reposInSections, resetInboxConfig, resolveRepoPath, runHere, runInPane, runInPaneHorizontal, sameCiStatusState, signalPath, signatureOf, sortByRecency, sortItems, toCiStatusState, toGHItem, truncate, useActionMenu, whoseMove, windowCount, withHeaders, withRetry, withoutItem, workCount, writeCache } from './chunk-6DVOSLNG.js';
 import { parsePatterns, HealthPanel, CommentsPanel, inboxConfig } from '@kud/gh-ink';
 import { $ } from 'zx';
-import { useState, useEffect } from 'react';
+import React3, { useState, useRef, useEffect } from 'react';
 import { useInput, Box, Text } from 'ink';
 import { useTabs, colors, Tabs, useListCursor, ScrollView } from '@kud/ink-ui';
-import { fetchHealth, fetchPrComments } from '@kud/gh';
+import { fetchHealth, fetchPrComments, fetchDefaultBranch } from '@kud/gh';
 import { sizePartsOf, sizeOf, filesOf } from '@kud/gh-workflow';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { readFileSync, mkdirSync, writeFileSync } from 'fs';
@@ -99,23 +99,53 @@ var fetchBody = async (kind, repo, number) => {
   }
 };
 var DIVIDER = " \xB7 ";
-var summaryOf = (item, data, cols) => {
+var SUMMARY_KEYS = [
+  "size",
+  "files",
+  "draft",
+  "head",
+  "base",
+  "author",
+  "opened"
+];
+var separatorBefore = (key, previous) => key === "base" && previous === "head" ? " " : DIVIDER;
+var joinCells = (cells) => {
+  let line = "";
+  let previous = null;
+  cells.forEach((cell, i) => {
+    if (!cell) return;
+    const key = SUMMARY_KEYS[i];
+    line = line ? line + separatorBefore(key, previous) + cell : cell;
+    previous = key;
+  });
+  return line;
+};
+var summaryOf = (item, data, cols, defaultBranch) => {
   const size = data ? sizeOf(data) : null;
   const files = data ? filesOf(data) : null;
-  const base = data?.baseRefName;
+  const baseRef = data?.baseRefName;
   const author = item.author ? item.author : null;
   const opened = item.age ? `opened ${item.age} ago` : null;
-  const branches = base ? item.branch ? `${item.branch} \u2192 ${base}` : `\u2192 ${base}` : item.branch ?? null;
-  const parts = (branch) => [branch, author, opened].filter((p) => !!p);
-  const full = parts(branches);
-  const line = (ps) => ps.join(DIVIDER);
-  const width = (ps) => (size ? size.length + DIVIDER.length : 0) + (files ? files.length + DIVIDER.length : 0) + line(ps).length;
-  const draft = item.health === "draft";
-  const prefix = draft ? `~ draft${DIVIDER}` : "";
-  if (width(full) + prefix.length <= cols)
-    return { size, files, rest: prefix + line(full) };
-  const shortened = parts(base ? `\u2192 ${base}` : null);
-  return { size, files, rest: prefix + line(shortened) };
+  const showBase = baseRef !== void 0 && baseRef !== defaultBranch;
+  const base = showBase ? `\u2192 ${baseRef}` : null;
+  const draft = item.health === "draft" ? `~ draft` : null;
+  const widthOf = (s) => joinCells([s.size, s.files, s.draft, s.head, s.base, s.author, s.opened]).length;
+  const full = {
+    size,
+    files,
+    draft,
+    head: item.branch ?? null,
+    base,
+    author,
+    opened
+  };
+  const rungs = ["author", "opened", "head"];
+  const line = { ...full };
+  for (const cell of rungs) {
+    if (widthOf(line) <= cols) return line;
+    line[cell] = null;
+  }
+  return line;
 };
 var jobIdOf = (url) => url?.match(/\/job\/(\d+)/)?.[1] ?? null;
 var stripTimestamp = (line) => line.replace(/^\d{4}-\d\d-\d\dT[\d:.]+Z\s?/, "").replace(/\s+$/, "");
@@ -175,8 +205,7 @@ var CheckLogView = ({
       live = false;
     };
   }, [repo, jobId]);
-  useInput((input, key) => {
-    if (key.escape || input === "q") return onBack();
+  useInput((input) => {
     if (input === "o" && url) $`open ${url}`.catch(() => {
     });
   });
@@ -196,7 +225,7 @@ var CheckLogView = ({
         ["\u2191\u2193/space", "scroll"],
         ["g/G", "top/tail"],
         ["o", "open"],
-        ["q/esc", "back"]
+        ["esc", "back"]
       ],
       children: /* @__PURE__ */ jsx(ScrollView, { lines, initialStart: jumpTo })
     }
@@ -264,8 +293,7 @@ var FilePicker = ({
     const ed = await openInEditor(repoPath, f);
     setNote(`\u2197 ${f.path}${f.line ? `:${f.line}` : ""} \u2014 ${ed}`);
   };
-  useInput((input, key) => {
-    if (key.escape || input === "q") return onBack();
+  useInput((_input, key) => {
     if (key.return && list[safeCursor]) void open(list[safeCursor]);
   });
   return /* @__PURE__ */ jsxs(
@@ -276,7 +304,7 @@ var FilePicker = ({
       hints: [
         ["\u2191\u2193", "nav"],
         ["\u21B5", "open in editor"],
-        ["q/esc", "back"]
+        ["esc", "back"]
       ],
       children: [
         !files ? /* @__PURE__ */ jsx(Text, { color: colors.info, children: "Fetching files\u2026" }) : list.length === 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "No files referenced in review comments." }) : /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: list.map((f, i) => /* @__PURE__ */ jsxs(Box, { children: [
@@ -338,7 +366,9 @@ var PrView = ({
   defaultTab,
   onRefresh,
   onRemove,
-  onMerged
+  onMerged,
+  registerPeel,
+  onTyping
 }) => {
   const [log, setLog] = useState(null);
   const [ai, setAi] = useState(false);
@@ -369,8 +399,43 @@ var PrView = ({
     `pr-health-${item.repo}-${item.number}`,
     () => fetchHealth(item.repo, item.number)
   );
-  const summary = summaryOf(item, health.data, process.stdout.columns ?? 80);
+  const defaultBranch = useCachedResource(
+    `repo-default-branch-${item.repo}`,
+    () => fetchDefaultBranch(item.repo)
+  );
+  const summary = summaryOf(
+    item,
+    health.data,
+    process.stdout.columns ?? 80,
+    defaultBranch.data ?? void 0
+  );
   const sizeParts = health.data ? sizePartsOf(health.data) : null;
+  const summaryCells = [
+    { key: "size", text: summary.size },
+    { key: "files", text: summary.files },
+    { key: "draft", text: summary.draft },
+    { key: "head", text: summary.head },
+    { key: "base", text: summary.base },
+    { key: "author", text: summary.author },
+    { key: "opened", text: summary.opened }
+  ].filter((c) => !!c.text);
+  const aiPeel = useRef(null);
+  const peel = () => {
+    if (menu.actions !== null) return menu.close(), true;
+    if (replying) return true;
+    if (log !== null) return setLog(null), true;
+    if (files) return setFiles(false), true;
+    if (ai) return aiPeel.current?.() ?? (setAi(false), true);
+    if (copy) return setCopy(false), true;
+    return false;
+  };
+  useEffect(() => {
+    registerPeel?.(peel);
+    return () => registerPeel?.(null);
+  });
+  useEffect(() => {
+    onTyping?.(replying);
+  }, [replying, onTyping]);
   const checkLabel = (c) => c.workflowName ? `${c.workflowName} / ${c.context ?? c.name}` : c.context ?? c.name ?? "";
   const onOpenCheck = (c) => {
     const url = c.detailsUrl ?? c.targetUrl ?? "";
@@ -383,7 +448,6 @@ var PrView = ({
   useInput(
     (input, key) => {
       if (menu.handleKey(key)) return;
-      if (key.escape || input === "q") return onBack();
       if (input === "M") {
         menu.open([
           ...buildActions(
@@ -454,7 +518,8 @@ var PrView = ({
         item,
         login,
         prompt: seedPromptFor(item),
-        onBack: () => setAi(false)
+        onBack: () => setAi(false),
+        peelRef: aiPeel
       }
     );
   if (copy)
@@ -488,7 +553,7 @@ var PrView = ({
     ["M", "actions"],
     ["\u2190\u2192", "tab"],
     ["o", "open PR"],
-    ["q", "back"]
+    ["esc", "back"]
   ] : [
     ["\u2191\u2193", "thread"],
     ["x", "resolve"],
@@ -498,7 +563,7 @@ var PrView = ({
     ["a", "AI"],
     ["y", "copy prompt"],
     ["\u2190\u2192", "tab"],
-    ["q", "back"]
+    ["esc", "back"]
   ];
   return /* @__PURE__ */ jsxs(
     DrillView,
@@ -507,17 +572,17 @@ var PrView = ({
       subtitle: item.title,
       hints,
       children: [
-        summary.size || summary.files || summary.rest ? /* @__PURE__ */ jsxs(Box, { children: [
-          sizeParts ? /* @__PURE__ */ jsxs(Text, { bold: true, children: [
+        summaryCells.length ? /* @__PURE__ */ jsx(Box, { children: summaryCells.map(({ key, text }, i) => /* @__PURE__ */ jsxs(React3.Fragment, { children: [
+          i > 0 ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: separatorBefore(
+            key,
+            summaryCells[i - 1].key
+          ) }) : null,
+          key === "size" && sizeParts ? /* @__PURE__ */ jsxs(Text, { bold: true, children: [
             /* @__PURE__ */ jsx(Text, { color: colors.success, children: sizeParts.added }),
             " ",
             /* @__PURE__ */ jsx(Text, { color: colors.error, children: sizeParts.removed })
-          ] }) : null,
-          summary.size && (summary.files || summary.rest) ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: " \xB7 " }) : null,
-          summary.files ? /* @__PURE__ */ jsx(Text, { children: summary.files }) : null,
-          summary.files && summary.rest ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: " \xB7 " }) : null,
-          summary.rest ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: summary.rest }) : null
-        ] }) : null,
+          ] }) : key === "files" || key === "base" ? /* @__PURE__ */ jsx(Text, { children: text }) : /* @__PURE__ */ jsx(Text, { dimColor: true, children: text })
+        ] }, key)) }) : null,
         /* @__PURE__ */ jsx(Box, { marginBottom: 1, marginTop: 1, children: /* @__PURE__ */ jsx(Tabs, { active: tab, items: tabItems }) }),
         menu.actions ? /* @__PURE__ */ jsx(ActionMenu, { item, actions: menu.actions, cursor: menu.cursor }) : tab === "health" ? /* @__PURE__ */ jsx(
           HealthPanel,
@@ -549,7 +614,9 @@ var PrView = ({
 var IssueView = ({
   item,
   login,
-  onBack
+  onBack,
+  registerPeel,
+  onTyping
 }) => {
   const [replying, setReplying] = useState(false);
   const [ai, setAi] = useState(false);
@@ -561,9 +628,22 @@ var IssueView = ({
   const tabItems = [
     { value: "conversation", label: "Conversation" }
   ];
+  const aiPeel = useRef(null);
+  const peel = () => {
+    if (replying) return true;
+    if (ai) return aiPeel.current?.() ?? (setAi(false), true);
+    if (copy) return setCopy(false), true;
+    return false;
+  };
+  useEffect(() => {
+    registerPeel?.(peel);
+    return () => registerPeel?.(null);
+  });
+  useEffect(() => {
+    onTyping?.(replying);
+  }, [replying, onTyping]);
   useInput(
     (input, key) => {
-      if (key.escape || input === "q") return onBack();
       if (input === "o") $`open ${item.url}`.catch(() => {
       });
       if (input === "a") setAi(true);
@@ -578,7 +658,8 @@ var IssueView = ({
         item,
         login,
         prompt: seedPromptFor({ ...item, kind: "issue" }),
-        onBack: () => setAi(false)
+        onBack: () => setAi(false),
+        peelRef: aiPeel
       }
     );
   if (copy)
@@ -599,7 +680,7 @@ var IssueView = ({
         ["a", "AI"],
         ["y", "copy prompt"],
         ["o", "open in browser"],
-        ["q/esc", "back"]
+        ["esc", "back"]
       ],
       children: [
         /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsx(Tabs, { active: "conversation", items: tabItems }) }),
@@ -627,13 +708,24 @@ var detailFor = (ctx) => ctx.kind === "pr" ? /* @__PURE__ */ jsx(
     onBack: ctx.onBack,
     onRefresh: ctx.onRefresh,
     onRemove: ctx.onRemove,
-    onMerged: ctx.onMerged
+    onMerged: ctx.onMerged,
+    registerPeel: ctx.registerPeel,
+    onTyping: ctx.onTyping
   }
 ) : (
   // No refresh/remove/merged: IssueView has no action menu to hang them off,
   // so passing them would type-check into a handler nothing ever calls. They
   // belong here the day it grows the `M` menu PrView has.
-  /* @__PURE__ */ jsx(IssueView, { item: ctx.item, login: ctx.login, onBack: ctx.onBack })
+  /* @__PURE__ */ jsx(
+    IssueView,
+    {
+      item: ctx.item,
+      login: ctx.login,
+      onBack: ctx.onBack,
+      registerPeel: ctx.registerPeel,
+      onTyping: ctx.onTyping
+    }
+  )
 );
 
 export { IssueView, PrView, checkDrillFor, defineCockpit, detailFor, hasPatterns, parseArgs, registerCheckDrills };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/gh-cockpit",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "description": "A configurable GitHub cockpit for the terminal — your PRs, reviews and issues in one Ink TUI, grouped by whose move it is.",
   "type": "module",
   "main": "dist/index.js",
@@ -53,11 +53,11 @@
     "react": ">=19"
   },
   "dependencies": {
-    "@kud/gh": "0.16.0",
-    "@kud/gh-ink": "0.56.0",
+    "@kud/gh": "0.17.0",
+    "@kud/gh-ink": "0.57.0",
     "@kud/ink-ui": "0.29.0",
     "zx": "8.8.5",
-    "@kud/gh-workflow": "0.12.0"
+    "@kud/gh-workflow": "0.12.1"
   },
   "devDependencies": {
     "@types/node": "22.20.1",