@tarout/cli 0.4.0 → 0.5.0

package/dist/index.js

@@ -61,7 +61,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@tarout/cli",
-  version: "0.4.0",
+  version: "0.5.0",
   description: "Tarout CLI \u2014 the Saudi cloud platform for coding agents",
   type: "module",
   bin: {
@@ -3758,8 +3758,8 @@ async function performBillingChange(client, input2) {
       addons: input2.addons
     });
   } else if (kind === "addon") {
-    const addons = input2.addons ?? (input2.addonKey ? [{ addonKey: input2.addonKey, quantity: input2.quantity ?? 1 }] : []);
-    result = await client.subscription.purchaseAddons.mutate({ addons });
+    const items = input2.addons ?? (input2.addonKey ? [{ addonKey: input2.addonKey, quantity: input2.quantity ?? 1 }] : []);
+    result = await client.subscription.purchaseAddons.mutate({ items });
   } else {
     result = await client.subscription.setPlanQuantity.mutate({
       quantity: input2.quantity
@@ -3949,6 +3949,46 @@ async function pollCheckoutUntilTerminal(client, orderId, opts) {
   };
 }
 
+// src/lib/plan-cart.ts
+function planFamily(planKey) {
+  if (!planKey) return null;
+  if (planKey === "free") return "FREE";
+  if (planKey === "shared" || planKey.startsWith("shared_") || planKey.startsWith("bundle_")) {
+    return "SHARED";
+  }
+  if (planKey === "dedicated" || planKey.startsWith("dedicated_")) {
+    return "DEDICATED";
+  }
+  return null;
+}
+function isPaidFamily(planKey) {
+  const family = planFamily(planKey);
+  return family === "SHARED" || family === "DEDICATED";
+}
+function resourceAddonKeysForPlan(planKey) {
+  switch (planFamily(planKey)) {
+    case "SHARED":
+      return { dbAddonKey: "db.starter", storageAddonKey: "storage.gb" };
+    case "DEDICATED":
+      return { dbAddonKey: "db.pro", storageAddonKey: "storage.gb" };
+    default:
+      return { dbAddonKey: null, storageAddonKey: null };
+  }
+}
+function buildPlanAddonCart(planKey, resources) {
+  const { dbAddonKey, storageAddonKey } = resourceAddonKeysForPlan(planKey);
+  const databases = Math.max(0, Math.floor(resources.databases ?? 0));
+  const storageGb = Math.max(0, Math.floor(resources.storageGb ?? 0));
+  const cart = [];
+  if (dbAddonKey && databases > 0) {
+    cart.push({ addonKey: dbAddonKey, quantity: databases });
+  }
+  if (storageAddonKey && storageGb > 0) {
+    cart.push({ addonKey: storageAddonKey, quantity: storageGb });
+  }
+  return cart;
+}
+
 // src/commands/billing.ts
 function reportBillingResult(result, label) {
   const code = emitBillingResult(result, { label });
@@ -4078,7 +4118,8 @@ function registerBillingCommands(program2) {
       const client = getApiClient();
       let targetPlan = planKey || options.plan;
       const billingPeriod = options.billingPeriod;
-      const addons = Array.isArray(options.addon) && options.addon.length > 0 ? options.addon : void 0;
+      let planQuantity = options.quantity;
+      let addons = Array.isArray(options.addon) && options.addon.length > 0 ? options.addon : void 0;
       if (!targetPlan) {
         const _spinner = startSpinner("Fetching plans...");
         const catalog = await client.subscription.getCatalog.query();
@@ -4109,12 +4150,31 @@ function registerBillingCommands(program2) {
       if (!targetPlan) {
         throw new Error("No plan selected");
       }
+      if (!isJsonMode() && !isNonInteractiveMode() && !shouldSkipConfirmation() && !addons && isPaidFamily(targetPlan)) {
+        if (planQuantity === void 0 && planFamily(targetPlan) === "SHARED") {
+          const apps = parsePositiveInt(
+            await input("How many apps (app slots)?", "1"),
+            1
+          );
+          planQuantity = Math.max(1, apps);
+        }
+        const databases = parsePositiveInt(
+          await input("How many databases to include?", "1"),
+          0
+        );
+        const storageGb = parsePositiveInt(
+          await input("Object storage to include (GB, 0 for none)?", "5"),
+          0
+        );
+        const cart = buildPlanAddonCart(targetPlan, { databases, storageGb });
+        if (cart.length > 0) addons = cart;
+      }
       const _previewSpinner = startSpinner("Calculating change...");
       let preview;
       try {
         preview = await client.subscription.previewPlanChange.query({
           planKey: targetPlan,
-          planQuantity: options.quantity,
+          planQuantity,
           billingPeriod,
           addons
         });
@@ -4126,7 +4186,7 @@ function registerBillingCommands(program2) {
       if (!shouldSkipConfirmation()) {
         log("");
         log(`Plan: ${colors.cyan(targetPlan)}`);
-        if (options.quantity) log(`Quantity: ${options.quantity}`);
+        if (planQuantity) log(`Quantity: ${planQuantity}`);
         if (billingPeriod) log(`Billing period: ${billingPeriod}`);
         if (addons && addons.length > 0) {
           log(
@@ -4153,7 +4213,7 @@ function registerBillingCommands(program2) {
             flag: "--yes",
             context: {
               plan: targetPlan,
-              quantity: options.quantity,
+              quantity: planQuantity,
               billingPeriod,
               addons,
               amountDueHalalas
@@ -4169,7 +4229,7 @@ function registerBillingCommands(program2) {
       const result = await performBillingChange(client, {
         kind: "plan",
         planKey: targetPlan,
-        quantity: options.quantity,
+        quantity: planQuantity,
         billingPeriod,
         addons,
         wait: options.wait,
@@ -4461,7 +4521,7 @@ function registerBillingCommands(program2) {
       const client = getApiClient();
       const _spinner = startSpinner("Calculating preview...");
       const preview = await client.subscription.previewAddonsPurchase.query({
-        addons: [{ addonKey, quantity: options.quantity || 1 }]
+        items: [{ addonKey, quantity: options.quantity || 1 }]
       });
       succeedSpinner();
       if (isJsonMode()) {
@@ -4771,6 +4831,10 @@ function collectAddon(value, previous) {
   }
   return [...previous, { addonKey, quantity }];
 }
+function parsePositiveInt(raw, fallback) {
+  const n = Number.parseInt(String(raw).trim(), 10);
+  return Number.isFinite(n) && n >= 0 ? n : fallback;
+}
 function parseBillingPeriod(raw) {
   const v = raw.toLowerCase();
   if (v === "monthly" || v === "yearly") return v;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tarout/cli",
-	"version": "0.4.0",
+	"version": "0.5.0",
 	"description": "Tarout CLI — the Saudi cloud platform for coding agents",
 	"type": "module",
 	"bin": {