@rulebricks/cli 2.1.7 → 2.3.2

package/dist/commands/upgrade.js

@@ -4,13 +4,29 @@ import { Box, Text, useApp, useInput } from "ink";
 import SelectInput from "ink-select-input";
 import { BorderBox, Spinner, ThemeProvider, useTheme, Logo, } from "../components/common/index.js";
 import { loadDeploymentConfig, loadDeploymentState, updateDeploymentStatus, getHelmValuesPath, } from "../lib/config.js";
-import { upgradeChart, dryRunUpgrade } from "../lib/helm.js";
-import { formatDate, getAppVersionInfo, } from "../lib/versions.js";
+import { upgradeChart, dryRunUpgrade, getInstalledChartVersion, } from "../lib/helm.js";
+import { formatDate, getAppVersionInfo, hasRegistryDigestMismatch, } from "../lib/versions.js";
 import { formatVersionDisplay, normalizeVersion } from "../lib/dockerHub.js";
 import { CHANGELOG_URL, getNamespace, getReleaseName, } from "../types/index.js";
-import { getDeployedImageVersions, rolloutRestart } from "../lib/kubernetes.js";
+import { getDeployedImageVersions, rolloutRestart, } from "../lib/kubernetes.js";
 import fs from "fs/promises";
 import YAML from "yaml";
+function hasSameVersionHpsPatch(version, deployedVersions) {
+    if (!deployedVersions) {
+        return false;
+    }
+    const hpsVersionMatches = deployedVersions.hpsVersion &&
+        normalizeVersion(deployedVersions.hpsVersion) ===
+            normalizeVersion(version.version);
+    const workerVersionMatches = deployedVersions.hpsWorkerVersion &&
+        normalizeVersion(deployedVersions.hpsWorkerVersion) ===
+            normalizeVersion(version.version);
+    if (!hpsVersionMatches && !workerVersionMatches) {
+        return false;
+    }
+    return (hasRegistryDigestMismatch(deployedVersions.hpsDigests, version.hpsDigests) ||
+        hasRegistryDigestMismatch(deployedVersions.hpsWorkerDigests, version.hpsWorkerDigests));
+}
 function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
     const { exit } = useApp();
     const { colors } = useTheme();
@@ -22,6 +38,15 @@ function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
     const [dryRunOutput, setDryRunOutput] = useState(null);
     // Store actual deployed HPS version separately (may differ from expected)
     const [deployedHpsVersion, setDeployedHpsVersion] = useState(null);
+    const [deployedVersions, setDeployedVersions] = useState(null);
+    async function resolvePinnedChartVersion(namespace, releaseName) {
+        const state = await loadDeploymentState(name);
+        const stateChartVersion = state?.application?.chartVersion;
+        if (stateChartVersion && stateChartVersion !== "latest") {
+            return stateChartVersion;
+        }
+        return (await getInstalledChartVersion(releaseName, namespace)) || undefined;
+    }
     useEffect(() => {
         loadVersions();
     }, []);
@@ -34,11 +59,14 @@ function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
             const namespace = state?.application?.namespace || getNamespace(name);
             const releaseName = getReleaseName(name);
             const deployedVersions = await getDeployedImageVersions(releaseName, namespace);
+            setDeployedVersions(deployedVersions);
             // Use deployed version from K8s, fall back to state file if K8s query fails
-            const currentAppVersion = deployedVersions.appVersion || state?.application?.appVersion || null;
+            const currentVersion = deployedVersions.appVersion ||
+                state?.application?.version ||
+                null;
             // Store actual deployed HPS version for display
-            setDeployedHpsVersion(deployedVersions.hpsVersion || state?.application?.hpsVersion || null);
-            const info = await getAppVersionInfo(cfg.licenseKey, currentAppVersion);
+            setDeployedHpsVersion(deployedVersions.hpsVersion || null);
+            const info = await getAppVersionInfo(cfg.licenseKey, currentVersion);
             setVersionInfo(info);
             if (targetVersion) {
                 // Find the version in available list
@@ -68,13 +96,18 @@ function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
     }
     async function performDryRun(version) {
         try {
-            // Update helm values with new image tags before dry run
+            // Update Helm values with the unified product version before dry run
             await updateHelmValuesWithVersion(version);
             const state = await loadDeploymentState(name);
             // Use namespace from state if available (backwards compat), otherwise compute from deployment name
             const namespace = state?.application?.namespace || getNamespace(name);
             const releaseName = getReleaseName(name);
-            const output = await dryRunUpgrade(name, { releaseName, namespace });
+            const chartVersion = await resolvePinnedChartVersion(namespace, releaseName);
+            const output = await dryRunUpgrade(name, {
+                releaseName,
+                namespace,
+                version: chartVersion,
+            });
             setDryRunOutput(output);
             setStep("complete");
         }
@@ -88,30 +121,10 @@ function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
         try {
             const content = await fs.readFile(valuesPath, "utf8");
             const values = YAML.parse(content);
-            // Update image tags
-            if (!values.rulebricks) {
-                values.rulebricks = {};
+            if (!values.global) {
+                values.global = {};
             }
-            const rulebricks = values.rulebricks;
-            // Update app image tag
-            if (!rulebricks.app) {
-                rulebricks.app = {};
-            }
-            const app = rulebricks.app;
-            if (!app.image) {
-                app.image = {};
-            }
-            app.image.tag = version.version;
-            // Update HPS image tag
-            if (!rulebricks.hps) {
-                rulebricks.hps = {};
-            }
-            const hps = rulebricks.hps;
-            if (!hps.image) {
-                hps.image = {};
-            }
-            hps.image.tag =
-                version.hpsVersion || version.version;
+            values.global.version = version.version;
             // Save updated values
             await fs.writeFile(valuesPath, YAML.stringify(values), "utf8");
         }
@@ -124,14 +137,20 @@ function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
             return;
         setStep("upgrading");
         try {
-            // Update helm values with new image tags
+            // Update Helm values with the unified product version
             await updateHelmValuesWithVersion(selectedVersion);
             const state = await loadDeploymentState(name);
             // Use namespace from state if available (backwards compat), otherwise compute from deployment name
             const namespace = state?.application?.namespace || getNamespace(name);
             const releaseName = getReleaseName(name);
             // Perform the upgrade
-            await upgradeChart(name, { releaseName, namespace, wait: true });
+            const chartVersion = await resolvePinnedChartVersion(namespace, releaseName);
+            await upgradeChart(name, {
+                releaseName,
+                namespace,
+                version: chartVersion,
+                wait: true,
+            });
             // Force restart HPS statefulsets to ensure fresh images are pulled
             // (pullPolicy: Always only pulls on pod restart, not on unchanged spec)
             await rolloutRestart("statefulset", `${releaseName}-hps`, namespace);
@@ -139,8 +158,8 @@ function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
             // Update deployment state
             await updateDeploymentStatus(name, "running", {
                 application: {
-                    appVersion: selectedVersion.version,
-                    hpsVersion: selectedVersion.hpsVersion || selectedVersion.version,
+                    version: selectedVersion.version,
+                    chartVersion: chartVersion || state?.application?.chartVersion,
                     namespace,
                     url: `https://${config.domain}`,
                 },
@@ -185,7 +204,7 @@ function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
         if (dryRun && dryRunOutput) {
             return (_jsx(BorderBox, { title: "Dry Run Results", children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { color: colors.accent, children: "Preview of changes (no changes made):" }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: colors.muted, children: [dryRunOutput.substring(0, 500), "..."] }) })] }) }));
         }
-        return (_jsx(BorderBox, { title: "Upgrade Complete", children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsxs(Text, { color: colors.success, bold: true, children: ["\u2713 Upgraded to ", formatVersionDisplay(selectedVersion?.version || "")] }), selectedVersion?.hpsVersion && (_jsxs(Text, { color: colors.muted, children: ["HPS version: ", formatVersionDisplay(selectedVersion.hpsVersion)] })), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { children: ["Run `rulebricks status ", name, "` to verify the deployment"] }) })] }) }));
+        return (_jsx(BorderBox, { title: "Upgrade Complete", children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsxs(Text, { color: colors.success, bold: true, children: ["\u2713 Upgraded to ", formatVersionDisplay(selectedVersion?.version || "")] }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { children: ["Run `rulebricks status ", name, "` to verify the deployment"] }) })] }) }));
     }
     if (step === "upgrading") {
         return (_jsx(BorderBox, { title: "Upgrading", children: _jsx(Box, { marginY: 1, children: _jsx(Spinner, { label: `Installing ${formatVersionDisplay(selectedVersion?.version || "")}...` }) }) }));
@@ -193,36 +212,40 @@ function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
     if (step === "confirm") {
         return (_jsx(BorderBox, { title: "Confirm Upgrade", children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsxs(Text, { children: ["Current:", " ", _jsx(Text, { color: colors.accent, children: versionInfo?.current
                                     ? formatVersionDisplay(versionInfo.current.version)
-                                    : "Not installed" }), deployedHpsVersion && (_jsxs(Text, { color: colors.muted, children: [" ", "(Solver: ", formatVersionDisplay(deployedHpsVersion), ")"] }))] }), _jsxs(Text, { children: ["Target:", " ", _jsx(Text, { color: colors.success, children: formatVersionDisplay(selectedVersion?.version || "") }), selectedVersion?.hpsVersion && (_jsxs(Text, { color: colors.muted, children: [" ", "(Solver: ", formatVersionDisplay(selectedVersion.hpsVersion), ")"] }))] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.warning, children: "\u26A0 This will upgrade your Rulebricks deployment." }), _jsx(Text, { color: colors.muted, children: "Pods will be restarted and there may be brief downtime." })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.success, bold: true, children: "Press Enter to continue, Esc to go back" }) })] }) }));
+                                    : "Not installed" })] }), _jsxs(Text, { children: ["Target:", " ", _jsx(Text, { color: colors.success, children: formatVersionDisplay(selectedVersion?.version || "") })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.warning, children: "\u26A0 This will upgrade your Rulebricks deployment." }), _jsx(Text, { color: colors.muted, children: "Pods will be restarted and there may be brief downtime." })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.success, bold: true, children: "Press Enter to continue, Esc to go back" }) })] }) }));
     }
     // Version selection screen
     const versionItems = versionInfo?.available.map((v) => ({
         label: formatVersionDisplay(v.version),
         value: v.version,
-        hpsVersion: v.hpsVersion,
         date: v.releaseDate,
-        // Only mark as "current" if both app AND HPS versions match what's deployed
+        hasSameVersionPatch: hasSameVersionHpsPatch(v, deployedVersions),
+        // Only mark as "current" if app and HPS versions match what's deployed
         isCurrent: versionInfo.current?.version === v.version &&
             (!deployedHpsVersion ||
-                !v.hpsVersion ||
-                normalizeVersion(deployedHpsVersion) ===
-                    normalizeVersion(v.hpsVersion)),
+                normalizeVersion(deployedHpsVersion) === normalizeVersion(v.version)) &&
+            !hasSameVersionHpsPatch(v, deployedVersions),
         isLatest: versionInfo.latest?.version === v.version,
     })) || [];
     return (_jsx(BorderBox, { title: "Rulebricks Version Manager", children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [(() => {
                     // Check if HPS has an update available (even if app version is current)
-                    const latestHps = versionInfo?.latest?.hpsVersion;
-                    const hasHpsUpdate = deployedHpsVersion &&
-                        latestHps &&
-                        normalizeVersion(deployedHpsVersion) !==
-                            normalizeVersion(latestHps);
+                    const hasHpsDigestUpdate = versionInfo?.latest
+                        ? hasSameVersionHpsPatch(versionInfo.latest, deployedVersions)
+                        : false;
+                    const hasHpsUpdate = hasHpsDigestUpdate ||
+                        !!(deployedHpsVersion &&
+                            versionInfo?.latest &&
+                            normalizeVersion(deployedHpsVersion) !==
+                                normalizeVersion(versionInfo.latest.version));
                     const hasAnyUpdate = versionInfo?.hasUpdate || hasHpsUpdate;
                     return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { children: ["Current:", " ", _jsx(Text, { color: colors.accent, children: versionInfo?.current
                                             ? formatVersionDisplay(versionInfo.current.version)
-                                            : "Not installed" }), deployedHpsVersion && (_jsxs(Text, { color: hasHpsUpdate ? colors.accent : colors.muted, children: [" ", "(Solver: ", formatVersionDisplay(deployedHpsVersion), ")"] }))] }), _jsxs(Text, { children: ["Latest:", " ", _jsx(Text, { color: hasAnyUpdate ? colors.success : colors.accent, children: versionInfo?.latest
+                                            : "Not installed" })] }), _jsxs(Text, { children: ["Latest:", " ", _jsx(Text, { color: hasAnyUpdate ? colors.success : colors.accent, children: versionInfo?.latest
                                             ? formatVersionDisplay(versionInfo.latest.version)
-                                            : "Unknown" }), versionInfo?.latest?.hpsVersion && (_jsxs(Text, { color: hasHpsUpdate ? colors.success : colors.muted, children: [" ", "(Solver:", " ", formatVersionDisplay(versionInfo.latest.hpsVersion), ")"] }))] }), hasAnyUpdate && (_jsx(Text, { color: colors.muted, dimColor: true, children: "Update available" }))] }));
-                })(), _jsxs(Box, { marginBottom: 1, paddingX: 1, borderStyle: "single", borderColor: colors.accent, alignSelf: "flex-start", children: [_jsx(Text, { children: "\uD83D\uDCDA What's new: " }), _jsx(Text, { color: colors.accent, underline: true, children: CHANGELOG_URL })] }), _jsx(Text, { bold: true, children: "Select app version to install:" }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: versionItems, onSelect: handleVersionSelect, limit: 8, itemComponent: ({ isSelected, label }) => {
+                                            : "Unknown" })] }), hasAnyUpdate && (_jsx(Text, { color: colors.muted, dimColor: true, children: hasHpsDigestUpdate
+                                    ? "HPS patch available for the installed version"
+                                    : "Update available" }))] }));
+                })(), _jsxs(Box, { marginBottom: 1, paddingX: 1, borderStyle: "single", borderColor: colors.accent, alignSelf: "flex-start", children: [_jsx(Text, { children: "\uD83D\uDCDA What's new: " }), _jsx(Text, { color: colors.accent, underline: true, children: CHANGELOG_URL })] }), _jsx(Text, { bold: true, children: "Select Rulebricks version to install:" }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: versionItems, onSelect: handleVersionSelect, limit: 8, itemComponent: ({ isSelected, label }) => {
                             const vItem = versionItems.find((v) => v.label === label) || versionItems[0];
                             // Highlight latest in green when there's an update available
                             const isLatestWithUpdate = vItem.isLatest && !vItem.isCurrent;
@@ -231,7 +254,7 @@ function UpgradeCommandInner({ name, targetVersion, dryRun, }) {
                                 : isLatestWithUpdate
                                     ? colors.success
                                     : undefined;
-                            return (_jsxs(Box, { children: [_jsx(Text, { color: labelColor, children: label }), vItem.hpsVersion && (_jsxs(Text, { color: isLatestWithUpdate ? colors.success : colors.muted, children: [" ", "(Solver: ", formatVersionDisplay(vItem.hpsVersion), ")"] })), vItem.isCurrent && (_jsx(Text, { color: colors.warning, children: " current" })), _jsxs(Text, { color: colors.muted, children: [" ", formatDate(vItem.date)] })] }));
+                            return (_jsxs(Box, { children: [_jsx(Text, { color: labelColor, children: label }), vItem.isCurrent && (_jsx(Text, { color: colors.warning, children: " current" })), vItem.hasSameVersionPatch && (_jsx(Text, { color: colors.success, children: " patch available" })), _jsxs(Text, { color: colors.muted, children: [" ", formatDate(vItem.date)] })] }));
                         } }) })] }) }));
 }
 export function UpgradeCommand(props) {

package/dist/components/DNSWaitScreen.d.ts

@@ -1,9 +1,13 @@
 interface DNSWaitScreenProps {
     domain: string;
     selfHostedSupabase: boolean;
+    builtInObservability?: boolean;
+    observabilityHostname?: string;
+    valkeyAdminIngress?: boolean;
+    valkeyAdminHostname?: string;
     namespace: string;
     onComplete: () => void;
     onSkip?: () => void;
 }
-export declare function DNSWaitScreen({ domain, selfHostedSupabase, namespace, onComplete, onSkip, }: DNSWaitScreenProps): import("react/jsx-runtime").JSX.Element;
+export declare function DNSWaitScreen({ domain, selfHostedSupabase, builtInObservability, observabilityHostname, valkeyAdminIngress, valkeyAdminHostname, namespace, onComplete, onSkip, }: DNSWaitScreenProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/DNSWaitScreen.js

@@ -1,19 +1,32 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect, useCallback } from "react";
 import { Box, Text, useInput } from "ink";
-import InkSpinner from "ink-spinner";
 import { BorderBox, Spinner, useTheme } from "./common/index.js";
 import { getLoadBalancerAddress, getRequiredDNSRecords, checkDNSRecord, isDNSComplete, } from "../lib/dns.js";
-export function DNSWaitScreen({ domain, selfHostedSupabase, namespace, onComplete, onSkip, }) {
+export function DNSWaitScreen({ domain, selfHostedSupabase, builtInObservability = false, observabilityHostname, valkeyAdminIngress = false, valkeyAdminHostname, namespace, onComplete, onSkip, }) {
     const { colors } = useTheme();
     const [status, setStatus] = useState("loading-lb");
     const [loadBalancer, setLoadBalancer] = useState(null);
     const [records, setRecords] = useState([]);
     const [error, setError] = useState(null);
-    const [pollCount, setPollCount] = useState(0);
-    // Use ref to avoid stale closure in polling interval
-    const recordsRef = useRef(records);
-    recordsRef.current = records;
+    const [hasChecked, setHasChecked] = useState(false);
+    const checkRecords = useCallback(async () => {
+        if (status !== "idle" || records.length === 0)
+            return;
+        setStatus("checking");
+        setHasChecked(true);
+        const updatedRecords = await Promise.all(records.map(async (record) => {
+            if (record.verified)
+                return record;
+            const result = await checkDNSRecord(record.hostname, record.target);
+            return {
+                ...record,
+                verified: result.resolved && result.matchesTarget,
+            };
+        }));
+        setRecords(updatedRecords);
+        setStatus(isDNSComplete(updatedRecords) ? "complete" : "idle");
+    }, [records, status]);
     useInput((input, key) => {
         if (key.escape || input.toLowerCase() === "s") {
             onSkip?.();
@@ -21,6 +34,9 @@ export function DNSWaitScreen({ domain, selfHostedSupabase, namespace, onComplet
         if (key.return && status === "complete") {
             onComplete();
         }
+        else if (key.return && status === "idle") {
+            void checkRecords();
+        }
     });
     // Fetch load balancer address
     useEffect(() => {
@@ -32,42 +48,32 @@ export function DNSWaitScreen({ domain, selfHostedSupabase, namespace, onComplet
                 return;
             }
             setLoadBalancer({ address: result.address, type: result.type });
-            const dnsRecords = getRequiredDNSRecords(domain, result.address, result.type, selfHostedSupabase);
+            const dnsRecords = getRequiredDNSRecords(domain, result.address, result.type, selfHostedSupabase, builtInObservability, observabilityHostname, valkeyAdminIngress, valkeyAdminHostname);
             setRecords(dnsRecords);
-            setStatus("waiting-dns");
+            setStatus("idle");
         };
         fetchLB();
-    }, [domain, selfHostedSupabase, namespace]);
-    // Poll DNS records
-    useEffect(() => {
-        if (status !== "waiting-dns")
-            return;
-        const pollDNS = async () => {
-            // Use ref to get current records, avoiding stale closure
-            const currentRecords = recordsRef.current;
-            const updatedRecords = await Promise.all(currentRecords.map(async (record) => {
-                if (record.verified)
-                    return record;
-                const result = await checkDNSRecord(record.hostname, record.target);
-                return {
-                    ...record,
-                    verified: result.resolved && result.matchesTarget,
-                };
-            }));
-            setRecords(updatedRecords);
-            setPollCount((c) => c + 1);
-            if (isDNSComplete(updatedRecords)) {
-                setStatus("complete");
-            }
-        };
-        // Initial check
-        pollDNS();
-        // Poll every 5 seconds
-        const interval = setInterval(pollDNS, 5000);
-        return () => clearInterval(interval);
-    }, [status]);
+    }, [
+        domain,
+        selfHostedSupabase,
+        builtInObservability,
+        observabilityHostname,
+        valkeyAdminIngress,
+        valkeyAdminHostname,
+        namespace,
+    ]);
     const verifiedCount = records.filter((r) => r.verified).length;
-    return (_jsxs(BorderBox, { title: "Configure DNS Records", children: [status === "loading-lb" && (_jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: "Getting load balancer address..." }) })), status === "error" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { color: colors.error, bold: true, children: "\u2717 Error" }), _jsx(Text, { color: colors.error, children: error }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, children: "Press Esc to skip DNS validation" }) })] })), (status === "waiting-dns" || status === "complete") && loadBalancer && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { bold: true, children: "Your load balancer address:" }), _jsx(Box, { marginY: 1, children: _jsx(Text, { color: colors.accent, bold: true, children: loadBalancer.address }) }), _jsx(Text, { children: "Please add the following DNS records:" }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: records.map((record, idx) => (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [record.verified ? (_jsx(Text, { color: colors.success, children: "\u2713" })) : (_jsx(Text, { color: colors.accent, children: _jsx(InkSpinner, { type: "dots" }) })), _jsx(Text, { children: " " }), _jsx(Text, { color: record.verified ? colors.success : undefined, children: record.hostname })] }), _jsxs(Box, { marginLeft: 2, children: [_jsx(Text, { color: colors.accent, children: record.type }), _jsx(Text, { color: colors.muted, children: " \u2192 " }), _jsx(Text, { color: colors.accent, children: record.target })] })] }, idx))) }), _jsx(Box, { marginTop: 2, children: status === "waiting-dns" ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { children: _jsx(Spinner, { label: `Checking DNS propagation... (${verifiedCount}/${records.length} complete)` }) }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: colors.muted, dimColor: true, children: ["Poll #", pollCount, " \u2022 DNS changes can take up to 48 hours to propagate"] }) })] })) : (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: colors.success, bold: true, children: "\u2713 All DNS records verified!" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, children: "Press Enter to continue with TLS setup" }) })] })) })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: status === "complete"
-                        ? "Enter to continue"
-                        : "S or Esc to skip DNS validation (not recommended)" }) })] }));
+    const footerText = status === "complete"
+        ? "Enter to continue"
+        : status === "checking"
+            ? "Checking DNS records..."
+            : hasChecked
+                ? "We couldn't find one or more DNS records. Please verify they exist and press Enter to try again."
+                : "Press Enter once you've created the DNS records • S or Esc to skip DNS validation";
+    return (_jsxs(BorderBox, { title: "Configure DNS Records", children: [status === "loading-lb" && (_jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: "Getting load balancer address..." }) })), status === "error" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { color: colors.error, bold: true, children: "\u2717 Error" }), _jsx(Text, { color: colors.error, children: error }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, children: "Press Esc to skip DNS validation" }) })] })), (status === "idle" || status === "checking" || status === "complete") &&
+                loadBalancer && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { bold: true, children: "Your load balancer address:" }), _jsx(Box, { marginY: 1, children: _jsx(Text, { color: colors.accent, bold: true, children: loadBalancer.address }) }), _jsx(Text, { children: "Please add the following DNS records:" }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: records.map((record, idx) => (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [record.verified ? (_jsx(Text, { color: colors.success, children: "\u2713" })) : hasChecked ? (_jsx(Text, { color: colors.warning, children: "\u25CB" })) : (_jsx(Text, { color: colors.muted, children: "\u25CB" })), _jsx(Text, { children: " " }), _jsx(Text, { color: record.verified
+                                                ? colors.success
+                                                : hasChecked
+                                                    ? colors.warning
+                                                    : undefined, children: record.hostname })] }), _jsxs(Box, { marginLeft: 2, children: [_jsx(Text, { color: colors.accent, children: record.type }), _jsx(Text, { color: colors.muted, children: " \u2192 " }), _jsx(Text, { color: colors.accent, children: record.target })] })] }, idx))) }), _jsx(Box, { marginTop: 2, children: status === "complete" ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: colors.success, bold: true, children: "\u2713 All DNS records verified!" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, children: "Press Enter to continue with TLS setup" }) })] })) : status === "checking" ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { children: _jsx(Spinner, { label: "Checking DNS records..." }) }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: colors.muted, dimColor: true, children: [verifiedCount, "/", records.length, " records verified"] }) })] })) : hasChecked ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: colors.warning, children: "We couldn't find one or more DNS records." }), _jsx(Text, { color: colors.muted, children: "Please verify they exist and press Enter to try again." })] })) : (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { color: colors.muted, children: "Press Enter once you've created the DNS records." }) })) })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: footerText }) })] }));
 }