spinuptui 0.21.1 → 0.22.0

package/src/ui/views/CloneWizard.tsx

@@ -562,7 +562,7 @@ export function CloneWizard() {
         case "adding":
           return "adding…"
         case "error":
-          return truncate(k.error ?? "failed", 36)
+          return k.error ?? "failed"
         default:
           return "add the key by hand, then r to re-check"
       }
@@ -579,9 +579,8 @@ export function CloneWizard() {
             return (
               <box key={k.repo} style={{ flexDirection: "row", height: 1 }}>
                 <text content={`${g} `} fg={c} style={{ flexShrink: 0 }} />
-                <text content={`${k.owner}/${k.name}`} fg={theme.text} wrapMode="none" style={{ flexShrink: 1 }} />
-                <box style={{ flexGrow: 1 }} />
-                <text content={label(k)} fg={k.status === "error" ? theme.bad : k.status === "present" || k.status === "added" ? theme.good : theme.textFaint} wrapMode="none" style={{ flexShrink: 0 }} />
+                <text content={`${k.owner}/${k.name}`} fg={theme.text} wrapMode="none" style={{ flexShrink: 0 }} />
+                <text content={" " + label(k)} fg={k.status === "error" ? theme.bad : k.status === "present" || k.status === "added" ? theme.good : theme.textFaint} wrapMode="none" style={{ flexGrow: 1, flexShrink: 1 }} />
               </box>
             )
           })}
@@ -682,15 +681,14 @@ export function CloneWizard() {
         : st === "done" ? `now → ${r.targetValue ?? targetIp}`
         : st === "ready" ? `${r.currentValue ?? "?"} → ${r.targetValue ?? targetIp}${r.excluded ? "  (skipped)" : ""}`
         : st === "manual" ? `manual: ${r.reason ?? "edit by hand"}`
-        : st === "error" ? truncate(r.error ?? "failed", 28)
+        : st === "error" ? (r.error ?? "failed")
         : "pending"
       const dcolor = st === "error" ? theme.bad : st === "done" ? theme.good : st === "manual" ? theme.warn : cur ? theme.text : theme.textFaint
       return (
         <box key={`${siteId}|${r.name}`} style={{ flexDirection: "row", height: 1, backgroundColor: cur ? theme.bgAlt : undefined }}>
           {busy ? <Spinner color={theme.brand} /> : <text content={glyph} fg={gcolor} style={{ flexShrink: 0 }} />}
-          <text content={` ${r.name}`} fg={theme.text} wrapMode="none" style={{ flexShrink: 1 }} />
-          <box style={{ flexGrow: 1 }} />
-          <text content={detail} fg={dcolor} wrapMode="none" style={{ flexShrink: 0 }} />
+          <text content={` ${r.name}`} fg={theme.text} wrapMode="none" style={{ flexShrink: 0 }} />
+          <text content={" " + detail} fg={dcolor} wrapMode="none" style={{ flexGrow: 1, flexShrink: 1 }} />
         </box>
       )
     }
@@ -732,13 +730,12 @@ export function CloneWizard() {
             return (
               <box key={s.sourceSiteId} style={{ flexDirection: "row", height: 1, backgroundColor: cur ? theme.bgAlt : undefined }}>
                 {active ? <Spinner color={theme.brand} /> : <text content={s.step === "done" ? "✓" : s.step === "error" ? "✕" : "○"} fg={s.step === "done" ? theme.good : s.step === "error" ? theme.bad : theme.textFaint} style={{ flexShrink: 0 }} />}
-                <text content={` ${s.domain}`} fg={cur || s.step === "error" || s.step === "done" ? theme.text : theme.textDim} wrapMode="none" style={{ flexShrink: 1 }} />
-                <box style={{ flexGrow: 1 }} />
+                <text content={` ${s.domain}`} fg={cur || s.step === "error" || s.step === "done" ? theme.text : theme.textDim} wrapMode="none" style={{ flexShrink: 0 }} />
                 <text
-                  content={(s.step === "error" ? truncate(s.error ?? "failed", 24) : s.step === "done" ? "done" : s.step === "queued" ? "queued" : `${s.step}${s.detail ? " · " + s.detail : ""}${s.transferBytes != null ? ` · ${formatBytes(s.transferBytes)}${s.transferTarget ? ` of ${s.transferExact ? "" : "~"}${formatBytes(s.transferTarget)}` : ""}${s.transferExact && s.transferTarget ? ` (${Math.min(100, Math.round((s.transferBytes / s.transferTarget) * 100))}%)` : ""}${s.transferRate ? ` · ${formatBytes(s.transferRate)}/s` : ""}` : ""}${s.stageStartedAt ? " · " + fmtElapsed(now - s.stageStartedAt) : ""}`) + vmark}
+                  content={" " + ((s.step === "error" ? s.error ?? "failed" : s.step === "done" ? "done" : s.step === "queued" ? "queued" : `${s.step}${s.detail ? " · " + s.detail : ""}${s.transferBytes != null ? ` · ${formatBytes(s.transferBytes)}${s.transferTarget ? ` of ${s.transferExact ? "" : "~"}${formatBytes(s.transferTarget)}` : ""}${s.transferExact && s.transferTarget ? ` (${Math.min(100, Math.round((s.transferBytes / s.transferTarget) * 100))}%)` : ""}${s.transferRate ? ` · ${formatBytes(s.transferRate)}/s` : ""}` : ""}${s.stageStartedAt ? " · " + fmtElapsed(now - s.stageStartedAt) : ""}`) + vmark)}
                   fg={s.step === "error" || (s.verify && !s.verify.ok) ? theme.bad : s.verify?.ok ? theme.good : s.step === "done" ? theme.good : theme.textFaint}
                   wrapMode="none"
-                  style={{ flexShrink: 0 }}
+                  style={{ flexGrow: 1, flexShrink: 1 }}
                 />
               </box>
             )

package/src/ui/views/Search.tsx

@@ -9,7 +9,7 @@ import { useKeyboard } from "@opentui/react"
 import { theme, statusColor, statusDot } from "../../lib/theme.ts"
 import { classifyStack, stackColor, stackTag } from "../../lib/stack.ts"
 import { truncate } from "../../lib/format.ts"
-import { Panel, Field, StatusBadge, SiteMetaCell, Spinner, ControlPanel } from "../components.tsx"
+import { Panel, Field, StatusBadge, SiteMetaCell, Spinner, ControlPanel, siteGroups } from "../components.tsx"
 import { isDbBackupInFlight } from "../../lib/dbBackup.ts"
 import { isDbSyncInFlight } from "../../lib/dbSync.ts"
 import { List, moveSelection } from "../List.tsx"
@@ -17,6 +17,7 @@ import { ServerDetail, SiteDetail, SERVER_CONTROL } from "../Details.tsx"
 import { StatusBar } from "../StatusBar.tsx"
 import { openUrl } from "../../lib/open.ts"
 import { serverWebUrl, siteWebUrl } from "../../lib/spinupweb.ts"
+import { isVanityPair } from "../../lib/vanitySite.ts"
 import { useStore } from "../store.tsx"
 import type { Server, Site } from "../../api/types.ts"
 
@@ -34,7 +35,7 @@ function score(haystack: string, q: string): number | null {
 
 export function Search({ rows }: { rows: number }) {
   const store = useStore()
-  const { servers, sites, serverById, setInputMode, setRoute, route, overlayOpen, setHealthServer, setPhpUpgradeSite, setHttpsToggleSite, setPurgeCacheSite, setServerActionsServer, accountSlug, localLinks, setLocalLinkSite, openLocalTerminal, openLocalUrl, sshSite, setDnsInventoryServer, setDbBackupSite, dbBackups, setDbSyncSite, dbSyncs, localSync, setMediaFallbackSite, beginClone, setSudoConnectServer, setKumaSite } = store
+  const { servers, sites, serverById, setInputMode, setRoute, route, overlayOpen, setHealthServer, setPhpUpgradeSite, setHttpsToggleSite, setPurgeCacheSite, setServerActionsServer, accountSlug, localLinks, setLocalLinkSite, openLocalTerminal, openLocalUrl, sshSite, setDnsInventoryServer, setDbBackupSite, dbBackups, setDbSyncSite, dbSyncs, localSync, setMediaFallbackSite, beginClone, setSudoConnectServer, setKumaSite, kumaConfigured, startKumaSetup, startVanityReseed } = store
   const [query, setQuery] = useState("")
   const [selected, setSelected] = useState(0)
   // "query" = typing/filtering (input focused); "actions" = input blurred so the
@@ -195,6 +196,14 @@ export function Search({ rows }: { rows: number }) {
         // fallback here; M matches the same overlay's binding in Stacks.
         if (current?.kind === "site") setKumaSite(current.site)
         return
+      case "R":
+        // Refresh a vanity page's HTML (site-only, and only for the one site per
+        // server whose domain equals the server's own name). Same binding/behavior
+        // as the m-overlay's R (KumaSite.tsx) — fires directly, no confirm, since
+        // it just republishes the same bundled page that's already live.
+        if (current?.kind === "site" && isVanityPair(current.site.domain, serverById(current.site.server_id)?.name ?? ""))
+          return kumaConfigured ? startKumaSetup(current.site, { reseed: true }) : startVanityReseed(current.site)
+        return
       case "n":
         // DNS inventory scoped to this site (its domains + records) — the migrate
         // lens for moving one site to another server.
@@ -241,7 +250,7 @@ export function Search({ rows }: { rows: number }) {
     focus === "query"
       ? [
           { key: "↑↓", label: "select" },
-          { key: "⏎", label: "open site" },
+          ...(current?.kind === "site" ? [{ key: "⏎", label: "open site" }] : []),
           { key: "Tab/→", label: "actions" },
           { key: "esc", label: "dashboard" },
         ]
@@ -254,15 +263,9 @@ export function Search({ rows }: { rows: number }) {
             { key: "←/esc", label: "back" },
           ]
         : [
+            // The Actions panel (Details pane) already lists every per-site key —
+            // this footer is nav-only now, so the two can't drift out of sync.
             { key: "↑↓", label: "select" },
-            { key: "o", label: "open" },
-            { key: "s", label: "SSH" },
-            { key: "n", label: "DNS" },
-            { key: "d", label: "DB backup" },
-            ...(localSync ? [{ key: "p", label: "pull to local" }] : []),
-            ...(current?.kind === "site" && current.site.is_wordpress && localLinks.has(current.site.id) ? [{ key: "m", label: "media fallback" }] : []),
-            { key: "M", label: "monitoring" },
-            { key: "a", label: "server actions" },
             { key: "←/esc", label: "back" },
           ]
 
@@ -352,7 +355,7 @@ export function Search({ rows }: { rows: number }) {
           />
         </Panel>
 
-        <Panel title={focus === "actions" ? " Actions " : " Details "} active={focus === "actions"} width={44}>
+        <Panel title={focus === "actions" ? " Actions " : " Details "} active={focus === "actions"} width={64}>
           {!current ? (
             <text content="No selection" fg={theme.textFaint} />
           ) : focus === "actions" ? (
@@ -374,48 +377,12 @@ export function Search({ rows }: { rows: number }) {
   )
 }
 
-// Site Control panel shown in the Details pane while in "actions" focus. Groups
-// the live single-key actions (Open / Remote / Local / Server) so the suite is
-// discoverable and scales as more actions land. A site gets the full set; a
-// server gets just the open + server actions.
-type ActionGroup = { title: string; items: [string, string][] }
-
-// The DB backup/sync use wp-cli, so they only apply to WordPress sites — omitted
-// for non-WP sites (their `d`/`p` keypresses are also guarded in the handler). DNS
-// (`n`) and the rest apply to any site.
-function siteGroups(isWordpress: boolean, localSync: boolean): ActionGroup[] {
-  const remote: [string, string][] = [
-    ["s", "SSH into the site"],
-    ["n", "DNS records (migrate lens)"],
-  ]
-  if (isWordpress) {
-    remote.push(["d", "Download DB backup"])
-    if (localSync) remote.push(["p", "Pull production DB to local"])
-  }
-  const local: [string, string][] = [
-    ["t", "Open working copy in a terminal"],
-    ["v", "Open the local URL"],
-    ["L", "Link / edit local copy"],
-  ]
-  if (isWordpress) local.push(["m", "Media: serve missing images from production"])
-  remote.push(["u", "Upgrade PHP version"])
-  remote.push(["H", "Enable/disable HTTPS"])
-  remote.push(["P", "Purge page + object cache"])
-  remote.push(["M", "Monitoring (Uptime Kuma + front-page check)"])
-  return [
-    { title: "Open", items: [["o", "Open site in browser"], ["w", "Open in SpinupWP"]] },
-    { title: "Remote", items: remote },
-    { title: "Local", items: local },
-    { title: "Server", items: [["a", "Server actions (reboot / restart)"], ["h", "Server health"]] },
-  ]
-}
-
 function ActionsCard({ result, serverName, localSync }: { result: Result; serverName: string; localSync: boolean }) {
   const isSite = result.kind === "site"
   const name = isSite ? result.site.domain : result.server.name
   const status = isSite ? result.site.status : result.server.connection_status
   // Server results reuse the SAME Server Control suite as the Browser detail pane.
-  const groups = isSite ? siteGroups(result.site.is_wordpress, localSync) : SERVER_CONTROL
+  const groups = isSite ? siteGroups(result.site.is_wordpress, localSync, isVanityPair(result.site.domain, serverName)) : SERVER_CONTROL
   return (
     <box style={{ flexDirection: "column" }}>
       <box style={{ flexDirection: "row" }}>