dev-cockpit 0.3.3 → 0.4.0

package/dist/index.js

@@ -15378,18 +15378,18 @@ var require_react_jsx_runtime_development = __commonJS({
       function isValidElement(object) {
         return "object" === typeof object && null !== object && object.$$typeof === REACT_ELEMENT_TYPE;
       }
-      var React7 = require_react(), REACT_ELEMENT_TYPE = Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = Symbol.for("react.memo"), REACT_LAZY_TYPE = Symbol.for("react.lazy"), REACT_ACTIVITY_TYPE = Symbol.for("react.activity"), REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"), ReactSharedInternals = React7.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, hasOwnProperty = Object.prototype.hasOwnProperty, isArrayImpl = Array.isArray, createTask = console.createTask ? console.createTask : function() {
+      var React8 = require_react(), REACT_ELEMENT_TYPE = Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = Symbol.for("react.memo"), REACT_LAZY_TYPE = Symbol.for("react.lazy"), REACT_ACTIVITY_TYPE = Symbol.for("react.activity"), REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference"), ReactSharedInternals = React8.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, hasOwnProperty = Object.prototype.hasOwnProperty, isArrayImpl = Array.isArray, createTask = console.createTask ? console.createTask : function() {
         return null;
       };
-      React7 = {
+      React8 = {
         react_stack_bottom_frame: function(callStackForError) {
           return callStackForError();
         }
       };
       var specialPropKeyWarningShown;
       var didWarnAboutElementRef = {};
-      var unknownOwnerDebugStack = React7.react_stack_bottom_frame.bind(
-        React7,
+      var unknownOwnerDebugStack = React8.react_stack_bottom_frame.bind(
+        React8,
         UnknownOwner
       )();
       var unknownOwnerDebugTask = createTask(getTaskName(UnknownOwner));
@@ -83869,8 +83869,40 @@ var v1ToV2 = (raw) => {
   if (watchers === void 0) return { ...rest, version: 2 };
   return { ...rest, processes: watchers, version: 2 };
 };
+var v2ToV3 = (raw) => {
+  const existing = raw["keybindings"] ?? {};
+  const merged = {};
+  for (const [k, v] of Object.entries(existing)) {
+    const ids = Array.isArray(v) ? v : [v];
+    merged[k] = ids.filter((s) => typeof s === "string" && s.length > 0);
+  }
+  const health = Array.isArray(raw["health"]) ? raw["health"] : [];
+  const migratedHealth = health.map((entry) => {
+    if (!entry || typeof entry !== "object") return entry;
+    const e = entry;
+    const rem = e["remediation"];
+    const id = e["id"];
+    if (!rem || typeof rem.key !== "string" || !id) return entry;
+    const key = rem.key;
+    const bucket = merged[key] ?? [];
+    if (!bucket.includes(id)) bucket.push(id);
+    merged[key] = bucket;
+    const remRest = {};
+    for (const [k, v] of Object.entries(rem)) {
+      if (k !== "key") remRest[k] = v;
+    }
+    return { ...e, remediation: remRest };
+  });
+  const result = { ...raw, version: 3 };
+  result["health"] = migratedHealth;
+  if (Object.keys(merged).length > 0) {
+    result["keybindings"] = merged;
+  }
+  return result;
+};
 var MIGRATORS = {
-  1: v1ToV2
+  1: v1ToV2,
+  2: v2ToV3
 };
 var MigrationError = class extends Error {
   constructor(fromVersion, toVersion, reason) {
@@ -83900,7 +83932,7 @@ function runMigrations(raw, fromVersion, toVersion) {
 }
 
 // src/core/config.ts
-var CONFIG_VERSION = 2;
+var CONFIG_VERSION = 3;
 var NotifyOverrideSchema = external_exports.union([
   external_exports.literal(false),
   external_exports.object({
@@ -83935,15 +83967,6 @@ var HighlightSchema = external_exports.object({
   severity: external_exports.enum(["info", "warn", "error"]).optional().default("info")
 });
 var RemediationSchema = external_exports.object({
-  /**
-   * Optional keypress binding on the Health pane. When omitted, the
-   * remediation is documentation-only — the row shows the label but pressing
-   * any key does nothing for this entry. Useful when several health entries
-   * share the same shell command and you only want ONE row to be the
-   * trigger — see `docker compose up -d` covering all four container-running
-   * checks in the awc wrapper config.
-   */
-  key: external_exports.string().optional(),
   label: external_exports.string(),
   command: external_exports.string(),
   cwd: external_exports.string().optional()
@@ -84007,6 +84030,7 @@ var ComposerSettingsSchema = external_exports.object({
    */
   packageDirs: external_exports.array(external_exports.string()).optional().default(["."])
 });
+var KeybindingsSchema = external_exports.record(external_exports.union([external_exports.string(), external_exports.array(external_exports.string())]));
 var MountSettingsSchema = external_exports.object({
   /**
    * Override path for the generated docker-compose overlay. When unset
@@ -84040,6 +84064,7 @@ var BaseCockpitConfigSchema = external_exports.object({
     manifestFile: "mount.manifest.json"
   }),
   composer: ComposerSettingsSchema.optional().default({ packageDirs: ["."] }),
+  keybindings: KeybindingsSchema.optional().default({}),
   /** Which pane the cockpit lands on when it boots. Profile may override. */
   defaultPane: external_exports.enum(["repos", "output", "health", "help"]).optional().default("repos"),
   /** Named keystroke-bound shell commands surfaced via the `:` palette. */
@@ -84051,6 +84076,16 @@ var BaseCockpitConfigSchema = external_exports.object({
    */
   profile: external_exports.record(external_exports.unknown()).optional().default({})
 });
+function normaliseKeybindings(raw) {
+  const out = {};
+  if (!raw) return out;
+  for (const [key, value] of Object.entries(raw)) {
+    const ids = Array.isArray(value) ? value : [value];
+    const clean = ids.filter((s) => typeof s === "string" && s.length > 0);
+    if (clean.length > 0) out[key] = clean;
+  }
+  return out;
+}
 var ConfigVersionError = class extends Error {
   constructor(filePath, found, supported) {
     super(
@@ -84166,7 +84201,7 @@ var {
 } = import_index.default;
 
 // src/cockpit/Cockpit.tsx
-var import_react8 = __toESM(require_react(), 1);
+var import_react9 = __toESM(require_react(), 1);
 
 // src/cockpit/hooks/useCockpitStore.ts
 var import_react = __toESM(require_react(), 1);
@@ -84213,6 +84248,7 @@ var cockpitStore = createStore()((set, get2) => ({
   output: [],
   outputFilter: {},
   knownSources: [],
+  keybindings: {},
   activeModal: null,
   actions: [],
   commandFilter: "",
@@ -84306,6 +84342,7 @@ var cockpitStore = createStore()((set, get2) => ({
   setActiveRemediation: (remediation) => set({ activeRemediation: remediation }),
   setHelpConfig: (config) => set({ helpConfig: config }),
   setFocus: (focus) => set({ focus }),
+  setKeybindings: (bindings) => set({ keybindings: bindings }),
   setActions: (actions) => set({ actions }),
   setCommandFilter: (filter) => set((state) => {
     const filtered = filterActions(state.actions, filter);
@@ -84678,7 +84715,17 @@ function RecentErrorRow({ err }) {
 }
 
 // src/cockpit/panes/Health.tsx
+var import_react4 = __toESM(require_react(), 1);
 var import_jsx_runtime3 = __toESM(require_jsx_runtime(), 1);
+function buildReverseKeybindings(bindings) {
+  const out = {};
+  for (const [key, ids] of Object.entries(bindings)) {
+    for (const id of ids) {
+      if (!(id in out)) out[id] = key;
+    }
+  }
+  return out;
+}
 var SEVERITY_GLYPH = { ok: "\u2713", warn: "\u26A0", error: "\u2717" };
 var SEVERITY_COLOR = {
   ok: "green",
@@ -84692,6 +84739,8 @@ function Health() {
   const focus = useCockpitStore((s) => s.focus);
   const notificationsEnabledSession = useCockpitStore((s) => s.notificationsEnabledSession);
   const activeRemediation = useCockpitStore((s) => s.activeRemediation);
+  const keybindings = useCockpitStore((s) => s.keybindings);
+  const idToKey = (0, import_react4.useMemo)(() => buildReverseKeybindings(keybindings), [keybindings]);
   const isFocused = focus === "health";
   if (health.length === 0) {
     return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { dimColor: true, children: "running health checks\u2026" }) });
@@ -84708,7 +84757,8 @@ function Health() {
       const isRunning = activeRemediation?.healthId === item.id;
       const glyph = isRunning ? "\u2026" : SEVERITY_GLYPH[item.severity] ?? "?";
       const color = isRunning ? "yellow" : SEVERITY_COLOR[item.severity] ?? "white";
-      const remKey = item.remediationKey ? ` [${item.remediationKey}]` : "";
+      const displayKey = idToKey[item.id] ?? item.remediationKey ?? null;
+      const remKey = displayKey ? ` [${displayKey}]` : "";
       return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box_default, { flexDirection: "column", children: [
         /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box_default, { children: [
           /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color: isSelected ? "cyan" : void 0, children: isSelected ? "\u25B6 " : "  " }),
@@ -84731,7 +84781,7 @@ function Health() {
 }
 
 // src/cockpit/panes/Help.tsx
-var import_react4 = __toESM(require_react(), 1);
+var import_react5 = __toESM(require_react(), 1);
 
 // src/cockpit/help/loader.ts
 import fs5 from "node:fs";
@@ -87542,7 +87592,7 @@ function Help2() {
   const helpConfig = useCockpitStore((s) => s.helpConfig);
   const { stdout } = use_stdout_default();
   const isActive = focus === "help";
-  const initial = (0, import_react4.useMemo)(() => {
+  const initial = (0, import_react5.useMemo)(() => {
     const result = loadHelpPages({
       sources: helpConfig.sources,
       defaultPage: helpConfig.defaultPage
@@ -87551,17 +87601,17 @@ function Help2() {
     return { pages: [FALLBACK_PAGE], defaultIndex: 0 };
   }, [helpConfig.sources, helpConfig.defaultPage]);
   const pages = initial.pages;
-  const [pageIndex, setPageIndex] = (0, import_react4.useState)(initial.defaultIndex);
-  const [scrollOffset, setScrollOffset] = (0, import_react4.useState)(0);
-  const lastPageIndexRef = (0, import_react4.useRef)(pageIndex);
-  (0, import_react4.useEffect)(() => {
+  const [pageIndex, setPageIndex] = (0, import_react5.useState)(initial.defaultIndex);
+  const [scrollOffset, setScrollOffset] = (0, import_react5.useState)(0);
+  const lastPageIndexRef = (0, import_react5.useRef)(pageIndex);
+  (0, import_react5.useEffect)(() => {
     if (lastPageIndexRef.current !== pageIndex) {
       lastPageIndexRef.current = pageIndex;
       setScrollOffset(0);
     }
   }, [pageIndex]);
   const activePage = pages[pageIndex] ?? pages[0];
-  const renderedLines = (0, import_react4.useMemo)(
+  const renderedLines = (0, import_react5.useMemo)(
     () => renderMarkdown(activePage.body).split("\n"),
     [activePage.body]
   );
@@ -87689,20 +87739,20 @@ function Footer({ legends } = {}) {
 }
 
 // src/cockpit/panes/FilterModal.tsx
-var import_react5 = __toESM(require_react(), 1);
+var import_react6 = __toESM(require_react(), 1);
 var import_jsx_runtime7 = __toESM(require_jsx_runtime(), 1);
 var SEVERITIES = [void 0, "info", "warn", "error"];
 function FilterModal() {
   const outputFilter = useCockpitStore((s) => s.outputFilter);
   const knownSources = useCockpitStore((s) => s.knownSources);
-  const [severityDraft, setSeverityDraft] = (0, import_react5.useState)(
+  const [severityDraft, setSeverityDraft] = (0, import_react6.useState)(
     outputFilter.severity
   );
   const initialSelected = new Set(
     outputFilter.sources && outputFilter.sources.length > 0 ? outputFilter.sources : knownSources
   );
-  const [selectedSources, setSelectedSources] = (0, import_react5.useState)(initialSelected);
-  const [cursor, setCursor] = (0, import_react5.useState)(0);
+  const [selectedSources, setSelectedSources] = (0, import_react6.useState)(initialSelected);
+  const [cursor, setCursor] = (0, import_react6.useState)(0);
   const sources = knownSources;
   const hasSources = sources.length > 0;
   use_input_default((input, key) => {
@@ -87787,11 +87837,11 @@ function FilterModal() {
 }
 
 // src/cockpit/panes/SearchModal.tsx
-var import_react6 = __toESM(require_react(), 1);
+var import_react7 = __toESM(require_react(), 1);
 var import_jsx_runtime8 = __toESM(require_jsx_runtime(), 1);
 function SearchModal() {
   const outputFilter = useCockpitStore((s) => s.outputFilter);
-  const [query, setQuery] = (0, import_react6.useState)(outputFilter.search ?? "");
+  const [query, setQuery] = (0, import_react7.useState)(outputFilter.search ?? "");
   use_input_default((input, key) => {
     if (key.escape) {
       cockpitStore.getState().setActiveModal(null);
@@ -88026,7 +88076,7 @@ function useGlobalKeys(opts) {
 }
 
 // src/health/useHealth.ts
-var import_react7 = __toESM(require_react(), 1);
+var import_react8 = __toESM(require_react(), 1);
 
 // src/health/scheduler.ts
 import path9 from "node:path";
@@ -88159,10 +88209,21 @@ var HealthScheduler = class {
 };
 
 // src/health/remediations.ts
-async function runRemediation(key, checks, ctx, workspaceRoot) {
-  const check = checks.find((c3) => c3.remediation.key === key);
-  if (!check) return;
-  await dispatchRemediation(check.remediation, ctx, workspaceRoot, check.id);
+function findChecksByKey(key, checks, keybindings) {
+  const ids = keybindings?.[key];
+  if (ids && ids.length > 0) {
+    return ids.map((id) => checks.find((c4) => c4.id === id)).filter((c4) => Boolean(c4));
+  }
+  const c3 = checks.find((c4) => c4.remediation.key === key);
+  return c3 ? [c3] : [];
+}
+async function runRemediation(key, checks, ctx, workspaceRoot, keybindings) {
+  const matched = findChecksByKey(key, checks, keybindings);
+  await Promise.all(
+    matched.map(
+      (check) => dispatchRemediation(check.remediation, ctx, workspaceRoot, check.id)
+    )
+  );
 }
 function findRemediation(key, checks) {
   return checks.find((c3) => c3.remediation.key === key);
@@ -88449,23 +88510,23 @@ function buildHealthContext(workspaceRoot, appendOutput) {
 
 // src/health/useHealth.ts
 function useHealth(opts) {
-  const checks = (0, import_react7.useMemo)(() => {
+  const checks = (0, import_react8.useMemo)(() => {
     if (!opts) return [];
     return buildHealthRegistry({
       profileChecks: opts.profileChecks,
       configEntries: opts.configEntries
     });
   }, [opts]);
-  const checksRef = (0, import_react7.useRef)(checks);
-  const ctxRef = (0, import_react7.useRef)(opts?.ctx);
-  const optsRef = (0, import_react7.useRef)(opts);
-  const schedulerRef = (0, import_react7.useRef)(null);
-  (0, import_react7.useEffect)(() => {
+  const checksRef = (0, import_react8.useRef)(checks);
+  const ctxRef = (0, import_react8.useRef)(opts?.ctx);
+  const optsRef = (0, import_react8.useRef)(opts);
+  const schedulerRef = (0, import_react8.useRef)(null);
+  (0, import_react8.useEffect)(() => {
     checksRef.current = checks;
     ctxRef.current = opts?.ctx;
     optsRef.current = opts;
   }, [checks, opts]);
-  (0, import_react7.useEffect)(() => {
+  (0, import_react8.useEffect)(() => {
     if (!opts) return;
     if (checks.length === 0) return;
     const scheduler3 = new HealthScheduler({
@@ -88504,21 +88565,25 @@ function useHealth(opts) {
     runRemediation: (key) => {
       const list3 = checksRef.current;
       const ctx = ctxRef.current ?? buildDefaultCtx(optsRef.current?.workspaceRoot ?? ".");
-      const check = list3.find((c3) => c3.remediation.key === key);
-      if (!check) return null;
+      const keybindings = optsRef.current?.keybindings;
+      const matched = findChecksByKey(key, list3, keybindings);
+      if (matched.length === 0) return null;
+      const first = matched[0];
+      const banner = matched.length === 1 ? first.remediation.label : `${matched.length} remediations`;
       const promise = runRemediation(
         key,
         list3,
         ctx,
-        optsRef.current?.workspaceRoot ?? "."
+        optsRef.current?.workspaceRoot ?? ".",
+        keybindings
       ).finally(() => {
         void schedulerRef.current?.runAll();
       });
       return {
-        label: check.remediation.label,
+        label: banner,
         promise,
-        healthId: check.id,
-        healthLabel: check.label
+        healthId: first.id,
+        healthLabel: first.label
       };
     }
   };
@@ -88551,8 +88616,8 @@ function Cockpit(props) {
   const { stdout } = use_stdout_default();
   const focus = useCockpitStore((s) => s.focus);
   const activeModal = useCockpitStore((s) => s.activeModal);
-  const [rows, setRows] = (0, import_react8.useState)(stdout.rows ?? 24);
-  (0, import_react8.useEffect)(() => {
+  const [rows, setRows] = (0, import_react9.useState)(stdout.rows ?? 24);
+  (0, import_react9.useEffect)(() => {
     const onResize = () => setRows(stdout.rows ?? 24);
     stdout.on("resize", onResize);
     return () => {
@@ -91386,7 +91451,7 @@ function hasLockfile(workspaceRoot) {
 }
 
 // src/runCockpit.ts
-var import_react9 = __toESM(require_react(), 1);
+var import_react10 = __toESM(require_react(), 1);
 var ENTER_ALT_SCREEN = "\x1B[?1049h\x1B[H";
 var EXIT_ALT_SCREEN = "\x1B[?1049l";
 function runCockpit(opts = {}) {
@@ -91425,7 +91490,7 @@ function runCockpit(opts = {}) {
       throw err;
     });
   }
-  const ink = render_default(import_react9.default.createElement(Cockpit, cockpitProps), { exitOnCtrlC: true });
+  const ink = render_default(import_react10.default.createElement(Cockpit, cockpitProps), { exitOnCtrlC: true });
   return {
     waitUntilExit: async () => {
       try {
@@ -91533,6 +91598,7 @@ async function devCommand(opts = {}) {
   const requestedHidden = requestedPane === "repos" && reposEmpty || requestedPane === "health" && healthEmpty;
   const initialFocus = requestedHidden ? "output" : requestedPane;
   cockpitStore.getState().setFocus(initialFocus);
+  cockpitStore.getState().setKeybindings(normaliseKeybindings(config.keybindings));
   const builtinActions = buildBuiltinActions(config);
   const actions = buildActionRegistry(
     [...config.actions],
@@ -91664,7 +91730,8 @@ async function devCommand(opts = {}) {
         exclude: config.notifications.exclude
       },
       appName: config.appName,
-      subscribeFsEvents: bootResult.subscribeFsEvents
+      subscribeFsEvents: bootResult.subscribeFsEvents,
+      keybindings: normaliseKeybindings(config.keybindings)
     }
   });
   for (const proc of config.processes) {
@@ -91802,6 +91869,29 @@ function quote(value) {
   if (/^[A-Za-z0-9_./-]+$/.test(value)) return value;
   return `'${value.replace(/'/g, "''")}'`;
 }
+function renderKeybindings(checks) {
+  const bindings = {};
+  for (const c3 of checks) {
+    const key = c3.remediation.key;
+    if (!key) continue;
+    if (!bindings[key]) bindings[key] = [];
+    if (!bindings[key].includes(c3.id)) bindings[key].push(c3.id);
+  }
+  const entries = Object.entries(bindings);
+  if (entries.length === 0) return [];
+  const out = ["keybindings:"];
+  for (const [key, ids] of entries) {
+    if (ids.length === 1) {
+      out.push(indent(`${quote(key)}: ${quote(ids[0])}`, 1));
+    } else {
+      out.push(indent(`${quote(key)}:`, 1));
+      for (const id of ids) {
+        out.push(indent(`- ${quote(id)}`, 2));
+      }
+    }
+  }
+  return out;
+}
 function renderHealth(checks) {
   if (checks.length === 0) return [];
   const out = ["health:"];
@@ -91829,9 +91919,6 @@ function renderHealth(checks) {
         break;
     }
     out.push(indent(`  remediation:`, 1));
-    if (c3.remediation.key) {
-      out.push(indent(`    key: ${quote(c3.remediation.key)}`, 1));
-    }
     out.push(indent(`    label: ${quote(c3.remediation.label)}`, 1));
     out.push(indent(`    command: ${quote(c3.remediation.command)}`, 1));
   }
@@ -91896,7 +91983,7 @@ function renderWizardYaml(result) {
   blocks.push([
     "# Generated by `dev-cockpit init-config --interactive`. Edit freely.",
     "",
-    "version: 2",
+    "version: 3",
     `appName: ${quote(result.appName)}`
   ]);
   const processes = renderProcesses(result.processes);
@@ -91909,6 +91996,8 @@ function renderWizardYaml(result) {
   if (highlights.length > 0) blocks.push(highlights);
   const health = renderHealth(result.health);
   if (health.length > 0) blocks.push(health);
+  const keybindings = renderKeybindings(result.health);
+  if (keybindings.length > 0) blocks.push(keybindings);
   const actions = renderActions(result.actions);
   if (actions.length > 0) blocks.push(actions);
   blocks.push(["notifications:", indent(`enabled: ${result.notifications.enabled}`, 1)]);