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

package/src/modules/scheduler.ts

@@ -104,6 +104,19 @@ export const schedulerModule: ModuleDefinition = {
     checks.push({ name: "jobs", ok: failed.length === 0, detail: `${active} active${failed.length ? `; not ok in the last day: ${failed.slice(0, 3).join(", ")}` : ""}` })
     const beacon = beaconFromConfig(cfg)
     checks.push({ name: "digests", ok: beacon.channels.length > 0, detail: beacon.channels.length ? `via Beacon (${beacon.defaultChannel ?? "no default"})` : "Beacon isn't set up, so runs aren't reported" })
+    const hb = cfg.scheduler?.heartbeat
+    const lastHb = last?.heartbeat
+    checks.push({
+      name: "heartbeat",
+      ok: !hb || !lastHb || lastHb.ok,
+      detail: !hb
+        ? "not set: nothing outside this machine notices if it stops (spinuptui scheduler heartbeat set <kuma-push-url>)"
+        : !lastHb
+          ? `${new URL(hb.url).host}: first ping on the next dispatcher tick`
+          : lastHb.ok
+            ? `pinging ${new URL(hb.url).host} every tick (last: ${lastHb.status})`
+            : `last ping to ${new URL(hb.url).host} failed: ${lastHb.error}`,
+    })
 
     if (!installed && !d) {
       return {

package/src/ui/App.tsx

@@ -19,6 +19,7 @@ import { SiteUpdate } from "./views/SiteUpdate.tsx"
 import { BulkWpUpdate } from "./views/BulkWpUpdate.tsx"
 import { HttpsToggle } from "./views/HttpsToggle.tsx"
 import { PurgeCache } from "./views/PurgeCache.tsx"
+import { AccountSlugPrompt } from "./views/AccountSlugPrompt.tsx"
 import { SiteOffline } from "./views/SiteOffline.tsx"
 import { ReleaseNotes } from "./views/ReleaseNotes.tsx"
 import { GrantKey } from "./views/GrantKey.tsx"
@@ -44,6 +45,8 @@ import { Accounts } from "./views/Accounts.tsx"
 import { Modules } from "./views/Modules.tsx"
 import { BeaconSetup } from "./views/BeaconSetup.tsx"
 import { SchedulerInstall } from "./views/SchedulerInstall.tsx"
+import { HomeSync } from "./views/HomeSync.tsx"
+import { HeartbeatSetup } from "./views/HeartbeatSetup.tsx"
 
 const MIN_SPLASH_MS = 1200
 
@@ -94,7 +97,10 @@ export function App() {
     store.dnsRecordsTarget !== null ||
     store.kumaSite !== null ||
     store.beaconSetupOpen ||
-    store.schedulerInstallOpen
+    store.schedulerInstallOpen ||
+    store.homeSyncOpen ||
+    store.heartbeatSetupOpen ||
+    store.slugPrompt !== null
   useEffect(() => {
     store.setOverlayOpen(overlayActive)
   }, [overlayActive, store])
@@ -132,6 +138,9 @@ export function App() {
     // The Accounts overlay owns the keyboard while open.
     if (showAccounts) return
 
+    // The account-slug prompt (from `w`) owns the keyboard while open.
+    if (store.slugPrompt) return
+
     // The release-notes overlay owns the keyboard while open (any key dismisses).
     if (store.releaseNotesInfo) return
 
@@ -213,6 +222,8 @@ export function App() {
     // Beacon's guided setup (Modules tab) owns the keyboard while open.
     if (store.beaconSetupOpen) return
     if (store.schedulerInstallOpen) return
+    if (store.homeSyncOpen) return
+    if (store.heartbeatSetupOpen) return
 
     // A (Shift+a): the Accounts overlay — the header advertises it from every tab.
     if (key.shift && key.name === "a") return setShowAccounts(true)
@@ -303,7 +314,10 @@ export function App() {
       {store.kumaSite && <KumaSite />}
       {store.beaconSetupOpen && <BeaconSetup />}
       {store.schedulerInstallOpen && <SchedulerInstall />}
+      {store.homeSyncOpen && <HomeSync />}
+      {store.heartbeatSetupOpen && <HeartbeatSetup />}
       {showAccounts && <Accounts onClose={() => setShowAccounts(false)} />}
+      {store.slugPrompt && <AccountSlugPrompt />}
       <ToastStack />
     </box>
   )

package/src/ui/Details.tsx

@@ -180,7 +180,13 @@ export function SiteDetail({ site, serverName }: { site: Site; serverName: strin
       <Field label="Stack" value={stack} valueColor={stackColor(stack)} />
       <Field
         label="Detected"
-        value={probing ? "identifying…" : probe ? probe.result.label + (isProbeStale(site) ? " (stale)" : "") : "not identified · d"}
+        value={
+          probing
+            ? "identifying…"
+            : probe
+              ? `${probe.result.label}${isProbeStale(site) ? " (stale)" : ""} · ${timeAgo(new Date(probe.detectedAt).toISOString())}`
+              : "not identified · d"
+        }
         valueColor={probing ? theme.textDim : probe ? probeKindColor(probe.result.kind) : theme.textFaint}
       />
       <Field label="Type" value={isWordPress ? "WordPress" : "Generic"} valueColor={isWordPress ? theme.brand : theme.textDim} />

package/src/ui/Onboarding.tsx

@@ -2,20 +2,25 @@
 //
 // Shown when no token is found in the environment or config file. Collects an
 // API token, validates it against the live API, persists it to ~/.config, then
-// hands control back to the app.
+// asks (optionally) for the account slug that `w` deep links need — the API
+// can't tell us — and hands control back to the app.
 
 import { useState } from "react"
 import { theme } from "../lib/theme.ts"
 import { Spinner, SecretInput } from "./components.tsx"
 import { SpinupWPClient } from "../api/client.ts"
 import { DEFAULT_BASE_URL, saveConfig, configPath } from "../config.ts"
+import { parseAccountSlug } from "../lib/spinupweb.ts"
 
-type Phase = "input" | "validating" | "error"
+type Phase = "input" | "validating" | "error" | "slug"
+
+const INPUT_STYLE = { backgroundColor: theme.bgAlt, focusedBackgroundColor: theme.bgAlt, textColor: theme.text }
 
 export function Onboarding({ onComplete }: { onComplete: () => void }) {
   const [value, setValue] = useState("")
   const [phase, setPhase] = useState<Phase>("input")
   const [error, setError] = useState<string | null>(null)
+  const [slug, setSlug] = useState("")
 
   async function submit(token: string) {
     const trimmed = token.trim()
@@ -26,13 +31,76 @@ export function Onboarding({ onComplete }: { onComplete: () => void }) {
     const result = await client.validateToken()
     if (result.ok) {
       await saveConfig({ token: trimmed, baseUrl: DEFAULT_BASE_URL })
-      onComplete()
+      setPhase("slug")
     } else {
       setError(result.reason)
       setPhase("error")
     }
   }
 
+  // Optional: empty skips (an existing slug, e.g. on `spinuptui login`, is kept).
+  async function submitSlug() {
+    if (!slug.trim()) return onComplete()
+    const parsed = parseAccountSlug(slug)
+    if (!parsed) {
+      setError("That doesn't look like a slug — paste the part after spinupwp.app/, or the whole URL.")
+      return
+    }
+    await saveConfig({ accountSlug: parsed })
+    onComplete()
+  }
+
+  if (phase === "slug") {
+    return (
+      <box
+        style={{
+          width: "100%",
+          height: "100%",
+          flexDirection: "column",
+          justifyContent: "center",
+          alignItems: "center",
+          backgroundColor: theme.bg,
+        }}
+      >
+        <ascii-font text="SPINUPTUI" font="block" color={[theme.brand, theme.accent]} />
+        <box style={{ height: 1 }} />
+        <box
+          title=" Almost done "
+          titleColor={theme.brand}
+          border
+          borderColor={theme.border}
+          style={{ flexDirection: "column", width: 70, paddingLeft: 2, paddingRight: 2, paddingTop: 1, paddingBottom: 1 }}
+        >
+          <text content="✓ Token works." fg={theme.good} />
+          <box style={{ height: 1 }} />
+          <text content="One more (optional): your SpinupWP account slug, the part" fg={theme.text} wrapMode="none" />
+          <text content="after spinupwp.app/ in your dashboard's address. With it, w" fg={theme.text} wrapMode="none" />
+          <text content="opens a site or server straight in SpinupWP." fg={theme.text} wrapMode="none" />
+          <text content="Pasting any dashboard URL works too." fg={theme.textDim} wrapMode="none" />
+          <box style={{ height: 1 }} />
+          <text content="Account slug" fg={theme.accent} />
+          <input
+            focused
+            value={slug}
+            placeholder="acme-agency"
+            onInput={(v: string) => {
+              setSlug(v)
+              setError(null)
+            }}
+            onSubmit={() => void submitSlug()}
+            style={INPUT_STYLE}
+          />
+          <box style={{ height: 1 }} />
+          {error ? (
+            <text content={"✕ " + error} fg={theme.bad} wrapMode="none" />
+          ) : (
+            <text content="Press Enter to finish. Leave it empty to skip; w will ask later." fg={theme.textFaint} wrapMode="none" />
+          )}
+        </box>
+      </box>
+    )
+  }
+
   return (
     <box
       style={{

package/src/ui/store.tsx

@@ -51,7 +51,7 @@ import { carrySiteSettings, type SettingsCarryResult } from "../lib/cloneSetting
 import { syncAdditionalDomains } from "../lib/cloneDomains.ts"
 import { parseRepo, deployKeysSettingsUrl, ghAvailable, ghDeployKeyPresent, ghAddDeployKey, generateDeployKeypair, type RepoHost } from "../lib/gitDeployKey.ts"
 import { keychainAvailable, setSudoPassword, getSudoPassword, deleteSudoPassword } from "../lib/keychain.ts"
-import { StackCache, siteSignature, type CachedProbe } from "../lib/stackCache.ts"
+import { StackCache, siteSignature, isRecheckDue, type CachedProbe } from "../lib/stackCache.ts"
 import { resolvePhpEolDates, refreshPhpEolDates, isPhpEol as isPhpEolWith, offeredPhpVersions as offeredPhpVersionsWith, type PhpEolDates } from "../lib/phpEol.ts"
 import { resolveUbuntuEolDates, refreshUbuntuEolDates, isUbuntuEol as isUbuntuEolWith, type UbuntuEolDates } from "../lib/ubuntuEol.ts"
 import { wpCoreBusy } from "./wpCoreJobs.tsx"
@@ -751,6 +751,12 @@ interface StoreValue extends DataState {
   // Scheduler's install plan + confirm overlay, opened from the Modules tab.
   schedulerInstallOpen: boolean
   setSchedulerInstallOpen: (v: boolean) => void
+  // The SpinupTUI folder: where it is, and sharing it across machines (Modules tab).
+  homeSyncOpen: boolean
+  setHomeSyncOpen: (v: boolean) => void
+  // The station heartbeat (Kuma push monitor) overlay, from the Modules tab.
+  heartbeatSetupOpen: boolean
+  setHeartbeatSetupOpen: (v: boolean) => void
   // Whether the "needs a local copy" (forgotten) report overlay is open, and an
   // optional stack filter (set from the selected Stacks group when opened).
   forgottenOpen: boolean
@@ -825,6 +831,14 @@ interface StoreValue extends DataState {
   enableLocalSync: () => void
   // SpinupWP account slug (from env/config) for building web deep links.
   accountSlug: string | null
+  // Open a page in the SpinupWP web app. Deep links need the account slug, which
+  // the API doesn't expose; with none saved this asks for it (slugPrompt) and
+  // opens the page once it's given, rather than landing on the dashboard root.
+  // Returns true when the page opened straight away.
+  openInSpinupWP: (build: (slug: string) => string) => boolean
+  slugPrompt: { build: (slug: string) => string } | null
+  setSlugPrompt: (p: { build: (slug: string) => string } | null) => void
+  saveAccountSlug: (slug: string) => void
   // The account (profile) this store is mounted for — see config.ts "Accounts".
   // Switching remounts the whole store, so these never change under a view.
   profileId: string
@@ -1038,6 +1052,24 @@ export function StoreProvider({ children }: { children: ReactNode }) {
     })
   }, [])
   const [profileLabel, setProfileLabel] = useState(cfgRef.current.profileLabel)
+  const [accountSlug, setAccountSlug] = useState(cfgRef.current.accountSlug)
+  const [slugPrompt, setSlugPrompt] = useState<{ build: (slug: string) => string } | null>(null)
+  const saveAccountSlug = useCallback((slug: string) => {
+    cfgRef.current.accountSlug = slug
+    setAccountSlug(slug)
+    void saveProfileConfig({ accountSlug: slug })
+  }, [])
+  const openInSpinupWP = useCallback(
+    (build: (slug: string) => string) => {
+      if (accountSlug) {
+        openUrl(build(accountSlug))
+        return true
+      }
+      setSlugPrompt({ build })
+      return false
+    },
+    [accountSlug],
+  )
   const [route, setRoute] = useState<Route>("dashboard")
   const [inputMode, setInputMode] = useState(false)
   const [overlayOpen, setOverlayOpen] = useState(false)
@@ -1122,6 +1154,8 @@ export function StoreProvider({ children }: { children: ReactNode }) {
   const [discoverOpen, setDiscoverOpen] = useState(false)
   const [beaconSetupOpen, setBeaconSetupOpen] = useState(false)
   const [schedulerInstallOpen, setSchedulerInstallOpen] = useState(false)
+  const [homeSyncOpen, setHomeSyncOpen] = useState(false)
+  const [heartbeatSetupOpen, setHeartbeatSetupOpen] = useState(false)
   const [forgottenOpen, setForgottenOpen] = useState(false)
   const [forgottenStack, setForgottenStack] = useState<Stack | null>(null)
   const [linkReturnToForgotten, setLinkReturnToForgotten] = useState(false)
@@ -1258,7 +1292,7 @@ export function StoreProvider({ children }: { children: ReactNode }) {
   }, [])
 
   const probeOne = useCallback(
-    async (site: Site) => {
+    async (site: Site): Promise<boolean> => {
       const cache = cacheRef.current!
       setProbingIds((prev) => new Set(prev).add(site.id))
       setProbeErrors((prev) => {
@@ -1280,6 +1314,7 @@ export function StoreProvider({ children }: { children: ReactNode }) {
         next.delete(site.id)
         return next
       })
+      return outcome.ok
     },
     [servers],
   )
@@ -1313,6 +1348,41 @@ export function StoreProvider({ children }: { children: ReactNode }) {
 
   const isProbeStale = useCallback((site: Site) => cacheRef.current!.isStale(site.id, siteSignature(site)), [])
 
+  // Re-check WordPress versions that have gone old, whenever the site list loads
+  // (launch, and every `r`). Only sites already probed successfully: an unprobed
+  // site's stack is the user's call (`d`/`D`), and it may not be reachable at all.
+  // Each site gets at most one automatic attempt per max-age window, recorded in
+  // the cache so it holds across launches: a site whose probe now fails keeps its
+  // old reading (shown with its age) instead of being retried on every launch or
+  // refresh. Dev Mode's servers aren't real.
+  //
+  // Unattended SSH must not trip fail2ban, which bans the source IP after a few
+  // failed logins on one server. So each server's sites go one at a time, and the
+  // first failure on a server ends that server's run for this window: at most one
+  // failed login per server per day. Servers run in parallel, a few at a time.
+  useEffect(() => {
+    if (isDevMode() || servers.length === 0) return
+    const cache = cacheRef.current!
+    const now = Date.now()
+    const due = sites.filter((s) => isRecheckDue(cache.get(s.id), now))
+    if (due.length === 0) return
+    // Marked up front, all of them: a reload mid-run must not queue these again,
+    // and a server's sites after its first failure are skipped for the window too.
+    void cache.noteRecheck(due.map((s) => s.id))
+    const byServer = new Map<number, Site[]>()
+    for (const s of due) byServer.set(s.server_id, [...(byServer.get(s.server_id) ?? []), s])
+    const queues = [...byServer.values()]
+    let cursor = 0
+    const worker = async () => {
+      while (cursor < queues.length) {
+        for (const site of queues[cursor++]) if (!(await probeOne(site))) break
+      }
+    }
+    for (let i = 0; i < Math.min(3, queues.length); i++) void worker()
+    // probeOne changes identity with `servers`, which reloads together with
+    // `sites` — this should only re-run when the site list itself is reloaded.
+  }, [sites, servers])
+
   const isPhpEol = useCallback((version: string | null | undefined) => isPhpEolWith(version, phpEolDates), [phpEolDates])
   const offeredPhpVersions = useCallback(
     (current?: string | null) => offeredPhpVersionsWith(phpEolDates, current),
@@ -4546,6 +4616,10 @@ export function StoreProvider({ children }: { children: ReactNode }) {
     setBeaconSetupOpen,
     schedulerInstallOpen,
     setSchedulerInstallOpen,
+    homeSyncOpen,
+    setHomeSyncOpen,
+    heartbeatSetupOpen,
+    setHeartbeatSetupOpen,
     forgottenOpen,
     setForgottenOpen,
     forgottenStack,
@@ -4587,7 +4661,11 @@ export function StoreProvider({ children }: { children: ReactNode }) {
     enableLocalSyncSite,
     setEnableLocalSyncSite,
     enableLocalSync,
-    accountSlug: cfgRef.current.accountSlug,
+    accountSlug,
+    openInSpinupWP,
+    slugPrompt,
+    setSlugPrompt,
+    saveAccountSlug,
     profileId: cfgRef.current.profileId,
     profileLabel,
     setProfileLabel,

package/src/ui/views/AccountSlugPrompt.tsx

@@ -0,0 +1,102 @@
+// Ask for the SpinupWP account slug the first time `w` needs it.
+//
+// Deep links into the web app are account-scoped (spinupwp.app/{slug}/sites/{id})
+// and the API doesn't expose the slug, so without one `w` could only open the
+// dashboard root. Instead of that, `w` opens this prompt: the user pastes the
+// slug (or any dashboard URL), it's saved to the current account, and the page
+// they asked for opens. Every later `w` goes straight there.
+
+import { useEffect, useState } from "react"
+import { useKeyboard } from "@opentui/react"
+import { theme } from "../../lib/theme.ts"
+import { openUrl } from "../../lib/open.ts"
+import { parseAccountSlug } from "../../lib/spinupweb.ts"
+import { Panel, Centered } from "../components.tsx"
+import { StatusBar } from "../StatusBar.tsx"
+import { useStore } from "../store.tsx"
+import { toast } from "../toast.ts"
+
+const INPUT_STYLE = { backgroundColor: theme.bgAlt, focusedBackgroundColor: theme.bgAlt, textColor: theme.text }
+
+export function AccountSlugPrompt() {
+  const { slugPrompt, setSlugPrompt, saveAccountSlug, setInputMode } = useStore()
+  const [value, setValue] = useState("")
+  const [error, setError] = useState<string | null>(null)
+
+  // The input owns the keyboard while this is open.
+  useEffect(() => {
+    setInputMode(true)
+    return () => setInputMode(false)
+  }, [setInputMode])
+
+  const close = () => setSlugPrompt(null)
+
+  const submit = () => {
+    if (!slugPrompt) return
+    const slug = parseAccountSlug(value)
+    if (!slug) {
+      setError(value.trim() ? "That doesn't look like a slug — paste the part after spinupwp.app/, or the whole URL." : "Paste your account slug, or Esc to cancel.")
+      return
+    }
+    saveAccountSlug(slug)
+    openUrl(slugPrompt.build(slug))
+    toast.success(`Saved “${slug}” — opening in SpinupWP…`)
+    close()
+  }
+
+  // Esc reaches us even with the input focused (it doesn't consume it).
+  useKeyboard((key) => {
+    if (key.name === "escape") close()
+  })
+
+  if (!slugPrompt) return null
+
+  return (
+    <box
+      style={{
+        position: "absolute",
+        top: 0,
+        left: 0,
+        width: "100%",
+        height: "100%",
+        flexDirection: "column",
+        backgroundColor: theme.bg,
+        zIndex: 300,
+      }}
+    >
+      <Centered>
+        <Panel title=" Open in SpinupWP " active>
+          <box style={{ flexDirection: "column", width: 68, paddingTop: 1, paddingBottom: 1 }}>
+            <text content="To open the right page, SpinupTUI needs your SpinupWP account slug:" fg={theme.text} wrapMode="none" />
+            <text content="the part after spinupwp.app/ in your dashboard's address." fg={theme.text} wrapMode="none" />
+            <box style={{ height: 1 }} />
+            <text content="SpinupWP's API doesn't provide it, so this asks once and saves it." fg={theme.textDim} wrapMode="none" />
+            <text content="Pasting any dashboard URL works too." fg={theme.textDim} wrapMode="none" />
+            <box style={{ height: 1 }} />
+            <text content="Account slug" fg={theme.accent} />
+            <input
+              focused
+              value={value}
+              placeholder="acme-agency"
+              onInput={(v: string) => {
+                setValue(v)
+                setError(null)
+              }}
+              onSubmit={submit}
+              style={INPUT_STYLE}
+            />
+            <box style={{ height: 1 }} />
+            {error ? <text content={"✕ " + error} fg={theme.bad} wrapMode="none" /> : <text content="Saved to this account in config.json." fg={theme.textFaint} wrapMode="none" />}
+          </box>
+        </Panel>
+      </Centered>
+      <StatusBar
+        hints={[
+          { key: "⏎", label: "save & open" },
+          { key: "esc", label: "cancel" },
+        ]}
+        showGlobal={false}
+      />
+    </box>
+  )
+}

package/src/ui/views/Browser.tsx

@@ -24,7 +24,7 @@ type Focus = "servers" | "sites"
 
 export function Browser({ rows }: { rows: number }) {
   const store = useStore()
-  const { servers, sitesForServer, route, inputMode, overlayOpen, setHealthServer, setWpInventorySite, runProbe, probes, accountSlug, setPhpUpgradeSite, phpUpgrades, setHttpsToggleSite, setPurgeCacheSite, setSiteOfflineSite, setGrantKeySite, setSudoConnectServer, isSudoConnected, setServerActionsServer, serverOps, setLocalLinkSite, openLocalTerminal, openLocalUrl, sshSite, setDnsInventoryServer, setNewServerSource, setNewServerOpen, setVanityServer, vanityJob, beginClone, isServerOsEol, setKumaSite, kumaConfigured, startKumaSetup, startVanityReseed, setDbSyncSite, localSync, localLinks, setDbBackupSite, setMediaFallbackSite, setEnableLocalSyncSite } = store
+  const { servers, sitesForServer, route, inputMode, overlayOpen, setHealthServer, setWpInventorySite, runProbe, probes, openInSpinupWP, setPhpUpgradeSite, phpUpgrades, setHttpsToggleSite, setPurgeCacheSite, setSiteOfflineSite, setGrantKeySite, setSudoConnectServer, isSudoConnected, setServerActionsServer, serverOps, setLocalLinkSite, openLocalTerminal, openLocalUrl, sshSite, setDnsInventoryServer, setNewServerSource, setNewServerOpen, setVanityServer, vanityJob, beginClone, isServerOsEol, setKumaSite, kumaConfigured, startKumaSetup, startVanityReseed, setDbSyncSite, localSync, localLinks, setDbBackupSite, setMediaFallbackSite, setEnableLocalSyncSite } = store
 
   const [serverIndex, setServerIndex] = useState(0)
   const [siteIndex, setSiteIndex] = useState(0)
@@ -283,11 +283,11 @@ export function Browser({ rows }: { rows: number }) {
         // Open the focused server/site in the SpinupWP web app — useful for
         // actions the API can't do (e.g. running a pending server upgrade).
         if (focus === "sites" && sites[siteIndex]) {
-          openUrl(siteWebUrl(sites[siteIndex].id, accountSlug))
-          setFlash(accountSlug ? "Opening in SpinupWP…" : "Set accountSlug for deep links — opening dashboard")
+          const id = sites[siteIndex].id
+          if (openInSpinupWP((slug) => siteWebUrl(id, slug))) setFlash("Opening in SpinupWP…")
         } else if (server) {
-          openUrl(serverWebUrl(server.id, accountSlug))
-          setFlash(accountSlug ? "Opening in SpinupWP…" : "Set accountSlug for deep links — opening dashboard")
+          const id = server.id
+          if (openInSpinupWP((slug) => serverWebUrl(id, slug))) setFlash("Opening in SpinupWP…")
         }
         setTimeout(() => setFlash(null), 2000)
         return