thinkwork-cli 0.12.10 → 0.12.12

package/dist/cli.js

@@ -1693,8 +1693,12 @@ async function resolveEnterpriseDeployRequest(options, deps = {}) {
   const repoContext = findEnterpriseDeploymentRepo(cwd);
   const loadDeployment = deps.loadDeployment ?? loadEnterpriseDeployment;
   const stdinIsTty = deps.stdinIsTty ?? Boolean(process.stdin.isTTY);
-  const component = options.component ?? "all";
   const inferRepository = deps.inferRepository ?? inferGitHubRepositoryFromRemote;
+  const component = await resolveEnterpriseDeployComponent(
+    options,
+    stdinIsTty,
+    deps
+  );
   const componentCheck = validateEnterpriseDeployComponent(component);
   if (!componentCheck.valid) {
     throw new Error(componentCheck.error);
@@ -1706,13 +1710,13 @@ async function resolveEnterpriseDeployRequest(options, deps = {}) {
     "Customer slug is required for enterprise deploy. Pass --customer <slug>."
   );
   const registry = loadDeployment(customerSlug);
-  const stage = options.stage ?? registry?.defaultStage ?? repoContext?.stages[0] ?? (options.bootstrap ? await promptWhenInteractive(
-    "Deployment stage:",
+  const stageDefault = registry?.defaultStage ?? repoContext?.stages[0] ?? "dev";
+  const stage = options.stage ?? (options.bootstrap ? await resolveEnterpriseBootstrapStage(
+    registry,
+    repoContext,
     stdinIsTty,
-    deps.promptInput,
-    "Deployment stage is required for enterprise bootstrap. Pass --stage <name>.",
-    "dev"
-  ) : "dev");
+    deps
+  ) : await resolveEnterpriseDispatchStage(stageDefault, stdinIsTty, deps));
   const stageCheck = validateStage(stage);
   if (!stageCheck.valid) {
     throw new Error(stageCheck.error);
@@ -1725,12 +1729,19 @@ async function resolveEnterpriseDeployRequest(options, deps = {}) {
     `${customerSlug}/${customerSlug}-thinkwork-deploy`
   );
   const checkoutDir = options.checkoutDir ?? registry?.checkoutDir ?? registry?.targetDir ?? repoContext?.repoRoot ?? join5(resolve3(cwd), `${customerSlug}-thinkwork-deploy`);
+  const runSmokes = await resolveEnterpriseRunSmokes(
+    options,
+    component,
+    stdinIsTty,
+    deps
+  );
   return {
     customerSlug,
     repository,
     checkoutDir: resolve3(checkoutDir),
     stage,
     component,
+    runSmokes,
     bootstrap: options.bootstrap === true,
     wait: options.wait !== false,
     createRepo: options.createRepo === true,
@@ -1835,6 +1846,78 @@ async function runEnterpriseDeploy(options, deps = {}) {
     workflow
   };
 }
+async function resolveEnterpriseBootstrapStage(registry, repoContext, stdinIsTty, deps) {
+  return registry?.defaultStage ?? repoContext?.stages[0] ?? await promptWhenInteractive(
+    "Deployment stage:",
+    stdinIsTty,
+    deps.promptInput,
+    "Deployment stage is required for enterprise bootstrap. Pass --stage <name>.",
+    "dev"
+  );
+}
+async function resolveEnterpriseDispatchStage(defaultValue, stdinIsTty, deps) {
+  if (!stdinIsTty) return defaultValue;
+  return promptWhenInteractive(
+    "Deployment stage:",
+    stdinIsTty,
+    deps.promptInput,
+    "Deployment stage is required for enterprise deploy. Pass --stage <name>.",
+    defaultValue
+  );
+}
+async function resolveEnterpriseDeployComponent(options, stdinIsTty, deps) {
+  const defaultValue = options.component ?? "all";
+  if (options.bootstrap || !stdinIsTty) return defaultValue;
+  if (!ENTERPRISE_DEPLOY_COMPONENTS.includes(
+    defaultValue
+  )) {
+    return defaultValue;
+  }
+  return promptSelectWhenInteractive(
+    {
+      message: "Deployment component:",
+      choices: [
+        {
+          name: "all",
+          value: "all",
+          description: "Deploy release artifacts, Terraform, runtimes, overlays, and smokes"
+        },
+        {
+          name: "foundation",
+          value: "foundation",
+          description: "Terraform apply only"
+        },
+        {
+          name: "artifacts",
+          value: "artifacts",
+          description: "Release artifacts, runtime images, and static bundles"
+        },
+        {
+          name: "overlays",
+          value: "overlays",
+          description: "Customer overlays only"
+        },
+        {
+          name: "smokes",
+          value: "smokes",
+          description: "Smoke checks against an existing stage"
+        }
+      ],
+      defaultValue
+    },
+    deps.promptSelect
+  );
+}
+async function resolveEnterpriseRunSmokes(options, component, stdinIsTty, deps) {
+  if (options.runSmokes !== void 0) return options.runSmokes;
+  if (options.bootstrap || !stdinIsTty) return true;
+  if (component !== "all" && component !== "smokes") return true;
+  return promptConfirmWhenInteractive(
+    "Run smoke checks after deploy?",
+    true,
+    deps.promptConfirm
+  );
+}
 async function promptWhenInteractive(message, stdinIsTty, promptInput, nonInteractiveError, defaultValue) {
   if (!stdinIsTty) throw new Error(nonInteractiveError);
   if (promptInput) {
@@ -1845,6 +1928,20 @@ async function promptWhenInteractive(message, stdinIsTty, promptInput, nonIntera
   const value = await input21({ message, default: defaultValue });
   return value.trim() || defaultValue || value;
 }
+async function promptSelectWhenInteractive(options, promptSelect) {
+  if (promptSelect) return promptSelect(options);
+  const { select: select10 } = await import("@inquirer/prompts");
+  return select10({
+    message: options.message,
+    choices: options.choices,
+    default: options.defaultValue
+  });
+}
+async function promptConfirmWhenInteractive(message, defaultValue, promptConfirm) {
+  if (promptConfirm) return promptConfirm(message);
+  const { confirm: confirmPrompt } = await import("@inquirer/prompts");
+  return confirmPrompt({ message, default: defaultValue });
+}
 function enterpriseBootstrapStages(requestedStage) {
   return [.../* @__PURE__ */ new Set([requestedStage, "prod"])];
 }
@@ -1879,7 +1976,7 @@ async function dispatchEnterpriseWorkflow(request, options, deps, bootstrap) {
       repository: request.repository,
       stage: request.stage,
       component: request.component,
-      runSmokes: options.runSmokes ?? true,
+      runSmokes: request.runSmokes,
       wait: request.wait,
       region: bootstrap?.plan.region ?? request.registry?.region
     },
@@ -1985,28 +2082,26 @@ async function runDeployCommand(opts, deps = {}) {
 }
 async function runLocalTerraformDeploy(opts) {
   const startTime = Date.now();
-  const stage = await resolveStage({ flag: opts.stage });
+  const initialStage = await resolveStage({ flag: opts.stage });
   const compCheck = validateComponent(opts.component);
   if (!compCheck.valid) {
     printError(compCheck.error);
     process.exit(1);
   }
   const identity = getAwsIdentity();
-  printHeader("deploy", stage, identity);
+  printHeader("deploy", initialStage, identity);
   if (!identity) {
     printWarning("Could not resolve AWS identity. Is the AWS CLI configured?");
   }
-  if (isProdLike(stage) && !opts.yes) {
-    const ok = await confirm(`  Stage "${stage}" is production-like. Deploy?`);
-    if (!ok) {
-      console.log("  Aborted.");
-      process.exit(0);
-    }
-  } else if (!opts.yes) {
-    const ok = await confirm(`  Deploy to stage "${stage}"?`);
-    if (!ok) {
-      console.log("  Aborted.");
-      process.exit(0);
+  const stage = await confirmLocalDeployStage(initialStage, opts);
+  if (!stage) {
+    console.log("  Aborted.");
+    process.exit(0);
+  }
+  if (stage !== initialStage) {
+    printHeader("deploy", stage, identity);
+    if (!identity) {
+      printWarning("Could not resolve AWS identity. Is the AWS CLI configured?");
     }
   }
   const terraformDir = process.env.THINKWORK_TERRAFORM_DIR || process.cwd();
@@ -2031,6 +2126,32 @@ async function runLocalTerraformDeploy(opts) {
   await runPostDeployProbe(stage);
   printSummary("deploy", stage, tiers, startTime);
 }
+async function confirmLocalDeployStage(initialStage, opts, deps = {}) {
+  if (opts.yes) return initialStage;
+  let stage = initialStage;
+  while (true) {
+    const ok = await (deps.confirm ?? confirm)(deployConfirmMessage(stage));
+    if (ok) return stage;
+    const canPromptForAnotherStage = deps.stdoutIsTty ?? Boolean(process.stdout.isTTY);
+    if (!canPromptForAnotherStage) return null;
+    const nextStage = (await promptAlternativeDeployStage(stage, deps.promptInput)).trim();
+    if (!nextStage) return null;
+    const check = validateStage(nextStage);
+    if (!check.valid) {
+      throw new Error(check.error);
+    }
+    stage = nextStage;
+  }
+}
+function deployConfirmMessage(stage) {
+  return isProdLike(stage) ? `  Stage "${stage}" is production-like. Deploy?` : `  Deploy to stage "${stage}"?`;
+}
+async function promptAlternativeDeployStage(currentStage, promptInput) {
+  const message = `Deployment stage to deploy instead of "${currentStage}" (blank to abort):`;
+  if (promptInput) return promptInput(message);
+  const { input: input21 } = await import("@inquirer/prompts");
+  return input21({ message });
+}
 function printEnterpriseDeploySummary(result) {
   const workflow = result.workflow;
   if (result.kind === "bootstrap") {
@@ -2159,7 +2280,11 @@ async function runEnterpriseDestroy(options, deps = {}) {
         "Refusing to destroy an enterprise stage without --yes in a non-interactive session."
       );
     }
-    const message = isProdLike(request.stage) ? `  Stage "${request.stage}" is production-like. Destroy the enterprise stage stack for "${request.customerSlug}" via ${request.repository}?` : `  Destroy enterprise stage "${request.stage}" for "${request.customerSlug}" via ${request.repository}?`;
+    const impact = `  This will dispatch operation=destroy to ${request.repository} and permanently remove the "${request.stage}" stage stack for "${request.customerSlug}". Customer-wide bootstrap resources such as the deployment repository, Terraform state bucket, artifact bucket, and OIDC trust are preserved.`;
+    const message = isProdLike(request.stage) ? `  Stage "${request.stage}" is production-like.
+${impact}
+  Continue?` : `${impact}
+  Continue?`;
     const ok = await (deps.promptConfirm ?? confirm)(message);
     if (!ok) {
       throw new Error("Enterprise destroy aborted.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkwork-cli",
-  "version": "0.12.10",
+  "version": "0.12.12",
   "description": "Thinkwork CLI — deploy, manage, and interact with your Thinkwork stack",
   "license": "Apache-2.0",
   "type": "module",