spinuptui 0.19.1 → 0.20.1

package/src/lib/wpInventory.ts

@@ -11,6 +11,7 @@
 import type { Server, Site } from "../api/types.ts"
 import { SSH_OPTS, sshPort } from "./dbBackup.ts"
 import { detectWpDirScript } from "./serverClone.ts"
+import { wpCliResolveScript } from "./wpCli.ts"
 
 // One plugin or theme, mirroring `wp {plugin,theme} list` columns.
 export interface WpItem {
@@ -100,13 +101,16 @@ export async function fetchWpInventory(
   const remote = [
     detectWpDirScript(root, site.public_folder ?? undefined),
     `if [ -z "$W" ]; then echo ===NOTWP; echo ===END; exit 0; fi`,
-    `WP=$(command -v wp 2>/dev/null || echo /usr/local/bin/wp)`,
+    // Pinned to the site's OWN configured PHP-CLI — bare `wp` resolves through
+    // its shebang to the server's system-default PHP, which can differ from
+    // (and lack extensions present in) the site's actual version. See wpCli.ts.
+    wpCliResolveScript(site.php_version),
     `echo ===WPDIR; printf '%s\\n' "$W"`,
     // The trailing `echo` after each wp command is load-bearing: `wp --format=json`
     // emits NO trailing newline, so without it the next ===MARKER glues onto the end
     // of the JSON line — the marker never parses and JSON.parse chokes on it.
-    `echo ===PLUGINS; "$WP" --path="$W" plugin list --fields=${fields} --format=json 2>/dev/null || true; echo`,
-    `echo ===THEMES; "$WP" --path="$W" theme list --fields=${fields} --format=json 2>/dev/null || true; echo`,
+    `echo ===PLUGINS; "$PHP" "$WP" --path="$W" plugin list --fields=${fields} --format=json 2>/dev/null || true; echo`,
+    `echo ===THEMES; "$PHP" "$WP" --path="$W" theme list --fields=${fields} --format=json 2>/dev/null || true; echo`,
     `echo ===END`,
   ].join("\n")
 

package/src/ui/store.tsx

@@ -17,7 +17,7 @@ import { APP_VERSION } from "../version.ts"
 import { cachedUpdateInfo, refreshUpdateInfo, type UpdateInfo } from "../lib/appUpdate.ts"
 import { fetchReleaseNotes, type ReleaseNotesInfo } from "../lib/releaseNotes.ts"
 import { resolveLocalLink, expandPath, normalizeLink, type LocalLink } from "../lib/local.ts"
-import type { Stack } from "../lib/stack.ts"
+import { cloneStackFor, type Stack } from "../lib/stack.ts"
 import { openTerminalAt, openUrl, openSshSession } from "../lib/open.ts"
 import { gitDrift, type Drift } from "../lib/gitStatus.ts"
 import { probeSite } from "../lib/probe.ts"
@@ -344,12 +344,6 @@ export function cloneNeedsGitAccess(j: CloneJob): boolean {
 export function isCloneInFlight(j: CloneJob | null | undefined): boolean {
   return j != null && j.step !== "done" && j.step !== "error"
 }
-// Detect a site's stack the way the clone branches: a git repo → Bedrock
-// (is_wordpress is unreliable for git sites — see the API findings doc);
-// is_wordpress → Standard WP; anything else → files-only (no DB, no wp-cli).
-export function cloneStackFor(site: Site): "wp" | "bedrock" | "files" {
-  return site.git?.repo ? "bedrock" : site.is_wordpress ? "wp" : "files"
-}
 // Alphanumeric token for generated dest DB passwords (never printed/persisted).
 function randomToken(n: number): string {
   const a = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
@@ -3335,8 +3329,11 @@ export function StoreProvider({ children }: { children: ReactNode }) {
       }
       const srcSites = sitesForServer(server.id)
       const sites: CloneSiteState[] = srcSites.map((s) => {
-        const stack = cloneStackFor(s)
-        const isWordPress = s.is_wordpress
+        // Probe-corrected: an API-mislabeled site (is_wordpress=false but really
+        // WordPress) gets a real database pull once probed (`d`), instead of
+        // silently defaulting to a files-only copy — see cloneStackFor's comment.
+        const stack = cloneStackFor(s, probes.get(s.id)?.result.kind)
+        const isWordPress = stack !== "files"
         return {
           sourceSiteId: s.id,
           domain: s.domain,
@@ -3371,7 +3368,7 @@ export function StoreProvider({ children }: { children: ReactNode }) {
       setCloneServer(server)
       setCloneJob(draft)
     },
-    [cloneJob, sitesForServer, servers],
+    [cloneJob, sitesForServer, servers, probes],
   )
 
   // Background an in-flight clone: hide the wizard but KEEP the job running (the
@@ -3770,7 +3767,7 @@ export function StoreProvider({ children }: { children: ReactNode }) {
         try {
           const res = site.stack === "files"
             ? await verifyFilesClone(source, dest, { domain: site.domain, destIp })
-            : await verifyClone(source, dest, { domain: site.domain, sourceSiteUser: site.siteUser, destSiteUser: site.siteUser, destIp, publicFolder: site.stack === "wp" ? site.publicFolder : undefined, sourceWebrootRel: site.stack === "wp" ? site.sourceWebrootRel : undefined, destWebrootRel: site.stack === "wp" ? site.destWebrootRel : undefined })
+            : await verifyClone(source, dest, { domain: site.domain, sourceSiteUser: site.siteUser, destSiteUser: site.siteUser, destIp, publicFolder: site.stack === "wp" ? site.publicFolder : undefined, sourceWebrootRel: site.stack === "wp" ? site.sourceWebrootRel : undefined, destWebrootRel: site.stack === "wp" ? site.destWebrootRel : undefined, phpVersion: site.phpVersion })
           setCloneSite(siteId, (s) => ({ ...s, verifying: false, verify: res }))
         } catch (err) {
           setCloneSite(siteId, (s) => ({ ...s, verifying: false, verifyError: (err as Error).message }))

package/src/ui/views/CloneWizard.tsx

@@ -48,6 +48,7 @@ export function CloneWizard() {
     cloneServer: server,
     cloneJob: job,
     servers,
+    sitesForServer,
     accountSlug,
     toggleCloneSite,
     toggleCloneSiteUploads,
@@ -473,7 +474,8 @@ export function CloneWizard() {
           <box style={{ height: 1 }} />
           {eligibleDests.map((s, i) => {
             const sel = i === destIdx
-            const meta = `${s.provider_name || "—"} · ${s.region || "—"}${s.ip_address ? "  " + s.ip_address : ""}`
+            const n = sitesForServer(s.id).length
+            const meta = `${n} site${n === 1 ? "" : "s"} · ${s.provider_name || "—"} · ${s.region || "—"}${s.ip_address ? "  " + s.ip_address : ""}`
             return (
               <box key={s.id} style={{ flexDirection: "row", height: 1, backgroundColor: sel ? theme.bgAlt : undefined }}>
                 <text content={sel ? "❯ " : "  "} fg={theme.brand} style={{ flexShrink: 0 }} />