@wraps.dev/cli 3.3.0 → 3.4.0

package/dist/cli.js

@@ -778,13 +778,13 @@ function handleCLIError(error, command6) {
       docsUrl = wrapsErr.docsUrl;
     } else {
       trackError("UNHANDLED_ERROR", cmdContext, {
-        errorType: error instanceof Error ? error.constructor.name : typeof error,
-        message: sanitizeErrorMessage(error)
+        errorType: error instanceof Error ? error.constructor.name : typeof error
       });
       message = error instanceof Error ? error.message : String(error || message);
     }
     jsonError(cmdContext, { code, message, suggestion, docsUrl });
-    process.exit(1);
+    process.exitCode = 1;
+    return;
   }
   console.error("");
   if (error instanceof WrapsError) {
@@ -804,7 +804,8 @@ ${pc.yellow("Suggestion:")}`);
       console.log(`  ${pc.blue(error.docsUrl)}
 `);
     }
-    process.exit(1);
+    process.exitCode = 1;
+    return;
   }
   if (isAWSError(error)) {
     const { code, action } = parseAWSError(error);
@@ -830,7 +831,8 @@ ${pc.yellow("Suggestion:")}`);
       console.log(`  ${pc.blue(wrapsError.docsUrl)}
 `);
     }
-    process.exit(1);
+    process.exitCode = 1;
+    return;
   }
   if (isPulumiError(error)) {
     const { code, iamAction, service, resourceName, resourceType } = parsePulumiError(error);
@@ -862,11 +864,11 @@ ${pc.yellow("Suggestion:")}`);
       console.log(`  ${pc.blue(wrapsError.docsUrl)}
 `);
     }
-    process.exit(1);
+    process.exitCode = 1;
+    return;
   }
   trackError("UNHANDLED_ERROR", cmdContext, {
-    errorType: error instanceof Error ? error.constructor.name : typeof error,
-    message: sanitizeErrorMessage(error)
+    errorType: error instanceof Error ? error.constructor.name : typeof error
   });
   clack.log.error("An unexpected error occurred");
   if (error instanceof Error) {
@@ -878,7 +880,7 @@ ${pc.yellow("Suggestion:")}`);
 ${pc.dim("If this persists, please report at:")}`);
   console.log(`  ${pc.blue("https://github.com/wraps-team/wraps/issues")}
 `);
-  process.exit(1);
+  process.exitCode = 1;
 }
 function awsErrorToWrapsError(code, action, originalError, isAgentContext = false) {
   const originalName = originalError instanceof Error ? originalError.name : "";
@@ -1035,6 +1037,37 @@ Saved regions: ${savedRegions.join(", ")}` : "Pass --region or set AWS_REGION.\n
         `Pass ${flagHint} (or run in an interactive terminal).`,
         "https://wraps.dev/docs/reference/json-output"
       ),
+      // ── User-input rejections ──────────────────────────────────────────────────
+      // "The user gave us bad input and this message says exactly what was wrong."
+      // These are WrapsErrors on purpose: handleCLIError's WrapsError branch
+      // (errors.ts:424 human, :369 JSON) already renders the exact target shape —
+      // a specific telemetry code, the message, the suggestion, exit non-zero —
+      // whereas a bare `throw new Error(...)` falls through to the generic tail,
+      // which prints "An unexpected error occurred" plus a GitHub-issue link and
+      // reports the user's typo as UNHANDLED_ERROR.
+      //
+      // Callers throw these INSTEAD of printing their own clack.log.error and
+      // usage line. That is not tidiness: an unguarded clack.log.error writes to
+      // stdout ahead of the JSON envelope, so `--json` consumers were parsing the
+      // human text and the envelope out of one stream.
+      unknownCommand: (what, typed, suggestion) => new WrapsError(
+        `Unknown ${what}: ${typed || "(none)"}`,
+        "UNKNOWN_COMMAND",
+        suggestion,
+        "https://wraps.dev/docs/cli-reference"
+      ),
+      // Code deliberately reuses MISSING_REQUIRED_FLAG rather than minting a new one:
+      // four commands already emit it inline (commands/sms/verify-number.ts:193,
+      // commands/sms/test.ts:71, commands/email/config-domain.ts:208,
+      // commands/email/test.ts:108), it is already on the errors reference page (:583),
+      // and domains.test.ts:1251 already asserts it. A second code for one condition is
+      // exactly the machine-readable inconsistency this feature exists to remove.
+      missingInput: (what, usage) => new WrapsError(
+        `${what} is required`,
+        "MISSING_REQUIRED_FLAG",
+        `Usage: ${usage}`,
+        "https://wraps.dev/docs/cli-reference"
+      ),
       pulumiError: (message) => new WrapsError(
         `Infrastructure deployment failed: ${message}`,
         "PULUMI_ERROR",
@@ -32427,7 +32460,7 @@ function collectRemediations(findings) {
 // src/commands/aws/doctor.ts
 init_json_output();
 var CATEGORY = "AWS Setup";
-async function runDiagnostics(state2) {
+async function runDiagnostics(state2, regionOverride) {
   const results = [];
   if (state2.cliInstalled) {
     results.push({
@@ -32613,6 +32646,8 @@ async function runDiagnostics(state2) {
     }
     return results;
   }
+  const configuredRegion = state2.region || "us-east-1";
+  const effectiveRegion = regionOverride || state2.region;
   if (state2.region) {
     results.push({
       status: "pass",
@@ -32628,6 +32663,14 @@ async function runDiagnostics(state2) {
       remediation: remediations.setAwsRegion()
     });
   }
+  if (regionOverride && regionOverride !== configuredRegion) {
+    results.push({
+      status: "info",
+      category: CATEGORY,
+      name: `Checked region: ${regionOverride}`,
+      details: state2.region ? `Overrides the configured region ${state2.region}. The SES check below is about ${regionOverride}.` : `The SES check below is about ${regionOverride}, not the us-east-1 default.`
+    });
+  }
   if (!state2.sso.configured) {
     const profiles = getConfiguredProfiles();
     if (profiles.length > 1) {
@@ -32640,11 +32683,19 @@ async function runDiagnostics(state2) {
     }
   }
   if (state2.credentialsConfigured) {
-    const regionUsed = state2.region || "us-east-1";
-    const regionNote = state2.region ? `Region: ${regionUsed}` : `No AWS_REGION set \u2014 defaulted to ${regionUsed}. Set AWS_REGION if your deployment lives elsewhere.`;
+    const regionUsed = effectiveRegion || "us-east-1";
+    const regionNote = effectiveRegion ? `Region: ${regionUsed}` : `No AWS_REGION set \u2014 defaulted to ${regionUsed}. Set AWS_REGION if your deployment lives elsewhere.`;
     try {
-      const sandbox = await isSESSandbox(regionUsed);
-      if (sandbox) {
+      const ses = await getSESAccountStatus(regionUsed);
+      if (ses.sandboxUncertain) {
+        results.push({
+          status: "info",
+          category: CATEGORY,
+          name: "Could not confirm SES account status",
+          details: `SES may not be enabled in this region, or the account may lack ses:GetAccount.
+${regionNote}`
+        });
+      } else if (ses.isSandbox) {
         results.push({
           status: "warn",
           category: CATEGORY,
@@ -32665,7 +32716,7 @@ ${regionNote}`,
       results.push({
         status: "info",
         category: CATEGORY,
-        name: "Could not check SES status",
+        name: "Could not confirm SES account status",
         details: `SES may not be enabled in this region.
 ${regionNote}`
       });
@@ -32731,22 +32782,32 @@ function suggestionsFor(results) {
     results.filter((r6) => r6.status === "fail" || r6.status === "warn")
   ).map(formatRemediation);
 }
-async function collectAwsFindings() {
-  const state2 = await detectAWSState();
-  return { findings: await runDiagnostics(state2), state: state2 };
+async function collectAwsFindings(options = {}) {
+  const state2 = options.state ?? await detectAWSState();
+  return { findings: await runDiagnostics(state2, options.region), state: state2 };
 }
-async function doctor() {
+async function doctor(options = {}) {
   const startTime = Date.now();
   if (!isJsonMode()) {
     clack5.intro(pc6.bold("AWS Setup Diagnostics"));
   }
   const spinner11 = isJsonMode() ? null : clack5.spinner();
   spinner11?.start("Running diagnostics...");
-  const { findings: results } = await collectAwsFindings();
+  const { findings: results, state: state2 } = await collectAwsFindings({
+    region: options.region
+  });
   spinner11?.stop("Diagnostics complete");
   const failCount = results.filter((r6) => r6.status === "fail").length;
   const warnCount = results.filter((r6) => r6.status === "warn").length;
   const passCount = results.filter((r6) => r6.status === "pass").length;
+  trackCommand("aws:doctor", {
+    success: true,
+    duration_ms: Date.now() - startTime,
+    region: options.region || state2.region || "us-east-1",
+    pass_count: passCount,
+    fail_count: failCount,
+    warn_count: warnCount
+  });
   if (isJsonMode()) {
     jsonSuccess("aws.doctor", {
       checks: results.map((r6) => ({
@@ -32778,13 +32839,6 @@ async function doctor() {
       console.log(`  ${pc6.dim("-")} ${suggestion}`);
     }
   }
-  trackCommand("aws:doctor", {
-    success: true,
-    duration_ms: Date.now() - startTime,
-    pass_count: passCount,
-    fail_count: failCount,
-    warn_count: warnCount
-  });
   console.log();
   clack5.outro(
     pc6.dim(failCount > 0 ? "See suggested fixes above" : "Ready to deploy")
@@ -36269,6 +36323,7 @@ ${pc16.dim("Tip:")} Run ${pc16.cyan("wraps cdn sync")} to update infrastructure
 init_esm_shims();
 init_events();
 init_aws();
+init_aws_detection();
 import * as clack16 from "@clack/prompts";
 import pc18 from "picocolors";
 init_json_output();
@@ -37256,19 +37311,23 @@ async function wrapsDoctor(options) {
     clack16.intro(pc18.bold("Wraps Doctor"));
   }
   const progress = new DeploymentProgress();
-  const { findings: awsFindings, state: state2 } = await progress.execute(
-    "Checking AWS setup",
-    async () => collectAwsFindings()
+  const state2 = await progress.execute(
+    "Detecting AWS setup",
+    async () => detectAWSState()
   );
-  const findings = [...awsFindings];
   const emailConnections = state2.credentialsConfigured && state2.accountId ? await findConnectionsWithService(state2.accountId, "email") : [];
   const regionExplicit = Boolean(
     options.region || process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION
   );
-  let region = options.region || await getAWSRegion();
+  let region = options.region || state2.region || await getAWSRegion();
   if (!regionExplicit && emailConnections.length > 0) {
     region = emailConnections[0].region;
   }
+  const { findings: awsFindings } = await progress.execute(
+    "Checking AWS setup",
+    async () => collectAwsFindings({ region, state: state2 })
+  );
+  const findings = [...awsFindings];
   if (state2.credentialsConfigured && state2.accountId) {
     if (!regionExplicit && emailConnections.length > 1) {
       findings.push({
@@ -53345,10 +53404,7 @@ ${pc40.bold("Cost Impact:")}`);
       trackError("STACK_LOCKED", "email:upgrade", { step: "deploy" });
       throw errors.stackLocked();
     }
-    trackError("UPGRADE_FAILED", "email:upgrade", {
-      step: "deploy",
-      error_detail: redactSensitiveValues(msg).slice(0, 3e3)
-    });
+    trackError("UPGRADE_FAILED", "email:upgrade", { step: "deploy" });
     throw new Error(`Pulumi upgrade failed: ${extractPulumiErrorSummary(msg)}`);
   }
   let dnsAutoCreated = false;
@@ -56296,7 +56352,6 @@ import pc47 from "picocolors";
 init_events();
 init_aws();
 init_config();
-init_errors();
 init_fs();
 init_json_output();
 init_metadata();
@@ -56960,9 +57015,7 @@ You can try the manual flow: ${pc47.cyan("wraps auth logout")} then ${pc47.cyan(
     progress.stop();
     const duration = Date.now() - startTime;
     const errorCode = error instanceof Error ? error.name : "UNKNOWN_ERROR";
-    trackError(errorCode, "platform:connect", {
-      message: sanitizeErrorMessage(error)
-    });
+    trackError(errorCode, "platform:connect", { step: "authenticated" });
     trackCommand("platform:connect", {
       success: false,
       duration_ms: duration,
@@ -57243,9 +57296,7 @@ ${pc47.bold("Next Steps:")}`);
     progress.stop();
     const duration = Date.now() - startTime;
     const errorCode = error instanceof Error ? error.name : "UNKNOWN_ERROR";
-    trackError(errorCode, "platform:connect", {
-      message: sanitizeErrorMessage(error)
-    });
+    trackError(errorCode, "platform:connect", { step: "unauthenticated" });
     trackCommand("platform:connect", {
       success: false,
       duration_ms: duration
@@ -66389,6 +66440,90 @@ function showNextSteps2() {
 
 // src/cli.ts
 init_client();
+
+// src/telemetry/command-name.ts
+init_esm_shims();
+
+// src/utils/shared/did-you-mean.ts
+init_esm_shims();
+var TOP_LEVEL_COMMANDS = [
+  "auth",
+  "aws",
+  "cdn",
+  "completion",
+  "console",
+  "destroy",
+  "doctor",
+  "email",
+  "help",
+  "license",
+  "news",
+  "permissions",
+  "platform",
+  "push",
+  "selfhost",
+  "sms",
+  "status",
+  "support",
+  "telemetry",
+  "update",
+  "workflow"
+];
+function distance(a6, b6) {
+  let previous = Array.from({ length: b6.length + 1 }, (_, i6) => i6);
+  for (let i6 = 1; i6 <= a6.length; i6++) {
+    const current = [i6];
+    for (let j6 = 1; j6 <= b6.length; j6++) {
+      const substitution = previous[j6 - 1] + (a6[i6 - 1] === b6[j6 - 1] ? 0 : 1);
+      current[j6] = Math.min(current[j6 - 1] + 1, previous[j6] + 1, substitution);
+    }
+    previous = current;
+  }
+  return previous[b6.length];
+}
+var MAX_DISTANCE = 2;
+function suggestCommand(input, known = TOP_LEVEL_COMMANDS) {
+  const needle = input.toLowerCase();
+  if (needle === "") {
+    return null;
+  }
+  const candidates = known.filter((candidate) => candidate !== needle);
+  let prefixMatch = null;
+  for (const candidate of candidates) {
+    if (candidate.startsWith(needle) && (prefixMatch === null || candidate.length < prefixMatch.length)) {
+      prefixMatch = candidate;
+    }
+  }
+  if (prefixMatch) {
+    return prefixMatch;
+  }
+  let best = null;
+  let bestDistance = Number.POSITIVE_INFINITY;
+  for (const candidate of candidates) {
+    const candidateDistance = distance(needle, candidate);
+    if (candidateDistance < bestDistance) {
+      best = candidate;
+      bestDistance = candidateDistance;
+    }
+  }
+  return bestDistance <= MAX_DISTANCE ? best : null;
+}
+
+// src/telemetry/command-name.ts
+var UNKNOWN = "unknown";
+var COMMAND_WORD = /^[a-z][a-z0-9-]{0,31}$/;
+var COMMANDS_WITH_DATA_SECOND_POSITIONAL = ["push"];
+function telemetryCommandName(primaryCommand2, subCommand2) {
+  if (!(primaryCommand2 && TOP_LEVEL_COMMANDS.includes(primaryCommand2))) {
+    return UNKNOWN;
+  }
+  if (!subCommand2 || COMMANDS_WITH_DATA_SECOND_POSITIONAL.includes(primaryCommand2)) {
+    return primaryCommand2;
+  }
+  return COMMAND_WORD.test(subCommand2) ? `${primaryCommand2}:${subCommand2}` : `${primaryCommand2}:${UNKNOWN}`;
+}
+
+// src/cli.ts
 init_events();
 
 // src/utils/shared/arg-parser.ts
@@ -66562,71 +66697,6 @@ function printCompletionScript() {
   console.log("#   --preview       : Preview changes without deploying\n");
 }
 
-// src/utils/shared/did-you-mean.ts
-init_esm_shims();
-var TOP_LEVEL_COMMANDS = [
-  "auth",
-  "aws",
-  "cdn",
-  "completion",
-  "console",
-  "destroy",
-  "doctor",
-  "email",
-  "help",
-  "license",
-  "news",
-  "permissions",
-  "platform",
-  "push",
-  "selfhost",
-  "sms",
-  "status",
-  "support",
-  "telemetry",
-  "update",
-  "workflow"
-];
-function distance(a6, b6) {
-  let previous = Array.from({ length: b6.length + 1 }, (_, i6) => i6);
-  for (let i6 = 1; i6 <= a6.length; i6++) {
-    const current = [i6];
-    for (let j6 = 1; j6 <= b6.length; j6++) {
-      const substitution = previous[j6 - 1] + (a6[i6 - 1] === b6[j6 - 1] ? 0 : 1);
-      current[j6] = Math.min(current[j6 - 1] + 1, previous[j6] + 1, substitution);
-    }
-    previous = current;
-  }
-  return previous[b6.length];
-}
-var MAX_DISTANCE = 2;
-function suggestCommand(input, known = TOP_LEVEL_COMMANDS) {
-  const needle = input.toLowerCase();
-  if (needle === "") {
-    return null;
-  }
-  const candidates = known.filter((candidate) => candidate !== needle);
-  let prefixMatch = null;
-  for (const candidate of candidates) {
-    if (candidate.startsWith(needle) && (prefixMatch === null || candidate.length < prefixMatch.length)) {
-      prefixMatch = candidate;
-    }
-  }
-  if (prefixMatch) {
-    return prefixMatch;
-  }
-  let best = null;
-  let bestDistance = Number.POSITIVE_INFINITY;
-  for (const candidate of candidates) {
-    const candidateDistance = distance(needle, candidate);
-    if (candidateDistance < bestDistance) {
-      best = candidate;
-      bestDistance = candidateDistance;
-    }
-  }
-  return bestDistance <= MAX_DISTANCE ? best : null;
-}
-
 // src/cli.ts
 init_errors();
 init_json_output();
@@ -67055,8 +67125,9 @@ if (!primaryCommand) {
       await telemetry.shutdown();
     }
   }
-  interactiveMenu().then(() => process.exit(0)).catch((err) => {
+  interactiveMenu().then(() => process.exit(0)).catch(async (err) => {
     handleCLIError(err);
+    await getTelemetryClient().shutdown();
     process.exit(1);
   });
 }
@@ -67173,13 +67244,10 @@ async function run() {
           break;
         case "verify": {
           if (!flags.domain) {
-            clack66.log.error("--domain flag is required");
-            console.log(
-              `
-Usage: ${pc71.cyan("wraps email verify --domain yourapp.com")}
-`
+            throw errors.missingInput(
+              "--domain",
+              "wraps email verify --domain yourapp.com"
             );
-            throw new Error("Missing required flag: --domain");
           }
           await verifyDomain({
             domain: flags.domain,
@@ -67248,16 +67316,10 @@ Usage: ${pc71.cyan("wraps email verify --domain yourapp.com")}
               });
               break;
             default:
-              clack66.log.error(
-                `Unknown inbound command: ${inboundSubCommand || "(none)"}`
-              );
-              console.log(
-                `
-Available commands: ${pc71.cyan("init")}, ${pc71.cyan("destroy")}, ${pc71.cyan("status")}, ${pc71.cyan("verify")}, ${pc71.cyan("test")}, ${pc71.cyan("add")}, ${pc71.cyan("remove")}
-`
-              );
-              throw new Error(
-                `Unknown inbound command: ${inboundSubCommand || "(none)"}`
+              throw errors.unknownCommand(
+                "inbound command",
+                inboundSubCommand,
+                "Available commands: init, destroy, status, verify, test, add, remove"
               );
           }
           break;
@@ -67290,16 +67352,10 @@ Available commands: ${pc71.cyan("init")}, ${pc71.cyan("destroy")}, ${pc71.cyan("
               });
               break;
             default:
-              clack66.log.error(
-                `Unknown agent command: ${agentSubCommand || "(none)"}`
-              );
-              console.log(
-                `
-Available commands: ${pc71.cyan("create")}, ${pc71.cyan("list")}, ${pc71.cyan("kill")}
-`
-              );
-              throw new Error(
-                `Unknown agent command: ${agentSubCommand || "(none)"}`
+              throw errors.unknownCommand(
+                "agent command",
+                agentSubCommand,
+                "Available commands: create, list, kill"
               );
           }
           break;
@@ -67347,16 +67403,10 @@ Available commands: ${pc71.cyan("create")}, ${pc71.cyan("list")}, ${pc71.cyan("k
               break;
             }
             default:
-              clack66.log.error(
-                `Unknown reply command: ${replySubCommand || "(none)"}`
-              );
-              console.log(
-                `
-Available commands: ${pc71.cyan("init")}, ${pc71.cyan("rotate")}, ${pc71.cyan("status")}, ${pc71.cyan("destroy")}, ${pc71.cyan("decode")}
-`
-              );
-              throw new Error(
-                `Unknown reply command: ${replySubCommand || "(none)"}`
+              throw errors.unknownCommand(
+                "reply command",
+                replySubCommand,
+                "Available commands: init, rotate, status, destroy, decode"
               );
           }
           break;
@@ -67377,39 +67427,30 @@ Available commands: ${pc71.cyan("init")}, ${pc71.cyan("rotate")}, ${pc71.cyan("s
               break;
             case "verify": {
               if (!flags.domain) {
-                clack66.log.error("--domain flag is required");
-                console.log(
-                  `
-Usage: ${pc71.cyan("wraps email domains verify --domain yourapp.com")}
-`
+                throw errors.missingInput(
+                  "--domain",
+                  "wraps email domains verify --domain yourapp.com"
                 );
-                throw new Error("Missing required flag: --domain");
               }
               await verifyDomain({ domain: flags.domain });
               break;
             }
             case "get-dkim": {
               if (!flags.domain) {
-                clack66.log.error("--domain flag is required");
-                console.log(
-                  `
-Usage: ${pc71.cyan("wraps email domains get-dkim --domain yourapp.com")}
-`
+                throw errors.missingInput(
+                  "--domain",
+                  "wraps email domains get-dkim --domain yourapp.com"
                 );
-                throw new Error("Missing required flag: --domain");
               }
               await getDkim({ domain: flags.domain });
               break;
             }
             case "remove": {
               if (!flags.domain) {
-                clack66.log.error("--domain flag is required");
-                console.log(
-                  `
-Usage: ${pc71.cyan("wraps email domains remove --domain yourapp.com --force")}
-`
+                throw errors.missingInput(
+                  "--domain",
+                  "wraps email domains remove --domain yourapp.com --force"
                 );
-                throw new Error("Missing required flag: --domain");
               }
               await removeDomain({
                 domain: flags.domain,
@@ -67436,16 +67477,10 @@ Usage: ${pc71.cyan("wraps email domains remove --domain yourapp.com --force")}
               break;
             }
             default:
-              clack66.log.error(
-                `Unknown domains command: ${domainsSubCommand || "(none)"}`
-              );
-              console.log(
-                `
-Available commands: ${pc71.cyan("add")}, ${pc71.cyan("list")}, ${pc71.cyan("verify")}, ${pc71.cyan("get-dkim")}, ${pc71.cyan("remove")}, ${pc71.cyan("config")}
-`
-              );
-              throw new Error(
-                `Unknown domains command: ${domainsSubCommand || "(none)"}`
+              throw errors.unknownCommand(
+                "domains command",
+                domainsSubCommand,
+                "Available commands: add, list, verify, get-dkim, remove, config"
               );
           }
           break;
@@ -67483,16 +67518,10 @@ Available commands: ${pc71.cyan("add")}, ${pc71.cyan("list")}, ${pc71.cyan("veri
               });
               break;
             default:
-              clack66.log.error(
-                `Unknown templates command: ${templatesSubCommand || "(none)"}`
-              );
-              console.log(
-                `
-Available commands: ${pc71.cyan("init")}, ${pc71.cyan("push")}, ${pc71.cyan("preview")}
-`
-              );
-              throw new Error(
-                `Unknown templates command: ${templatesSubCommand || "(none)"}`
+              throw errors.unknownCommand(
+                "templates command",
+                templatesSubCommand,
+                "Available commands: init, push, preview"
               );
           }
           break;
@@ -67527,16 +67556,10 @@ Available commands: ${pc71.cyan("init")}, ${pc71.cyan("push")}, ${pc71.cyan("pre
               });
               break;
             default:
-              clack66.log.error(
-                `Unknown workflows command: ${workflowsSubCommand || "(none)"}`
-              );
-              console.log(
-                `
-Available commands: ${pc71.cyan("init")}, ${pc71.cyan("validate")}, ${pc71.cyan("push")}
-`
-              );
-              throw new Error(
-                `Unknown workflows command: ${workflowsSubCommand || "(none)"}`
+              throw errors.unknownCommand(
+                "workflows command",
+                workflowsSubCommand,
+                "Available commands: init, validate, push"
               );
           }
           break;
@@ -67557,8 +67580,10 @@ Available commands: ${pc71.cyan("init")}, ${pc71.cyan("validate")}, ${pc71.cyan(
             case "get": {
               const messageId = sub[3];
               if (!messageId) {
-                clack66.log.error("Usage: wraps email logs get <message-id>");
-                throw new Error("Missing required argument: <message-id>");
+                throw errors.missingInput(
+                  "<message-id>",
+                  "wraps email logs get <message-id>"
+                );
               }
               await emailLogsGet({
                 messageId,
@@ -67569,16 +67594,10 @@ Available commands: ${pc71.cyan("init")}, ${pc71.cyan("validate")}, ${pc71.cyan(
               break;
             }
             default:
-              clack66.log.error(
-                `Unknown logs command: ${logsSubCommand || "(none)"}`
-              );
-              console.log(
-                `
-Available commands: ${pc71.cyan("list")}, ${pc71.cyan("get <message-id>")}
-`
-              );
-              throw new Error(
-                `Unknown logs command: ${logsSubCommand || "(none)"}`
+              throw errors.unknownCommand(
+                "logs command",
+                logsSubCommand,
+                "Available commands: list, get <message-id>"
               );
           }
           break;
@@ -67599,13 +67618,11 @@ Available commands: ${pc71.cyan("list")}, ${pc71.cyan("get <message-id>")}
           });
           break;
         default:
-          clack66.log.error(`Unknown email command: ${subCommand}`);
-          console.log(
-            `
-Run ${pc71.cyan("wraps --help")} for available commands.
-`
+          throw errors.unknownCommand(
+            "email command",
+            subCommand,
+            "Run wraps --help for available commands."
           );
-          throw new Error(`Unknown email command: ${subCommand}`);
       }
       const emailDuration = Date.now() - startTime;
       const emailCommandName = `email:${subCommand}`;
@@ -67627,13 +67644,11 @@ Run ${pc71.cyan("wraps --help")} for available commands.
           });
           break;
         default:
-          clack66.log.error(`Unknown license command: ${subCommand}`);
-          console.log(
-            `
-Run ${pc71.cyan("wraps --help")} for available commands.
-`
+          throw errors.unknownCommand(
+            "license command",
+            subCommand,
+            "Run wraps --help for available commands."
           );
-          throw new Error(`Unknown license command: ${subCommand}`);
       }
       trackCommand(`license:${subCommand}`, {
         success: true,
@@ -67701,13 +67716,11 @@ Run ${pc71.cyan("wraps --help")} for available commands.
           });
           break;
         default:
-          clack66.log.error(`Unknown selfhost command: ${subCommand}`);
-          console.log(
-            `
-Run ${pc71.cyan("wraps --help")} for available commands.
-`
+          throw errors.unknownCommand(
+            "selfhost command",
+            subCommand,
+            "Run wraps --help for available commands."
           );
-          throw new Error(`Unknown selfhost command: ${subCommand}`);
       }
       const selfhostDuration = Date.now() - startTime;
       const selfhostCommandName = `selfhost:${subCommand}`;
@@ -67787,13 +67800,11 @@ Run ${pc71.cyan("wraps --help")} for available commands.
           });
           break;
         default:
-          clack66.log.error(`Unknown sms command: ${subCommand}`);
-          console.log(
-            `
-Run ${pc71.cyan("wraps --help")} for available commands.
-`
+          throw errors.unknownCommand(
+            "sms command",
+            subCommand,
+            "Run wraps --help for available commands."
           );
-          throw new Error(`Unknown sms command: ${subCommand}`);
       }
       const smsDuration = Date.now() - startTime;
       const smsCommandName = `sms:${subCommand}`;
@@ -67851,13 +67862,11 @@ Run ${pc71.cyan("wraps --help")} for available commands.
           });
           break;
         default:
-          clack66.log.error(`Unknown cdn command: ${subCommand}`);
-          console.log(
-            `
-Run ${pc71.cyan("wraps --help")} for available commands.
-`
+          throw errors.unknownCommand(
+            "cdn command",
+            subCommand,
+            "Run wraps --help for available commands."
           );
-          throw new Error(`Unknown cdn command: ${subCommand}`);
       }
       const cdnDuration = Date.now() - startTime;
       const cdnCommandName = `cdn:${subCommand}`;
@@ -67876,16 +67885,10 @@ Run ${pc71.cyan("wraps --help")} for available commands.
           });
           break;
         default:
-          clack66.log.error(
-            `Unknown workflow command: ${subCommand || "(none)"}`
-          );
-          console.log(`
-Available commands: ${pc71.cyan("init")}
-`);
-          console.log(`Run ${pc71.cyan("wraps --help")} for more information.
-`);
-          throw new Error(
-            `Unknown workflow command: ${subCommand || "(none)"}`
+          throw errors.unknownCommand(
+            "workflow command",
+            subCommand,
+            "Available commands: init\n\nRun wraps --help for more information."
           );
       }
       const workflowDuration = Date.now() - startTime;
@@ -67924,17 +67927,11 @@ Available commands: ${pc71.cyan("init")}
           });
           break;
         default:
-          clack66.log.error(`Unknown platform command: ${subCommand}`);
-          console.log(
-            `
-Available commands: ${pc71.cyan("connect")}, ${pc71.cyan("update-role")}
-`
+          throw errors.unknownCommand(
+            "platform command",
+            subCommand,
+            "Available commands: connect, update-role\n\nRun wraps platform for more information."
           );
-          console.log(
-            `Run ${pc71.cyan("wraps platform")} for more information.
-`
-          );
-          throw new Error(`Unknown platform command: ${subCommand}`);
       }
       const platformDuration = Date.now() - startTime;
       const platformCommandName = `platform:${subCommand}`;
@@ -67956,13 +67953,11 @@ Available commands: ${pc71.cyan("connect")}, ${pc71.cyan("update-role")}
           await logout();
           break;
         default:
-          clack66.log.error(`Unknown auth command: ${subCommand || "(none)"}`);
-          console.log(
-            `
-Available commands: ${pc71.cyan("login")}, ${pc71.cyan("status")}, ${pc71.cyan("logout")}
-`
+          throw errors.unknownCommand(
+            "auth command",
+            subCommand,
+            "Available commands: login, status, logout"
           );
-          throw new Error(`Unknown auth command: ${subCommand || "(none)"}`);
       }
       return;
     }
@@ -67972,18 +67967,14 @@ Available commands: ${pc71.cyan("login")}, ${pc71.cyan("status")}, ${pc71.cyan("
           await setup({});
           break;
         case "doctor":
-          await doctor();
+          await doctor({ region: flags.region, json: flags.json });
           break;
         default:
-          clack66.log.error(`Unknown aws command: ${subCommand}`);
-          console.log(
-            `
-Available commands: ${pc71.cyan("setup")}, ${pc71.cyan("doctor")}
-`
+          throw errors.unknownCommand(
+            "aws command",
+            subCommand,
+            "Available commands: setup, doctor\n\nRun wraps --help for more information."
           );
-          console.log(`Run ${pc71.cyan("wraps --help")} for more information.
-`);
-          throw new Error(`Unknown aws command: ${subCommand}`);
       }
       const awsDuration = Date.now() - startTime;
       const awsCommandName = `aws:${subCommand}`;
@@ -68068,13 +68059,11 @@ Available commands: ${pc71.cyan("setup")}, ${pc71.cyan("doctor")}
             await telemetryStatus();
             break;
           default:
-            clack66.log.error(`Unknown telemetry command: ${subCommand}`);
-            console.log(
-              `
-Available commands: ${pc71.cyan("enable")}, ${pc71.cyan("disable")}, ${pc71.cyan("status")}
-`
+            throw errors.unknownCommand(
+              "telemetry command",
+              subCommand,
+              "Available commands: enable, disable, status"
             );
-            throw new Error(`Unknown telemetry command: ${subCommand}`);
         }
         break;
       }
@@ -68095,29 +68084,22 @@ Please specify a command for ${primaryCommand} service.
         showHelp();
         break;
       default: {
-        clack66.log.error(`Unknown command: ${primaryCommand}`);
-        const suggestion = suggestCommand(primaryCommand);
-        if (suggestion) {
-          console.log(`
-Did you mean ${pc71.cyan(`wraps ${suggestion}`)}?`);
-        }
-        console.log(
-          `
-Run ${pc71.cyan("wraps --help")} for available commands.
-`
-        );
-        throw new Error(`Unknown command: ${primaryCommand}`);
+        const didYouMean = suggestCommand(primaryCommand);
+        const hint = didYouMean ? `Did you mean: wraps ${didYouMean}
+
+Run wraps --help for available commands.` : "Run wraps --help for available commands.";
+        throw errors.unknownCommand("command", primaryCommand, hint);
       }
     }
     const duration = Date.now() - startTime;
-    const commandName = subCommand ? `${primaryCommand}:${subCommand}` : primaryCommand;
+    const commandName = telemetryCommandName(primaryCommand, subCommand);
     trackCommand(commandName, {
       success: true,
       duration_ms: duration
     });
   } catch (error) {
     const duration = Date.now() - startTime;
-    const commandName = subCommand ? `${primaryCommand}:${subCommand}` : primaryCommand;
+    const commandName = telemetryCommandName(primaryCommand, subCommand);
     trackCommand(commandName, {
       success: false,
       duration_ms: duration
@@ -68125,6 +68107,9 @@ Run ${pc71.cyan("wraps --help")} for available commands.
     handleCLIError(error, commandName);
   } finally {
     await telemetry.shutdown();
+    if (process.exitCode) {
+      process.exit(process.exitCode);
+    }
   }
 }
 if (primaryCommand) {