@tarout/cli 0.6.0 → 0.7.1

package/dist/index.js

@@ -61,7 +61,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@tarout/cli",
-  version: "0.6.0",
+  version: "0.7.1",
   description: "Tarout CLI \u2014 the Saudi cloud platform for coding agents",
   type: "module",
   bin: {
@@ -7133,87 +7133,91 @@ async function resolveDeploymentTarget(client, profile, appIdentifier, options =
       );
       throw new NotFoundError("Application", appIdentifier, suggestions);
     }
-    const details2 = await getApplicationDetails(client, app2.applicationId);
+    const details = await getApplicationDetails(client, app2.applicationId);
     return {
       app: app2,
       createdApp: false,
-      hasConfiguredSource: hasConfiguredSource(details2),
-      shouldUploadSource: shouldUseLocalSource(details2, {
+      hasConfiguredSource: hasConfiguredSource(details),
+      shouldUploadSource: shouldUseLocalSource(details, {
         explicitApp: true
       })
     };
   }
-  const linkedProject = getProjectConfig();
-  if (linkedProject) {
-    const app2 = findApp3(apps, linkedProject.applicationId) ?? findApp3(apps, linkedProject.name);
-    if (app2) {
-      const details2 = await getApplicationDetails(client, app2.applicationId);
-      return {
-        app: app2,
-        createdApp: false,
-        hasConfiguredSource: hasConfiguredSource(details2),
-        shouldUploadSource: shouldUseLocalSource(details2, {
-          linkedProject: true
-        })
-      };
-    }
-    if (!isJsonMode()) {
-      log("");
-      log(
-        colors.warn(
-          `Linked application "${linkedProject.name}" was not found in this organization.`
-        )
-      );
-    }
+  if (options.newApp) {
+    assertConfiguredSourceAllowsCreate(sourcePreference);
+    return createNewAppTarget(client, profile, options);
   }
-  if (isJsonMode()) {
-    throw new InvalidArgumentError(
-      "No linked application. Run 'tarout link', pass an app name, or run without --json to choose interactively."
+  const linkedProject = getProjectConfig();
+  const linkedApp = linkedProject ? findApp3(apps, linkedProject.applicationId) ?? findApp3(apps, linkedProject.name) : void 0;
+  if (linkedProject && !linkedApp && !isJsonMode()) {
+    log("");
+    log(
+      colors.warn(
+        `Linked application "${linkedProject.name}" was not found in this organization.`
+      )
     );
   }
   if (apps.length === 0) {
-    if (sourcePreference === "configured") {
-      throw new InvalidArgumentError(
-        'No Tarout app exists to deploy from a configured source. Create or select an app with a configured Git provider first, or rerun with "--source upload".'
-      );
-    }
-    const app2 = await createAppFromCurrentDirectory(client, profile, options);
-    return {
-      app: app2,
-      createdApp: true,
-      hasConfiguredSource: false,
-      shouldUploadSource: true
-    };
+    assertConfiguredSourceAllowsCreate(sourcePreference, true);
+    return createNewAppTarget(client, profile, options);
+  }
+  if (shouldSkipConfirmation()) {
+    if (linkedApp) return reuseAppTarget(client, profile, linkedApp);
+    assertConfiguredSourceAllowsCreate(sourcePreference, true);
+    return createNewAppTarget(client, profile, options);
   }
   const createValue = "__create__";
-  const selected = await select("Select an application to deploy:", [
+  const orderedApps = linkedApp ? [linkedApp, ...apps.filter((a) => a.applicationId !== linkedApp.applicationId)] : apps;
+  const selected = await select(
+    "Create a new app or reuse an existing one?",
+    [
+      {
+        name: `Create a new app from ${colors.cyan(basename(process.cwd()) || "this directory")}`,
+        value: createValue
+      },
+      ...orderedApps.map((app2) => ({
+        name: `Reuse ${app2.name} ${colors.dim(`(${app2.applicationId.slice(0, 8)})`)}${linkedApp && app2.applicationId === linkedApp.applicationId ? colors.dim(" \u2014 linked") : ""}`,
+        value: app2.applicationId
+      }))
+    ],
     {
-      name: `Create a new app from ${colors.cyan(basename(process.cwd()) || "this directory")}`,
-      value: createValue
-    },
-    ...apps.map((app2) => ({
-      name: `${app2.name} ${colors.dim(`(${app2.applicationId.slice(0, 8)})`)}`,
-      value: app2.applicationId
-    }))
-  ]);
-  if (selected === createValue) {
-    if (sourcePreference === "configured") {
-      throw new InvalidArgumentError(
-        'New apps do not have a configured Git provider source yet. Connect a Git provider first, or rerun with "--source upload".'
-      );
+      field: "deploy_app",
+      flag: "--new-app to create a new app, or --app <id|name> to reuse an existing one",
+      context: {
+        linkedApp: linkedApp ? { id: linkedApp.applicationId, name: linkedApp.name } : null,
+        apps: orderedApps.map((a) => ({
+          id: a.applicationId,
+          name: a.name
+        }))
+      }
     }
-    const app2 = await createAppFromCurrentDirectory(client, profile, options);
-    return {
-      app: app2,
-      createdApp: true,
-      hasConfiguredSource: false,
-      shouldUploadSource: true
-    };
+  );
+  if (selected === createValue) {
+    assertConfiguredSourceAllowsCreate(sourcePreference);
+    return createNewAppTarget(client, profile, options);
   }
   const app = findApp3(apps, selected);
   if (!app) {
     throw new NotFoundError("Application", selected);
   }
+  return reuseAppTarget(client, profile, app);
+}
+function assertConfiguredSourceAllowsCreate(sourcePreference, noAppsExist = false) {
+  if (sourcePreference !== "configured") return;
+  throw new InvalidArgumentError(
+    noAppsExist ? 'No Tarout app exists to deploy from a configured source. Create or select an app with a configured Git provider first, or rerun with "--source upload".' : 'New apps do not have a configured Git provider source yet. Connect a Git provider first, or rerun with "--source upload".'
+  );
+}
+async function createNewAppTarget(client, profile, options) {
+  const app = await createAppFromCurrentDirectory(client, profile, options);
+  return {
+    app,
+    createdApp: true,
+    hasConfiguredSource: false,
+    shouldUploadSource: true
+  };
+}
+async function reuseAppTarget(client, profile, app) {
   setProjectConfig({
     applicationId: app.applicationId,
     name: app.name,
@@ -7282,9 +7286,30 @@ async function createAppFromCurrentDirectory(client, profile, options = {}) {
     sourceType: application.sourceType
   };
 }
+async function isOrgPaidSafely(client) {
+  try {
+    const opts = await client.application.getCreateOptions.query();
+    return opts?.isPaid === true;
+  } catch {
+    return false;
+  }
+}
 async function resolveAppPlanForCreate(client, options) {
   const explicitPlan = normalizeAppPlan(options.plan);
-  if (explicitPlan) return explicitPlan;
+  if (explicitPlan && explicitPlan !== "FREE") return explicitPlan;
+  if (explicitPlan === "FREE") {
+    if (await isOrgPaidSafely(client)) {
+      if (!isJsonMode()) {
+        log(
+          colors.dim(
+            "Your org is on a paid plan \u2014 free apps aren't available, so this app will use your paid tier."
+          )
+        );
+      }
+      return void 0;
+    }
+    return "FREE";
+  }
   if (isJsonMode() || shouldSkipConfirmation()) return void 0;
   let createOptions;
   try {
@@ -7564,20 +7589,50 @@ function extractEntitlementKeyFromError(err) {
   const m = msg.match(/Plan limit reached for ([\w.]+)/i);
   return m?.[1];
 }
+function buildRemedyOptions(remedy, requestedPlan, catalog) {
+  if (remedy.kind === "addon" || remedy.kind === "plan_quantity") {
+    const upgradePlan = nextPlanForRequested(requestedPlan);
+    const planDef = (catalog?.plans ?? []).find(
+      (p) => (p.planKey ?? p.key) === upgradePlan
+    );
+    return [
+      {
+        action: remedy.kind === "addon" ? "buy_addon" : "add_app_slot",
+        label: remedy.kind === "addon" ? `Buy just the ${remedy.targetName ?? remedy.targetKey}` : "Add one more app slot",
+        command: remedy.command
+      },
+      {
+        action: "upgrade_plan",
+        label: `Upgrade to ${planDef?.name ?? upgradePlan}`,
+        command: `tarout billing upgrade ${upgradePlan} --wait`
+      }
+    ];
+  }
+  return [
+    {
+      action: "upgrade_plan",
+      label: `Upgrade to ${remedy.targetName ?? remedy.targetKey}`,
+      command: remedy.command
+    }
+  ];
+}
 async function emitNeedsUpgrade(client, err, requestedPlan, retryCommand) {
   const message = err instanceof Error ? err.message : "Plan upgrade required";
   const failedKey = extractEntitlementKeyFromError(err);
   const catalog = await fetchCatalogSafely(client);
   const remedy = resolveEntitlementRemedy(failedKey, catalog, { requestedPlan });
+  const options = buildRemedyOptions(remedy, requestedPlan, catalog);
+  const hint = options.length > 1 ? `Two ways to resolve this \u2014 ask the user which they prefer, do not choose for them: (1) ${options[0]?.label}: \`${options[0]?.command}\`; (2) ${options[1]?.label}: \`${options[1]?.command}\`. Then retry: ${retryCommand}.` : `${remedy.hint} Then retry: ${retryCommand}.`;
   outputError("NEEDS_UPGRADE", message, {
     failedEntitlementKey: failedKey,
     remedyKind: remedy.kind,
-    // `suggestedPlan` retained for back-compat; now correct for every gate
-    // (the plan key, addon key, or quantity-aware plan to act on).
+    // `suggestedPlan`/`nextCommand` retained for back-compat (the recommended
+    // targeted action); `options` is the authoritative choice list.
     suggestedPlan: remedy.targetKey,
     suggestedTarget: remedy.targetKey,
     nextCommand: remedy.command,
-    hint: `${remedy.hint} Then retry: ${retryCommand}.`
+    options,
+    hint
   });
 }
 async function listFreeDatabasesSafely(client) {
@@ -8656,6 +8711,12 @@ function registerDeployCommands(program2) {
   ).option(
     "--reuse-storage <ref>",
     "Reuse an existing storage bucket in this project: <id>, <name>, or 'auto' (exactly one match)"
+  ).option(
+    "--new-app",
+    "Create a new app instead of being prompted to reuse an existing one"
+  ).option(
+    "--name <name>",
+    "Name for a newly created app (defaults to the directory name)"
   ).option("--token <token>", "API token to use for this deployment").option("-r, --region <region>", "Deployment region", DEFAULT_REGION).option("--description <text>", "Description for a newly created app").option(
     "--framework-preset <preset>",
     "Framework preset override (e.g. nextjs, vite, astro)"
@@ -8744,7 +8805,7 @@ function registerDeployCommands(program2) {
     } catch (err) {
       if (isEntitlementError(err)) {
         const message = err instanceof Error ? err.message : "Plan upgrade required";
-        if (isJsonMode() || shouldSkipConfirmation()) {
+        if (isJsonMode() || isNonInteractiveMode() || shouldSkipConfirmation()) {
           await emitNeedsUpgrade(
             getApiClient(),
             err,
@@ -19204,9 +19265,15 @@ function registerUpCommand(program2) {
   ).option(
     "--api-url <url>",
     "Custom API URL (defaults to saved profile or https://tarout.sa)"
-  ).option("--token <token>", "API token for this run").option("--name <name>", "Application name (defaults to directory name)").option("--plan <plan>", "App hosting plan: free, shared, or dedicated", "free").option("--source <source>", "Source: upload (default) or github", "upload").option(
+  ).option("--token <token>", "API token for this run").option("--name <name>", "Application name (defaults to directory name)").option(
+    "--plan <plan>",
+    "App hosting plan: free, shared, or dedicated (defaults to your org's tier)"
+  ).option("--source <source>", "Source: upload (default) or github", "upload").option(
     "--app <ref>",
     "Deploy to an existing app by id or name (skips create-or-pick prompt; 'auto' picks the lone match)"
+  ).option(
+    "--new-app",
+    "Create a new app instead of being prompted to reuse an existing one"
   ).option("--repo <owner/repo>", "GitHub repository (when --source github)").option("--branch <branch>", "GitHub branch (with --source github)", "main").option("-r, --region <region>", "Deployment region", DEFAULT_REGION3).option(
     "--database <type>",
     "Provision and attach a database: none, postgres, or mysql (defaults to auto-detected)"
@@ -19268,9 +19335,7 @@ function registerUpCommand(program2) {
         }
         return allApps;
       };
-      if (options.app) {
-        const apps = await loadApps();
-        const picked = resolveAppRef(apps, options.app);
+      const reuse = (picked, via) => {
         app = picked;
         reused = true;
         setProjectConfig({
@@ -19283,45 +19348,47 @@ function registerUpCommand(program2) {
           event: "app_reused",
           applicationId: picked.applicationId,
           name: picked.name,
-          via: "--app"
+          via
         });
-      } else if (linked) {
+      };
+      if (options.app) {
         const apps = await loadApps();
-        const existing = findApp3(apps, linked.applicationId) ?? findApp3(apps, linked.name);
-        if (existing) {
-          app = existing;
-          reused = true;
-          emitEvent2({
-            event: "app_reused",
-            applicationId: app.applicationId,
-            name: app.name,
-            via: "linked"
-          });
-        }
-      }
-      if (!app && !isJsonMode() && !shouldSkipConfirmation()) {
+        reuse(resolveAppRef(apps, options.app), "--app");
+      } else if (!options.newApp) {
         const apps = await loadApps();
-        if (apps.length > 0) {
+        const linkedApp = linked ? findApp3(apps, linked.applicationId) ?? findApp3(apps, linked.name) : void 0;
+        if (shouldSkipConfirmation()) {
+          if (linkedApp) reuse(linkedApp, "linked");
+        } else if (apps.length > 0) {
           const createValue = "__create__";
-          log("");
-          log(
-            `Found ${apps.length} existing app${apps.length === 1 ? "" : "s"} in this organization.`
-          );
+          const orderedApps = linkedApp ? [
+            linkedApp,
+            ...apps.filter(
+              (a) => a.applicationId !== linkedApp.applicationId
+            )
+          ] : apps;
           const selected = await select(
-            "Deploy to an existing app or create a new one?",
+            "Create a new app or reuse an existing one?",
             [
               {
                 name: `Create a new app${options.name ? ` named "${options.name}"` : ""}`,
                 value: createValue
               },
-              ...apps.map((existing) => ({
-                name: `${existing.name} ${colors.dim(`(${existing.applicationId.slice(0, 8)})`)}`,
+              ...orderedApps.map((existing) => ({
+                name: `Reuse ${existing.name} ${colors.dim(`(${existing.applicationId.slice(0, 8)})`)}${linkedApp && existing.applicationId === linkedApp.applicationId ? colors.dim(" \u2014 linked") : ""}`,
                 value: existing.applicationId
               }))
             ],
             {
-              field: "deploy_target_app",
-              flag: "--app <id|name|auto>"
+              field: "deploy_app",
+              flag: "--new-app to create a new app, or --app <id|name> to reuse an existing one",
+              context: {
+                linkedApp: linkedApp ? { id: linkedApp.applicationId, name: linkedApp.name } : null,
+                apps: orderedApps.map((a) => ({
+                  id: a.applicationId,
+                  name: a.name
+                }))
+              }
             }
           );
           if (selected !== createValue) {
@@ -19329,20 +19396,7 @@ function registerUpCommand(program2) {
             if (!picked) {
               throw new NotFoundError("Application", selected);
             }
-            app = picked;
-            reused = true;
-            setProjectConfig({
-              applicationId: picked.applicationId,
-              name: picked.name,
-              organizationId: profile.organizationId,
-              linkedAt: (/* @__PURE__ */ new Date()).toISOString()
-            });
-            emitEvent2({
-              event: "app_reused",
-              applicationId: picked.applicationId,
-              name: picked.name,
-              via: "interactive"
-            });
+            reuse(picked, "interactive");
           }
         }
       }
@@ -19370,7 +19424,7 @@ function registerUpCommand(program2) {
         } catch (err) {
           if (isEntitlementError(err)) {
             const message = err instanceof Error ? err.message : "Plan upgrade required";
-            if (isJsonMode() || shouldSkipConfirmation()) {
+            if (isJsonMode() || isNonInteractiveMode() || shouldSkipConfirmation()) {
               await emitNeedsUpgrade(client, err, options.plan, "tarout up");
               exit(ExitCode.PERMISSION_DENIED);
             }
@@ -19484,7 +19538,7 @@ function registerUpCommand(program2) {
     } catch (err) {
       if (isEntitlementError(err)) {
         const message = err instanceof Error ? err.message : "Plan upgrade required";
-        if (isJsonMode() || shouldSkipConfirmation()) {
+        if (isJsonMode() || isNonInteractiveMode() || shouldSkipConfirmation()) {
           await emitNeedsUpgrade(
             getApiClient(),
             err,

package/package.json

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