@tarout/cli 0.4.0 → 0.6.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.6.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;
@@ -6465,6 +6529,20 @@ function resolveEntitlementRemedy(failedKey, catalog, opts) {
       hint: `A dedicated host slot is required \u2014 upgrade to ${plan2?.name ?? target2}.`
     };
   }
+  if (failedKey === "db.free.slots" || failedKey === "storage.free.slots") {
+    const target2 = nextPlanForRequested(opts?.requestedPlan);
+    const plan2 = plans.find((p) => planKeyOf(p) === target2);
+    const resource = failedKey === "db.free.slots" ? "database" : "storage bucket";
+    return {
+      kind: "plan",
+      failedKey,
+      targetKey: target2,
+      targetName: plan2?.name,
+      priceHalalas: plan2?.priceHalalas,
+      command: `tarout billing upgrade ${target2} --wait`,
+      hint: `The free plan includes a single ${resource} for the whole org \u2014 delete the existing free ${resource}, or upgrade to ${plan2?.name ?? target2} to add more.`
+    };
+  }
   if (failedKey?.startsWith("db.") || failedKey?.startsWith("storage.") || failedKey?.startsWith("domain") || failedKey?.startsWith("email")) {
     const matched = addons.find(
       (a) => a.grants?.some((g) => g.entitlementKey === failedKey)
@@ -7305,6 +7383,97 @@ async function runInlineUpgrade(client, planKey) {
   }
   return false;
 }
+async function getCurrentPlanQuantitySafely(client) {
+  try {
+    const sub = await client.subscription.getCurrent.query();
+    const q = Number(sub?.planQuantity);
+    return Number.isFinite(q) && q > 0 ? q : 1;
+  } catch {
+    return 1;
+  }
+}
+async function runInlineTargetedRemedy(client, remedy) {
+  let input2;
+  let label;
+  if (remedy.kind === "addon") {
+    input2 = { kind: "addon", addonKey: remedy.targetKey, quantity: 1 };
+    label = remedy.targetName ?? remedy.targetKey;
+  } else {
+    const next = await getCurrentPlanQuantitySafely(client) + 1;
+    input2 = { kind: "plan_quantity", planKey: remedy.targetKey, quantity: next };
+    label = `${remedy.targetName ?? remedy.targetKey} \xD7${next}`;
+  }
+  const _spinner = startSpinner(`Adding ${label}...`);
+  const result = await performBillingChange(client, {
+    ...input2,
+    wait: true,
+    timeoutMs: 6e5,
+    openBrowser: isJsonMode() ? void 0 : async (url) => {
+      await open4(url);
+    },
+    onCheckoutOpened: ({ orderId, paymentUrl }) => {
+      log("");
+      log("Open this URL to complete payment:");
+      log(`  ${colors.cyan(paymentUrl)}`);
+      log(`Order ID: ${colors.dim(orderId)}`);
+    }
+  });
+  if (result.status === "applied" || result.status === "paid") {
+    succeedSpinner(`${label} added.`);
+    return true;
+  }
+  failSpinner(
+    result.status === "deferred" ? "Change did not require an immediate payment." : result.status === "pending_timeout" ? "Payment still pending after 10 minutes." : `Payment ${result.status}.`
+  );
+  if (result.failureReason) log(colors.error(result.failureReason));
+  if (result.orderId) {
+    log(
+      colors.dim(
+        `Resume later with: tarout billing wait ${result.orderId.slice(0, 8)} --timeout 600`
+      )
+    );
+  }
+  return false;
+}
+async function promptEntitlementRemedy(client, err, requestedPlan) {
+  const failedKey = extractEntitlementKeyFromError(err);
+  const catalog = await fetchCatalogSafely(client);
+  const remedy = resolveEntitlementRemedy(failedKey, catalog, { requestedPlan });
+  if (remedy.kind === "plan") {
+    return promptUpgradeFromEntitlementError(client, err, requestedPlan);
+  }
+  const price = remedy.priceHalalas !== void 0 ? ` (${formatPlanPrice(remedy.priceHalalas)})` : "";
+  const targetedLabel = remedy.kind === "plan_quantity" ? `Add one more app slot${price}` : `Add just the ${remedy.targetName ?? remedy.targetKey}${price}`;
+  log("");
+  log(colors.warn("That resource isn't included in your current plan."));
+  log("");
+  const UPGRADE = "__upgrade__";
+  const TARGETED = "__targeted__";
+  const CANCEL = "__cancel__";
+  const choice = await select(
+    "How would you like to add it?",
+    [
+      { name: "Upgrade the plan", value: UPGRADE },
+      { name: targetedLabel, value: TARGETED },
+      { name: "Cancel", value: CANCEL }
+    ],
+    {
+      field: "entitlement_remedy",
+      flag: "--plan <key> (upgrade) | tarout billing addon:buy <key> (addon)",
+      context: {
+        failedEntitlementKey: failedKey,
+        remedyKind: remedy.kind,
+        targetKey: remedy.targetKey,
+        command: remedy.command
+      }
+    }
+  );
+  if (choice === CANCEL) return false;
+  if (choice === UPGRADE) {
+    return promptUpgradeFromEntitlementError(client, err, requestedPlan);
+  }
+  return runInlineTargetedRemedy(client, remedy);
+}
 async function getAppPlanChoices(client, preloadedOptions) {
   try {
     const options = preloadedOptions ?? await client.application.getCreateOptions.query();
@@ -7411,6 +7580,63 @@ async function emitNeedsUpgrade(client, err, requestedPlan, retryCommand) {
     hint: `${remedy.hint} Then retry: ${retryCommand}.`
   });
 }
+async function listFreeDatabasesSafely(client) {
+  try {
+    const [pgRows, myRows] = await Promise.all([
+      client.postgres.allByOrganization.query().catch(() => []),
+      client.mysql.allByOrganization.query().catch(() => [])
+    ]);
+    const out = [];
+    for (const r of pgRows ?? []) {
+      if ((r?.plan ?? "FREE") === "FREE" && r?.postgresId) {
+        out.push({ kind: "postgres", id: r.postgresId, name: r.name });
+      }
+    }
+    for (const r of myRows ?? []) {
+      if ((r?.plan ?? "FREE") === "FREE" && r?.mysqlId) {
+        out.push({ kind: "mysql", id: r.mysqlId, name: r.name });
+      }
+    }
+    return out;
+  } catch {
+    return [];
+  }
+}
+async function explainFreeResourceSlotExhaustion(client, failedKey) {
+  const isDb = failedKey === "db.free.slots";
+  const resource = isDb ? "database" : "storage bucket";
+  log("");
+  log(
+    colors.warn(
+      `The free plan includes one ${resource} for the whole organization (across all environments).`
+    )
+  );
+  if (isDb) {
+    const existing = await listFreeDatabasesSafely(client);
+    if (existing.length > 0) {
+      log("You already have:");
+      for (const d of existing) {
+        log(
+          `  \u2022 ${d.name} ${colors.dim(`(${d.kind} \xB7 ${d.id.slice(0, 8)})`)}`
+        );
+      }
+    } else {
+      log(
+        colors.dim(
+          "Your existing free database may be in another environment \u2014 run `tarout db list`."
+        )
+      );
+    }
+  }
+  log("");
+  log("To continue, pick one:");
+  if (isDb) {
+    log(`  \u2022 Reuse it:  ${colors.cyan("tarout deploy --reuse-database auto")}`);
+    log(`  \u2022 Delete it: ${colors.cyan("tarout db delete <id>")}`);
+  }
+  log(`  \u2022 Upgrade:   ${colors.cyan("tarout billing upgrade shared --wait")}`);
+  log("");
+}
 async function promptUpgradeFromEntitlementError(client, err, requestedPlan) {
   const catalog = await fetchCatalogSafely(client);
   const allPlans = catalog?.plans ?? [];
@@ -8529,7 +8755,11 @@ function registerDeployCommands(program2) {
         }
         log("");
         log(colors.warn(message));
-        const upgraded = await promptUpgradeFromEntitlementError(
+        const failedKey = extractEntitlementKeyFromError(err);
+        if (failedKey === "db.free.slots" || failedKey === "storage.free.slots") {
+          await explainFreeResourceSlotExhaustion(getApiClient(), failedKey);
+        }
+        const upgraded = await promptEntitlementRemedy(
           getApiClient(),
           err,
           options.plan
@@ -8543,7 +8773,7 @@ function registerDeployCommands(program2) {
           );
           exit(ExitCode.PERMISSION_DENIED);
         }
-        box("Upgrade complete", [
+        box("Billing updated", [
           colors.success("Subscription updated."),
           `Run ${colors.cyan("tarout deploy")} again to deploy on the new plan.`
         ]);
@@ -19146,7 +19376,7 @@ function registerUpCommand(program2) {
             }
             log("");
             log(colors.warn(message));
-            const upgraded = await promptUpgradeFromEntitlementError(
+            const upgraded = await promptEntitlementRemedy(
               client,
               err,
               options.plan
@@ -19155,7 +19385,7 @@ function registerUpCommand(program2) {
               await emitNeedsUpgrade(client, err, options.plan, "tarout up");
               exit(ExitCode.PERMISSION_DENIED);
             }
-            box("Upgrade complete", [
+            box("Billing updated", [
               colors.success("Subscription updated."),
               `Run ${colors.cyan("tarout up")} again to deploy on the new plan.`
             ]);
@@ -19252,6 +19482,39 @@ function registerUpCommand(program2) {
         app.applicationId
       );
     } catch (err) {
+      if (isEntitlementError(err)) {
+        const message = err instanceof Error ? err.message : "Plan upgrade required";
+        if (isJsonMode() || shouldSkipConfirmation()) {
+          await emitNeedsUpgrade(
+            getApiClient(),
+            err,
+            options.plan,
+            "tarout up"
+          );
+          exit(ExitCode.PERMISSION_DENIED);
+        }
+        log("");
+        log(colors.warn(message));
+        const upgraded = await promptEntitlementRemedy(
+          getApiClient(),
+          err,
+          options.plan
+        );
+        if (!upgraded) {
+          await emitNeedsUpgrade(
+            getApiClient(),
+            err,
+            options.plan,
+            "tarout up"
+          );
+          exit(ExitCode.PERMISSION_DENIED);
+        }
+        box("Billing updated", [
+          colors.success("Subscription updated."),
+          `Run ${colors.cyan("tarout up")} again to deploy on the new plan.`
+        ]);
+        return;
+      }
       if (err instanceof Error && err.message.startsWith("Invalid --source")) {
         outputError("INVALID_ARGUMENTS", err.message);
         if (!isJsonMode()) log(colors.error(err.message));
@@ -19480,10 +19743,11 @@ program.name("tarout").description("Tarout PaaS Command Line Interface").version
   "Fail fast on missing input (emit needs_input + exit 6 instead of prompting on TTY)"
 ).option("-q, --quiet", "Minimal output").option("-v, --verbose", "Extra debug information").option("--no-color", "Disable colored output").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
+  const stdinIsTTY = Boolean(process.stdin.isTTY);
   setGlobalOptions({
     json: opts.json || false,
     yes: opts.yes || false,
-    nonInteractive: opts.nonInteractive || false,
+    nonInteractive: opts.nonInteractive || !stdinIsTTY,
     quiet: opts.quiet || false,
     verbose: opts.verbose || false,
     noColor: opts.color === false

package/package.json

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