@mateusbmp/backup-manager 0.1.1 → 0.2.2

package/dist/cli.js

@@ -899,8 +899,11 @@ function useBackHandler(handler) {
 }
 function useHints(hints, deps = []) {
   const { setHints } = useApp();
+  const ref = useRef(hints);
+  ref.current = hints;
   useEffect(() => {
-    setHints(hints);
+    if (!hints) return;
+    setHints(hints.map((h, i) => h.run ? { ...h, run: () => ref.current?.[i]?.run?.() } : h));
   }, [setHints, ...deps]);
 }
 function Provider({ value, children }) {
@@ -1012,6 +1015,9 @@ function Muted({ children }) {
   const { theme: theme2 } = useApp();
   return /* @__PURE__ */ jsx3(Text2, { color: theme2.muted, children });
 }
+function FormTip() {
+  return /* @__PURE__ */ jsx3(Muted, { children: "Ctrl+\u2193 (or Alt+\u2193) reaches the buttons below; Ctrl-S also saves." });
+}
 function ErrorLine({ children }) {
   const { theme: theme2 } = useApp();
   return /* @__PURE__ */ jsxs2(Text2, { color: theme2.error, children: [
@@ -1150,12 +1156,31 @@ function Footer({
   theme: theme2,
   columns,
   hints,
-  global
+  global,
+  focused = false,
+  selected = 0
 }) {
-  return /* @__PURE__ */ jsxs3(Box3, { width: columns, children: [
-    /* @__PURE__ */ jsx4(KeyHints, { hints: [...hints, ...global] }),
-    /* @__PURE__ */ jsx4(Text3, { color: theme2.muted, children: " " })
-  ] });
+  if (!focused)
+    return /* @__PURE__ */ jsxs3(Box3, { width: columns, children: [
+      /* @__PURE__ */ jsx4(KeyHints, { hints: [...hints, ...global] }),
+      /* @__PURE__ */ jsx4(Text3, { color: theme2.muted, children: " " })
+    ] });
+  const buttons = [...hints, ...global].filter((h) => h.run);
+  return /* @__PURE__ */ jsx4(Box3, { width: columns, children: /* @__PURE__ */ jsxs3(Text3, { wrap: "truncate-end", children: [
+    buttons.map((b, i) => /* @__PURE__ */ jsxs3(Text3, { children: [
+      " ",
+      /* @__PURE__ */ jsx4(
+        Text3,
+        {
+          color: i === selected ? theme2.focus : theme2.accent,
+          inverse: i === selected,
+          bold: i === selected,
+          children: `[ ${b.label} ]`
+        }
+      )
+    ] }, `${b.key}-${b.label}`)),
+    /* @__PURE__ */ jsx4(Text3, { color: theme2.muted, children: "  \u2190\u2192 pick  \u23CE press  esc back" })
+  ] }) });
 }
 var SIDEBAR_WIDTH, WIDE;
 var init_Frame = __esm({
@@ -1273,10 +1298,12 @@ var init_Overlay = __esm({
       ["PgUp PgDn", "page"],
       ["\u23CE", "open / select"],
       ["Esc", "back"],
+      ["Ctrl/Alt + \u2190 \u2192 \u2193", "zones: sidebar \xB7 content \xB7 buttons (\u2191 back)"],
+      ["\u2190\u2192 \u23CE (buttons)", "pick and press a button: save, add, run\u2026"],
       ["Tab", "switch sidebar / content (next field in forms)"],
       ["1\u20139", "jump to a menu entry"],
       ["n \xB7 e \xB7 s", "new backup \xB7 environments \xB7 service"],
-      ["Ctrl-S", "save a form"],
+      ["Ctrl-S", "save a form (or its save button)"],
       ["?", "this help"],
       ["q", "quit (jobs keep running)"]
     ];
@@ -1358,7 +1385,9 @@ function useListNav(count, options) {
     },
     { isActive: options.isActive }
   );
-  return { index: Math.min(index, Math.max(0, count - 1)), setIndex };
+  const at = Math.min(index, Math.max(0, count - 1));
+  const select = () => count > 0 && options.onSelect?.(at);
+  return { index: at, setIndex, select };
 }
 function splitList(text) {
   const out = [];
@@ -1375,12 +1404,16 @@ function splitList(text) {
   out.push(current);
   return out.map((s) => s.trim()).filter(Boolean);
 }
-var isUp, isDown, joinList;
+var isZoneKey, plain, isUp, isDown, joinList;
 var init_keys = __esm({
   "src/ui/keys.ts"() {
     "use strict";
-    isUp = (input, key) => key.upArrow || input === "k";
-    isDown = (input, key) => key.downArrow || input === "j";
+    isZoneKey = (key) => Boolean(
+      (key.ctrl || key.meta) && (key.upArrow || key.downArrow || key.leftArrow || key.rightArrow)
+    );
+    plain = (key) => !key.ctrl && !key.meta;
+    isUp = (input, key) => plain(key) && (key.upArrow || input === "k");
+    isDown = (input, key) => plain(key) && (key.downArrow || input === "j");
     joinList = (items) => items.join(", ");
   }
 });
@@ -1492,19 +1525,22 @@ function Backups({ envName }) {
       if (b && env) navigate({ name: "backup-detail", env: env.name, id: b.id });
     }
   });
+  const shiftEnv = (delta) => setEnvIndex((i) => (i + delta + envs.length) % Math.max(1, envs.length));
+  const nextFilter = () => setFilter((f) => (f + 1) % FILTERS.length);
   useHints(
     [
-      { key: "\u23CE", label: "details" },
-      { key: "\u2190\u2192", label: "environment" },
-      { key: "f", label: `filter: ${status}` }
+      { key: "\u23CE", label: "details", run: () => nav.select() },
+      { key: "\u2190\u2192", label: "environment", run: () => shiftEnv(1) },
+      { key: "f", label: `filter: ${status}`, run: nextFilter }
     ],
     [status]
   );
   useInput2(
     (input, key) => {
-      if (key.leftArrow) setEnvIndex((i) => (i - 1 + envs.length) % Math.max(1, envs.length));
-      else if (key.rightArrow) setEnvIndex((i) => (i + 1) % Math.max(1, envs.length));
-      else if (input === "f") setFilter((f) => (f + 1) % FILTERS.length);
+      if (isZoneKey(key)) return;
+      if (key.leftArrow) shiftEnv(-1);
+      else if (key.rightArrow) shiftEnv(1);
+      else if (input === "f") nextFilter();
     },
     { isActive: active }
   );
@@ -1562,10 +1598,7 @@ function BackupDetail2({ envName, id }) {
     0,
     [config, envName, id]
   );
-  useHints([
-    { key: "\u2191\u2193", label: "scroll" },
-    { key: "esc", label: "back" }
-  ]);
+  useHints([{ key: "\u2191\u2193", label: "scroll" }]);
   const b = backup.data;
   const lines = [];
   if (b) {
@@ -1855,17 +1888,17 @@ function Dashboard() {
       if (env) navigate({ name: "backups", env: env.name });
     }
   });
+  const runNow = useRunNow(active, () => envs[nav.index]?.name);
   useHints(
     [
       { key: "\u2191\u2193", label: "move" },
-      { key: "\u23CE", label: "backups" },
-      { key: "r", label: "run now" },
-      { key: "n", label: "new backup" },
-      { key: "e", label: "environments" }
+      { key: "\u23CE", label: "backups", run: () => nav.select() },
+      { key: "r", label: "run now", run: runNow },
+      { key: "n", label: "new backup", run: () => navigate({ name: "new-backup" }) },
+      { key: "e", label: "environments", run: () => navigate({ name: "environments" }) }
     ],
     []
   );
-  useRunNow(active, () => envs[nav.index]?.name);
   if (!config) return null;
   if (config.environments.length === 0) {
     return /* @__PURE__ */ jsxs7(Panel, { title: "Welcome", width, height, children: [
@@ -1920,29 +1953,27 @@ function Dashboard() {
 }
 function useRunNow(active, envName) {
   const { services, config, navigate, toast, confirm } = useApp();
-  useInput3(
-    (input) => {
-      if (input !== "r" || !config) return;
-      const name2 = envName();
-      if (!name2) return;
-      void (async () => {
-        if (!await confirm({
-          title: "Run backup now",
-          message: `Back up every database and project of '${name2}' now?`,
-          confirmLabel: "Run"
-        }))
-          return;
-        try {
-          const job = await services.startBackup(config, [{ environment: name2 }]);
-          toast(`backup of ${name2} started`, "success");
-          navigate({ name: "job-live", id: job.id });
-        } catch (error) {
-          toast(error.message, "error");
-        }
-      })();
-    },
-    { isActive: active }
-  );
+  const runNow = () => {
+    const name2 = envName();
+    if (!config || !name2) return;
+    void (async () => {
+      if (!await confirm({
+        title: "Run backup now",
+        message: `Back up every database and project of '${name2}' now?`,
+        confirmLabel: "Run"
+      }))
+        return;
+      try {
+        const job = await services.startBackup(config, [{ environment: name2 }]);
+        toast(`backup of ${name2} started`, "success");
+        navigate({ name: "job-live", id: job.id });
+      } catch (error) {
+        toast(error.message, "error");
+      }
+    })();
+  };
+  useInput3((input) => input === "r" && runNow(), { isActive: active });
+  return runNow;
 }
 var init_Dashboard = __esm({
   "src/ui/screens/Dashboard.tsx"() {
@@ -1967,7 +1998,7 @@ function Doctor() {
   const report = usePolling(() => services.doctor({ db: true }), 0);
   const [offset, setOffset] = useState6(0);
   useHints([
-    { key: "r", label: "re-run" },
+    { key: "r", label: "re-run", run: () => report.refresh() },
     { key: "\u2191\u2193", label: "scroll" }
   ]);
   const color = { ok: theme2.success, warn: theme2.warning, fail: theme2.error };
@@ -2046,6 +2077,7 @@ function TextField({ value, onChange, focus, mask, placeholder, width }) {
     (input, key) => {
       const { value: v, cursor: cursor2 } = live.current;
       const at2 = Math.min(cursor2, v.length);
+      if (isZoneKey(key)) return;
       if (key.leftArrow) commit(v, Math.max(0, at2 - 1));
       else if (key.rightArrow) commit(v, Math.min(v.length, at2 + 1));
       else if (key.home || key.ctrl && input === "a") commit(v, 0);
@@ -2088,6 +2120,7 @@ var init_TextField = __esm({
   "src/ui/components/TextField.tsx"() {
     "use strict";
     init_context();
+    init_keys();
   }
 });
 
@@ -2123,6 +2156,7 @@ function Form(props) {
   };
   useInput6(
     (input, key) => {
+      if (isZoneKey(key)) return;
       if (key.ctrl && input === "s") return props.onSubmit(latest.current);
       if (key.escape) return props.onCancel();
       if (key.tab) return move(key.shift ? -1 : 1);
@@ -2234,6 +2268,7 @@ var init_Form = __esm({
   "src/ui/components/Form.tsx"() {
     "use strict";
     init_context();
+    init_keys();
     init_basics();
     init_TextField();
     focusable = (f) => f.kind !== "heading";
@@ -2323,12 +2358,6 @@ function DatabaseEdit({
   const [errors, setErrors] = useState9({});
   const [general, setGeneral] = useState9([]);
   const [test, setTest] = useState9(null);
-  useHints([
-    { key: "tab", label: "next field" },
-    { key: "\u2190\u2192", label: "change type" },
-    { key: "ctrl-s", label: "apply" },
-    { key: "esc", label: "cancel" }
-  ]);
   const validate = (values2) => {
     const parsed = DatabaseSchema.safeParse(buildDatabase(values2));
     if (!parsed.success) {
@@ -2368,6 +2397,12 @@ function DatabaseEdit({
     setTest({ state: "running" });
     void services.testConnection(env, db).then((r) => setTest({ state: "done", ...r }));
   };
+  useHints([
+    { key: "tab", label: "field" },
+    { key: "\u2190\u2192", label: "change" },
+    { key: "ctrl-s", label: "apply", run: () => submit(values) },
+    { key: "esc", label: "cancel", run: onCancel }
+  ]);
   const laravel = values.type === "laravel";
   const fields = [
     { kind: "text", key: "name", label: "Name", placeholder: "shop", error: errors.name },
@@ -2568,11 +2603,6 @@ function ProjectEdit({
   const [errors, setErrors] = useState10({});
   const [general, setGeneral] = useState10([]);
   const hint = useArtisanHint(String(values.path));
-  useHints([
-    { key: "tab", label: "next field" },
-    { key: "ctrl-s", label: "apply" },
-    { key: "esc", label: "cancel" }
-  ]);
   const submit = (values2) => {
     const candidate = {
       name: String(values2.name).trim(),
@@ -2601,6 +2631,11 @@ function ProjectEdit({
     );
     onApply({ ...env, projects, databases });
   };
+  useHints([
+    { key: "tab", label: "field" },
+    { key: "ctrl-s", label: "apply", run: () => submit(values) },
+    { key: "esc", label: "cancel", run: onCancel }
+  ]);
   const fields = [
     {
       kind: "text",
@@ -2709,7 +2744,7 @@ function EnvironmentEdit({
   envName,
   onboarding
 }) {
-  const { config, width, height, save, back, navigate, confirm, services, toast, theme: theme2 } = useApp();
+  const { config, width, height, save, back, navigate, confirm, services, toast } = useApp();
   const active = useScreenActive();
   const original = config && envName ? findEnvironment(config, envName) : void 0;
   const [draft, setDraft] = useState11(
@@ -2725,14 +2760,15 @@ function EnvironmentEdit({
   const [mode, setMode] = useState11({ kind: "env" });
   const [errors, setErrors] = useState11({});
   const [general, setGeneral] = useState11([]);
+  const cancel = () => onboarding ? void 0 : back();
   useHints(
     mode.kind === "env" ? [
       { key: "tab/\u2191\u2193", label: "field" },
       { key: "\u23CE", label: "open" },
       { key: "d", label: "remove item" },
-      { key: "ctrl-s", label: "save" },
-      { key: "esc", label: "cancel" }
-    ] : [],
+      { key: "ctrl-s", label: "save", run: () => void submit(values) },
+      ...onboarding ? [] : [{ key: "esc", label: "cancel", run: cancel }]
+    ] : null,
     [mode.kind]
   );
   if (!config) return null;
@@ -2962,7 +2998,7 @@ function EnvironmentEdit({
             values,
             onChange: setValues,
             onSubmit: (v) => void submit(v),
-            onCancel: () => onboarding ? void 0 : back(),
+            onCancel: cancel,
             isActive: active,
             width: width - 4,
             height: height - 4 - general.length
@@ -2970,7 +3006,7 @@ function EnvironmentEdit({
         ),
         /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", children: [
           general.map((g) => /* @__PURE__ */ jsx14(ErrorLine, { children: g }, g)),
-          onboarding && /* @__PURE__ */ jsx14(Text13, { color: theme2.muted, children: "Ctrl-S saves; you can add projects and databases now or later." })
+          onboarding && /* @__PURE__ */ jsx14(FormTip, {})
         ] })
       ]
     }
@@ -3004,34 +3040,41 @@ function Environments() {
     state: useSessionState("environments:index", 0),
     onSelect: (i) => navigate({ name: "environment-edit", env: envs[i]?.name })
   });
+  const runNow = useRunNow(active, () => envs[nav.index]?.name);
+  const add = () => navigate({ name: "environment-edit" });
+  const backups = () => {
+    const env = envs[nav.index];
+    if (env) navigate({ name: "backups", env: env.name });
+  };
+  const remove = () => {
+    const env = envs[nav.index];
+    if (!env || !config) return;
+    void (async () => {
+      const ok = await confirm({
+        title: "Delete environment",
+        message: `Remove '${env.name}' from the config? Its backups on disk are kept.`,
+        confirmLabel: "Delete",
+        danger: true
+      });
+      if (ok)
+        await save(
+          { ...config, environments: envs.filter((e) => e.name !== env.name) },
+          `deleted ${env.name}`
+        );
+    })();
+  };
   useHints([
-    { key: "\u23CE", label: "edit" },
-    { key: "a", label: "add" },
-    { key: "d", label: "delete" },
-    { key: "b", label: "backups" },
-    { key: "r", label: "run now" }
+    { key: "\u23CE", label: "edit", run: () => nav.select() },
+    { key: "a", label: "add", run: add },
+    { key: "d", label: "delete", run: remove },
+    { key: "b", label: "backups", run: backups },
+    { key: "r", label: "run now", run: runNow }
   ]);
-  useRunNow(active, () => envs[nav.index]?.name);
   useInput7(
     (input) => {
-      const env = envs[nav.index];
-      if (input === "a") navigate({ name: "environment-edit" });
-      else if (input === "b" && env) navigate({ name: "backups", env: env.name });
-      else if (input === "d" && env && config) {
-        void (async () => {
-          const ok = await confirm({
-            title: "Delete environment",
-            message: `Remove '${env.name}' from the config? Its backups on disk are kept.`,
-            confirmLabel: "Delete",
-            danger: true
-          });
-          if (ok)
-            await save(
-              { ...config, environments: envs.filter((e) => e.name !== env.name) },
-              `deleted ${env.name}`
-            );
-        })();
-      }
+      if (input === "a") add();
+      else if (input === "b") backups();
+      else if (input === "d") remove();
     },
     { isActive: active }
   );
@@ -3116,8 +3159,8 @@ function Jobs() {
     }
   });
   useHints([
-    { key: "\u23CE", label: "follow" },
-    { key: "x", label: "stop" }
+    { key: "\u23CE", label: "follow", run: () => nav.select() },
+    { key: "x", label: "stop", run: () => kill(list[nav.index]) }
   ]);
   useInput8((input) => input === "x" && kill(list[nav.index]), { isActive: active });
   return /* @__PURE__ */ jsx16(
@@ -3213,8 +3256,8 @@ function JobLive({ id }) {
   const max = Math.max(0, logLines.length - logHeight);
   useHints([
     { key: "\u2191\u2193", label: "scroll log" },
-    { key: "G", label: "follow" },
-    { key: "x", label: "stop" }
+    { key: "G", label: "follow", run: () => setOffset(null) },
+    { key: "x", label: "stop", run: () => kill(j ?? void 0) }
   ]);
   useInput8(
     (input, key) => {
@@ -3302,7 +3345,7 @@ function buildTargets(envs, picked, items) {
   return targets;
 }
 function NewBackup({ envName }) {
-  const { config, services, width, height, navigate, toast, theme: theme2 } = useApp();
+  const { config, services, width, height, navigate, back, toast, theme: theme2 } = useApp();
   const active = useScreenActive();
   const envs = (config?.environments ?? []).filter(
     (e) => e.databases.length + e.projects.length > 0
@@ -3323,18 +3366,6 @@ function NewBackup({ envName }) {
   const [starting, setStarting] = useState13(false);
   const envNav = useListNav(envs.length, { isActive: active && step === "envs" });
   const itemNav = useListNav(items.length, { isActive: active && step === "items" });
-  useHints(
-    step === "confirm" ? [
-      { key: "\u23CE", label: "start" },
-      { key: "esc", label: "back" }
-    ] : [
-      { key: "space", label: "toggle" },
-      { key: "a", label: "all/none" },
-      { key: "\u23CE", label: "next" },
-      { key: "esc", label: "back" }
-    ],
-    [step]
-  );
   const start = async () => {
     if (!config || starting) return;
     setStarting(true);
@@ -3347,39 +3378,61 @@ function NewBackup({ envName }) {
       setStarting(false);
     }
   };
-  useBackHandler(() => {
+  const stepBack = () => {
     if (step === "envs") return false;
     setStep(step === "confirm" ? "items" : "envs");
     return true;
-  });
+  };
+  useBackHandler(stepBack);
+  const toggle = () => {
+    if (step === "envs") {
+      const env = envs[envNav.index];
+      if (!env) return;
+      const next2 = new Set(selectedEnvs);
+      next2.has(env.name) ? next2.delete(env.name) : next2.add(env.name);
+      setSelectedEnvs(next2);
+    } else if (step === "items") {
+      const item = items[itemNav.index];
+      if (!item) return;
+      const next2 = new Set(excluded);
+      next2.has(keyOf(item)) ? next2.delete(keyOf(item)) : next2.add(keyOf(item));
+      setExcluded(next2);
+    }
+  };
+  const all = () => {
+    if (step === "envs")
+      setSelectedEnvs(
+        selectedEnvs.size === envs.length ? /* @__PURE__ */ new Set() : new Set(envs.map((e) => e.name))
+      );
+    else if (step === "items")
+      setExcluded(picked.size === items.length ? new Set(items.map(keyOf)) : /* @__PURE__ */ new Set());
+  };
+  const next = () => {
+    if (step === "envs") {
+      const env = envs[envNav.index];
+      if (selectedEnvs.size === 0 && env) setSelectedEnvs(/* @__PURE__ */ new Set([env.name]));
+      setStep("items");
+    } else if (step === "items") {
+      if (picked.size > 0) setStep("confirm");
+    } else void start();
+  };
+  useHints(
+    step === "confirm" ? [
+      { key: "\u23CE", label: "start", run: next },
+      { key: "esc", label: "back", run: stepBack }
+    ] : [
+      { key: "space", label: "toggle", run: toggle },
+      { key: "a", label: "all/none", run: all },
+      { key: "\u23CE", label: "next", run: next },
+      { key: "esc", label: "back", run: () => stepBack() || back() }
+    ],
+    [step]
+  );
   useInput9(
     (input, key) => {
-      if (step === "envs") {
-        const env = envs[envNav.index];
-        if (input === " " && env) {
-          const next = new Set(selectedEnvs);
-          next.has(env.name) ? next.delete(env.name) : next.add(env.name);
-          setSelectedEnvs(next);
-        } else if (input === "a") {
-          setSelectedEnvs(
-            selectedEnvs.size === envs.length ? /* @__PURE__ */ new Set() : new Set(envs.map((e) => e.name))
-          );
-        } else if (key.return) {
-          if (selectedEnvs.size === 0 && env) setSelectedEnvs(/* @__PURE__ */ new Set([env.name]));
-          setStep("items");
-        }
-      } else if (step === "items") {
-        const item = items[itemNav.index];
-        if (input === " " && item) {
-          const next = new Set(excluded);
-          next.has(keyOf(item)) ? next.delete(keyOf(item)) : next.add(keyOf(item));
-          setExcluded(next);
-        } else if (input === "a") {
-          setExcluded(picked.size === items.length ? new Set(items.map(keyOf)) : /* @__PURE__ */ new Set());
-        } else if (key.return && picked.size > 0) setStep("confirm");
-      } else if (step === "confirm") {
-        if (key.return) void start();
-      }
+      if (input === " ") toggle();
+      else if (input === "a") all();
+      else if (key.return) next();
     },
     { isActive: active }
   );
@@ -3460,10 +3513,6 @@ function Onboarding() {
   const [values, setValues] = useState14({ backupDir: "", keepLast: "7", keepDays: "30" });
   const [errors, setErrors] = useState14({});
   const [general, setGeneral] = useState14([]);
-  useHints([
-    { key: "tab", label: "field" },
-    { key: "ctrl-s", label: "continue" }
-  ]);
   const submit = async (values2) => {
     const base = emptyConfig();
     const parsed = ConfigSchema.safeParse({
@@ -3506,15 +3555,12 @@ function Onboarding() {
       label: "Keep days",
       error: errors.keepDays,
       hint: "also keep anything younger than this many days"
-    },
-    {
-      kind: "action",
-      key: "continue",
-      label: "Continue \u25B8",
-      detail: "save and add the first environment",
-      onPress: () => void submit(values)
     }
   ];
+  useHints([
+    { key: "tab", label: "field" },
+    { key: "ctrl-s", label: "continue", run: () => void submit(values) }
+  ]);
   return /* @__PURE__ */ jsxs17(Panel, { title: "Welcome", width, height, focused: active, right: "step 1 of 2", children: [
     /* @__PURE__ */ jsxs17(Box15, { flexDirection: "column", marginBottom: 1, children: [
       /* @__PURE__ */ jsx18(GradientText, { children: "Let's set up backup-manager" }),
@@ -3540,7 +3586,8 @@ function Onboarding() {
         width: width - 4
       }
     ),
-    general.map((g) => /* @__PURE__ */ jsx18(ErrorLine, { children: g }, g))
+    general.map((g) => /* @__PURE__ */ jsx18(ErrorLine, { children: g }, g)),
+    /* @__PURE__ */ jsx18(Box15, { marginTop: 1, children: /* @__PURE__ */ jsx18(FormTip, {}) })
   ] });
 }
 var init_Onboarding = __esm({
@@ -3570,11 +3617,6 @@ function Prune() {
   );
   const [offset, setOffset] = useState15(0);
   const [busy, setBusy] = useState15(false);
-  useHints([
-    { key: "p", label: "apply" },
-    { key: "r", label: "refresh" },
-    { key: "\u2191\u2193", label: "scroll" }
-  ]);
   const list = plans.data ?? [];
   const toDelete = list.reduce((s, p) => s + p.delete.length + p.staleTemp.length, 0);
   const freed = list.reduce((s, p) => s + p.freedBytes, 0);
@@ -3600,31 +3642,38 @@ function Prune() {
       lines.push(/* @__PURE__ */ jsx19(Text18, { color: theme2.muted, children: " nothing to delete" }));
   }
   const viewHeight = height - 5;
+  const apply = () => {
+    if (toDelete === 0 || busy) return;
+    void (async () => {
+      const ok = await confirm({
+        title: "Apply retention",
+        message: `Delete ${toDelete} item(s) and free ${formatBytes(freed)}? This cannot be undone.`,
+        confirmLabel: "Delete",
+        danger: true
+      });
+      if (!ok) return;
+      setBusy(true);
+      const r = await services.applyPrune(list);
+      setBusy(false);
+      toast(
+        r.errors.length ? `deleted ${r.deleted}; ${r.errors[0]}` : `deleted ${r.deleted} item(s)`,
+        r.errors.length ? "warning" : "success"
+      );
+      plans.refresh();
+    })();
+  };
+  useHints([
+    { key: "p", label: "apply", run: apply },
+    { key: "r", label: "refresh", run: () => plans.refresh() },
+    { key: "\u2191\u2193", label: "scroll" }
+  ]);
   useInput10(
     (input, key) => {
       if (isUp(input, key)) setOffset((o) => Math.max(0, o - 1));
       else if (isDown(input, key))
         setOffset((o) => Math.min(Math.max(0, lines.length - viewHeight), o + 1));
       else if (input === "r") plans.refresh();
-      else if (input === "p" && toDelete > 0 && !busy) {
-        void (async () => {
-          const ok = await confirm({
-            title: "Apply retention",
-            message: `Delete ${toDelete} item(s) and free ${formatBytes(freed)}? This cannot be undone.`,
-            confirmLabel: "Delete",
-            danger: true
-          });
-          if (!ok) return;
-          setBusy(true);
-          const r = await services.applyPrune(list);
-          setBusy(false);
-          toast(
-            r.errors.length ? `deleted ${r.deleted}; ${r.errors[0]}` : `deleted ${r.deleted} item(s)`,
-            r.errors.length ? "warning" : "success"
-          );
-          plans.refresh();
-        })();
-      }
+      else if (input === "p") apply();
     },
     { isActive: active }
   );
@@ -3732,20 +3781,16 @@ function Service() {
     isActive: active,
     onSelect: (i) => void run(ACTIONS[i].action)
   });
+  const refresh = () => {
+    status.refresh();
+    logs.refresh();
+  };
   useHints([
     { key: "\u2191\u2193", label: "action" },
-    { key: "\u23CE", label: "run" },
-    { key: "r", label: "refresh" }
+    { key: "\u23CE", label: "run", run: () => nav.select() },
+    { key: "r", label: "refresh", run: refresh }
   ]);
-  useInput11(
-    (input) => {
-      if (input === "r") {
-        status.refresh();
-        logs.refresh();
-      }
-    },
-    { isActive: active }
-  );
+  useInput11((input) => input === "r" && refresh(), { isActive: active });
   const half = Math.floor(width / 2);
   const tz = config ? timezone(config) : void 0;
   const api = config?.api;
@@ -3874,8 +3919,8 @@ function Settings() {
   useHints([
     { key: "tab", label: "field" },
     { key: "space", label: "toggle" },
-    { key: "ctrl-s", label: "save" },
-    { key: "esc", label: "leave" }
+    { key: "ctrl-s", label: "save", run: () => void submit(values) },
+    { key: "esc", label: "cancel", run: () => void leave() }
   ]);
   if (!config) return null;
   const submit = async (current) => {
@@ -3893,6 +3938,16 @@ function Settings() {
     setGeneral([]);
     await save(parsed.data, "settings saved");
   };
+  const leave = async () => {
+    const dirty = JSON.stringify(values) !== JSON.stringify(settingsValues(config));
+    if (!dirty || await confirm({
+      title: "Discard changes",
+      message: "Leave Settings without saving?",
+      confirmLabel: "Discard",
+      danger: true
+    }))
+      back();
+  };
   const fields = [
     { kind: "heading", key: "h1", label: "Storage" },
     {
@@ -3986,16 +4041,7 @@ function Settings() {
         values,
         onChange: setValues,
         onSubmit: (v) => void submit(v),
-        onCancel: () => void (async () => {
-          const dirty = JSON.stringify(values) !== JSON.stringify(settingsValues(config));
-          if (!dirty || await confirm({
-            title: "Discard changes",
-            message: "Leave Settings without saving?",
-            confirmLabel: "Discard",
-            danger: true
-          }))
-            back();
-        })(),
+        onCancel: () => void leave(),
         isActive: active,
         width: width - 4,
         height: height - 3 - general.length
@@ -4107,6 +4153,12 @@ function App(props) {
   const [stack, setStack] = useState18([props.initialRoute ?? { name: "dashboard" }]);
   const route = stack[stack.length - 1];
   const [focus, setFocus] = useState18("content");
+  const [actionIndex, setActionIndexState] = useState18(0);
+  const actionRef = useRef7(0);
+  const setActionIndex = (i) => {
+    actionRef.current = i;
+    setActionIndexState(i);
+  };
   const [sidebarIndex, setSidebarIndex] = useState18(0);
   const [captures, setCaptures] = useState18([]);
   const [hints, setHints] = useState18([]);
@@ -4206,6 +4258,23 @@ function App(props) {
   const captured = captures.length > 0;
   const wide = size.columns >= WIDE;
   const current = menuIndex(route);
+  const goBack = () => {
+    if (backHandler.current?.()) return;
+    if (stack.length > 1) back();
+    else if (wide && config) {
+      setSidebarIndex(current);
+      setFocus("sidebar");
+    }
+  };
+  const globals = [
+    { key: "ctrl+\u2190\u2193\u2192", label: "zones" },
+    // Screens that declare their own Esc button (forms: cancel) don't get a second one.
+    ...stack.length > 1 && !hints.some((h) => h.key === "esc") ? [{ key: "esc", label: "back", run: goBack }] : [],
+    { key: "?", label: "help", run: () => setModal({ kind: "help" }) },
+    { key: "q", label: "quit", run: () => ink.exit() }
+  ];
+  const buttons = [...hints, ...globals].filter((h) => h.run);
+  const selectedAction = Math.min(actionIndex, Math.max(0, buttons.length - 1));
   const closeModal = (result) => {
     if (modal?.kind === "confirm") modal.resolve(result ?? false);
     setModal(null);
@@ -4216,6 +4285,7 @@ function App(props) {
       if (modal.kind === "help") return closeModal();
       if (input === "y") return closeModal(true);
       if (input === "n" || key.escape) return closeModal(false);
+      if (isZoneKey(key)) return;
       if (key.leftArrow || key.rightArrow || key.tab)
         return setModal({ ...modal, choice: !modal.choice });
       if (key.return) return closeModal(modal.choice);
@@ -4238,18 +4308,45 @@ function App(props) {
         return setFocus((f) => f === "content" && wide ? "sidebar" : "content");
       }
       if (key.escape) {
-        if (focus === "content" && backHandler.current?.()) return;
-        if (stack.length > 1) back();
-        else if (wide) {
-          setSidebarIndex(current);
-          setFocus("sidebar");
-        }
+        if (focus === "content") goBack();
+        else if (stack.length > 1) back();
+      }
+    },
+    { isActive: !captured && modal === null && focus !== "actions" }
+  );
+  useInput12(
+    (_input, key) => {
+      if (!isZoneKey(key)) return;
+      if (key.leftArrow) {
+        if (!wide || !config) return;
+        setSidebarIndex(current);
+        setFocus("sidebar");
+      } else if (key.downArrow) {
+        setActionIndex(0);
+        setFocus("actions");
+      } else setFocus("content");
+    },
+    { isActive: modal === null }
+  );
+  useInput12(
+    (input, key) => {
+      if (isZoneKey(key)) return;
+      const n = buttons.length;
+      const at = Math.min(actionRef.current, n - 1);
+      if (key.leftArrow || input === "h" || key.tab && key.shift)
+        setActionIndex((at - 1 + n) % n);
+      else if (key.rightArrow || input === "l" || key.tab) setActionIndex((at + 1) % n);
+      else if (key.escape || key.upArrow) setFocus("content");
+      else if (key.return || input === " ") {
+        setFocus("content");
+        buttons[at]?.run?.();
       }
     },
-    { isActive: !captured && modal === null }
+    { isActive: focus === "actions" && modal === null && buttons.length > 0 }
   );
   useInput12(
     (input, key) => {
+      if (isZoneKey(key)) return;
       if (isUp(input, key)) setSidebarIndex((i) => (i - 1 + MENU.length) % MENU.length);
       else if (isDown(input, key)) setSidebarIndex((i) => (i + 1) % MENU.length);
       else if (key.return || key.rightArrow) {
@@ -4322,7 +4419,9 @@ function App(props) {
         theme: theme2,
         columns: size.columns,
         hints,
-        global: captured ? [] : GLOBAL_HINTS
+        global: captured ? globals.slice(0, 1) : globals,
+        focused: focus === "actions",
+        selected: selectedAction
       }
     ),
     /* @__PURE__ */ jsx23(Toasts, { theme: theme2, toasts, now }),
@@ -4350,7 +4449,10 @@ function QuitOnQ() {
 }
 function ConfigErrorView({ message }) {
   const { theme: theme2, reload, setHints } = useApp();
-  useEffect7(() => setHints([{ key: "r", label: "reload" }]), [setHints]);
+  useEffect7(
+    () => setHints([{ key: "r", label: "reload", run: () => void reload() }]),
+    [setHints, reload]
+  );
   useInput12((input) => {
     if (input === "r") void reload();
   });
@@ -4360,7 +4462,6 @@ function ConfigErrorView({ message }) {
     /* @__PURE__ */ jsx23(Text21, { color: theme2.muted, children: "Fix the file (or restore config.json.bak) and press r to reload." })
   ] });
 }
-var GLOBAL_HINTS;
 var init_App = __esm({
   "src/ui/App.tsx"() {
     "use strict";
@@ -4374,11 +4475,6 @@ var init_App = __esm({
     init_router();
     init_screens();
     init_theme();
-    GLOBAL_HINTS = [
-      { key: "tab", label: "pane" },
-      { key: "?", label: "help" },
-      { key: "q", label: "quit" }
-    ];
   }
 });
 
@@ -6362,11 +6458,24 @@ import path18 from "path";
 
 // src/core/service/systemctl.ts
 import { execFile } from "child_process";
+import { existsSync } from "fs";
+function userBusEnv(env = process.env, uid = process.getuid?.() ?? null, exists = existsSync) {
+  const out = { ...env };
+  if (!out.XDG_RUNTIME_DIR && uid !== null) {
+    const dir = `/run/user/${uid}`;
+    if (exists(dir)) out.XDG_RUNTIME_DIR = dir;
+  }
+  if (!out.DBUS_SESSION_BUS_ADDRESS && out.XDG_RUNTIME_DIR) {
+    const bus = `${out.XDG_RUNTIME_DIR}/bus`;
+    if (exists(bus)) out.DBUS_SESSION_BUS_ADDRESS = `unix:path=${bus}`;
+  }
+  return out;
+}
 var execRunner = (command, args) => new Promise((resolve) => {
   execFile(
     command,
     args,
-    { timeout: 3e4, maxBuffer: 4 * 1024 * 1024 },
+    { timeout: 3e4, maxBuffer: 4 * 1024 * 1024, env: userBusEnv() },
     (error, stdout, stderr) => {
       const err = error;
       if (err && err.code === "ENOENT") {
@@ -6452,6 +6561,10 @@ function renderUnit({ command, configPath }) {
 }
 
 // src/core/service/manager.ts
+function busHint(message, user) {
+  if (!/Failed to connect to bus|XDG_RUNTIME_DIR not defined/i.test(message)) return message;
+  return `${message} \u2014 no systemd user session for ${user}: log in as ${user} directly (e.g. \`ssh ${user}@host\`, not \`su\`/\`sudo -u\`), or have an administrator run \`loginctl enable-linger ${user}\` once, then retry`;
+}
 var ServiceError = class extends Error {
   name = "ServiceError";
 };
@@ -6503,7 +6616,10 @@ var ServiceManager = class {
     if (show.code !== 0) {
       return {
         ...base,
-        error: (show.stderr || show.stdout).trim() || `systemctl exited with ${show.code}`
+        error: busHint(
+          (show.stderr || show.stdout).trim() || `systemctl exited with ${show.code}`,
+          this.user
+        )
       };
     }
     const p = parseProperties(show.stdout);
@@ -6709,8 +6825,8 @@ import { Box, renderToString, Text } from "ink";
 import Gradient from "ink-gradient";
 import { jsx, jsxs } from "react/jsx-runtime";
 function printOptions(stream = process.stdout) {
-  const plain = !stream.isTTY || "NO_COLOR" in process.env && process.env.NO_COLOR !== "0";
-  return { plain, columns: stream.columns || 100 };
+  const plain2 = !stream.isTTY || "NO_COLOR" in process.env && process.env.NO_COLOR !== "0";
+  return { plain: plain2, columns: stream.columns || 100 };
 }
 function render(element, options) {
   return renderToString(element, { columns: options.columns ?? 100 });