@tarout/cli 0.2.1 → 0.2.2

package/dist/index.js

@@ -6,7 +6,7 @@ import {
   stopSpinner,
   succeedSpinner,
   updateSpinner
-} from "./chunk-XSJKHLNL.js";
+} from "./chunk-5XBVQICT.js";
 import {
   AuthError,
   BuildFailedError,
@@ -33,14 +33,14 @@ import {
   setProfile,
   setProjectConfig,
   updateProfile
-} from "./chunk-FKX4CRPL.js";
+} from "./chunk-7YS2WBLB.js";
 import {
   confirm,
   input,
   password,
   promptOrEmit,
   select
-} from "./chunk-J3H7LTFT.js";
+} from "./chunk-CJMIX35A.js";
 import {
   ExitCode,
   box,
@@ -49,6 +49,7 @@ import {
   exit,
   getStatusBadge,
   isJsonMode,
+  isNonInteractiveMode,
   log,
   outputData,
   outputError,
@@ -58,7 +59,7 @@ import {
   shouldSkipConfirmation,
   success,
   table
-} from "./chunk-FS74WWHV.js";
+} from "./chunk-KL3JNPAY.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -66,7 +67,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@tarout/cli",
-  version: "0.2.1",
+  version: "0.2.2",
   description: "Tarout CLI \u2014 the Saudi cloud platform for coding agents",
   type: "module",
   bin: {
@@ -167,7 +168,11 @@ function registerAccountCommands(program2) {
         if (options.email) updates.email = options.email;
         if (options.password) {
           updates.password = options.password;
-          updates.currentPassword = options.currentPassword || await input("Current password:");
+          updates.currentPassword = options.currentPassword || await input("Current password:", void 0, {
+            field: "currentPassword",
+            flag: "--current-password",
+            sensitive: true
+          });
         }
         if (Object.keys(updates).length === 0) {
           log("No changes specified.");
@@ -197,14 +202,19 @@ function registerAccountCommands(program2) {
         log("");
         const confirmed = await confirm(
           "Delete your account? This cannot be undone.",
-          false
+          false,
+          { field: "confirm_delete_account", flag: "--yes" }
         );
         if (!confirmed) {
           log("Cancelled.");
           return;
         }
       }
-      const confirmEmail = await input("Type your email address to confirm:");
+      const confirmEmail = await input(
+        "Type your email address to confirm:",
+        void 0,
+        { field: "confirm_email", flag: "--confirm-email" }
+      );
       const client = getApiClient();
       const _spinner = startSpinner("Deleting account...");
       await client.user.deleteSelf.mutate({ confirmEmail });
@@ -253,7 +263,10 @@ function registerAccountCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const name = options.name || await input("API key name:");
+        const name = options.name || await input("API key name:", void 0, {
+          field: "name",
+          flag: "--name"
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Creating API key...");
         const result = await client.user.createApiKey.mutate({
@@ -292,7 +305,12 @@ function registerAccountCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete API key "${apiKeyId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_api_key",
+            flag: "--yes",
+            context: { apiKeyId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -501,10 +519,15 @@ Root access: ${hasAccess ? colors.success("yes") : colors.error("no")}
     try {
       if (!isLoggedIn()) throw new AuthError();
       if (!shouldSkipConfirmation()) {
-        const { confirm: confirmFn } = await import("./prompts-WNFR34TG.js");
+        const { confirm: confirmFn } = await import("./prompts-QQ2FZKQT.js");
         const ok = await confirmFn(
           `Remove user "${userId}" from the organization?`,
-          false
+          false,
+          {
+            field: "confirm_remove_member",
+            flag: "--yes",
+            context: { userId }
+          }
         );
         if (!ok) {
           log("Cancelled.");
@@ -523,11 +546,15 @@ Root access: ${hasAccess ? colors.success("yes") : colors.error("no")}
   account.command("assign-permissions").argument("<user-id>", "User ID").option("--role <role>", "Role: admin, member").description("Assign permissions/role to a member (org owner only)").action(async (userId, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const { select: selectFn } = await import("./prompts-WNFR34TG.js");
-      const role = options.role || await selectFn("Role:", [
-        { name: "Admin", value: "admin" },
-        { name: "Member", value: "member" }
-      ]);
+      const { select: selectFn } = await import("./prompts-QQ2FZKQT.js");
+      const role = options.role || await selectFn(
+        "Role:",
+        [
+          { name: "Admin", value: "admin" },
+          { name: "Member", value: "member" }
+        ],
+        { field: "role", flag: "--role" }
+      );
       const client = getApiClient();
       const _spinner = startSpinner("Assigning permissions...");
       await client.user.assignPermissions.mutate({ userId, role });
@@ -690,7 +717,10 @@ function registerAiCommands(program2) {
       let modelId = options.model;
       const modelProvider = options.provider || "global";
       if (!keyName) {
-        keyName = await input("Key name:");
+        keyName = await input("Key name:", void 0, {
+          field: "name",
+          flag: "--name"
+        });
       }
       if (!modelId) {
         const client2 = getApiClient();
@@ -703,13 +733,22 @@ function registerAiCommands(program2) {
               modelList.map((m) => ({
                 name: m.name || m.displayName || m.id || m.modelId,
                 value: m.id || m.modelId
-              }))
+              })),
+              {
+                field: "model_id",
+                flag: "--model",
+                context: { keyName }
+              }
             );
           }
         } catch {
         }
         if (!modelId) {
-          modelId = await input("Model ID (e.g., gpt-4o):");
+          modelId = await input("Model ID (e.g., gpt-4o):", void 0, {
+            field: "model_id",
+            flag: "--model",
+            context: { keyName }
+          });
         }
       }
       const client = getApiClient();
@@ -865,7 +904,12 @@ function registerAiCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Permanently delete key "${keyId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_ai_key",
+            flag: "--yes",
+            context: { keyId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -1036,9 +1080,19 @@ ${colors.bold(prov.name || "AI Config")}: ${prov.apiUrl || "-"}
   aiProvider.command("create").description("Create a custom AI provider configuration (org owner only)").option("--name <name>", "Provider name").option("--url <url>", "Provider API URL").option("--key <key>", "Provider API key").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const name = options.name || await input("Provider name:");
-      const apiUrl = options.url || await input("Provider API URL:");
-      const apiKey = options.key || await input("Provider API key:");
+      const name = options.name || await input("Provider name:", void 0, {
+        field: "name",
+        flag: "--name"
+      });
+      const apiUrl = options.url || await input("Provider API URL:", void 0, {
+        field: "api_url",
+        flag: "--url"
+      });
+      const apiKey = options.key || await input("Provider API key:", void 0, {
+        field: "api_key",
+        flag: "--key",
+        sensitive: true
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Creating AI provider...");
       const result = await client.ai.create.mutate({
@@ -1077,7 +1131,12 @@ ${colors.bold(prov.name || "AI Config")}: ${prov.apiUrl || "-"}
       if (!shouldSkipConfirmation()) {
         const ok = await confirm(
           `Delete AI provider configuration "${aiId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_ai_provider",
+            flag: "--yes",
+            context: { aiId }
+          }
         );
         if (!ok) {
           log("Cancelled.");
@@ -1154,10 +1213,16 @@ function registerAppsCommands(program2) {
       let appName = name;
       let description = options.description;
       if (!appName) {
-        appName = await input("Application name:");
+        appName = await input("Application name:", void 0, {
+          field: "app_name",
+          flag: "<name>"
+        });
       }
       if (!description && !shouldSkipConfirmation()) {
-        description = await input("Description (optional):");
+        description = await input("Description (optional):", void 0, {
+          field: "description",
+          flag: "--description"
+        });
       }
       const slug = generateSlug(appName);
       const client = getApiClient();
@@ -1214,7 +1279,12 @@ function registerAppsCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Are you sure you want to delete "${app.name}"? This cannot be undone.`,
-          false
+          false,
+          {
+            field: "confirm_delete_app",
+            flag: "--yes",
+            context: { appName: app.name, applicationId: app.applicationId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -1353,10 +1423,15 @@ function registerAppsCommands(program2) {
         throw new NotFoundError("Application", appIdentifier, suggestions);
       }
       if (!shouldSkipConfirmation()) {
-        const { confirm: confirm2 } = await import("./prompts-WNFR34TG.js");
+        const { confirm: confirm2 } = await import("./prompts-QQ2FZKQT.js");
         const confirmed = await confirm2(
           `Stop application "${app.name}"?`,
-          false
+          false,
+          {
+            field: "confirm_stop_app",
+            flag: "--yes",
+            context: { appName: app.name, applicationId: app.applicationId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -1436,7 +1511,10 @@ function registerAppsCommands(program2) {
       let repo = options.repo;
       const branch = options.branch;
       if (!repo) {
-        repo = await input("Repository (owner/repo):");
+        repo = await input("Repository (owner/repo):", void 0, {
+          field: "github_repo",
+          flag: "--repo"
+        });
       }
       const [owner, repository] = (repo || "").split("/");
       if (!owner || !repository) {
@@ -1456,7 +1534,11 @@ function registerAppsCommands(program2) {
               providerList.map((p) => ({
                 name: p.name || p.login || p.githubId,
                 value: p.githubId || p.id
-              }))
+              })),
+              {
+                field: "github_provider_id",
+                flag: "--provider-id"
+              }
             );
           }
         }
@@ -1501,7 +1583,10 @@ function registerAppsCommands(program2) {
       }
       let repo = options.repo;
       if (!repo) {
-        repo = await input("Repository (namespace/repo):");
+        repo = await input("Repository (namespace/repo):", void 0, {
+          field: "gitlab_repo",
+          flag: "--repo"
+        });
       }
       const parts = (repo || "").split("/");
       const gitlabOwner = parts.slice(0, -1).join("/");
@@ -1518,7 +1603,11 @@ function registerAppsCommands(program2) {
             providerList.map((p) => ({
               name: p.name || p.gitlabId,
               value: p.gitlabId || p.id
-            }))
+            })),
+            {
+              field: "gitlab_provider_id",
+              flag: "--provider-id"
+            }
           );
         }
       }
@@ -1562,7 +1651,12 @@ function registerAppsCommands(program2) {
       let image = options.image;
       if (!image) {
         image = await input(
-          "Docker image (e.g., nginx:latest or myorg/app:1.0):"
+          "Docker image (e.g., nginx:latest or myorg/app:1.0):",
+          void 0,
+          {
+            field: "docker_image",
+            flag: "--image"
+          }
         );
       }
       const _configSpinner = startSpinner("Configuring Docker Hub...");
@@ -1601,7 +1695,10 @@ function registerAppsCommands(program2) {
       }
       let gitUrl = options.url;
       if (!gitUrl) {
-        gitUrl = await input("Git URL (https://... or git@...):");
+        gitUrl = await input("Git URL (https://... or git@...):", void 0, {
+          field: "git_url",
+          flag: "--url"
+        });
       }
       const _configSpinner = startSpinner("Connecting git repository...");
       await client.application.saveGitProvider.mutate({
@@ -1644,10 +1741,15 @@ function registerAppsCommands(program2) {
         throw new NotFoundError("Application", appIdentifier);
       }
       if (!shouldSkipConfirmation()) {
-        const { confirm: confirm2 } = await import("./prompts-WNFR34TG.js");
+        const { confirm: confirm2 } = await import("./prompts-QQ2FZKQT.js");
         const confirmed = await confirm2(
           `Disconnect source provider from "${app.name}"?`,
-          false
+          false,
+          {
+            field: "confirm_disconnect_git_provider",
+            flag: "--yes",
+            context: { appName: app.name, applicationId: app.applicationId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -1682,11 +1784,18 @@ function registerAppsCommands(program2) {
       }
       let buildType = options.type;
       if (!buildType) {
-        buildType = await select("Build type:", [
-          { name: "Nixpacks (auto-detect)", value: "nixpacks" },
-          { name: "Dockerfile", value: "dockerfile" },
-          { name: "Static / SPA", value: "static" }
-        ]);
+        buildType = await select(
+          "Build type:",
+          [
+            { name: "Nixpacks (auto-detect)", value: "nixpacks" },
+            { name: "Dockerfile", value: "dockerfile" },
+            { name: "Static / SPA", value: "static" }
+          ],
+          {
+            field: "build_type",
+            flag: "--type"
+          }
+        );
       }
       const _configSpinner = startSpinner("Saving build configuration...");
       await client.application.saveBuildType.mutate({
@@ -1723,7 +1832,10 @@ function registerAppsCommands(program2) {
       }
       let repo = options.repo;
       if (!repo) {
-        repo = await input("Repository (owner/repo):");
+        repo = await input("Repository (owner/repo):", void 0, {
+          field: "bitbucket_repo",
+          flag: "--repo"
+        });
       }
       const parts = (repo || "").split("/");
       const bitbucketOwner = parts.slice(0, -1).join("/") || parts[0] || "";
@@ -1741,7 +1853,11 @@ function registerAppsCommands(program2) {
               providerList.map((p) => ({
                 name: p.username || p.bitbucketId,
                 value: p.bitbucketId || p.id
-              }))
+              })),
+              {
+                field: "bitbucket_provider_id",
+                flag: "--provider-id"
+              }
             );
           }
         } catch {
@@ -1788,7 +1904,10 @@ function registerAppsCommands(program2) {
       }
       let repo = options.repo;
       if (!repo) {
-        repo = await input("Repository (owner/repo):");
+        repo = await input("Repository (owner/repo):", void 0, {
+          field: "gitea_repo",
+          flag: "--repo"
+        });
       }
       const parts = (repo || "").split("/");
       const giteaOwner = parts.slice(0, -1).join("/") || parts[0] || "";
@@ -2226,7 +2345,16 @@ function registerAppsCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Change plan for "${app.name}" to "${newPlan}"?`,
-          false
+          false,
+          {
+            field: "confirm_change_plan",
+            flag: "--yes",
+            context: {
+              appName: app.name,
+              applicationId: app.applicationId,
+              newPlan
+            }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -2442,7 +2570,10 @@ function registerAppsCommands(program2) {
         failSpinner();
         throw new NotFoundError("Application", appIdentifier);
       }
-      const dockerfileContent = options.content || await input("Dockerfile content:");
+      const dockerfileContent = options.content || await input("Dockerfile content:", void 0, {
+        field: "dockerfile_content",
+        flag: "--content"
+      });
       const _saveSpinner = startSpinner("Saving Dockerfile...");
       await client.application.saveDockerfileUploadProvider.mutate({
         applicationId: app.applicationId,
@@ -2849,12 +2980,36 @@ function isCredentialError(error2) {
 }
 
 // src/commands/auth.ts
+function refuseBrowserAuthForAgent(action) {
+  const message = `tarout ${action} requires a browser. Agents should ask the user to run \`tarout token <api-token>\` or set TAROUT_TOKEN \u2014 generate one at https://tarout.sa/dashboard/account/api-keys.`;
+  if (isJsonMode()) {
+    outputError("AUTH_BOOTSTRAP_REQUIRED", message, {
+      action,
+      recommendedFlags: [
+        "export TAROUT_TOKEN=<token>",
+        "tarout token <api-token>"
+      ]
+    });
+  } else {
+    process.stderr.write(`error: ${message}
+`);
+  }
+  exit(ExitCode.AUTH_ERROR);
+}
 function registerAuthCommands(program2) {
   program2.command("login").description("Authenticate with Tarout via browser").option("--api-url <url>", "Custom API URL", "https://tarout.sa").action(async (options) => {
     try {
       if (isLoggedIn()) {
         const profile = getCurrentProfile();
         if (profile) {
+          if (isJsonMode()) {
+            outputData({
+              alreadyLoggedIn: true,
+              userEmail: profile.userEmail,
+              organizationName: profile.organizationName
+            });
+            return;
+          }
           log(`Already logged in as ${colors.cyan(profile.userEmail)}`);
           log(`Organization: ${profile.organizationName}`);
           log("");
@@ -2862,6 +3017,9 @@ function registerAuthCommands(program2) {
           return;
         }
       }
+      if (isJsonMode() || isNonInteractiveMode()) {
+        refuseBrowserAuthForAgent("login");
+      }
       const apiUrl = options.apiUrl;
       log("");
       log("Opening browser to authenticate...");
@@ -2955,11 +3113,22 @@ function registerAuthCommands(program2) {
       if (isLoggedIn()) {
         const profile = getCurrentProfile();
         if (profile) {
+          if (isJsonMode()) {
+            outputData({
+              alreadyLoggedIn: true,
+              userEmail: profile.userEmail,
+              organizationName: profile.organizationName
+            });
+            return;
+          }
           log(`Already logged in as ${colors.cyan(profile.userEmail)}`);
           log(`Run ${colors.dim("tarout logout")} to sign out first.`);
           return;
         }
       }
+      if (isJsonMode() || isNonInteractiveMode()) {
+        refuseBrowserAuthForAgent("register");
+      }
       const apiUrl = options.apiUrl;
       log("");
       log("Opening browser to create your account...");
@@ -3081,7 +3250,7 @@ function registerAuthCommands(program2) {
           () => input("Token name (e.g., ci-deploy):")
         );
       }
-      const { getApiClient: getApiClient2 } = await import("./api-SHKZO2SZ.js");
+      const { getApiClient: getApiClient2 } = await import("./api-735LN7BA.js");
       const client = getApiClient2();
       const profile = getCurrentProfile();
       const _spinner = startSpinner("Creating API token...");
@@ -3178,19 +3347,38 @@ function registerBackupsCommands(program2) {
         dbType = "mysql";
         dbId = options.mysqlId;
       } else {
-        dbType = await select("Database type:", [
-          { name: "PostgreSQL", value: "postgres" },
-          { name: "MySQL", value: "mysql" }
-        ]);
+        dbType = await select(
+          "Database type:",
+          [
+            { name: "PostgreSQL", value: "postgres" },
+            { name: "MySQL", value: "mysql" }
+          ],
+          {
+            field: "database_type",
+            flag: "--postgres-id|--mysql-id"
+          }
+        );
         dbId = await input(
-          `${dbType === "postgres" ? "PostgreSQL" : "MySQL"} database ID:`
+          `${dbType === "postgres" ? "PostgreSQL" : "MySQL"} database ID:`,
+          void 0,
+          {
+            field: "database_id",
+            flag: dbType === "postgres" ? "--postgres-id" : "--mysql-id",
+            context: { dbType }
+          }
         );
       }
       let destinationId = options.destinationId;
       if (!destinationId) {
-        destinationId = await input("Backup destination ID:");
+        destinationId = await input("Backup destination ID:", void 0, {
+          field: "destination_id",
+          flag: "--destination-id"
+        });
       }
-      const database = options.database || await input("Database name to back up:");
+      const database = options.database || await input("Database name to back up:", void 0, {
+        field: "database",
+        flag: "--database"
+      });
       const _spinner = startSpinner("Creating backup schedule...");
       const payload = {
         databaseType: dbType,
@@ -3286,7 +3474,12 @@ function registerBackupsCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete backup schedule "${backupId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_backup",
+            flag: "--yes",
+            context: { backupId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -3416,7 +3609,7 @@ function registerBackupsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       if (!shouldSkipConfirmation()) {
-        const { confirm: confirmFn } = await import("./prompts-WNFR34TG.js");
+        const { confirm: confirmFn } = await import("./prompts-QQ2FZKQT.js");
         const ok = await confirmFn(
           `Restore backup file "${backupFile}"? This will overwrite current data.`,
           false
@@ -4039,21 +4232,32 @@ function registerDbCommands(program2) {
       handleError(err);
     }
   });
-  db.command("create").argument("[name]", "Database name").description("Create a new database").option("-t, --type <type>", "Database type (postgres, mysql)", "postgres").option("-d, --description <description>", "Database description").action(async (name, options) => {
+  db.command("create").argument("[name]", "Database name").description("Create a new database").option("-t, --type <type>", "Database type (postgres, mysql)", "postgres").option("-d, --description <description>", "Database description").option("--name <name>", "Database name (alternative to positional argument)").action(async (name, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const profile = getCurrentProfile();
       if (!profile) throw new AuthError();
-      let dbName = name;
+      let dbName = name || options.name;
       let dbType = options.type;
       if (!dbName) {
-        dbName = await input("Database name:");
+        dbName = await input("Database name:", void 0, {
+          field: "db_name",
+          flag: "--name"
+        });
       }
       if (!options.type && !shouldSkipConfirmation()) {
-        dbType = await select("Database type:", [
-          { name: "PostgreSQL", value: "postgres" },
-          { name: "MySQL", value: "mysql" }
-        ]);
+        dbType = await select(
+          "Database type:",
+          [
+            { name: "PostgreSQL", value: "postgres" },
+            { name: "MySQL", value: "mysql" }
+          ],
+          {
+            field: "db_type",
+            flag: "--type",
+            context: { name: dbName }
+          }
+        );
       }
       const slug = generateSlug2(dbName);
       const client = getApiClient();
@@ -4129,7 +4333,12 @@ function registerDbCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Are you sure you want to delete "${dbInfo.name}"? This cannot be undone.`,
-          false
+          false,
+          {
+            field: "confirm_delete_db",
+            flag: "--yes",
+            context: { id: dbInfo.id, name: dbInfo.name, type: dbInfo.type }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -4276,7 +4485,12 @@ function registerDbCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Stop database "${dbInfo.name}"?`,
-          false
+          false,
+          {
+            field: "confirm_stop_db",
+            flag: "--yes",
+            context: { id: dbInfo.id, name: dbInfo.name, type: dbInfo.type }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -4486,7 +4700,15 @@ function registerDbCommands(program2) {
         failSpinner();
         throw new NotFoundError("Database", dbIdentifier);
       }
-      const targetPlan = options.plan || await input("Target plan:");
+      const targetPlan = options.plan || await input("Target plan:", void 0, {
+        field: "target_plan",
+        flag: "--plan",
+        context: {
+          id: dbSummary.id,
+          name: dbSummary.name,
+          type: dbSummary.type
+        }
+      });
       const _upgradeSpinner = startSpinner(`Upgrading to ${targetPlan}...`);
       if (dbSummary.type === "postgres") {
         await client.postgres.upgrade.mutate({
@@ -5079,10 +5301,14 @@ async function promptForCredentials(apiUrl, message) {
       { name: "Log in to an existing account", value: "login" },
       { name: "Paste an API token", value: "token" },
       { name: "Create a free Tarout account", value: "register" }
-    ]
+    ],
+    { field: "auth_method", flag: "--token" }
   );
   if (authAction === "token") {
-    const apiToken = await password("Tarout API token:");
+    const apiToken = await password("Tarout API token:", {
+      field: "token",
+      flag: "--token"
+    });
     return authenticateViaApiToken(apiToken.trim(), apiUrl, {
       showSuccess: true,
       persist: true
@@ -5714,7 +5940,7 @@ function formatPlanPrice(priceHalalas) {
   return `${(priceHalalas / 100).toFixed(2)} SAR/mo`;
 }
 async function runInlineUpgrade(client, planKey) {
-  const { pollCheckoutUntilTerminal } = await import("./billing-ENTHZKID.js");
+  const { pollCheckoutUntilTerminal } = await import("./billing-WOKNOS4N.js");
   const _changing = startSpinner(`Switching to plan "${planKey}"...`);
   const result = await client.subscription.changePlan.mutate({ planKey });
   if (result?.applied) {
@@ -6803,8 +7029,12 @@ function registerDeployCommands(program2) {
           name: `${colors.cyan(d.deploymentId.slice(0, 8))} - ${d.title || "Deployment"} (${formatDate5(d.createdAt)})${index === 0 ? colors.dim(" [current]") : ""}`,
           value: d.deploymentId
         }));
-        const { select: select2 } = await import("./prompts-WNFR34TG.js");
-        targetDeploymentId = await select2("Select deployment:", choices);
+        const { select: select2 } = await import("./prompts-QQ2FZKQT.js");
+        targetDeploymentId = await select2(
+          "Select deployment:",
+          choices,
+          { field: "deployment", flag: "--to" }
+        );
       }
       if (!options.yes) {
         const targetDeployment = successfulDeployments.find(
@@ -6818,10 +7048,18 @@ function registerDeployCommands(program2) {
           `  Created: ${targetDeployment ? formatDate5(targetDeployment.createdAt) : colors.dim("unknown")}`
         );
         log("");
-        const { confirm: confirm2 } = await import("./prompts-WNFR34TG.js");
+        const { confirm: confirm2 } = await import("./prompts-QQ2FZKQT.js");
         const confirmed = await confirm2(
           "Are you sure you want to rollback?",
-          false
+          false,
+          {
+            field: "confirm_rollback",
+            flag: "--yes",
+            context: {
+              deploymentId: targetDeploymentId,
+              app: appSummary.name
+            }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -7209,19 +7447,46 @@ function registerDestinationsCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const name = options.name || await input("Destination name:");
-        const provider = options.provider || await select("Storage provider:", [
-          { name: "S3 (AWS)", value: "s3" },
-          { name: "GCS (Google Cloud)", value: "gcs" },
-          { name: "R2 (Cloudflare)", value: "r2" },
-          { name: "Wasabi", value: "wasabi" },
-          { name: "MinIO (custom)", value: "minio" }
-        ]);
-        const bucket = options.bucket || await input("Bucket name:");
-        const region = options.region || await input("Region (or leave blank):") || void 0;
-        const endpoint = options.endpoint || await input("Custom endpoint URL (or leave blank):") || void 0;
-        const accessKey = options.accessKey || await input("Access Key ID:");
-        const secretAccessKey = options.secretKey || await input("Secret Access Key:");
+        const name = options.name || await input("Destination name:", void 0, {
+          field: "name",
+          flag: "--name"
+        });
+        const provider = options.provider || await select(
+          "Storage provider:",
+          [
+            { name: "S3 (AWS)", value: "s3" },
+            { name: "GCS (Google Cloud)", value: "gcs" },
+            { name: "R2 (Cloudflare)", value: "r2" },
+            { name: "Wasabi", value: "wasabi" },
+            { name: "MinIO (custom)", value: "minio" }
+          ],
+          {
+            field: "provider",
+            flag: "--provider"
+          }
+        );
+        const bucket = options.bucket || await input("Bucket name:", void 0, {
+          field: "bucket",
+          flag: "--bucket"
+        });
+        const region = options.region || await input("Region (or leave blank):", void 0, {
+          field: "region",
+          flag: "--region"
+        }) || void 0;
+        const endpoint = options.endpoint || await input("Custom endpoint URL (or leave blank):", void 0, {
+          field: "endpoint",
+          flag: "--endpoint"
+        }) || void 0;
+        const accessKey = options.accessKey || await input("Access Key ID:", void 0, {
+          field: "access_key",
+          flag: "--access-key",
+          sensitive: true
+        });
+        const secretAccessKey = options.secretKey || await input("Secret Access Key:", void 0, {
+          field: "secret_key",
+          flag: "--secret-key",
+          sensitive: true
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Creating destination...");
         const result = await client.destination.create.mutate({
@@ -7276,7 +7541,12 @@ function registerDestinationsCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete destination "${destinationId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_destination",
+            flag: "--yes",
+            context: { destinationId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -7312,10 +7582,24 @@ function registerDestinationsCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const provider = options.provider || await input("Storage provider (s3/gcs/r2):");
-        const bucket = options.bucket || await input("Bucket name:");
-        const accessKey = options.accessKey || await input("Access Key ID:");
-        const secretAccessKey = options.secretKey || await input("Secret Access Key:");
+        const provider = options.provider || await input("Storage provider (s3/gcs/r2):", void 0, {
+          field: "provider",
+          flag: "--provider"
+        });
+        const bucket = options.bucket || await input("Bucket name:", void 0, {
+          field: "bucket",
+          flag: "--bucket"
+        });
+        const accessKey = options.accessKey || await input("Access Key ID:", void 0, {
+          field: "access_key",
+          flag: "--access-key",
+          sensitive: true
+        });
+        const secretAccessKey = options.secretKey || await input("Secret Access Key:", void 0, {
+          field: "secret_key",
+          flag: "--secret-key",
+          sensitive: true
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Testing credentials...");
         const result = await client.destination.testCredentials.mutate({
@@ -7561,7 +7845,12 @@ function registerDomainsCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Proceed to payment for ${domainName}?`,
-          false
+          false,
+          {
+            field: "confirm_register_domain",
+            flag: "--yes",
+            context: { domain: domainName }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -7782,7 +8071,12 @@ function registerDomainsCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Are you sure you want to unlink "${domain.host}"?`,
-          false
+          false,
+          {
+            field: "confirm_unlink_domain",
+            flag: "--yes",
+            context: { domain: domain.host, domainId: domain.domainId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -8091,7 +8385,12 @@ function registerDomainsCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Are you sure you want to delete DNS record "${recordId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_dns_record",
+            flag: "--yes",
+            context: { recordId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -8429,7 +8728,12 @@ function registerDomainsCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete domain "${domainIdentifier}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_registered_domain",
+            flag: "--yes",
+            context: { domain: domainIdentifier }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -8542,7 +8846,11 @@ function registerDomainsCommands(program2) {
           failSpinner();
           throw new NotFoundError("Domain", domainIdentifier);
         }
-        const targetRegistrar = options.registrar || await input("Target registrar name:");
+        const targetRegistrar = options.registrar || await input("Target registrar name:", void 0, {
+          field: "target_registrar",
+          flag: "--registrar",
+          context: { domain: domainIdentifier }
+        });
         const _transferSpinner = startSpinner("Requesting transfer out...");
         await client.domainRegistrar.requestTransferOut.mutate({
           domainId: domain.domainId,
@@ -8791,8 +9099,16 @@ function registerDomainsCommands(program2) {
           failSpinner();
           throw new NotFoundError("Domain", domainIdentifier);
         }
-        const name = options.name || await input("Rule name:");
-        const expression = options.expression || await input("Firewall expression:");
+        const name = options.name || await input("Rule name:", void 0, {
+          field: "firewall_rule_name",
+          flag: "--name",
+          context: { domain: domainIdentifier }
+        });
+        const expression = options.expression || await input("Firewall expression:", void 0, {
+          field: "firewall_expression",
+          flag: "--expression",
+          context: { domain: domainIdentifier }
+        });
         const action = options.action || "block";
         const _createSpinner = startSpinner("Creating firewall rule...");
         const result = await client.domainRegistrar.createFirewallRule.mutate(
@@ -8939,7 +9255,11 @@ function registerDomainsCommands(program2) {
         failSpinner();
         throw new NotFoundError("Domain", domainIdentifier);
       }
-      const ipAddress = options.ip || await input("IP address:");
+      const ipAddress = options.ip || await input("IP address:", void 0, {
+        field: "ip_address",
+        flag: "--ip",
+        context: { domain: domainIdentifier }
+      });
       const _setupSpinner = startSpinner("Setting up DNS records...");
       await client.dns.setupCommonRecords.mutate({
         registeredDomainId: domain.domainId,
@@ -9119,9 +9439,20 @@ function registerDomainsCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const registeredDomainId = options.registeredDomain || await input("Registered domain ID:");
-        const subdomain = options.subdomain || await input("Subdomain (e.g. www):");
-        const applicationId = options.app || await input("Application ID:");
+        const registeredDomainId = options.registeredDomain || await input("Registered domain ID:", void 0, {
+          field: "registered_domain_id",
+          flag: "--registered-domain"
+        });
+        const subdomain = options.subdomain || await input("Subdomain (e.g. www):", void 0, {
+          field: "subdomain",
+          flag: "--subdomain",
+          context: { registeredDomainId }
+        });
+        const applicationId = options.app || await input("Application ID:", void 0, {
+          field: "application_id",
+          flag: "--app",
+          context: { registeredDomainId, subdomain }
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Creating domain...");
         const result = await client.domain.createWithRegisteredDomain.mutate({
@@ -9290,8 +9621,15 @@ function registerDomainsCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const domainId = options.domainId || await input("Domain ID:");
-        const applicationId = options.appId || await input("Application ID:");
+        const domainId = options.domainId || await input("Domain ID:", void 0, {
+          field: "domain_id",
+          flag: "--domain-id"
+        });
+        const applicationId = options.appId || await input("Application ID:", void 0, {
+          field: "application_id",
+          flag: "--app-id",
+          context: { domainId }
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Linking domain...");
         await client.domain.linkToApplication.mutate({
@@ -9393,7 +9731,10 @@ function registerEmailCommands(program2) {
   config.command("get").description("Show email configuration for an environment").option("-e, --env <environment-id>", "Environment ID").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Fetching email config...");
       const data = await client.emailService.getConfig.query({
@@ -9433,17 +9774,38 @@ function registerEmailCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
-        const provider = options.provider || await select("Email provider:", [
-          { name: "Resend", value: "resend" },
-          { name: "SendGrid", value: "sendgrid" },
-          { name: "Mailgun", value: "mailgun" },
-          { name: "Amazon SES", value: "ses" }
-        ]);
-        const apiKey = options.apiKey || await input("API Key:");
-        const fromDomain = options.fromDomain || await input("From domain (e.g. mail.example.com):");
-        const fromName = options.fromName || await input("From name:");
-        const fromEmail = options.fromEmail || await input(`From email (e.g. hello@${fromDomain}):`);
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
+        const provider = options.provider || await select(
+          "Email provider:",
+          [
+            { name: "Resend", value: "resend" },
+            { name: "SendGrid", value: "sendgrid" },
+            { name: "Mailgun", value: "mailgun" },
+            { name: "Amazon SES", value: "ses" }
+          ],
+          { field: "email_provider", flag: "--provider" }
+        );
+        const apiKey = options.apiKey || await input("API Key:", void 0, {
+          field: "api_key",
+          flag: "--api-key",
+          sensitive: true
+        });
+        const fromDomain = options.fromDomain || await input("From domain (e.g. mail.example.com):", void 0, {
+          field: "from_domain",
+          flag: "--from-domain"
+        });
+        const fromName = options.fromName || await input("From name:", void 0, {
+          field: "from_name",
+          flag: "--from-name"
+        });
+        const fromEmail = options.fromEmail || await input(
+          `From email (e.g. hello@${fromDomain}):`,
+          void 0,
+          { field: "from_email", flag: "--from-email" }
+        );
         const client = getApiClient();
         const _spinner = startSpinner("Creating email config...");
         const result = await client.emailService.createConfig.mutate({
@@ -9492,7 +9854,12 @@ function registerEmailCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete email configuration "${emailServiceId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_email_config",
+            flag: "--yes",
+            context: { emailServiceId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -9515,8 +9882,14 @@ function registerEmailCommands(program2) {
   domain.command("verify").description("Initiate email domain verification").option("-e, --env <environment-id>", "Environment ID").option("-d, --domain <domain>", "Domain to verify").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
-      const domainName = options.domain || await input("Domain to verify:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
+      const domainName = options.domain || await input("Domain to verify:", void 0, {
+        field: "domain",
+        flag: "--domain"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Initiating domain verification...");
       const result = await client.emailService.verifyDomain.mutate({
@@ -9533,8 +9906,14 @@ function registerEmailCommands(program2) {
   domain.command("status").description("Check email domain verification status").option("-e, --env <environment-id>", "Environment ID").option("-d, --domain <domain>", "Domain to check").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
-      const domainName = options.domain || await input("Domain name:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
+      const domainName = options.domain || await input("Domain name:", void 0, {
+        field: "domain",
+        flag: "--domain"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Checking domain status...");
       const data = await client.emailService.getDomainStatus.query({
@@ -9562,8 +9941,14 @@ function registerEmailCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
-        const domainName = options.domain || await input("Domain name:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
+        const domainName = options.domain || await input("Domain name:", void 0, {
+          field: "domain",
+          flag: "--domain"
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Fetching DNS records...");
         const data = await client.emailService.getDnsRecords.query({
@@ -9599,7 +9984,10 @@ function registerEmailCommands(program2) {
   templates.command("list").alias("ls").description("List email templates").option("-e, --env <environment-id>", "Environment ID").option("--active", "Show only active templates").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Fetching templates...");
       const list = await client.emailService.listTemplates.query({
@@ -9636,7 +10024,10 @@ function registerEmailCommands(program2) {
   templates.command("get-by-slug <slug>").description("Get an email template by its slug").option("-e, --env <environment-id>", "Environment ID").action(async (slug, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Fetching template...");
       const data = await client.emailService.getTemplateBySlug.query({
@@ -9700,10 +10091,22 @@ function registerEmailCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
-        const name = options.name || await input("Template name:");
-        const subject = options.subject || await input("Email subject:");
-        const htmlContent = options.html || await input("HTML content (or paste):");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
+        const name = options.name || await input("Template name:", void 0, {
+          field: "template_name",
+          flag: "--name"
+        });
+        const subject = options.subject || await input("Email subject:", void 0, {
+          field: "email_subject",
+          flag: "--subject"
+        });
+        const htmlContent = options.html || await input("HTML content (or paste):", void 0, {
+          field: "html_content",
+          flag: "--html"
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Creating template...");
         const result = await client.emailService.createTemplate.mutate({
@@ -9756,7 +10159,12 @@ function registerEmailCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete template "${templateId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_template",
+            flag: "--yes",
+            context: { templateId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -9778,7 +10186,10 @@ function registerEmailCommands(program2) {
   templates.command("seed").description("Seed pre-built templates for an environment").option("-e, --env <environment-id>", "Environment ID").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Seeding templates...");
       const result = await client.emailService.seedPrebuiltTemplates.mutate({
@@ -9795,9 +10206,18 @@ function registerEmailCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
-        const to = options.to || await input("Recipient email:");
-        const subject = options.subject || await input("Subject:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
+        const to = options.to || await input("Recipient email:", void 0, {
+          field: "recipient_email",
+          flag: "--to"
+        });
+        const subject = options.subject || await input("Subject:", void 0, {
+          field: "email_subject",
+          flag: "--subject"
+        });
         const html = options.html || options.text;
         const client = getApiClient();
         const _spinner = startSpinner("Sending email...");
@@ -9821,9 +10241,18 @@ function registerEmailCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
-        const templateId = options.templateId || await input("Template ID:");
-        const to = options.to || await input("Recipient email:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
+        const templateId = options.templateId || await input("Template ID:", void 0, {
+          field: "template_id",
+          flag: "--template-id"
+        });
+        const to = options.to || await input("Recipient email:", void 0, {
+          field: "recipient_email",
+          flag: "--to"
+        });
         const variables = options.vars ? JSON.parse(options.vars) : {};
         const client = getApiClient();
         const _spinner = startSpinner("Sending templated email...");
@@ -9845,7 +10274,10 @@ function registerEmailCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Fetching logs...");
         const logs = await client.emailService.getEmailLogs.query({
@@ -9884,7 +10316,10 @@ function registerEmailCommands(program2) {
   email.command("stats").description("Show email sending statistics").option("-e, --env <environment-id>", "Environment ID").option("--start <date>", "Start date (ISO)").option("--end <date>", "End date (ISO)").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Fetching stats...");
       const stats = await client.emailService.getEmailStats.query({
@@ -9916,7 +10351,10 @@ function registerEmailCommands(program2) {
   apiKeys.command("list").alias("ls").description("List email service API keys").option("-e, --env <environment-id>", "Environment ID").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Fetching API keys...");
       const list = await client.emailService.listApiKeys.query({
@@ -9951,8 +10389,14 @@ function registerEmailCommands(program2) {
   apiKeys.command("create").description("Create an email service API key").option("-e, --env <environment-id>", "Environment ID").option("-n, --name <name>", "Key name").option("--mode <mode>", "Key mode (sending/full)", "sending").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
-      const name = options.name || await input("API key name:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
+      const name = options.name || await input("API key name:", void 0, {
+        field: "api_key_name",
+        flag: "--name"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Creating API key...");
       const result = await client.emailService.createApiKey.mutate({
@@ -9977,7 +10421,10 @@ function registerEmailCommands(program2) {
   apiKeys.command("update <api-key-id>").description("Update an email service API key").option("-n, --name <name>", "New name").action(async (apiKeyId, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const name = options.name || await input("New name:");
+      const name = options.name || await input("New name:", void 0, {
+        field: "new_name",
+        flag: "--name"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Updating API key...");
       await client.emailService.updateApiKey.mutate({
@@ -9997,7 +10444,12 @@ function registerEmailCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Revoke API key "${apiKeyId}"?`,
-          false
+          false,
+          {
+            field: "confirm_revoke_api_key",
+            flag: "--yes",
+            context: { apiKeyId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -10020,7 +10472,12 @@ function registerEmailCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete API key "${apiKeyId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_api_key",
+            flag: "--yes",
+            context: { apiKeyId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -10204,7 +10661,12 @@ function registerEnvCommands(program2) {
         succeedSpinner();
         const confirmed = await confirm(
           `File ${options.output} already exists. Overwrite?`,
-          false
+          false,
+          {
+            field: "confirm_overwrite_env_file",
+            flag: "--yes",
+            context: { outputPath: options.output }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -10462,7 +10924,7 @@ ${colors.bold(key)}: ${maskValue(val.value || String(v))}
       } else {
         const _raw = await import("process");
         log('Enter JSON key-value object (e.g. {"KEY":"value"}):');
-        const input2 = await (await import("./prompts-WNFR34TG.js")).input(
+        const input2 = await (await import("./prompts-QQ2FZKQT.js")).input(
           "JSON:"
         );
         vars = JSON.parse(input2);
@@ -10485,7 +10947,7 @@ ${colors.bold(key)}: ${maskValue(val.value || String(v))}
     try {
       if (!isLoggedIn()) throw new AuthError();
       if (!shouldSkipConfirmation()) {
-        const { confirm: confirmFn } = await import("./prompts-WNFR34TG.js");
+        const { confirm: confirmFn } = await import("./prompts-QQ2FZKQT.js");
         const ok = await confirmFn(
           `Delete ${keys.length} variable(s)?`,
           false
@@ -10524,7 +10986,7 @@ ${colors.bold(key)}: ${maskValue(val.value || String(v))}
       );
       if (!app) throw new NotFoundError("Application", appIdentifier);
       if (!shouldSkipConfirmation()) {
-        const { confirm: confirmFn } = await import("./prompts-WNFR34TG.js");
+        const { confirm: confirmFn } = await import("./prompts-QQ2FZKQT.js");
         const ok = await confirmFn(
           `Copy env vars from ${fromEnvId} to ${toEnvId}?`,
           false
@@ -10633,27 +11095,61 @@ function registerFirewallCommands(program2) {
       handleError(err);
     }
   });
-  fw.command("create").description("Create a new firewall template").option("-n, --name <name>", "Template name").action(async (options) => {
+  fw.command("create").description("Create a new firewall template").option("-n, --name <name>", "Template name").option(
+    "--rules <json>",
+    "JSON array of rules: [{protocol,portRange,direction,sourceRanges}]"
+  ).action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const name = options.name || await input("Template name:");
+      const name = options.name || await input("Template name:", void 0, {
+        field: "firewall_template_name",
+        flag: "--name"
+      });
       log("");
       log("Add rules interactively (leave protocol empty to finish):");
       const rules = [];
       for (let i = 0; i < 10; i++) {
-        const protocol = await select(`Rule ${i + 1} protocol (or skip):`, [
-          { name: "TCP", value: "tcp" },
-          { name: "UDP", value: "udp" },
-          { name: "ICMP", value: "icmp" },
-          { name: "Done \u2014 no more rules", value: "__done__" }
-        ]);
+        const protocol = await select(
+          `Rule ${i + 1} protocol (or skip):`,
+          [
+            { name: "TCP", value: "tcp" },
+            { name: "UDP", value: "udp" },
+            { name: "ICMP", value: "icmp" },
+            { name: "Done \u2014 no more rules", value: "__done__" }
+          ],
+          {
+            field: `firewall_rule_${i}_protocol`,
+            flag: "--rules",
+            context: { ruleIndex: i }
+          }
+        );
         if (protocol === "__done__") break;
-        const portRange = await input("Port range (e.g. 80 or 8080-8090):");
-        const direction = await select("Direction:", [
-          { name: "Ingress (inbound)", value: "ingress" },
-          { name: "Egress (outbound)", value: "egress" }
-        ]);
-        const sourceRanges = await input("Source CIDR (default 0.0.0.0/0):") || "0.0.0.0/0";
+        const portRange = await input(
+          "Port range (e.g. 80 or 8080-8090):",
+          void 0,
+          {
+            field: `firewall_rule_${i}_port_range`,
+            flag: "--rules",
+            context: { ruleIndex: i }
+          }
+        );
+        const direction = await select(
+          "Direction:",
+          [
+            { name: "Ingress (inbound)", value: "ingress" },
+            { name: "Egress (outbound)", value: "egress" }
+          ],
+          {
+            field: `firewall_rule_${i}_direction`,
+            flag: "--rules",
+            context: { ruleIndex: i }
+          }
+        );
+        const sourceRanges = await input("Source CIDR (default 0.0.0.0/0):", void 0, {
+          field: `firewall_rule_${i}_source_ranges`,
+          flag: "--rules",
+          context: { ruleIndex: i }
+        }) || "0.0.0.0/0";
         rules.push({ protocol, portRange, direction, sourceRanges });
       }
       const client = getApiClient();
@@ -10678,7 +11174,11 @@ function registerFirewallCommands(program2) {
   fw.command("update").argument("<id>", "Firewall template ID").description("Update a firewall template name").option("-n, --name <name>", "New template name").action(async (id, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const name = options.name || await input("New name:");
+      const name = options.name || await input("New name:", void 0, {
+        field: "firewall_template_name",
+        flag: "--name",
+        context: { templateId: id }
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Updating firewall template...");
       const result = await client.firewallTemplate.update.mutate({
@@ -10697,7 +11197,12 @@ function registerFirewallCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete firewall template "${id}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_firewall_template",
+            flag: "--yes",
+            context: { templateId: id }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -10743,7 +11248,12 @@ function registerFirewallCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Remove firewall template from server ${serverId}?`,
-          false
+          false,
+          {
+            field: "confirm_remove_firewall_template",
+            flag: "--yes",
+            context: { templateId, serverId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -10900,7 +11410,11 @@ function registerInboxCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           "Clear all notifications? This cannot be undone.",
-          false
+          false,
+          {
+            field: "confirm_clear_notifications",
+            flag: "--yes"
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -10965,7 +11479,10 @@ function registerKeysCommands(program2) {
       let keyName = name;
       let publicKey = options.publicKey;
       if (!keyName) {
-        keyName = await input("Key name:");
+        keyName = await input("Key name:", void 0, {
+          field: "name",
+          flag: "--name"
+        });
       }
       if (!publicKey && options.file) {
         const { readFileSync: readFileSync4 } = await import("fs");
@@ -10975,7 +11492,11 @@ function registerKeysCommands(program2) {
         log(
           "Paste your public key below (usually found in ~/.ssh/id_rsa.pub):"
         );
-        publicKey = await input("Public key:");
+        publicKey = await input("Public key:", void 0, {
+          field: "publicKey",
+          flag: "--public-key",
+          sensitive: false
+        });
       }
       const client = getApiClient();
       const _spinner = startSpinner("Adding SSH key...");
@@ -11020,7 +11541,12 @@ function registerKeysCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Are you sure you want to delete SSH key "${key.name}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_ssh_key",
+            flag: "--yes",
+            context: { keyName: key.name }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -11184,7 +11710,12 @@ function registerLinkCommands(program2) {
           log("");
           const confirmed = await confirm(
             "Do you want to relink to a different application?",
-            false
+            false,
+            {
+              field: "confirm_relink",
+              flag: "--yes",
+              context: { currentApp: existingConfig.name }
+            }
           );
           if (!confirmed) {
             log("Cancelled.");
@@ -11222,7 +11753,11 @@ function registerLinkCommands(program2) {
             value: app.applicationId
           })
         );
-        const selectedId = await select("Select an application:", choices);
+        const selectedId = await select(
+          "Select an application:",
+          choices,
+          { field: "app", flag: "--app" }
+        );
         selectedApp = apps.find(
           (a) => a.applicationId === selectedId
         ) || null;
@@ -11282,7 +11817,12 @@ function registerLinkCommands(program2) {
         log("");
         const confirmed = await confirm(
           "Are you sure you want to unlink this directory?",
-          false
+          false,
+          {
+            field: "confirm_unlink",
+            flag: "--yes",
+            context: { currentApp: config.name }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -11486,13 +12026,25 @@ function registerMonitorCommands(program2) {
       let monitorUrl = options.url;
       if (!monitorName) {
         monitorName = await input(
-          `Monitor name (default: ${app.name} uptime):`
+          `Monitor name (default: ${app.name} uptime):`,
+          void 0,
+          {
+            field: "monitor_name",
+            flag: "--name",
+            context: { applicationId: app.applicationId, appName: app.name }
+          }
         );
         if (!monitorName) monitorName = `${app.name} uptime`;
       }
       if (!monitorUrl) {
         monitorUrl = await input(
-          "URL to monitor (e.g., https://example.com/health):"
+          "URL to monitor (e.g., https://example.com/health):",
+          void 0,
+          {
+            field: "monitor_url",
+            flag: "--url",
+            context: { applicationId: app.applicationId }
+          }
         );
       }
       const _createSpinner = startSpinner("Creating monitor...");
@@ -11574,7 +12126,12 @@ function registerMonitorCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete monitor "${monitorId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_monitor",
+            flag: "--yes",
+            context: { monitorId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -11810,7 +12367,10 @@ function registerNotificationsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client = getApiClient();
-      const name = options.name || await input("Name (press Enter for default):") || "Email Notifications";
+      const name = options.name || await input("Name (press Enter for default):", void 0, {
+        field: "name",
+        flag: "--name"
+      }) || "Email Notifications";
       const payload = {
         name,
         appDeploy: options.deploy ?? false,
@@ -11841,7 +12401,12 @@ function registerNotificationsCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete notification configuration "${notificationId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_notification",
+            flag: "--yes",
+            context: { notificationId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -11930,10 +12495,16 @@ function registerNotificationsCommands(program2) {
       let title = options.title;
       let message = options.message;
       if (!title) {
-        title = await input("Subject:");
+        title = await input("Subject:", void 0, {
+          field: "title",
+          flag: "--title"
+        });
       }
       if (!message) {
-        message = await input("Message:");
+        message = await input("Message:", void 0, {
+          field: "message",
+          flag: "--message"
+        });
       }
       const client = getApiClient();
       const _spinner = startSpinner("Sending message...");
@@ -11957,7 +12528,10 @@ function registerNotificationsCommands(program2) {
   notifications.command("create").description("Create a new notification configuration (org owner only)").option("-n, --name <name>", "Configuration name").option("--deploy", "Enable deploy notifications").option("--errors", "Enable build error notifications").option("--backups", "Enable backup notifications").option("--uptime", "Enable uptime alert notifications").option("--emails <emails>", "Comma-separated additional email addresses").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const name = options.name || await input("Name:") || "Notifications";
+      const name = options.name || await input("Name:", void 0, {
+        field: "name",
+        flag: "--name"
+      }) || "Notifications";
       const client = getApiClient();
       const _spinner = startSpinner("Creating notification config...");
       const result = await client.notification.create.mutate({
@@ -12048,7 +12622,13 @@ function registerOrgsCommands(program2) {
       let name = options.name;
       if (!name) {
         name = await input(
-          `New name (current: ${profile.organizationName}):`
+          `New name (current: ${profile.organizationName}):`,
+          void 0,
+          {
+            field: "organization_name",
+            flag: "--name",
+            context: { currentName: profile.organizationName }
+          }
         );
       }
       const client = getApiClient();
@@ -12078,7 +12658,15 @@ function registerOrgsCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Type the organization name "${profile.organizationName}" to confirm deletion:`,
-          false
+          false,
+          {
+            field: "confirm_delete_organization",
+            flag: "--yes",
+            context: {
+              organizationId: profile.organizationId,
+              organizationName: profile.organizationName
+            }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -12121,7 +12709,15 @@ function registerOrgsCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Transfer ownership to user "${userId}"?`,
-          false
+          false,
+          {
+            field: "confirm_transfer_ownership",
+            flag: "--yes",
+            context: {
+              organizationId: profile.organizationId,
+              newOwnerUserId: userId
+            }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -12223,7 +12819,12 @@ function registerOrgsCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Revoke invitation "${invitationId}"?`,
-          false
+          false,
+          {
+            field: "confirm_revoke_invitation",
+            flag: "--yes",
+            context: { invitationId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -12371,7 +12972,11 @@ function registerEnvsCommands(program2) {
       if (!isLoggedIn()) throw new AuthError();
       let envName = name;
       if (!envName) {
-        envName = await input("Environment name (e.g., staging):");
+        envName = await input(
+          "Environment name (e.g., staging):",
+          void 0,
+          { field: "environment_name", flag: "name" }
+        );
       }
       const client = getApiClient();
       const _spinner = startSpinner("Creating environment...");
@@ -12420,7 +13025,15 @@ function registerEnvsCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Delete environment "${env.name}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_environment",
+            flag: "--yes",
+            context: {
+              environmentId: env.environmentId,
+              environmentName: env.name
+            }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -12798,7 +13411,11 @@ function registerProjectsCommands(program2) {
       if (!isLoggedIn()) throw new AuthError();
       let name = options.name;
       if (!name) {
-        name = await input("New name (leave blank to keep):");
+        name = await input("New name (leave blank to keep):", void 0, {
+          field: "project_name",
+          flag: "--name",
+          context: { projectId }
+        });
       }
       const client = getApiClient();
       const _spinner = startSpinner("Updating project...");
@@ -12828,7 +13445,12 @@ function registerProjectsCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Delete project "${projectId}"? This cannot be undone.`,
-          false
+          false,
+          {
+            field: "confirm_delete_project",
+            flag: "--yes",
+            context: { projectId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -13034,7 +13656,12 @@ function registerProvidersCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Remove provider "${gitProviderId}"?`,
-          false
+          false,
+          {
+            field: "confirm_remove_provider",
+            flag: "--yes",
+            context: { gitProviderId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -13204,7 +13831,10 @@ function registerProvidersCommands(program2) {
   github.command("update <github-id>").description("Update a GitHub provider name").option("-n, --name <name>", "New name").action(async (githubId, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const name = options.name || await input("New name for this provider:");
+      const name = options.name || await input("New name for this provider:", void 0, {
+        field: "provider_name",
+        flag: "--name"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Updating provider...");
       const data = await client.github.one.query({ githubId });
@@ -13256,8 +13886,15 @@ function registerProvidersCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const applicationId = options.applicationId || await input("GitLab OAuth Application ID:");
-        const secret = options.secret || await input("GitLab OAuth Secret:");
+        const applicationId = options.applicationId || await input("GitLab OAuth Application ID:", void 0, {
+          field: "gitlab_application_id",
+          flag: "--application-id"
+        });
+        const secret = options.secret || await input("GitLab OAuth Secret:", void 0, {
+          field: "gitlab_oauth_secret",
+          flag: "--secret",
+          sensitive: true
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Creating GitLab provider...");
         const result = await client.gitlab.create.mutate({
@@ -13422,7 +14059,11 @@ function registerProvidersCommands(program2) {
   bitbucket.command("create").description("Create a Bitbucket provider").option("--client-id <id>", "Bitbucket OAuth Client ID").option("--secret <secret>", "Bitbucket OAuth Secret").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const appPassword = options.secret || await input("Bitbucket App Password or Secret:");
+      const appPassword = options.secret || await input("Bitbucket App Password or Secret:", void 0, {
+        field: "bitbucket_oauth_secret",
+        flag: "--secret",
+        sensitive: true
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Creating Bitbucket provider...");
       const result = await client.bitbucket.create.mutate({
@@ -13680,7 +14321,12 @@ No ${options.status} jobs in queue "${queueName}".
       if (!shouldSkipConfirmation()) {
         const ok = await confirm(
           `Retry all failed jobs in queue "${queueName}"?`,
-          false
+          false,
+          {
+            field: "confirm_retry_all_failed_jobs",
+            flag: "--yes",
+            context: { queueName }
+          }
         );
         if (!ok) {
           log("Cancelled.");
@@ -13708,7 +14354,11 @@ ${colors.success(`${count} job(s) queued for retry.`)}
     try {
       if (!isLoggedIn()) throw new AuthError();
       if (!shouldSkipConfirmation()) {
-        const ok = await confirm(`Pause queue "${queueName}"?`, false);
+        const ok = await confirm(`Pause queue "${queueName}"?`, false, {
+          field: "confirm_pause_queue",
+          flag: "--yes",
+          context: { queueName }
+        });
         if (!ok) {
           log("Cancelled.");
           return;
@@ -13742,14 +14392,23 @@ ${colors.success(`${count} job(s) queued for retry.`)}
   ).option("--older-than <ms>", "Clean jobs older than N milliseconds", "0").description("Remove completed or failed jobs from a queue").action(async (queueName, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const status = options.status || await select("Clean which jobs?", [
-        { name: "Completed", value: "completed" },
-        { name: "Failed", value: "failed" }
-      ]);
+      const status = options.status || await select(
+        "Clean which jobs?",
+        [
+          { name: "Completed", value: "completed" },
+          { name: "Failed", value: "failed" }
+        ],
+        { field: "clean_job_status", flag: "--status" }
+      );
       if (!shouldSkipConfirmation()) {
         const ok = await confirm(
           `Clean ${status} jobs from "${queueName}"?`,
-          false
+          false,
+          {
+            field: "confirm_clean_queue",
+            flag: "--yes",
+            context: { queueName, status }
+          }
         );
         if (!ok) {
           log("Cancelled.");
@@ -13781,7 +14440,12 @@ ${colors.success(`${count} ${status} job(s) removed.`)}
       if (!shouldSkipConfirmation()) {
         const ok = await confirm(
           `Remove job "${jobId}" from queue "${queueName}"?`,
-          false
+          false,
+          {
+            field: "confirm_remove_job",
+            flag: "--yes",
+            context: { queueName, jobId }
+          }
         );
         if (!ok) {
           log("Cancelled.");
@@ -13859,13 +14523,20 @@ function registerServersCommands(program2) {
       let serverSize = options.size;
       let osType = options.os;
       if (!serverName) {
-        serverName = await input("Server name:");
+        serverName = await input("Server name:", void 0, {
+          field: "server_name",
+          flag: "<name>"
+        });
       }
       if (!serverType) {
-        serverType = await select("Server type:", [
-          { name: "CPU (general purpose)", value: "cpu" },
-          { name: "GPU (for AI/ML workloads)", value: "gpu" }
-        ]);
+        serverType = await select(
+          "Server type:",
+          [
+            { name: "CPU (general purpose)", value: "cpu" },
+            { name: "GPU (for AI/ML workloads)", value: "gpu" }
+          ],
+          { field: "server_type", flag: "--type" }
+        );
       }
       const _spinner = startSpinner("Fetching available sizes...");
       const sizes = await client.virtualMachine.getServerTypes.query({
@@ -13879,19 +14550,28 @@ function registerServersCommands(program2) {
           name: `${s.name || s.id} - ${s.description || ""} ${s.priceHalalas ? `(${(s.priceHalalas / 100).toFixed(2)} SAR/hr)` : ""}`,
           value: s.name || s.id || s.size
         }));
-        serverSize = await select("Server size:", sizeChoices);
+        serverSize = await select("Server size:", sizeChoices, {
+          field: "server_size",
+          flag: "--size"
+        });
       } else if (!serverSize) {
         serverSize = await input(
-          "Server size (e.g., n2-standard-2 for GCP, GPU-small for RunPod):"
+          "Server size (e.g., n2-standard-2 for GCP, GPU-small for RunPod):",
+          void 0,
+          { field: "server_size", flag: "--size" }
         );
       }
       if (!osType) {
-        osType = await select("Operating system:", [
-          { name: "Ubuntu 22.04 LTS", value: "ubuntu-22" },
-          { name: "Ubuntu 24.04 LTS", value: "ubuntu-24" },
-          { name: "Debian 12", value: "debian-12" },
-          { name: "Rocky Linux 9", value: "rocky-linux-9" }
-        ]);
+        osType = await select(
+          "Operating system:",
+          [
+            { name: "Ubuntu 22.04 LTS", value: "ubuntu-22" },
+            { name: "Ubuntu 24.04 LTS", value: "ubuntu-24" },
+            { name: "Debian 12", value: "debian-12" },
+            { name: "Rocky Linux 9", value: "rocky-linux-9" }
+          ],
+          { field: "os_type", flag: "--os" }
+        );
       }
       if (!shouldSkipConfirmation()) {
         log("");
@@ -13900,7 +14580,11 @@ function registerServersCommands(program2) {
         log(`Size: ${serverSize}`);
         log(`OS: ${osType}`);
         log("");
-        const confirmed = await confirm("Create this server?", false);
+        const confirmed = await confirm("Create this server?", false, {
+          field: "confirm_create_server",
+          flag: "--yes",
+          context: { name: serverName, type: serverType, size: serverSize }
+        });
         if (!confirmed) {
           log("Cancelled.");
           return;
@@ -14027,7 +14711,12 @@ function registerServersCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Stop server "${server.name || serverIdentifier}"?`,
-          false
+          false,
+          {
+            field: "confirm_stop_server",
+            flag: "--yes",
+            context: { server: server.name || serverIdentifier }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -14100,7 +14789,12 @@ function registerServersCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Are you sure you want to delete server "${server.name || serverIdentifier}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_server",
+            flag: "--yes",
+            context: { server: server.name || serverIdentifier }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -14266,7 +14960,9 @@ function registerServersCommands(program2) {
       let name = snapshotName;
       if (!name) {
         name = await input(
-          `Snapshot name (default: ${server.name}-snapshot-${Date.now()}):`
+          `Snapshot name (default: ${server.name}-snapshot-${Date.now()}):`,
+          void 0,
+          { field: "snapshot_name", flag: "<snapshot-name>" }
         );
         if (!name) {
           name = `${server.name || serverIdentifier}-snapshot-${Date.now()}`;
@@ -14296,7 +14992,12 @@ function registerServersCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete snapshot "${snapshotId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_snapshot",
+            flag: "--yes",
+            context: { snapshotId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -14372,7 +15073,11 @@ function registerServersCommands(program2) {
       }
       let portRange = options.port;
       if (!portRange) {
-        portRange = await input("Port or range (e.g., 80, 443, 8000-9000):");
+        portRange = await input(
+          "Port or range (e.g., 80, 443, 8000-9000):",
+          void 0,
+          { field: "port_range", flag: "--port" }
+        );
       }
       const _addSpinner = startSpinner("Adding firewall rule...");
       const result = await client.virtualMachine.createFirewallRule.mutate({
@@ -14402,7 +15107,12 @@ function registerServersCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete firewall rule "${ruleId}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_firewall_rule",
+            flag: "--yes",
+            context: { ruleId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -14618,7 +15328,10 @@ function registerServersCommands(program2) {
       }
       let name = options.name;
       if (!name) {
-        name = await input("Volume name:");
+        name = await input("Volume name:", void 0, {
+          field: "volume_name",
+          flag: "--name"
+        });
       }
       const _createSpinner = startSpinner("Creating volume...");
       const vol = await client.virtualMachine.createVolume.mutate({
@@ -14644,7 +15357,12 @@ function registerServersCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete volume "${volumeId}"? This is irreversible.`,
-          false
+          false,
+          {
+            field: "confirm_delete_volume",
+            flag: "--yes",
+            context: { volumeId }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -14779,7 +15497,11 @@ function registerServersCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       if (!shouldSkipConfirmation()) {
-        const confirmed = await confirm(`Release IP "${ipId}"?`, false);
+        const confirmed = await confirm(`Release IP "${ipId}"?`, false, {
+          field: "confirm_release_ip",
+          flag: "--yes",
+          context: { ipId }
+        });
         if (!confirmed) {
           log("Cancelled.");
           return;
@@ -14901,11 +15623,15 @@ function registerServersCommands(program2) {
       }
       let metric = options.metric;
       if (!metric) {
-        metric = await select("Alert metric:", [
-          { name: "CPU Usage", value: "cpu" },
-          { name: "Memory Usage", value: "memory" },
-          { name: "Disk Usage", value: "disk" }
-        ]);
+        metric = await select(
+          "Alert metric:",
+          [
+            { name: "CPU Usage", value: "cpu" },
+            { name: "Memory Usage", value: "memory" },
+            { name: "Disk Usage", value: "disk" }
+          ],
+          { field: "alert_metric", flag: "--metric" }
+        );
       }
       const _setSpinner = startSpinner("Saving alert...");
       await client.virtualMachine.upsertAlertConfig.mutate({
@@ -14978,7 +15704,12 @@ ${colors.error("WARNING: This will permanently destroy the server and all data."
         );
         const confirmed = await confirm(
           `Terminate server "${server.name || identifier}"?`,
-          false
+          false,
+          {
+            field: "confirm_terminate_server",
+            flag: "--yes",
+            context: { server: server.name || identifier }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -15072,7 +15803,12 @@ ${colors.error("WARNING: This will permanently destroy the server and all data."
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Cancel subscription for server "${server.name || identifier}"?`,
-          false
+          false,
+          {
+            field: "confirm_cancel_vm_subscription",
+            flag: "--yes",
+            context: { server: server.name || identifier }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -15308,12 +16044,23 @@ RunPod: ${available ? colors.success("available") : colors.error("unavailable")}
   pool.command("provision").description("Provision a new dedicated Coolify server").option("--size <size>", "Server size key").option("--region <region>", "Region").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const sizeKey = options.size || await input("Server size key:");
-      const region = options.region || await input("Region:");
+      const sizeKey = options.size || await input("Server size key:", void 0, {
+        field: "server_size",
+        flag: "--size"
+      });
+      const region = options.region || await input("Region:", void 0, {
+        field: "region",
+        flag: "--region"
+      });
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Provision a dedicated server (${sizeKey} in ${region})?`,
-          false
+          false,
+          {
+            field: "confirm_provision_dedicated",
+            flag: "--yes",
+            context: { sizeKey, region }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -15345,7 +16092,12 @@ RunPod: ${available ? colors.success("available") : colors.error("unavailable")}
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Decommission server "${id}"? Apps will be migrated first.`,
-          false
+          false,
+          {
+            field: "confirm_decommission_server",
+            flag: "--yes",
+            context: { id }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -15364,7 +16116,10 @@ RunPod: ${available ? colors.success("available") : colors.error("unavailable")}
   pool.command("upgrade").argument("<id>", "Server ID").option("--size <size>", "New size key").description("Upgrade a dedicated server to a larger size").action(async (id, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const sizeKey = options.size || await input("New size key:");
+      const sizeKey = options.size || await input("New size key:", void 0, {
+        field: "new_size",
+        flag: "--size"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Starting upgrade...");
       const result = await client.server.upgradeServer.mutate({
@@ -15380,7 +16135,10 @@ RunPod: ${available ? colors.success("available") : colors.error("unavailable")}
   pool.command("blue-green-upgrade").argument("<id>", "Server ID").option("--size <size>", "Target size key").description("Start a blue/green server upgrade (zero-downtime)").action(async (id, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const sizeKey = options.size || await input("Target size:");
+      const sizeKey = options.size || await input("Target size:", void 0, {
+        field: "target_size",
+        flag: "--size"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Starting blue/green upgrade...");
       const result = await client.server.upgradeBlueGreen.mutate({
@@ -15425,7 +16183,12 @@ RunPod: ${available ? colors.success("available") : colors.error("unavailable")}
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Complete cutover for server "${id}"?`,
-          false
+          false,
+          {
+            field: "confirm_complete_cutover",
+            flag: "--yes",
+            context: { id }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -15471,7 +16234,11 @@ RunPod: ${available ? colors.success("available") : colors.error("unavailable")}
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           "Migrate all shared apps to your dedicated server?",
-          false
+          false,
+          {
+            field: "confirm_migrate_to_dedicated",
+            flag: "--yes"
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -15514,7 +16281,10 @@ RunPod: ${available ? colors.success("available") : colors.error("unavailable")}
   pool.command("request-enterprise").description("Request an enterprise server configuration").option("-m, --message <message>", "Additional requirements or message").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const message = options.message || await input("Requirements / message (optional):");
+      const message = options.message || await input("Requirements / message (optional):", void 0, {
+        field: "enterprise_message",
+        flag: "--message"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Submitting enterprise request...");
       await client.server.requestEnterprise.mutate({ message });
@@ -15702,7 +16472,10 @@ function registerSmsCommands(program2) {
   sms.command("config").description("Show SMS configuration for an environment").option("-e, --env <environment-id>", "Environment ID").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Fetching SMS config...");
       const data = await client.sms.getConfig.query({ environmentId });
@@ -15730,15 +16503,34 @@ function registerSmsCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
-        const provider = options.provider || await select("SMS provider:", [
-          { name: "Twilio", value: "twilio" },
-          { name: "Vonage", value: "vonage" },
-          { name: "Sinch", value: "sinch" }
-        ]);
-        const apiKey = options.apiKey || await input("API Key / Account SID:");
-        const apiSecret = options.apiSecret || await input("API Secret / Auth Token:");
-        const fromNumber = options.from || await input("From phone number (e.g. +1234567890):");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
+        const provider = options.provider || await select(
+          "SMS provider:",
+          [
+            { name: "Twilio", value: "twilio" },
+            { name: "Vonage", value: "vonage" },
+            { name: "Sinch", value: "sinch" }
+          ],
+          { field: "sms_provider", flag: "--provider" }
+        );
+        const apiKey = options.apiKey || await input("API Key / Account SID:", void 0, {
+          field: "api_key",
+          flag: "--api-key",
+          sensitive: true
+        });
+        const apiSecret = options.apiSecret || await input("API Secret / Auth Token:", void 0, {
+          field: "api_secret",
+          flag: "--api-secret",
+          sensitive: true
+        });
+        const fromNumber = options.from || await input(
+          "From phone number (e.g. +1234567890):",
+          void 0,
+          { field: "from_number", flag: "--from" }
+        );
         const client = getApiClient();
         const _spinner = startSpinner("Creating SMS config...");
         const result = await client.sms.createConfig.mutate({
@@ -15762,7 +16554,10 @@ function registerSmsCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
         const isEnabled = options.enable ? true : options.disable ? false : void 0;
         const client = getApiClient();
         const _spinner = startSpinner("Updating SMS config...");
@@ -15786,9 +16581,18 @@ function registerSmsCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
-        const to = options.to || await input("Recipient phone number:");
-        const body = options.message || await input("Message:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
+        const to = options.to || await input("Recipient phone number:", void 0, {
+          field: "recipient_phone",
+          flag: "--to"
+        });
+        const body = options.message || await input("Message:", void 0, {
+          field: "message_body",
+          flag: "--message"
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Sending SMS...");
         const result = await client.sms.send.mutate({
@@ -15808,7 +16612,10 @@ function registerSmsCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Fetching logs...");
         const logs = await client.sms.getLogs.query({
@@ -15846,7 +16653,10 @@ function registerSmsCommands(program2) {
   sms.command("stats").description("Show SMS sending statistics").option("-e, --env <environment-id>", "Environment ID").option("--start <date>", "Start date (ISO format)").option("--end <date>", "End date (ISO format)").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Fetching stats...");
       const stats = await client.sms.getStats.query({
@@ -15925,15 +16735,22 @@ function registerStorageCommands(program2) {
       let bucketName = name;
       let plan = (options.plan || "FREE").toUpperCase();
       if (!bucketName) {
-        bucketName = await input("Bucket name:");
+        bucketName = await input("Bucket name:", void 0, {
+          field: "name",
+          flag: "--name"
+        });
       }
       if (!options.plan && !shouldSkipConfirmation()) {
-        plan = await select("Storage plan:", [
-          { name: "FREE (1 GB)", value: "FREE" },
-          { name: "STARTER (10 GB)", value: "STARTER" },
-          { name: "STANDARD (100 GB)", value: "STANDARD" },
-          { name: "PRO (1 TB)", value: "PRO" }
-        ]);
+        plan = await select(
+          "Storage plan:",
+          [
+            { name: "FREE (1 GB)", value: "FREE" },
+            { name: "STARTER (10 GB)", value: "STARTER" },
+            { name: "STANDARD (100 GB)", value: "STANDARD" },
+            { name: "PRO (1 TB)", value: "PRO" }
+          ],
+          { field: "plan", flag: "--plan" }
+        );
       }
       const client = getApiClient();
       const _spinner = startSpinner("Creating storage bucket...");
@@ -16000,7 +16817,12 @@ function registerStorageCommands(program2) {
         log("");
         const confirmed = await confirm(
           `Are you sure you want to delete bucket "${bucket.name}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_bucket",
+            flag: "--yes",
+            context: { bucketName: bucket.name }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -16149,7 +16971,12 @@ function registerStorageCommands(program2) {
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Delete file "${fileName}" from bucket "${bucket.name}"?`,
-          false
+          false,
+          {
+            field: "confirm_delete_file",
+            flag: "--yes",
+            context: { fileName, bucketName: bucket.name }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -16245,7 +17072,10 @@ function registerStorageCommands(program2) {
         throw new NotFoundError("Storage bucket", bucketIdentifier);
       }
       const bucketId = bucket.bucketId || bucket.id;
-      const targetPlan = options.plan || await input("Target plan (standard/pro):");
+      const targetPlan = options.plan || await input("Target plan (standard/pro):", void 0, {
+        field: "plan",
+        flag: "--plan"
+      });
       const _upgradeSpinner = startSpinner(
         `Upgrading bucket to ${targetPlan}...`
       );
@@ -16639,34 +17469,47 @@ ${colors.warn(`${unread.count} unread ticket${unread.count === 1 ? "" : "s"}`)}`
   ).option(
     "-c, --category <category>",
     "Category: billing, technical, account, feature_request"
-  ).action(async (options) => {
+  ).option("-d, --description <description>", "Ticket description").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
       let subject = options.subject;
       let priority = options.priority;
       let category = options.category;
       if (!subject) {
-        subject = await input("Subject:");
+        subject = await input("Subject:", void 0, {
+          field: "ticket_subject",
+          flag: "--subject"
+        });
       }
       if (!priority) {
-        priority = await select("Priority:", [
-          { name: "Low", value: "low" },
-          { name: "Medium", value: "medium" },
-          { name: "High", value: "high" },
-          { name: "Critical - Production is down!", value: "critical" }
-        ]);
+        priority = await select(
+          "Priority:",
+          [
+            { name: "Low", value: "low" },
+            { name: "Medium", value: "medium" },
+            { name: "High", value: "high" },
+            { name: "Critical - Production is down!", value: "critical" }
+          ],
+          { field: "ticket_priority", flag: "--priority" }
+        );
       }
       if (!category) {
-        category = await select("Category:", [
-          { name: "Technical issue", value: "technical" },
-          { name: "Billing question", value: "billing" },
-          { name: "Account management", value: "account" },
-          { name: "Feature request", value: "feature_request" }
-        ]);
+        category = await select(
+          "Category:",
+          [
+            { name: "Technical issue", value: "technical" },
+            { name: "Billing question", value: "billing" },
+            { name: "Account management", value: "account" },
+            { name: "Feature request", value: "feature_request" }
+          ],
+          { field: "ticket_category", flag: "--category" }
+        );
       }
       log("");
-      const description = await input(
-        "Description (press Enter twice when done):"
+      const description = options.description || await input(
+        "Description (press Enter twice when done):",
+        void 0,
+        { field: "ticket_description", flag: "--description" }
       );
       if (!shouldSkipConfirmation()) {
         log("");
@@ -16674,7 +17517,11 @@ ${colors.warn(`${unread.count} unread ticket${unread.count === 1 ? "" : "s"}`)}`
         log(`Priority: ${formatPriority(priority)}`);
         log(`Category: ${category}`);
         log("");
-        const confirmed = await confirm("Submit this ticket?", true);
+        const confirmed = await confirm("Submit this ticket?", true, {
+          field: "confirm_submit_ticket",
+          flag: "--yes",
+          context: { subject, priority, category }
+        });
         if (!confirmed) {
           log("Cancelled.");
           return;
@@ -16779,7 +17626,10 @@ ${colors.warn(`${unread.count} unread ticket${unread.count === 1 ? "" : "s"}`)}`
       if (!isLoggedIn()) throw new AuthError();
       let message = options.message;
       if (!message) {
-        message = await input("Your reply:");
+        message = await input("Your reply:", void 0, {
+          field: "reply_message",
+          flag: "--message"
+        });
       }
       const client = getApiClient();
       let ticketId = ticketIdentifier;
@@ -16932,7 +17782,12 @@ ${colors.success("File attached to ticket.")}
       if (!shouldSkipConfirmation()) {
         const confirmed = await confirm(
           `Close ticket "${ticketIdentifier}"?`,
-          false
+          false,
+          {
+            field: "confirm_close_ticket",
+            flag: "--yes",
+            context: { ticket: ticketIdentifier }
+          }
         );
         if (!confirmed) {
           log("Cancelled.");
@@ -17303,7 +18158,9 @@ function registerWalletCommands(program2) {
         amountHalalas = Number.parseInt(options.amount);
       } else {
         const amountStr = await input(
-          "Amount in SAR (e.g., 50 for 50 SAR, leave blank for default):"
+          "Amount in SAR (e.g., 50 for 50 SAR, leave blank for default):",
+          void 0,
+          { field: "wallet_topup_amount_sar", flag: "--amount" }
         );
         if (amountStr) {
           amountHalalas = Math.round(Number.parseFloat(amountStr) * 100);
@@ -17394,7 +18251,10 @@ function registerWhatsappCommands(program2) {
   wa.command("config").description("Show WhatsApp configuration for an environment").option("-e, --env <environment-id>", "Environment ID").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Fetching WhatsApp config...");
       const data = await client.whatsapp.getConfig.query({ environmentId });
@@ -17421,13 +18281,28 @@ function registerWhatsappCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
-        const provider = options.provider || await select("WhatsApp provider:", [
-          { name: "Meta (official)", value: "meta" },
-          { name: "Twilio", value: "twilio" }
-        ]);
-        const apiKey = options.apiKey || await input("API Key / Token:");
-        const whatsappNumber = options.number || await input("WhatsApp business number (e.g. +1234567890):");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
+        const provider = options.provider || await select(
+          "WhatsApp provider:",
+          [
+            { name: "Meta (official)", value: "meta" },
+            { name: "Twilio", value: "twilio" }
+          ],
+          { field: "whatsapp_provider", flag: "--provider" }
+        );
+        const apiKey = options.apiKey || await input("API Key / Token:", void 0, {
+          field: "api_key",
+          flag: "--api-key",
+          sensitive: true
+        });
+        const whatsappNumber = options.number || await input(
+          "WhatsApp business number (e.g. +1234567890):",
+          void 0,
+          { field: "whatsapp_number", flag: "--number" }
+        );
         const client = getApiClient();
         const _spinner = startSpinner("Creating WhatsApp config...");
         const result = await client.whatsapp.createConfig.mutate({
@@ -17450,7 +18325,10 @@ function registerWhatsappCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
         const isEnabled = options.enable ? true : options.disable ? false : void 0;
         const client = getApiClient();
         const _spinner = startSpinner("Updating WhatsApp config...");
@@ -17473,8 +18351,14 @@ function registerWhatsappCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
-        const to = options.to || await input("Recipient phone number:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
+        const to = options.to || await input("Recipient phone number:", void 0, {
+          field: "recipient_phone",
+          flag: "--to"
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Sending WhatsApp message...");
         const result = await client.whatsapp.send.mutate({
@@ -17496,7 +18380,10 @@ function registerWhatsappCommands(program2) {
     async (options) => {
       try {
         if (!isLoggedIn()) throw new AuthError();
-        const environmentId = options.env || await input("Environment ID:");
+        const environmentId = options.env || await input("Environment ID:", void 0, {
+          field: "environment_id",
+          flag: "--env"
+        });
         const client = getApiClient();
         const _spinner = startSpinner("Fetching logs...");
         const logs = await client.whatsapp.getLogs.query({
@@ -17535,7 +18422,10 @@ function registerWhatsappCommands(program2) {
   wa.command("stats").description("Show WhatsApp messaging statistics").option("-e, --env <environment-id>", "Environment ID").option("--start <date>", "Start date (ISO)").option("--end <date>", "End date (ISO)").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const environmentId = options.env || await input("Environment ID:");
+      const environmentId = options.env || await input("Environment ID:", void 0, {
+        field: "environment_id",
+        flag: "--env"
+      });
       const client = getApiClient();
       const _spinner = startSpinner("Fetching stats...");
       const stats = await client.whatsapp.getStats.query({
@@ -17565,11 +18455,15 @@ function registerWhatsappCommands(program2) {
 
 // src/index.ts
 var program = new Command();
-program.name("tarout").description("Tarout PaaS Command Line Interface").version(package_default.version).option("--json", "Output as JSON (machine-readable)").option("-y, --yes", "Skip all confirmation prompts").option("-q, --quiet", "Minimal output").option("-v, --verbose", "Extra debug information").option("--no-color", "Disable colored output").hook("preAction", (thisCommand) => {
+program.name("tarout").description("Tarout PaaS Command Line Interface").version(package_default.version).option("--json", "Output as JSON (machine-readable)").option("-y, --yes", "Skip all confirmation prompts").option(
+  "--non-interactive",
+  "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();
   setGlobalOptions({
     json: opts.json || false,
     yes: opts.yes || false,
+    nonInteractive: opts.nonInteractive || false,
     quiet: opts.quiet || false,
     verbose: opts.verbose || false,
     noColor: opts.color === false
@@ -17610,4 +18504,27 @@ registerSmsCommands(program);
 registerWhatsappCommands(program);
 registerFirewallCommands(program);
 registerQueuesCommands(program);
+var argErrorPatterns = [
+  /invalid/i,
+  /missing required/i,
+  /unknown option/i,
+  /unknown command/i
+];
+var originalWriteErr = process.stderr.write.bind(process.stderr);
+program.configureOutput({
+  writeErr: (str) => {
+    if (process.argv.includes("--json")) {
+      setGlobalOptions({ json: true });
+      const isArgError = argErrorPatterns.some((p) => p.test(str));
+      outputError(
+        isArgError ? "INVALID_ARGUMENTS" : "CLI_ERROR",
+        str.replace(/^error:\s*/i, "").trim()
+      );
+      process.exit(
+        isArgError ? ExitCode.INVALID_ARGUMENTS : ExitCode.GENERAL_ERROR
+      );
+    }
+    return originalWriteErr(str);
+  }
+});
 program.parse();