@layr-labs/ecloud-cli 0.3.4-dev → 0.4.0-dev

package/dist/commands/compute/app/upgrade.js

@@ -205,6 +205,7 @@ import { getBuildType as getBuildType3 } from "@layr-labs/ecloud-sdk";
 
 // src/utils/prompts.ts
 import { input, select, password, confirm as inquirerConfirm } from "@inquirer/prompts";
+import chalk from "chalk";
 import fs3 from "fs";
 import path3 from "path";
 import os3 from "os";
@@ -311,7 +312,7 @@ function listApps(environment) {
 
 // src/utils/version.ts
 function getCliVersion() {
-  return true ? "0.3.4-dev" : "0.0.0";
+  return true ? "0.4.0-dev" : "0.0.0";
 }
 function getClientId() {
   return `ecloud-cli/v${getCliVersion()}`;
@@ -758,6 +759,30 @@ async function getEnvFileInteractive(envFilePath) {
       throw new Error(`Unexpected choice: ${choice}`);
   }
 }
+var SKU_TIER_NAMES = {
+  "g1-micro-1v": "Starter 1",
+  "g1-small-1v": "Starter 2",
+  "g1-custom-2-4096s": "Growth 1",
+  "g1-standard-2s": "Growth 2",
+  "g1-standard-4t": "Enterprise 1",
+  "g1-standard-8t": "Enterprise 2"
+};
+function formatSkuChoice(it) {
+  if (it.vcpus != null && it.memory_mb != null && it.monthly_price_usd != null && it.hourly_price_usd != null) {
+    const tier = SKU_TIER_NAMES[it.sku] ?? it.sku;
+    const isShared = it.description.toLowerCase().includes("shared");
+    const vcpuLabel = isShared ? `Shared ${it.vcpus} vCPU` : `${it.vcpus} vCPU`;
+    const memLabel = it.memory_mb >= 1024 ? `${it.memory_mb / 1024} GB` : `${it.memory_mb} MB`;
+    const specs = `${vcpuLabel} + ${memLabel}`;
+    const pricing = `$${it.hourly_price_usd.toFixed(2)}/hr ($${it.monthly_price_usd.toFixed(2)}/mo)`;
+    const platform = it.platform ?? "";
+    const tierPad = tier.padEnd(14);
+    const specsPad = specs.padEnd(22);
+    const platformPad = platform.padEnd(20);
+    return `${tierPad} ${specsPad} ${platformPad} ${pricing}`.trimEnd();
+  }
+  return `${it.sku} - ${it.description}`;
+}
 async function getInstanceTypeInteractive(instanceType, defaultSKU, availableTypes) {
   if (instanceType) {
     const valid = availableTypes.find((t) => t.sku === instanceType);
@@ -768,19 +793,22 @@ async function getInstanceTypeInteractive(instanceType, defaultSKU, availableTyp
     throw new Error(`Invalid instance-type: ${instanceType} (must be one of: ${validSKUs})`);
   }
   const isCurrentType = defaultSKU !== "";
-  if (defaultSKU === "" && availableTypes.length > 0) {
-    defaultSKU = availableTypes[0].sku;
+  const hasPricing = availableTypes.some((t) => t.monthly_price_usd != null);
+  if (hasPricing) {
+    console.log("\nPay for what you use \u2014 no upfront costs, per-hour billing.\n");
+    console.log(`  ${chalk.bold("Shielded VM (vTPM)")}: Verified boot and runtime attestation.`);
+    console.log(`  ${chalk.bold("SEV-SNP (TEE)")}: Verified boot, runtime attestation, and hardware-encrypted memory (AMD).`);
+    console.log(`  ${chalk.bold("TDX (TEE)")}: Verified boot, runtime attestation, and hardware-encrypted memory (Intel).
+`);
   }
   if (isCurrentType && defaultSKU) {
-    console.log(`
-Select instance type (current: ${defaultSKU}):`);
-  } else {
-    console.log("\nSelect instance type:");
+    console.log(`Current instance type: ${defaultSKU}
+`);
   }
   const choices = availableTypes.map((it) => {
-    let name = `${it.sku} - ${it.description}`;
-    if (it.sku === defaultSKU) {
-      name += isCurrentType ? " (current)" : " (default)";
+    let name = formatSkuChoice(it);
+    if (isCurrentType && it.sku === defaultSKU) {
+      name += " (current)";
     }
     return { name, value: it.sku };
   });
@@ -1323,7 +1351,7 @@ async function createBuildClient(flags) {
 }
 
 // src/commands/compute/app/upgrade.ts
-import chalk from "chalk";
+import chalk2 from "chalk";
 
 // src/utils/build.ts
 function formatSourceLink(repoUrl, gitRef) {
@@ -1538,7 +1566,7 @@ var AppUpgrade = class _AppUpgrade extends Command {
     }),
     "instance-type": Flags2.string({
       required: false,
-      description: "Machine instance type to use e.g. g1-standard-4t, g1-standard-8t",
+      description: "Machine instance type (e.g., g1-standard-4t, g1-standard-2s, g1-micro-1v)",
       env: "ECLOUD_INSTANCE_TYPE"
     }),
     "resource-usage-monitoring": Flags2.string({
@@ -1655,7 +1683,7 @@ var AppUpgrade = class _AppUpgrade extends Command {
         if (includeTlsCaddyfile && !inputs.caddyfilePath) {
           inputs.caddyfilePath = "Caddyfile";
         }
-        this.log(chalk.blue("Building from source with verifiable build..."));
+        this.log(chalk2.blue("Building from source with verifiable build..."));
         this.log("");
         const buildClient2 = await getBuildClient();
         const { build, verified } = await runVerifiableBuildAndVerify(buildClient2, inputs, {
@@ -1687,7 +1715,7 @@ var AppUpgrade = class _AppUpgrade extends Command {
         } catch (e) {
           this.error(e?.message || String(e));
         }
-        this.log(chalk.blue("Resolving and verifying prebuilt verifiable image..."));
+        this.log(chalk2.blue("Resolving and verifying prebuilt verifiable image..."));
         this.log("");
         const digest = await resolveDockerHubImageDigest(imageRef2);
         const buildClient2 = await getBuildClient();
@@ -1719,7 +1747,7 @@ var AppUpgrade = class _AppUpgrade extends Command {
         const { publicClient, walletClient } = createViemClients({
           privateKey,
           rpcUrl,
-          environment: environmentConfig.name
+          environment
         });
         const userApiClient = new UserApiClient3(
           environmentConfig,
@@ -1734,6 +1762,7 @@ var AppUpgrade = class _AppUpgrade extends Command {
       } catch {
       }
       const availableTypes = await fetchAvailableInstanceTypes(
+        environment,
         environmentConfig,
         privateKey,
         rpcUrl
@@ -1766,12 +1795,12 @@ var AppUpgrade = class _AppUpgrade extends Command {
         resourceUsageMonitoring
       });
       this.log(`
-Estimated transaction cost: ${chalk.cyan(gasEstimate.maxCostEth)} ETH`);
+Estimated transaction cost: ${chalk2.cyan(gasEstimate.maxCostEth)} ETH`);
       if (isMainnet(environmentConfig)) {
         const confirmed = await confirm(`Continue with upgrade?`);
         if (!confirmed) {
           this.log(`
-${chalk.gray(`Upgrade cancelled`)}`);
+${chalk2.gray(`Upgrade cancelled`)}`);
           return;
         }
       }
@@ -1785,20 +1814,20 @@ ${chalk.gray(`Upgrade cancelled`)}`);
       }
       this.log(
         `
-\u2705 ${chalk.green(`App upgraded successfully ${chalk.bold(`(id: ${res.appId}, image: ${res.imageRef})`)}`)}`
+\u2705 ${chalk2.green(`App upgraded successfully ${chalk2.bold(`(id: ${res.appId}, image: ${res.imageRef})`)}`)}`
       );
       const dashboardUrl = getDashboardUrl(environment, res.appId);
       this.log(`
-${chalk.gray("View your app:")} ${chalk.blue.underline(dashboardUrl)}`);
+${chalk2.gray("View your app:")} ${chalk2.blue.underline(dashboardUrl)}`);
     });
   }
 };
-async function fetchAvailableInstanceTypes(environmentConfig, privateKey, rpcUrl) {
+async function fetchAvailableInstanceTypes(environment, environmentConfig, privateKey, rpcUrl) {
   try {
     const { publicClient, walletClient } = createViemClients({
       privateKey,
       rpcUrl,
-      environment: environmentConfig.name
+      environment
     });
     const userApiClient = new UserApiClient3(environmentConfig, walletClient, publicClient, { clientId: getClientId() });
     const skuList = await userApiClient.getSKUs();
@@ -1808,7 +1837,7 @@ async function fetchAvailableInstanceTypes(environmentConfig, privateKey, rpcUrl
     return skuList.skus;
   } catch (err) {
     console.warn(`Failed to fetch instance types: ${err.message}`);
-    return [{ sku: "g1-standard-4t", description: "Standard 4-thread instance" }];
+    return [{ sku: "g1-standard-4t", description: "4 vCPUs, 16 GB memory, TDX" }];
   }
 }
 export {