spinuptui 1.3.0-alpha.2 → 1.3.0-alpha.3

package/src/ui/views/Modules.tsx

@@ -17,6 +17,7 @@ import type { ModuleId, ModuleStatus } from "../../modules/contract.ts"
 import { beaconFromConfig, beaconSend, testMessage } from "../../lib/beacon.ts"
 import { loadConfig } from "../../config.ts"
 import { upcomingRuns } from "../../modules/scheduler.ts"
+import { describeShare, homeStatus, tilde, type HomeStatus } from "../../lib/home.ts"
 
 interface Card {
   id: ModuleId
@@ -43,7 +44,7 @@ function stateLabel(card: Card, status: ModuleStatus | undefined): { dot: string
 
 export function Modules({ rows }: { rows: number }) {
   const store = useStore()
-  const { route, inputMode, overlayOpen, beaconSetupOpen, setBeaconSetupOpen, schedulerInstallOpen, setSchedulerInstallOpen } = store
+  const { route, inputMode, overlayOpen, beaconSetupOpen, setBeaconSetupOpen, schedulerInstallOpen, setSchedulerInstallOpen, homeSyncOpen, setHomeSyncOpen, heartbeatSetupOpen, setHeartbeatSetupOpen } = store
   const [selected, setSelected] = useState(0)
   const [statuses, setStatuses] = useState<Map<ModuleId, ModuleStatus>>(new Map())
   const [testing, setTesting] = useState(false)
@@ -52,7 +53,7 @@ export function Modules({ rows }: { rows: number }) {
   // the config). status() is cheap and never sends anything.
   const [tick, setTick] = useState(0)
   useEffect(() => {
-    if (beaconSetupOpen || schedulerInstallOpen) return
+    if (beaconSetupOpen || schedulerInstallOpen || homeSyncOpen || heartbeatSetupOpen) return
     let live = true
     void Promise.all(MODULES.map((m) => m.status())).then((list) => {
       if (live) setStatuses(new Map(list.map((s) => [s.id, s])))
@@ -60,7 +61,7 @@ export function Modules({ rows }: { rows: number }) {
     return () => {
       live = false
     }
-  }, [beaconSetupOpen, schedulerInstallOpen, tick])
+  }, [beaconSetupOpen, schedulerInstallOpen, homeSyncOpen, heartbeatSetupOpen, tick])
 
   const isActive = route === "modules" && !inputMode && !overlayOpen
   const card = CARDS[selected]!
@@ -91,6 +92,12 @@ export function Modules({ rows }: { rows: number }) {
         if (card.id === "beacon") return setBeaconSetupOpen(true)
         if (card.id === "scheduler") return setSchedulerInstallOpen(true)
         return
+      case "f":
+        if (card.id === "scheduler") return setHomeSyncOpen(true)
+        return
+      case "h":
+        if (card.id === "scheduler") return setHeartbeatSetupOpen(true)
+        return
       case "t":
         if (card.id === "beacon" && status && status.state !== "not_configured") return sendTest()
         return
@@ -142,7 +149,13 @@ export function Modules({ rows }: { rows: number }) {
         hints={[
           { key: "↑↓/jk", label: "select" },
           ...(card.id === "beacon" ? [{ key: "⏎", label: beaconReady ? "reconfigure" : "set up" }] : []),
-          ...(card.id === "scheduler" ? [{ key: "⏎", label: status && status.state !== "not_configured" ? "reinstall" : "install" }] : []),
+          ...(card.id === "scheduler"
+            ? [
+                { key: "⏎", label: status && status.state !== "not_configured" ? "reinstall" : "install" },
+                { key: "f", label: "your folder" },
+                { key: "h", label: "heartbeat" },
+              ]
+            : []),
           ...(beaconReady ? [{ key: "t", label: testing ? "sending…" : "test page" }] : []),
         ]}
       />
@@ -194,13 +207,23 @@ function ModuleDetail({ card, status }: { card: Card; status: ModuleStatus | und
       {card.id === "beacon" && status.state !== "not_configured" && (
         <text content="⏎ reconfigure the pager  ·  t send a test page  ·  CLI: spinuptui beacon status" fg={theme.textFaint} />
       )}
-      {card.id === "scheduler" && <SchedulerDetail installed={status.state !== "not_configured"} />}
+      {card.id === "scheduler" && <SchedulerDetail installed={status.state !== "not_configured"} refreshKey={status} />}
     </box>
   )
 }
 
-function SchedulerDetail({ installed }: { installed: boolean }) {
+function SchedulerDetail({ installed, refreshKey }: { installed: boolean; refreshKey: unknown }) {
   const [runs] = useState(() => upcomingRuns())
+  // Level 0 of the SpinupTUI folder: always say where the work lands.
+  const [home, setHome] = useState<HomeStatus | null>(null)
+  const heartbeatSet = !!loadConfig().scheduler?.heartbeat
+  useEffect(() => {
+    let live = true
+    void homeStatus().then((h) => live && setHome(h))
+    return () => {
+      live = false
+    }
+  }, [refreshKey])
   return (
     <>
       <box style={{ height: 1 }} />
@@ -223,6 +246,11 @@ function SchedulerDetail({ installed }: { installed: boolean }) {
         </box>
       ))}
       <box style={{ height: 1 }} />
+      {home && <text content={`Jobs and reports: ${tilde(home.path)}`} fg={theme.textDim} wrapMode="none" />}
+      {home && <text content={`  ${describeShare(home)}`} fg={home.git && home.remote ? theme.good : theme.textDim} wrapMode="none" />}
+      <text content={home?.git && home.remote ? "f your folder" : "f share it across machines, so you can queue jobs from anywhere"} fg={theme.accent} wrapMode="none" />
+      <text content={heartbeatSet ? "h station heartbeat" : "h get alerted from elsewhere if this machine stops (station heartbeat)"} fg={theme.accent} wrapMode="none" />
+      <box style={{ height: 1 }} />
       <text
         content={`${installed ? "⏎ reinstall (repairs the unit)  ·  " : ""}CLI: spinuptui scheduler add | list | status`}
         fg={theme.textFaint}

package/src/ui/views/Search.tsx

@@ -36,7 +36,7 @@ function score(haystack: string, q: string): number | null {
 
 export function Search({ rows }: { rows: number }) {
   const store = useStore()
-  const { servers, sites, serverById, sitesForServer, setInputMode, setRoute, route, overlayOpen, setHealthServer, setPhpUpgradeSite, setHttpsToggleSite, setPurgeCacheSite, setSiteOfflineSite, setServerActionsServer, accountSlug, localLinks, setLocalLinkSite, openLocalTerminal, openLocalUrl, sshSite, setDnsInventoryServer, setDbBackupSite, dbBackups, setDbSyncSite, dbSyncs, localSync, setMediaFallbackSite, beginClone, setSudoConnectServer, setKumaSite, kumaConfigured, startKumaSetup, startVanityReseed, setWpInventorySite, setGrantKeySite, runProbe, setEnableLocalSyncSite, setVanityServer, vanityJob } = store
+  const { servers, sites, serverById, sitesForServer, setInputMode, setRoute, route, overlayOpen, setHealthServer, setPhpUpgradeSite, setHttpsToggleSite, setPurgeCacheSite, setSiteOfflineSite, setServerActionsServer, openInSpinupWP, localLinks, setLocalLinkSite, openLocalTerminal, openLocalUrl, sshSite, setDnsInventoryServer, setDbBackupSite, dbBackups, setDbSyncSite, dbSyncs, localSync, setMediaFallbackSite, beginClone, setSudoConnectServer, setKumaSite, kumaConfigured, startKumaSetup, startVanityReseed, setWpInventorySite, setGrantKeySite, runProbe, setEnableLocalSyncSite, setVanityServer, vanityJob } = store
   const [query, setQuery] = useState("")
   const [selected, setSelected] = useState(0)
   // "query" = typing/filtering (input focused); "actions" = input blurred so the
@@ -101,9 +101,8 @@ export function Search({ rows }: { rows: number }) {
     openUrl((s.https?.enabled ? "https://" : "http://") + s.domain)
     flashMsg(`Opening ${s.domain}…`)
   }
-  const openInSpinup = (url: string) => {
-    openUrl(url)
-    flashMsg(accountSlug ? "Opening in SpinupWP…" : "Set accountSlug for deep links — opening dashboard")
+  const openInSpinup = (build: (slug: string) => string) => {
+    if (openInSpinupWP(build)) flashMsg("Opening in SpinupWP…")
   }
 
   useKeyboard((key) => {
@@ -141,8 +140,8 @@ export function Search({ rows }: { rows: number }) {
         if (current?.kind === "site") openSite(current.site)
         return
       case "w":
-        if (current?.kind === "site") openInSpinup(siteWebUrl(current.site.id, accountSlug))
-        else if (current?.kind === "server") openInSpinup(serverWebUrl(current.server.id, accountSlug))
+        if (current?.kind === "site") openInSpinup((slug) => siteWebUrl(current.site.id, slug))
+        else if (current?.kind === "server") openInSpinup((slug) => serverWebUrl(current.server.id, slug))
         return
       case "u":
         if (current?.kind === "site") setPhpUpgradeSite(current.site)

package/src/ui/views/ServerActions.tsx

@@ -19,7 +19,6 @@ import { Panel, Spinner, Centered } from "../components.tsx"
 import { StatusBar } from "../StatusBar.tsx"
 import { useStore } from "../store.tsx"
 import { moveSelection } from "../List.tsx"
-import { openUrl } from "../../lib/open.ts"
 import { serverWebUrl } from "../../lib/spinupweb.ts"
 import { toast } from "../toast.ts"
 import type { RebootInfo } from "../../lib/ssh.ts"
@@ -67,7 +66,7 @@ export function ServerActions() {
     rebootInfoLoading,
     rebootInfoErrors,
     loadRebootInfo,
-    accountSlug,
+    openInSpinupWP,
     refresh,
   } = store
 
@@ -161,8 +160,11 @@ export function ServerActions() {
           return
         case "w":
           if (upgradeRequired && server) {
-            openUrl(serverWebUrl(server.id, accountSlug))
-            toast.success(accountSlug ? "Opening in SpinupWP…" : "Set accountSlug for deep links — opening dashboard")
+            const id = server.id
+            if (openInSpinupWP((slug) => serverWebUrl(id, slug))) toast.success("Opening in SpinupWP…")
+            // No slug yet: the prompt takes over — close this overlay so its
+            // keys don't fire underneath.
+            else close()
           }
           return
       }

package/src/ui/views/Stacks.tsx

@@ -16,7 +16,8 @@
 import { useEffect, useMemo, useRef, useState } from "react"
 import { useKeyboard } from "@opentui/react"
 import { theme, statusColor, statusDot } from "../../lib/theme.ts"
-import { bar, truncate } from "../../lib/format.ts"
+import { bar, timeAgo, truncate } from "../../lib/format.ts"
+import { isVersionOld } from "../../lib/stackCache.ts"
 import { STACKS, effectiveStack, stackColor, type Stack } from "../../lib/stack.ts"
 import { phpSortKey } from "../../lib/phpEol.ts"
 import { probeKindColor, type ProbeKind } from "../../lib/probe.ts"
@@ -75,7 +76,7 @@ function nonWpSub(kind: ProbeKind | null, vanity: boolean): NonWpSub {
 export function Stacks({ rows }: { rows: number }) {
   const store = useStore()
   const wpCoreJobs = useWpCoreJobs()
-  const { sites, serverById, route, inputMode, overlayOpen, probes, probingIds, probeErrors, runProbe, runProbeMany, isProbeStale, isPhpEol, accountSlug, setPhpUpgradeSite, setBulkWpGroup, phpUpgrades, setHttpsToggleSite, setPurgeCacheSite, setSiteOfflineSite, setLocalLinkSite, openLocalTerminal, openLocalUrl, localLinks, setDiscoverOpen, setForgottenOpen, setForgottenStack, sshSite, setKumaSite } =
+  const { sites, serverById, route, inputMode, overlayOpen, probes, probingIds, probeErrors, runProbe, runProbeMany, isProbeStale, isPhpEol, openInSpinupWP, setPhpUpgradeSite, setBulkWpGroup, phpUpgrades, setHttpsToggleSite, setPurgeCacheSite, setSiteOfflineSite, setLocalLinkSite, openLocalTerminal, openLocalUrl, localLinks, setDiscoverOpen, setForgottenOpen, setForgottenStack, sshSite, setKumaSite } =
     store
 
   const [groupIndex, setGroupIndex] = useState(0)
@@ -218,8 +219,8 @@ export function Stacks({ rows }: { rows: number }) {
       case "w":
         // Open the selected site in the SpinupWP web app.
         if (focus === "sites" && groupSites[siteIndex]) {
-          openUrl(siteWebUrl(groupSites[siteIndex].id, accountSlug))
-          flashMsg(accountSlug ? "Opening in SpinupWP…" : "Set accountSlug for deep links — opening dashboard")
+          const id = groupSites[siteIndex].id
+          if (openInSpinupWP((slug) => siteWebUrl(id, slug))) flashMsg("Opening in SpinupWP…")
         }
         return
       case "d":
@@ -421,11 +422,23 @@ export function Stacks({ rows }: { rows: number }) {
                     ) : vanity ? (
                       <text content="Vanity Site" fg={selected ? theme.text : VANITY_COLOR} wrapMode="none" />
                     ) : cached ? (
-                      <text
-                        content={truncate(cached.result.label, 20) + (isProbeStale(s) ? "*" : "")}
-                        fg={probeKindColor(cached.result.kind, selected)}
-                        wrapMode="none"
-                      />
+                      <>
+                        <text
+                          content={truncate(cached.result.label, 20) + (isProbeStale(s) ? "*" : "")}
+                          fg={probeKindColor(cached.result.kind, selected)}
+                          wrapMode="none"
+                        />
+                        {/* A version past its re-check age (the background re-probe
+                            failed or hasn't run) says how old it is, so it can't
+                            pass for current. */}
+                        {isVersionOld(cached) && (
+                          <text
+                            content={" " + timeAgo(new Date(cached.detectedAt).toISOString()).replace(/ ago$/, "")}
+                            fg={selected ? theme.text : theme.warn}
+                            wrapMode="none"
+                          />
+                        )}
+                      </>
                     ) : errored ? (
                       <text content="probe failed" fg={selected ? theme.text : theme.bad} wrapMode="none" />
                     ) : (