@rulebricks/cli 2.1.7 → 2.3.1

package/dist/commands/destroy.d.ts

@@ -1,8 +1,8 @@
 interface DestroyCommandProps {
     name: string;
-    cluster?: boolean;
     config?: boolean;
     force?: boolean;
+    purge?: boolean;
 }
 export declare function DestroyCommand(props: DestroyCommandProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/commands/destroy.js

@@ -1,58 +1,48 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import React, { useState, useCallback } from "react";
+import React, { useCallback, useState } from "react";
 import { Box, Text, useApp, useInput } from "ink";
 import { BorderBox, Spinner, StatusLine, ThemeProvider, useTheme, Logo, } from "../components/common/index.js";
-import { loadDeploymentConfig, loadDeploymentState, deleteDeployment, deploymentExists, } from "../lib/config.js";
+import { loadDeploymentConfig, loadDeploymentState, deleteDeployment, deploymentExists, updateDeploymentStatus, } from "../lib/config.js";
 import { uninstallChart, getInstalledVersion } from "../lib/helm.js";
-import { terraformDestroy, hasTerraformState } from "../lib/terraform.js";
-import { deleteNamespace, deletePVCs, isClusterAccessible, namespaceExists, removeKedaFinalizers, } from "../lib/kubernetes.js";
-import { getNamespace, getReleaseName, } from "../types/index.js";
-function DestroyCommandInner({ name, cluster, config, force, }) {
+import { cleanupKubeSystemLeftovers, cleanupNamespaceAPIServices, deleteNamespace, deletePVCs, deleteRulebricksCRDs, isClusterAccessible, isLastRulebricksDeployment, namespaceExists, removeBlockingFinalizers, } from "../lib/kubernetes.js";
+import { getNamespace, getReleaseName } from "../types/index.js";
+function DestroyCommandInner({ name, config, force, purge, }) {
     const { exit } = useApp();
     const { colors } = useTheme();
     const [step, setStep] = useState("loading");
-    const [deploymentConfig, setDeploymentConfig] = useState(null);
     const [state, setState] = useState(null);
     const [scope, setScope] = useState(null);
     const [error, setError] = useState(null);
-    const [confirmText, setConfirmText] = useState("");
-    const [infraError, setInfraError] = useState(null);
     const [status, setStatus] = useState({
         helm: "pending",
         pvc: "pending",
         namespace: "pending",
-        infrastructure: "pending",
+        kubeSystem: "pending",
+        crds: "pending",
         cleanup: "pending",
     });
-    // Load config and determine scope on mount
     React.useEffect(() => {
         (async () => {
             try {
-                // Check if deployment exists
                 const exists = await deploymentExists(name);
                 if (!exists) {
                     setError(`Deployment "${name}" not found`);
                     setStep("error");
                     return;
                 }
-                // Load config (may throw if corrupted)
-                let cfg = null;
                 try {
-                    cfg = await loadDeploymentConfig(name);
-                    setDeploymentConfig(cfg);
+                    await loadDeploymentConfig(name);
                 }
                 catch {
-                    // Config might be corrupted or missing, that's OK for destroy
+                    // Config might be corrupted or missing; cluster cleanup can still use state/name.
                 }
-                // Load state
                 const st = await loadDeploymentState(name);
                 setState(st);
-                // Determine what was actually deployed
-                const deploymentScope = await determineScope(name, cfg, st);
+                const deploymentScope = await determineScope(name, st);
                 setScope(deploymentScope);
                 if (force) {
                     setStep("destroying");
-                    runDestroy(cfg, st, deploymentScope);
+                    runDestroy(st, deploymentScope);
                 }
                 else {
                     setStep("confirm");
@@ -67,41 +57,22 @@ function DestroyCommandInner({ name, cluster, config, force, }) {
     useInput((input, key) => {
         if (step === "confirm") {
             if (key.return) {
-                if (cluster && scope?.hasInfrastructure) {
-                    if (confirmText === "destroy-all") {
-                        setStep("destroying");
-                        runDestroy(deploymentConfig, state, scope);
-                    }
-                }
-                else {
-                    setStep("destroying");
-                    runDestroy(deploymentConfig, state, scope);
-                }
+                setStep("destroying");
+                runDestroy(state, scope);
             }
             else if (key.escape) {
                 exit();
             }
-            else if (key.backspace || key.delete) {
-                setConfirmText((t) => t.slice(0, -1));
-            }
-            else if (input && !key.ctrl && !key.meta) {
-                setConfirmText((t) => t + input);
-            }
         }
-        else if (step === "error") {
-            if (key.escape || key.return) {
-                exit();
-            }
+        else if (step === "error" && (key.escape || key.return)) {
+            exit();
         }
     });
-    const runDestroy = useCallback(async (cfg, st, deploymentScope) => {
+    const runDestroy = useCallback(async (st, deploymentScope) => {
         try {
-            // Use namespace from state if available (backwards compat), otherwise compute from deployment name
             const namespace = st?.application?.namespace || getNamespace(name);
             const releaseName = getReleaseName(name);
-            // Run cluster cleanup if cluster is accessible
             if (deploymentScope.clusterAccessible) {
-                // Step 1: Uninstall Helm release (only if namespace exists - helm data is stored there)
                 if (deploymentScope.hasHelmRelease && deploymentScope.hasNamespace) {
                     setStatus((s) => ({ ...s, helm: "running" }));
                     try {
@@ -109,15 +80,12 @@ function DestroyCommandInner({ name, cluster, config, force, }) {
                         setStatus((s) => ({ ...s, helm: "success" }));
                     }
                     catch {
-                        // Helm release might already be gone, continue anyway
                         setStatus((s) => ({ ...s, helm: "error" }));
                     }
                 }
                 else {
-                    // Skip if no helm release OR namespace is already gone
                     setStatus((s) => ({ ...s, helm: "skipped" }));
                 }
-                // Step 2: Delete all PVCs in the namespace
                 if (deploymentScope.hasNamespace) {
                     setStatus((s) => ({ ...s, pvc: "running" }));
                     try {
@@ -125,64 +93,72 @@ function DestroyCommandInner({ name, cluster, config, force, }) {
                         setStatus((s) => ({ ...s, pvc: "success" }));
                     }
                     catch {
-                        // PVCs might not exist, continue anyway
                         setStatus((s) => ({ ...s, pvc: "error" }));
                     }
-                }
-                else {
-                    setStatus((s) => ({ ...s, pvc: "skipped" }));
-                }
-                // Step 3: Delete namespace
-                if (deploymentScope.hasNamespace) {
                     setStatus((s) => ({ ...s, namespace: "running" }));
                     try {
-                        // Remove KEDA finalizers first to prevent namespace deletion from hanging
-                        // KEDA finalizers wait for KEDA controller, but it's being deleted too
-                        await removeKedaFinalizers(namespace);
+                        // Clear teardown deadlocks BEFORE deleting the namespace:
+                        //  - Custom-resource finalizers (KEDA ScaledObjects, cert-manager
+                        //    ACME Challenges/Orders, Strimzi Kafka) wait on controllers
+                        //    removed with the release, so they're never cleared and wedge
+                        //    the namespace (and the CRD) in Terminating.
+                        //  - Aggregated APIServices backed by this namespace's services
+                        //    (KEDA external.metrics, metrics adapters, etc.) go
+                        //    Unavailable as the namespace tears down and break the
+                        //    namespace controller's discovery, wedging it in Terminating.
+                        await removeBlockingFinalizers(namespace);
+                        await cleanupNamespaceAPIServices(namespace);
                         await deleteNamespace(namespace);
                         setStatus((s) => ({ ...s, namespace: "success" }));
                     }
                     catch {
-                        // Namespace might already be gone
                         setStatus((s) => ({ ...s, namespace: "error" }));
                     }
                 }
                 else {
-                    setStatus((s) => ({ ...s, namespace: "skipped" }));
+                    setStatus((s) => ({ ...s, pvc: "skipped", namespace: "skipped" }));
+                }
+                // Leftovers `helm uninstall` does NOT remove. The prometheus-operator's
+                // kube-system kubelet Service is per-release and operator-created, so
+                // always clean it (safe; scoped to this release only).
+                setStatus((s) => ({ ...s, kubeSystem: "running" }));
+                try {
+                    await cleanupKubeSystemLeftovers(releaseName);
+                    setStatus((s) => ({ ...s, kubeSystem: "success" }));
+                }
+                catch {
+                    setStatus((s) => ({ ...s, kubeSystem: "error" }));
+                }
+                // CRDs (cert-manager/keda/strimzi/kube-prometheus-stack) ship in crds/
+                // dirs and are never removed by helm. They are cluster-SHARED, so only
+                // purge them when this is the last Rulebricks deployment on the cluster
+                // (or the operator forces --purge) — otherwise deleting a CRD would
+                // cascade-delete other deployments' custom resources.
+                const purgeCRDs = purge === true || (await isLastRulebricksDeployment(releaseName));
+                if (purgeCRDs) {
+                    setStatus((s) => ({ ...s, crds: "running" }));
+                    try {
+                        await deleteRulebricksCRDs();
+                        setStatus((s) => ({ ...s, crds: "success" }));
+                    }
+                    catch {
+                        setStatus((s) => ({ ...s, crds: "error" }));
+                    }
+                }
+                else {
+                    setStatus((s) => ({ ...s, crds: "skipped" }));
                 }
             }
             else {
-                // Cluster not accessible - skip all cluster operations
                 setStatus((s) => ({
                     ...s,
                     helm: "skipped",
                     pvc: "skipped",
                     namespace: "skipped",
+                    kubeSystem: "skipped",
+                    crds: "skipped",
                 }));
             }
-            // Destroy infrastructure if requested and it exists
-            if (cluster && deploymentScope.hasInfrastructure) {
-                setStatus((s) => ({ ...s, infrastructure: "running" }));
-                try {
-                    const cloudContext = cfg?.infrastructure.provider && cfg?.infrastructure.region
-                        ? {
-                            provider: cfg.infrastructure.provider,
-                            clusterName: cfg.infrastructure.clusterName || `${name}-cluster`,
-                            region: cfg.infrastructure.region,
-                        }
-                        : undefined;
-                    await terraformDestroy(name, cloudContext);
-                    setStatus((s) => ({ ...s, infrastructure: "success" }));
-                }
-                catch (infraErr) {
-                    setInfraError(infraErr instanceof Error ? infraErr.message : "Infrastructure destroy failed");
-                    setStatus((s) => ({ ...s, infrastructure: "error" }));
-                }
-            }
-            else {
-                setStatus((s) => ({ ...s, infrastructure: "skipped" }));
-            }
-            // Clean up local files (only if --config flag is passed)
             if (config && deploymentScope.hasLocalFiles) {
                 setStatus((s) => ({ ...s, cleanup: "running" }));
                 try {
@@ -196,6 +172,9 @@ function DestroyCommandInner({ name, cluster, config, force, }) {
             else {
                 setStatus((s) => ({ ...s, cleanup: "skipped" }));
             }
+            if (!config && deploymentScope.clusterAccessible) {
+                await updateDeploymentStatus(name, "destroyed");
+            }
             setStep("complete");
             setTimeout(() => exit(), 3000);
         }
@@ -203,16 +182,13 @@ function DestroyCommandInner({ name, cluster, config, force, }) {
             setError(err instanceof Error ? err.message : "Destruction failed");
             setStep("error");
         }
-    }, [name, cluster, config, exit]);
-    // Loading screen
+    }, [name, config, purge, exit]);
     if (step === "loading") {
         return (_jsx(BorderBox, { title: `Destroying ${name}`, children: _jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: "Checking deployment state..." }) }) }));
     }
-    // Error screen
     if (step === "error") {
         return (_jsx(BorderBox, { title: "Destruction Failed", children: _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, dimColor: true, children: "Press Enter or Esc to exit" }) })] }) }));
     }
-    // Complete screen
     if (step === "complete") {
         const cleanedItems = [];
         if (status.helm === "success")
@@ -221,57 +197,35 @@ function DestroyCommandInner({ name, cluster, config, force, }) {
             cleanedItems.push("Persistent volume claims");
         if (status.namespace === "success")
             cleanedItems.push("Kubernetes namespace");
-        if (status.infrastructure === "success")
-            cleanedItems.push("Cloud infrastructure");
+        if (status.kubeSystem === "success")
+            cleanedItems.push("kube-system leftovers (kubelet service)");
+        if (status.crds === "success")
+            cleanedItems.push("Shared CRDs");
         if (status.cleanup === "success")
             cleanedItems.push("Local configuration files");
-        // Check if nothing was cleaned in cluster (no helm, no pvc, no namespace)
         const noClusterCleanup = status.helm === "skipped" &&
             status.pvc === "skipped" &&
             status.namespace === "skipped";
-        const hasInfraFailure = status.infrastructure === "error";
-        const title = hasInfraFailure ? "Destruction Partially Complete" : "Destruction Complete";
-        return (_jsx(BorderBox, { title: title, children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [hasInfraFailure ? (_jsxs(Text, { color: colors.warning, bold: true, children: ["\u26A0 Deployment \"", name, "\" was partially destroyed"] })) : (_jsxs(Text, { color: colors.success, bold: true, children: ["\u2713 Deployment \"", name, "\" has been destroyed"] })), cleanedItems.length > 0 && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.muted, children: "Cleaned up:" }), cleanedItems.map((item) => (_jsxs(Text, { color: colors.muted, children: [" ", "\u2022 ", item] }, item)))] })), hasInfraFailure && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.error, bold: true, children: "\u2717 Infrastructure destroy failed" }), _jsx(Text, { color: colors.error, children: infraError }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: colors.muted, children: ["Cloud resources may still exist. Run `rulebricks destroy ", name, " ", "--cluster` to retry."] }) })] })), noClusterCleanup && status.cleanup === "success" && !hasInfraFailure && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Note: No cluster resources found, only local files were cleaned up." }) })), status.cleanup === "skipped" && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: colors.muted, dimColor: true, children: ["Local configuration files preserved in ~/.rulebricks/deployments/", name, "/"] }) }))] }) }));
+        return (_jsx(BorderBox, { title: "Destruction Complete", children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsxs(Text, { color: colors.success, bold: true, children: ["\u2713 Deployment \"", name, "\" has been destroyed"] }), cleanedItems.length > 0 && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.muted, children: "Cleaned up:" }), cleanedItems.map((item) => (_jsxs(Text, { color: colors.muted, children: [" ", "\u2022 ", item] }, item)))] })), noClusterCleanup && status.cleanup === "success" && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Note: No cluster resources found, only local files were cleaned up." }) })), status.cleanup === "skipped" && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: colors.muted, dimColor: true, children: ["Local configuration files preserved in ~/.rulebricks/deployments/", name, "/"] }) }))] }) }));
     }
-    // Destroying screen
     if (step === "destroying") {
-        // Show cluster operations if cluster is accessible
-        const showClusterOps = scope?.clusterAccessible;
-        const showInfra = cluster && scope?.hasInfrastructure;
-        return (_jsx(BorderBox, { title: `Destroying ${name}`, children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [showClusterOps && (_jsxs(_Fragment, { children: [_jsx(StatusLine, { status: status.helm, label: "Uninstalling Helm release" }), _jsx(StatusLine, { status: status.pvc, label: "Deleting persistent volumes" }), _jsx(StatusLine, { status: status.namespace, label: "Deleting namespace" })] })), showInfra && (_jsx(StatusLine, { status: status.infrastructure, label: "Destroying infrastructure" })), config && (_jsx(StatusLine, { status: status.cleanup, label: "Cleaning up local files" })), !scope?.clusterAccessible && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, dimColor: true, children: "Skipping cluster operations (cluster not accessible)" }) })), _jsx(Box, { marginTop: 1, children: _jsx(Spinner, { label: "Destroying deployment..." }) })] }) }));
+        return (_jsx(BorderBox, { title: `Destroying ${name}`, children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [scope?.clusterAccessible && (_jsxs(_Fragment, { children: [_jsx(StatusLine, { status: status.helm, label: "Uninstalling Helm release" }), _jsx(StatusLine, { status: status.pvc, label: "Deleting persistent volumes" }), _jsx(StatusLine, { status: status.namespace, label: "Deleting namespace" }), _jsx(StatusLine, { status: status.kubeSystem, label: "Removing kube-system leftovers" }), _jsx(StatusLine, { status: status.crds, label: "Removing shared CRDs" })] })), config && (_jsx(StatusLine, { status: status.cleanup, label: "Cleaning up local files" })), !scope?.clusterAccessible && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, dimColor: true, children: "Skipping cluster operations (cluster not accessible)" }) })), _jsx(Box, { marginTop: 1, children: _jsx(Spinner, { label: "Destroying deployment..." }) })] }) }));
     }
-    // Confirmation screen
-    // Check if there's nothing in the cluster to clean up
     const hasClusterResources = scope?.hasHelmRelease || scope?.hasNamespace;
-    const onlyLocalFiles = !hasClusterResources && !scope?.hasInfrastructure;
-    const needsInfraConfirm = cluster && scope?.hasInfrastructure;
+    const onlyLocalFiles = !hasClusterResources;
     const willDeleteConfig = config && scope?.hasLocalFiles;
-    // Nothing to do if only local files exist but --config not passed
     if (onlyLocalFiles && !config) {
         return (_jsx(BorderBox, { title: "Nothing to Destroy", children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { color: colors.muted, children: "No cluster resources found to clean up." }), _jsx(Text, { color: colors.muted, children: "Local configuration files will be preserved." }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: colors.muted, dimColor: true, children: ["Use ", _jsx(Text, { color: colors.accent, children: "--config" }), " to also remove local files."] }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Press Esc to exit" }) })] }) }));
     }
-    return (_jsx(BorderBox, { title: "Confirm Destruction", children: _jsx(Box, { flexDirection: "column", marginY: 1, children: onlyLocalFiles && config ? (
-            // Only cleaning local files (with --config)
-            _jsxs(_Fragment, { children: [_jsx(Text, { color: colors.warning, bold: true, children: "\u2139 Local Cleanup" }), _jsxs(Box, { marginY: 1, flexDirection: "column", children: [_jsx(Text, { children: "No cluster resources found to clean up." }), _jsx(Text, { children: "This will delete local configuration files." })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, children: "Press Enter to confirm, Esc to cancel" }) })] })) : (
-            // Full destruction
-            _jsxs(_Fragment, { children: [_jsx(Text, { color: colors.accent, bold: true, children: "\u26A0 WARNING" }), _jsxs(Box, { marginY: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.muted, children: "This will permanently delete:" }), (scope?.hasHelmRelease || scope?.hasNamespace) && (_jsxs(_Fragment, { children: [_jsx(Text, { color: colors.muted, children: " \u2022 Rulebricks application" }), _jsxs(Text, { color: colors.muted, children: [" ", "\u2022 All databases and stored data"] }), _jsx(Text, { color: colors.muted, children: " \u2022 All persistent volumes" }), _jsx(Text, { color: colors.muted, children: " \u2022 Monitoring stack" }), _jsx(Text, { color: colors.muted, children: " \u2022 Kubernetes namespace" })] })), needsInfraConfirm && (_jsxs(_Fragment, { children: [_jsx(Text, { color: colors.accent, children: " \u2022 Kubernetes cluster" }), _jsx(Text, { color: colors.accent, children: " \u2022 All cloud infrastructure" })] })), willDeleteConfig && (_jsx(Text, { color: colors.muted, children: " \u2022 Local configuration files" })), !cluster && scope?.hasInfrastructure && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Cloud infrastructure will be preserved. Use --cluster to remove it." }) })), cluster && !scope?.hasInfrastructure && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "No CLI managed infrastructure found for this deployment." }) })), !willDeleteConfig && (_jsx(Box, { marginTop: !needsInfraConfirm && !cluster ? 0 : 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Local config files will be preserved. Use --config to remove them." }) })), !scope?.clusterAccessible && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, dimColor: true, children: "\u26A0 Cluster is not accessible. Some cluster resources may need manual cleanup." }) }))] }), needsInfraConfirm ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Type", " ", _jsx(Text, { color: colors.accent, bold: true, children: "destroy-all" }), " ", "to confirm:"] }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.accent, children: "\u276F " }), _jsx(Text, { children: confirmText }), _jsx(Text, { color: colors.muted, children: "\u2588" })] })] })) : (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, children: "Press Enter to confirm, Esc to cancel" }) }))] })) }) }));
+    return (_jsx(BorderBox, { title: "Confirm Destruction", children: _jsxs(Box, { flexDirection: "column", marginY: 1, children: [onlyLocalFiles && config ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: colors.warning, bold: true, children: "Local Cleanup" }), _jsxs(Box, { marginY: 1, flexDirection: "column", children: [_jsx(Text, { children: "No cluster resources found to clean up." }), _jsx(Text, { children: "This will delete local configuration files." })] })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { color: colors.accent, bold: true, children: "WARNING" }), _jsxs(Box, { marginY: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.muted, children: "This will permanently delete:" }), (scope?.hasHelmRelease || scope?.hasNamespace) && (_jsxs(_Fragment, { children: [_jsx(Text, { color: colors.muted, children: " \u2022 Rulebricks application" }), _jsx(Text, { color: colors.muted, children: " \u2022 All databases and stored data" }), _jsx(Text, { color: colors.muted, children: " \u2022 All persistent volumes" }), _jsx(Text, { color: colors.muted, children: " \u2022 Monitoring stack" }), _jsx(Text, { color: colors.muted, children: " \u2022 Kubernetes namespace" })] })), willDeleteConfig && (_jsx(Text, { color: colors.muted, children: " \u2022 Local configuration files" })), !willDeleteConfig && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Local config files will be preserved. Use --config to remove them." }) })), !scope?.clusterAccessible && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, dimColor: true, children: "Cluster is not accessible. Some cluster resources may need manual cleanup." }) }))] })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, children: "Press Enter to confirm, Esc to cancel" }) })] }) }));
 }
 export function DestroyCommand(props) {
     return (_jsxs(ThemeProvider, { theme: "destroy", children: [_jsx(Logo, {}), _jsx(DestroyCommandInner, { ...props })] }));
 }
-/**
- * Determines what actually exists by checking cluster state directly.
- * This ensures cleanup works even if local state is out of sync.
- */
-async function determineScope(name, config, state) {
-    // Check if we have local files (we do, since we loaded the deployment)
+async function determineScope(name, state) {
     const hasLocalFiles = true;
-    // Check if infrastructure was provisioned (from local terraform state)
-    const hasInfrastructure = await hasTerraformState(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);
-    // Check if cluster is accessible
     let clusterAccessible = false;
     try {
         clusterAccessible = await isClusterAccessible();
@@ -279,11 +233,9 @@ async function determineScope(name, config, state) {
     catch {
         clusterAccessible = false;
     }
-    // If cluster is accessible, check what actually exists in the cluster
     let hasHelmRelease = false;
     let hasNamespace = false;
     if (clusterAccessible) {
-        // Check if Helm release actually exists in the cluster
         try {
             const installedVersion = await getInstalledVersion(releaseName, namespace);
             hasHelmRelease = installedVersion !== null;
@@ -291,7 +243,6 @@ async function determineScope(name, config, state) {
         catch {
             hasHelmRelease = false;
         }
-        // Check if namespace exists
         try {
             hasNamespace = await namespaceExists(namespace);
         }
@@ -303,7 +254,6 @@ async function determineScope(name, config, state) {
         hasLocalFiles,
         hasHelmRelease,
         hasNamespace,
-        hasInfrastructure,
         clusterAccessible,
     };
 }

package/dist/commands/init.d.ts

@@ -1,7 +1,11 @@
+import { WizardState } from "../components/Wizard/WizardContext.js";
 import { ProfileConfig } from "../types/index.js";
 interface InitWizardProps {
     initialName?: string;
+    initialState?: WizardState;
+    mode?: "create" | "redeploy";
+    onSaveComplete?: () => void;
     profile?: ProfileConfig | null;
 }
-export declare function InitWizard({ initialName, profile: providedProfile, }: InitWizardProps): import("react/jsx-runtime").JSX.Element;
+export declare function InitWizard({ initialName, initialState, mode, onSaveComplete, profile: providedProfile, }: InitWizardProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/commands/init.js

@@ -2,29 +2,37 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useCallback, useEffect } from "react";
 import { Box, Text, useApp, useStdout } from "ink";
 import { WizardProvider, useWizard, } from "../components/Wizard/WizardContext.js";
-import { DeploymentModeStep, CloudProviderStep, DomainStep, SMTPStep, DatabaseStep, SupabaseCredentialsStep, TierStep, FeaturesStep, FeatureConfigStep, VersionStep, ReviewStep, } from "../components/Wizard/steps/index.js";
-import { AppShell, ProgressHeader, ThemeProvider, useTheme, Logo, LOGO_LINES, } from "../components/common/index.js";
-import { saveDeploymentConfig, deploymentExists, loadProfile, updateProfile, extractProfileFromConfig, } from "../lib/config.js";
-import { generateHelmValues } from "../lib/helmValues.js";
-import { inferClusterTier } from "../lib/kubernetes.js";
+import { CloudProviderStep, DomainStep, SMTPStep, DatabaseStep, SupabaseCredentialsStep, FeaturesStep, StorageStep, ObservabilityStep, ExternalServicesStep, FeatureConfigStep, VersionStep, ReviewStep, } from "../components/Wizard/steps/index.js";
+import { AppShell, ProgressHeader, ThemeProvider, useTheme, Logo, LOGO_LINES, CommandApprovalProvider, } from "../components/common/index.js";
+import { saveDeploymentConfig, deploymentExists, loadHelmValues, loadProfile, saveHelmValues, updateProfile, extractProfileFromConfig, } from "../lib/config.js";
+import { buildHelmValues, generateHelmValues, mergeHelmValues, } from "../lib/helmValues.js";
+import { assertValidHelmValues } from "../lib/validateValues.js";
+import { getActiveWizardSteps, } from "../lib/wizardSteps.js";
 const STEP_INFO = {
-    mode: { title: "Deployment Mode", description: "Choose how to deploy" },
     cloud: { title: "Cloud Provider", description: "Select your cloud provider" },
-    domain: { title: "Domain & Email", description: "Configure your domain" },
+    domain: { title: "Domain & DNS", description: "Configure your domain and DNS" },
     smtp: { title: "Email (SMTP)", description: "Configure email delivery" },
     database: { title: "Database", description: "Choose your database setup" },
     "database-creds": {
         title: "Database Credentials",
         description: "Configure database access",
     },
-    tier: {
-        title: "Performance Tier",
-        description: "Select your deployment size",
+    "external-services": {
+        title: "External Services",
+        description: "Use managed Redis/Kafka (optional)",
     },
     features: {
         title: "Optional Features",
         description: "Enable additional features",
     },
+    storage: {
+        title: "Storage & Backups",
+        description: "Configure object storage and database backups",
+    },
+    observability: {
+        title: "Observability",
+        description: "Choose built-in ClickStack or export to your own systems",
+    },
     "feature-config": {
         title: "Feature Settings",
         description: "Configure enabled features",
@@ -35,12 +43,12 @@ const STEP_INFO = {
     },
     review: { title: "Review & Save", description: "Review your configuration" },
 };
-function WizardStepController({ onSaveComplete }) {
-    const { state, dispatch, toConfig } = useWizard();
+function WizardStepController({ mode, onSaveComplete, }) {
+    const { state, dispatch, toConfig, configIssues } = useWizard();
     const { exit } = useApp();
     const { write } = useStdout();
     const { colors } = useTheme();
-    const [currentStep, setCurrentStep] = useState("mode");
+    const [currentStep, setCurrentStep] = useState(mode === "redeploy" ? "domain" : "cloud");
     const [saving, setSaving] = useState(false);
     const [complete, setComplete] = useState(false);
     const [error, setError] = useState(null);
@@ -53,39 +61,22 @@ function WizardStepController({ onSaveComplete }) {
     }, [complete, write]);
     // Track pending navigation to handle React's async state updates
     const [pendingNav, setPendingNav] = useState(null);
+    // Direction of the last navigation, so multi-substep steps can resume at their
+    // end when the user navigates back into them (e.g. Esc from the Storage step).
+    const [navDirection, setNavDirection] = useState("forward");
     // Get list of active steps based on config
     const getActiveSteps = useCallback(() => {
-        const steps = ["mode"];
-        // Cloud provider step for both provision and existing modes
-        if (state.infrastructureMode === "provision" ||
-            state.infrastructureMode === "existing") {
-            steps.push("cloud");
-        }
-        steps.push("domain", "smtp", "database");
-        // Database credentials only for self-hosted
-        if (state.databaseType === "self-hosted") {
-            steps.push("database-creds");
-        }
-        if (state.infrastructureMode === "provision") {
-            steps.push("tier");
-        }
-        steps.push("features");
-        // Feature config only if AI, SSO, monitoring, external logging, or custom emails enabled
-        if (state.aiEnabled ||
-            state.ssoEnabled ||
-            state.monitoringEnabled ||
-            state.loggingSink !== "console" ||
-            state.customEmailsEnabled) {
-            steps.push("feature-config");
-        }
-        steps.push("version", "review");
-        return steps;
+        return getActiveWizardSteps(state, mode);
     }, [
-        state.infrastructureMode,
+        mode,
         state.databaseType,
         state.aiEnabled,
         state.ssoEnabled,
-        state.monitoringEnabled,
+        state.clickStackEnabled,
+        state.metricsExportEnabled,
+        state.tracingEnabled,
+        state.appLogsEnabled,
+        state.valkeyAdminEnabled,
         state.loggingSink,
         state.customEmailsEnabled,
     ]);
@@ -95,9 +86,11 @@ function WizardStepController({ onSaveComplete }) {
             const steps = getActiveSteps();
             const currentIndex = steps.indexOf(currentStep);
             if (pendingNav === "next" && currentIndex < steps.length - 1) {
+                setNavDirection("forward");
                 setCurrentStep(steps[currentIndex + 1]);
             }
             else if (pendingNav === "back" && currentIndex > 0) {
+                setNavDirection("back");
                 setCurrentStep(steps[currentIndex - 1]);
             }
             setPendingNav(null);
@@ -111,17 +104,36 @@ function WizardStepController({ onSaveComplete }) {
         setPendingNav("back");
     }, []);
     const handleSave = useCallback(async () => {
-        const inferredTier = state.infrastructureMode === "existing"
-            ? (await inferClusterTier()) || state.tier || "small"
-            : state.tier || undefined;
-        const config = toConfig({ tier: inferredTier });
+        const config = toConfig({
+            nodeArchitecture: state.nodeArchitecture || undefined,
+            arm64TolerationRequired: state.arm64TolerationRequired,
+            storageClass: state.storageClass || undefined,
+            storageProvisioner: state.storageProvisioner || undefined,
+            schedulableNodeCount: state.schedulableNodeCount || undefined,
+            totalCpuCores: state.totalCpuCores || undefined,
+            totalMemoryGi: state.totalMemoryGi || undefined,
+            eligibleCpuCores: state.eligibleCpuCores || undefined,
+            eligibleMemoryGi: state.eligibleMemoryGi || undefined,
+            totalPersistentStorageGi: state.totalPersistentStorageGi || undefined,
+        });
         if (!config) {
-            setError("Invalid configuration - please check all required fields");
+            const issues = configIssues();
+            setError(issues.length > 0
+                ? `Configuration is incomplete:\n${issues.map((i) => `  • ${i}`).join("\n")}`
+                : "Invalid configuration - please check all required fields");
             return;
         }
         setSaving(true);
         try {
             if (await deploymentExists(config.name)) {
+                if (mode === "redeploy") {
+                    await saveRedeployValues(config);
+                    await saveDeploymentConfig(config);
+                    const profileData = extractProfileFromConfig(config);
+                    await updateProfile(profileData);
+                    onSaveComplete?.();
+                    return;
+                }
                 setError(`Deployment "${config.name}" already exists. Choose a different name.`);
                 setSaving(false);
                 return;
@@ -139,7 +151,17 @@ function WizardStepController({ onSaveComplete }) {
             setError(err instanceof Error ? err.message : "Failed to save configuration");
             setSaving(false);
         }
-    }, [toConfig, exit, onSaveComplete]);
+    }, [toConfig, configIssues, state, exit, onSaveComplete, mode]);
+    async function saveRedeployValues(config) {
+        if (!config)
+            return;
+        const existingValues = (await loadHelmValues(config.name)) ?? {};
+        const generatedValues = buildHelmValues(config);
+        const mergedValues = mergeHelmValues(existingValues, generatedValues);
+        // Guardrail: a merge with stale manual edits must still satisfy the chart.
+        assertValidHelmValues(mergedValues);
+        await saveHelmValues(config.name, mergedValues);
+    }
     // Get step progress
     const steps = getActiveSteps();
     const stepNumber = steps.indexOf(currentStep) + 1;
@@ -160,8 +182,6 @@ function WizardStepController({ onSaveComplete }) {
     // Render current step
     const renderStep = () => {
         switch (currentStep) {
-            case "mode":
-                return _jsx(DeploymentModeStep, { onComplete: goNext });
             case "cloud":
                 return _jsx(CloudProviderStep, { onComplete: goNext, onBack: goBack });
             case "domain":
@@ -172,23 +192,27 @@ function WizardStepController({ onSaveComplete }) {
                 return _jsx(DatabaseStep, { onComplete: goNext, onBack: goBack });
             case "database-creds":
                 return _jsx(SupabaseCredentialsStep, { onComplete: goNext, onBack: goBack });
-            case "tier":
-                return _jsx(TierStep, { onComplete: goNext, onBack: goBack });
+            case "external-services":
+                return _jsx(ExternalServicesStep, { onComplete: goNext, onBack: goBack });
             case "features":
                 return _jsx(FeaturesStep, { onComplete: goNext, onBack: goBack });
+            case "storage":
+                return _jsx(StorageStep, { onComplete: goNext, onBack: goBack });
+            case "observability":
+                return _jsx(ObservabilityStep, { onComplete: goNext, onBack: goBack });
             case "feature-config":
-                return _jsx(FeatureConfigStep, { onComplete: goNext, onBack: goBack });
+                return (_jsx(FeatureConfigStep, { onComplete: goNext, onBack: goBack, entryDirection: navDirection }));
             case "version":
                 return _jsx(VersionStep, { onComplete: goNext, onBack: goBack });
             case "review":
-                return _jsx(ReviewStep, { onComplete: handleSave, onBack: goBack });
+                return (_jsx(ReviewStep, { onComplete: handleSave, onBack: goBack, allowEditName: mode === "create" }));
             default:
                 return null;
         }
     };
     return (_jsxs(AppShell, { title: "Rulebricks Configuration", children: [_jsx(ProgressHeader, { currentStep: stepNumber, totalSteps: totalSteps, stepTitle: stepInfo?.title || "Complete" }), _jsx(Box, { marginTop: 1, children: renderStep() })] }));
 }
-export function InitWizard({ initialName, profile: providedProfile, }) {
+export function InitWizard({ initialName, initialState, mode = "create", onSaveComplete, profile: providedProfile, }) {
     const [profile, setProfile] = useState(providedProfile ?? null);
     const [profileLoaded, setProfileLoaded] = useState(!!providedProfile);
     // Load profile on mount if not provided
@@ -204,5 +228,5 @@ export function InitWizard({ initialName, profile: providedProfile, }) {
     if (!profileLoaded) {
         return (_jsxs(ThemeProvider, { theme: "init", children: [_jsx(Logo, {}), _jsx(Box, { paddingLeft: 2, children: _jsx(Text, { children: "Loading..." }) })] }));
     }
-    return (_jsxs(ThemeProvider, { theme: "init", children: [_jsx(Logo, {}), _jsx(WizardProvider, { initialName: initialName, profile: profile, children: _jsx(WizardStepController, {}) })] }));
+    return (_jsxs(ThemeProvider, { theme: "init", children: [_jsx(Logo, {}), _jsx(CommandApprovalProvider, { children: _jsx(WizardProvider, { initialName: initialName, initialState: initialState, profile: profile, children: _jsx(WizardStepController, { mode: mode, onSaveComplete: onSaveComplete }) }) })] }));
 }

package/dist/commands/list.d.ts

@@ -0,0 +1 @@
+export declare function ListCommand(): import("react/jsx-runtime").JSX.Element;