@ascendkit/cli 0.3.0 → 0.3.2

package/dist/cli.js

@@ -14,6 +14,11 @@ import * as webhooks from "./commands/webhooks.js";
 import * as campaigns from "./commands/campaigns.js";
 import * as importCmd from "./commands/import.js";
 import { parseDelay } from "./utils/duration.js";
+import { exitCli, installGlobalHandlers, onExit } from "./utils/exit.js";
+import { getInvocationId, getMachineId } from "./utils/correlation.js";
+import { redactArgs } from "./utils/redaction.js";
+import { captureTelemetry } from "./utils/telemetry.js";
+import { hostname as osHostname, platform as osPlatform } from "node:os";
 import { formatJourneyAnalytics, formatJourneyWithGuidance, formatNodeList, formatSingleNode, formatSingleTransition, formatTransitionList, } from "./utils/journey-format.js";
 const require = createRequire(import.meta.url);
 const { version: CLI_VERSION } = require("../package.json");
@@ -217,7 +222,8 @@ function getClient() {
     // Require auth unless env var provides the public key (CI/CD escape hatch)
     if (!auth?.token && !publicKey) {
         console.error("Not initialized. Run: ascendkit init");
-        process.exit(1);
+        exitCli(1);
+        throw new Error("unreachable");
     }
     if (!publicKey && env?.publicKey) {
         publicKey = env.publicKey;
@@ -227,7 +233,8 @@ function getClient() {
     }
     if (!publicKey) {
         console.error("No environment set. Run: ascendkit set-env <public-key>");
-        process.exit(1);
+        exitCli(1);
+        throw new Error("unreachable");
     }
     const client = new AscendKitClient({
         apiUrl: apiUrl ?? DEFAULT_API_URL,
@@ -280,7 +287,7 @@ function printAuthSettingsSummary(data) {
         console.log(`Session: ${data.sessionDuration}`);
     }
 }
-function printTemplateSummary(data) {
+function printTemplateSummary(data, opts) {
     console.log(`Template: ${data.name} (${data.id})`);
     if (data.slug)
         console.log(`Slug: ${data.slug}`);
@@ -290,6 +297,35 @@ function printTemplateSummary(data) {
     if (Array.isArray(data.variables) && data.variables.length > 0) {
         console.log(`Variables: ${data.variables.join(", ")}`);
     }
+    if (Array.isArray(data.unconfiguredVariables) && data.unconfiguredVariables.length > 0) {
+        console.log(`\n⚠ Unconfigured variables: ${data.unconfiguredVariables.join(", ")}`);
+        console.log(`  Set values with: ascendkit keystore set <key> <value>`);
+    }
+    if (Array.isArray(data.relatedJourneys) && data.relatedJourneys.length > 0) {
+        const refs = data.relatedJourneys.map((j) => `${j.name} (${j.id})`).join(", ");
+        console.log(`Used in journeys: ${refs}`);
+    }
+    // Show body content on show/get (verbose) but not on create/update summaries
+    if (opts?.verbose) {
+        if (data.bodyHtml) {
+            console.log(`\n--- HTML Body ---\n${data.bodyHtml}`);
+        }
+        if (data.bodyText) {
+            console.log(`\n--- Plain Text Body ---\n${data.bodyText}`);
+        }
+    }
+    // Always show warnings and variable diffs (relevant on update responses)
+    if (Array.isArray(data.droppedVariables) && data.droppedVariables.length > 0) {
+        console.log(`\n⚠ Variables removed: ${data.droppedVariables.join(", ")}`);
+    }
+    if (Array.isArray(data.addedVariables) && data.addedVariables.length > 0) {
+        console.log(`Variables added: ${data.addedVariables.join(", ")}`);
+    }
+    if (Array.isArray(data.warnings) && data.warnings.length > 0) {
+        for (const w of data.warnings) {
+            console.log(`⚠ ${w}`);
+        }
+    }
 }
 function printSurveySummary(data) {
     console.log(`Survey: ${data.name} (${data.id})`);
@@ -302,6 +338,65 @@ function printSurveySummary(data) {
     if (questions != null)
         console.log(`Questions: ${questions}`);
 }
+function printEnvironmentSummary(data) {
+    console.log(`${data.name} (${data.id})`);
+    console.log(`Tier: ${data.tier}`);
+    if (data.description)
+        console.log(`Description: ${data.description}`);
+    console.log(`Public key: ${data.publicKey}`);
+    if (data.secretKey) {
+        const masked = data.secretKey.slice(0, 10) + "****";
+        console.log(`Secret key: ${masked}`);
+    }
+    const vars = data.variables && typeof data.variables === "object" ? Object.entries(data.variables) : [];
+    if (vars.length > 0) {
+        console.log(`Variables:`);
+        for (const [k, v] of vars)
+            console.log(`  ${k}=${v}`);
+    }
+}
+function printPromotionSummary(result) {
+    const src = result.source ?? {};
+    const tgt = result.target ?? {};
+    console.log(`Promoted ${src.tier} → ${tgt.tier} (${tgt.envId})`);
+    console.log("");
+    const changes = result.changes ?? {};
+    const rows = [];
+    for (const [key, val] of Object.entries(changes)) {
+        const label = key.padEnd(14);
+        if (val.action === "unchanged") {
+            rows.push([label, "unchanged"]);
+        }
+        else if (val.action === "skip") {
+            rows.push([label, `skipped — ${val.reason}`]);
+        }
+        else if (val.action === "update" || val.action === "add_only") {
+            const fields = Array.isArray(val.fields) && val.fields.length ? ` (${val.fields.join(", ")})` : "";
+            rows.push([label, `updated${fields}`]);
+        }
+        else if (val.items) {
+            const counts = Object.entries(val.counts ?? {}).map(([k, v]) => `${v} ${k}`).join(", ");
+            rows.push([label, counts || "unchanged"]);
+        }
+        else {
+            rows.push([label, val.action ?? "—"]);
+        }
+    }
+    for (const [label, status] of rows) {
+        console.log(`  ${label} ${status}`);
+    }
+    // Only show warnings not already conveyed by a skipped row in the table
+    const skippedKeys = new Set(Object.entries(changes)
+        .filter(([, v]) => v.action === "skip")
+        .map(([k]) => k.toUpperCase()));
+    const warnings = (Array.isArray(result.warnings) ? result.warnings : [])
+        .filter((w) => !skippedKeys.size || !Array.from(skippedKeys).some(k => w.code?.toUpperCase().includes(k)));
+    if (warnings.length > 0) {
+        console.log("");
+        for (const w of warnings)
+            console.log(`⚠ ${w.message}`);
+    }
+}
 function printProjectSummary(data) {
     console.log(`Project: ${data.id}`);
     console.log(`Name: ${data.name}`);
@@ -348,7 +443,36 @@ function table(rows, columns) {
     }
 }
 async function run() {
+    installGlobalHandlers();
     const args = process.argv.slice(2);
+    const dtEntered = new Date();
+    // Extract command/domain/action for telemetry before any early returns
+    const teleDomain = args[0] ?? null;
+    const teleAction = args[1] ?? null;
+    const redactedArgs = redactArgs(args);
+    // Register telemetry hook — runs on every exit path (success or failure)
+    onExit(async (code, error) => {
+        const dtCompleted = new Date();
+        const record = {
+            invocationId: getInvocationId(),
+            machineId: getMachineId(),
+            clientType: "cli",
+            clientVersion: CLI_VERSION,
+            command: redactedArgs.join(" ") || "(empty)",
+            domain: teleDomain,
+            action: teleAction,
+            args: redactedArgs,
+            dtEntered: dtEntered.toISOString(),
+            dtCompleted: dtCompleted.toISOString(),
+            durationMs: dtCompleted.getTime() - dtEntered.getTime(),
+            success: code === 0,
+            errorMessage: error?.message ?? null,
+            hostname: osHostname(),
+            os: osPlatform(),
+            nodeVersion: process.version,
+        };
+        await captureTelemetry(record);
+    });
     if (args[0] === "--version" || args[0] === "-v" || args[0] === "-V") {
         console.log(CLI_VERSION);
         return;
@@ -362,7 +486,7 @@ async function run() {
             if (!printSectionHelp(args[1])) {
                 console.error(`Unknown help section: ${args[1]}`);
                 console.error('Run "ascendkit --help" for available sections.');
-                process.exit(1);
+                return await exitCli(1);
             }
             return;
         }
@@ -378,7 +502,7 @@ async function run() {
         if (!printSectionHelp(domain)) {
             console.error(`Unknown command section: ${domain}`);
             console.error('Run "ascendkit --help" for usage');
-            process.exit(1);
+            return await exitCli(1);
         }
         return;
     }
@@ -404,7 +528,7 @@ async function run() {
             else if (action === "show") {
                 if (!args[2]) {
                     console.error("Usage: ascendkit project show <project-id>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 printProjectSummary(await platform.showProject(args[2]));
             }
@@ -415,7 +539,7 @@ async function run() {
                 const flags = parseFlags(args.slice(2));
                 if (!flags.name) {
                     console.error("Usage: ascendkit project create --name <name> [--description <description>] [--services <s1,s2,...>]");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 try {
                     const proj = await platform.createProject(flags.name, flags.description, flags.services?.split(","));
@@ -435,18 +559,18 @@ async function run() {
                         catch { /* use raw message */ }
                     }
                     console.error(message);
-                    process.exit(1);
+                    return await exitCli(1);
                 }
             }
             else {
                 console.error('Usage: ascendkit project list|create|show|env');
-                process.exit(1);
+                return await exitCli(1);
             }
             return;
         case "set-env":
             if (!action) {
                 console.error("Usage: ascendkit set-env <public-key>");
-                process.exit(1);
+                return await exitCli(1);
             }
             await platform.setEnv(action);
             return;
@@ -495,7 +619,7 @@ async function run() {
         default:
             console.error(`Unknown command: ${domain}`);
             console.error('Run "ascendkit --help" for usage');
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 async function runImport(client, source, rest) {
@@ -529,7 +653,7 @@ async function runImport(client, source, rest) {
         console.error(`Unsupported import source: ${source}`);
         console.error("Supported sources: clerk");
         console.error('Run "ascendkit help import" for usage');
-        process.exit(1);
+        return await exitCli(1);
     }
     const dryRun = action !== "run";
     const hasUsers = flags.users !== undefined;
@@ -542,7 +666,7 @@ async function runImport(client, source, rest) {
     const filePath = flags.file;
     if (!apiKey && !filePath) {
         console.error("Usage: ascendkit import clerk preview|run --api-key <key> | --file <path>");
-        process.exit(1);
+        return await exitCli(1);
     }
     let clerkUsers = [];
     if (filePath) {
@@ -668,7 +792,7 @@ async function runProjectEnvironment(rest) {
         case "list":
             if (!target) {
                 console.error("Usage: ascendkit project env list <project-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             table(await platform.listEnvironments(target), [
                 { key: "id", label: "ID" },
@@ -679,7 +803,7 @@ async function runProjectEnvironment(rest) {
             return;
         default:
             console.error("Usage: ascendkit project env list <project-id>");
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 async function runEnvironment(action, rest) {
@@ -687,23 +811,22 @@ async function runEnvironment(action, rest) {
     const ctx = loadEnvContext();
     if (!ctx) {
         console.error("No environment set. Run: ascendkit set-env <public-key>");
-        process.exit(1);
+        return await exitCli(1);
     }
     switch (action) {
         case "show":
-            output(await platform.getEnvironment(ctx.projectId, ctx.environmentId));
+            printEnvironmentSummary(await platform.getEnvironment(ctx.projectId, ctx.environmentId));
             return;
         case "promote": {
             const envId = rest[0] && !rest[0].startsWith("--") ? rest[0] : ctx.environmentId;
             const target = flags.target;
             if (!envId || !target) {
                 console.error("Usage: ascendkit environment promote [<env-id>] --target <tier>");
-                process.exit(1);
+                return await exitCli(1);
             }
             try {
                 const result = await platform.promoteEnvironment(envId, target);
-                console.log("Promotion successful:");
-                console.log(JSON.stringify(result, null, 2));
+                printPromotionSummary(result);
             }
             catch (err) {
                 let message = err instanceof Error ? err.message : String(err);
@@ -719,7 +842,7 @@ async function runEnvironment(action, rest) {
                     catch { /* use raw message */ }
                 }
                 console.error(message);
-                process.exit(1);
+                return await exitCli(1);
             }
             return;
         }
@@ -729,7 +852,7 @@ async function runEnvironment(action, rest) {
             const description = flags.description;
             if (!name && description === undefined) {
                 console.error("Provide at least --name or --description to update.");
-                process.exit(1);
+                return await exitCli(1);
             }
             try {
                 const result = await platform.updateEnvironment(ctx.projectId, envId, name, description);
@@ -750,21 +873,21 @@ async function runEnvironment(action, rest) {
                     catch { /* use raw message */ }
                 }
                 console.error(message);
-                process.exit(1);
+                return await exitCli(1);
             }
             return;
         }
         default:
             console.error(`Unknown environment command: ${action}`);
             console.error("Usage: ascendkit environment show|update|promote");
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 async function runKeystore(action, rest) {
     const ctx = loadEnvContext();
     if (!ctx) {
         console.error("No environment set. Run: ascendkit set-env <public-key>");
-        process.exit(1);
+        return await exitCli(1);
     }
     const current = await platform.getEnvironment(ctx.projectId, ctx.environmentId);
     const vars = { ...(current.variables ?? {}) };
@@ -777,7 +900,7 @@ async function runKeystore(action, rest) {
             const value = rest[1];
             if (!key || value === undefined) {
                 console.error("Usage: ascendkit keystore set <key> <value>");
-                process.exit(1);
+                return await exitCli(1);
             }
             vars[key] = value;
             await platform.updateEnvironmentVariables(ctx.projectId, ctx.environmentId, vars);
@@ -788,11 +911,11 @@ async function runKeystore(action, rest) {
             const key = rest[0];
             if (!key) {
                 console.error("Usage: ascendkit keystore remove <key>");
-                process.exit(1);
+                return await exitCli(1);
             }
             if (!(key in vars)) {
                 console.error(`Variable "${key}" not found.`);
-                process.exit(1);
+                return await exitCli(1);
             }
             delete vars[key];
             await platform.updateEnvironmentVariables(ctx.projectId, ctx.environmentId, vars);
@@ -828,7 +951,7 @@ async function runKeystore(action, rest) {
         default:
             console.error(`Unknown keystore command: ${action}`);
             console.error("Usage: ascendkit keystore list|set|remove");
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 async function runAuth(client, action, rest) {
@@ -866,7 +989,7 @@ async function runAuth(client, action, rest) {
                 const providersArg = normalizedAction === "providers" ? rest[0] : rest[1];
                 if (!providersArg) {
                     console.error("Usage: ascendkit auth provider set <p1,p2,...>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 printAuthSettingsSummary(await auth.updateProviders(client, providersArg.split(",")));
             }
@@ -885,22 +1008,22 @@ async function runAuth(client, action, rest) {
             if (oauthAction === "set") {
                 if (!provider || !flags["client-id"]) {
                     console.error("Usage: ascendkit auth oauth set <provider> --client-id <id> [--client-secret <secret> | --client-secret-stdin] [--callback-url <url>]");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 const secretFromArg = flags["client-secret"];
                 const secretFromStdin = flags["client-secret-stdin"] === "true";
                 if (!secretFromArg && !secretFromStdin) {
                     console.error("Missing client secret. Use --client-secret-stdin (recommended) or --client-secret.");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 if (secretFromArg && secretFromStdin) {
                     console.error("Use only one of --client-secret or --client-secret-stdin.");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 const clientSecret = secretFromArg ?? await readSecretFromStdin();
                 if (!clientSecret) {
                     console.error("Client secret cannot be empty.");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 await auth.updateOAuthCredentials(client, provider, flags["client-id"], clientSecret, flags["callback-url"]);
                 console.log(`Saved OAuth credentials for ${provider}.`);
@@ -908,7 +1031,7 @@ async function runAuth(client, action, rest) {
             else if (oauthAction === "remove") {
                 if (!provider) {
                     console.error("Usage: ascendkit auth oauth remove <provider>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 await auth.deleteOAuthCredentials(client, provider);
                 console.log(`Removed OAuth credentials for ${provider}.`);
@@ -916,7 +1039,7 @@ async function runAuth(client, action, rest) {
             else {
                 if (!provider) {
                     console.error("Usage: ascendkit auth oauth open <provider>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 const portalUrl = process.env.ASCENDKIT_PORTAL_URL ?? "http://localhost:3000";
                 const url = auth.getOAuthSetupUrl(portalUrl, provider, client.currentPublicKey ?? undefined);
@@ -939,7 +1062,7 @@ async function runAuth(client, action, rest) {
             else if (rest[0] === "remove") {
                 if (!rest[1]) {
                     console.error("Usage: ascendkit auth user remove <user-id>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 await auth.deleteUser(client, rest[1]);
                 console.log(`Removed user ${rest[1]}.`);
@@ -947,19 +1070,19 @@ async function runAuth(client, action, rest) {
             else if (rest[0] === "reactivate") {
                 if (!rest[1]) {
                     console.error("Usage: ascendkit auth user reactivate <user-id>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 await auth.reactivateUser(client, rest[1]);
                 console.log(`Reactivated user ${rest[1]}.`);
             }
             else {
                 console.error(`Unknown auth user command: ${rest[0]}`);
-                process.exit(1);
+                return await exitCli(1);
             }
             break;
         default:
             console.error(`Unknown auth command: ${action}`);
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 async function runContent(client, action, rest) {
@@ -975,7 +1098,7 @@ async function runContent(client, action, rest) {
         case "create":
             if (!flags.name || !flags.subject || !flags["body-html"] || !flags["body-text"]) {
                 console.error("Usage: ascendkit template create --name <n> --subject <s> --body-html <h> --body-text <t> [--slug <slug>] [--description <desc>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             printTemplateSummary(await content.createTemplate(client, {
                 name: flags.name, subject: flags.subject,
@@ -1003,14 +1126,14 @@ async function runContent(client, action, rest) {
         case "show":
             if (!rest[0]) {
                 console.error("Usage: ascendkit template show <template-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
-            printTemplateSummary(await content.getTemplate(client, rest[0]));
+            printTemplateSummary(await content.getTemplate(client, rest[0]), { verbose: true });
             break;
         case "update":
             if (!rest[0]) {
                 console.error("Usage: ascendkit template update <template-id> [--flags]");
-                process.exit(1);
+                return await exitCli(1);
             }
             printTemplateSummary(await content.updateTemplate(client, rest[0], {
                 subject: flags.subject,
@@ -1022,7 +1145,7 @@ async function runContent(client, action, rest) {
         case "remove":
             if (!rest[0]) {
                 console.error("Usage: ascendkit template remove <template-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             await content.deleteTemplate(client, rest[0]);
             console.log(`Removed template ${rest[0]}.`);
@@ -1033,7 +1156,7 @@ async function runContent(client, action, rest) {
                 const templateId = normalizedAction === "versions" ? rest[0] : rest[1];
                 if (!templateId) {
                     console.error("Usage: ascendkit template version list <template-id>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 const versions = await content.listVersions(client, templateId);
                 table(versions, [
@@ -1047,14 +1170,14 @@ async function runContent(client, action, rest) {
                 const versionNumber = normalizedAction === "version" && rest[0] === "show" ? rest[2] : normalizedAction === "version" ? rest[1] : rest[2];
                 if (!templateId || !versionNumber) {
                     console.error("Usage: ascendkit template version show <template-id> <n>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 output(await content.getVersion(client, templateId, parseInt(versionNumber, 10)));
             }
             break;
         default:
             console.error(`Unknown template command: ${action}`);
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 async function runSurvey(client, action, rest) {
@@ -1070,7 +1193,7 @@ async function runSurvey(client, action, rest) {
         case "create":
             if (!flags.name) {
                 console.error("Usage: ascendkit survey create --name <n> [--type nps|csat|custom]");
-                process.exit(1);
+                return await exitCli(1);
             }
             printSurveySummary(await surveys.createSurvey(client, {
                 name: flags.name,
@@ -1089,14 +1212,14 @@ async function runSurvey(client, action, rest) {
         case "show":
             if (!rest[0]) {
                 console.error("Usage: ascendkit survey show <survey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             printSurveySummary(await surveys.getSurvey(client, rest[0]));
             break;
         case "update":
             if (!rest[0]) {
                 console.error("Usage: ascendkit survey update <survey-id> [--flags]");
-                process.exit(1);
+                return await exitCli(1);
             }
             printSurveySummary(await surveys.updateSurvey(client, rest[0], {
                 name: flags.name,
@@ -1107,7 +1230,7 @@ async function runSurvey(client, action, rest) {
         case "remove":
             if (!rest[0]) {
                 console.error("Usage: ascendkit survey remove <survey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             await surveys.deleteSurvey(client, rest[0]);
             console.log(`Removed survey ${rest[0]}.`);
@@ -1115,7 +1238,7 @@ async function runSurvey(client, action, rest) {
         case "distribute":
             if (!rest[0] || !flags.users) {
                 console.error("Usage: ascendkit survey distribute <survey-id> --users <usr_id1,usr_id2,...>");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await surveys.distributeSurvey(client, rest[0], flags.users.split(",")));
             break;
@@ -1125,19 +1248,19 @@ async function runSurvey(client, action, rest) {
                 const surveyId = normalizedAction === "invitations" ? rest[0] : rest[1];
                 if (!surveyId) {
                     console.error("Usage: ascendkit survey invitation list <survey-id>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 output(await surveys.listInvitations(client, surveyId));
             }
             else {
                 console.error(`Unknown survey invitation command: ${rest[0]}`);
-                process.exit(1);
+                return await exitCli(1);
             }
             break;
         case "analytics":
             if (!rest[0]) {
                 console.error("Usage: ascendkit survey analytics <survey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await surveys.getAnalytics(client, rest[0]));
             break;
@@ -1151,7 +1274,7 @@ async function runSurvey(client, action, rest) {
             if (definitionAction === "export") {
                 if (!surveyId) {
                     console.error("Usage: ascendkit survey definition export <survey-id> [--out <file>]");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 const survey = await surveys.getSurvey(client, surveyId);
                 const text = `${JSON.stringify(survey.definition ?? {}, null, 2)}\n`;
@@ -1167,7 +1290,7 @@ async function runSurvey(client, action, rest) {
             else {
                 if (!surveyId || !(flags.in || flags.file)) {
                     console.error("Usage: ascendkit survey definition import <survey-id> --in <file>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 const inPath = flags.in || flags.file;
                 const raw = readFileSync(inPath, "utf8");
@@ -1177,7 +1300,7 @@ async function runSurvey(client, action, rest) {
                     : parsed;
                 if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) {
                     console.error("Invalid definition JSON: expected an object or { definition: object }");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 printSurveySummary(await surveys.updateSurvey(client, surveyId, {
                     definition: candidate,
@@ -1201,7 +1324,7 @@ async function runSurvey(client, action, rest) {
             const questionName = normalizedAction === "question" ? rest[2] : rest[1];
             if (!surveyId) {
                 console.error("Usage: ascendkit survey question list <survey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             if (questionAction === "list") {
                 output(await surveys.listQuestions(client, surveyId));
@@ -1209,7 +1332,7 @@ async function runSurvey(client, action, rest) {
             else if (questionAction === "add") {
                 if (!flags.type || !flags.title) {
                     console.error("Usage: ascendkit survey question add <survey-id> --type <type> --title <title> [--name <name>] [--required <true|false>] [--choices <c1,c2,...>] [--position <n>]");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 const params = { type: flags.type, title: flags.title };
                 if (flags.name)
@@ -1225,7 +1348,7 @@ async function runSurvey(client, action, rest) {
             else if (questionAction === "update") {
                 if (!questionName) {
                     console.error("Usage: ascendkit survey question update <survey-id> <question-name> [--title <title>] [--required <true|false>] [--choices <c1,c2,...>]");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 const params = {};
                 if (flags.title)
@@ -1239,27 +1362,27 @@ async function runSurvey(client, action, rest) {
             else if (questionAction === "remove") {
                 if (!questionName) {
                     console.error("Usage: ascendkit survey question remove <survey-id> <question-name>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 output(await surveys.removeQuestion(client, surveyId, questionName));
             }
             else if (questionAction === "reorder") {
                 if (!flags.order) {
                     console.error("Usage: ascendkit survey question reorder <survey-id> --order <name1,name2,...>");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 output(await surveys.reorderQuestions(client, surveyId, flags.order.split(",")));
             }
             else {
                 console.error(`Unknown survey question command: ${questionAction}`);
-                process.exit(1);
+                return await exitCli(1);
             }
             break;
         }
         default:
             console.error(`Unknown survey command: ${action}`);
             console.error('Run "ascendkit survey --help" for usage');
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 function runStatus() {
@@ -1377,7 +1500,7 @@ async function runJourney(client, action, rest) {
         case "create":
             if (!flags.name || !flags["entry-event"] || !flags["entry-node"]) {
                 console.error("Usage: ascendkit journey create --name <n> --entry-event <e> --entry-node <n> [--nodes <json>] [--transitions <json>] [--description <d>] [--entry-conditions <json>] [--re-entry-policy <skip|restart>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatJourneyWithGuidance((await journeys.createJourney(client, {
                 name: flags.name,
@@ -1407,14 +1530,14 @@ async function runJourney(client, action, rest) {
         case "get":
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey show <journey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatJourneyWithGuidance(await journeys.getJourney(client, rest[0])));
             break;
         case "update":
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey update <journey-id> [--flags]");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatJourneyWithGuidance((await journeys.updateJourney(client, rest[0], {
                 name: flags.name,
@@ -1430,7 +1553,7 @@ async function runJourney(client, action, rest) {
         case "delete":
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey remove <journey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             await journeys.deleteJourney(client, rest[0]);
             console.log(`Deleted journey ${rest[0]}.`);
@@ -1438,49 +1561,49 @@ async function runJourney(client, action, rest) {
         case "activate":
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey activate <journey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatJourneyWithGuidance(await journeys.activateJourney(client, rest[0])));
             break;
         case "pause":
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey pause <journey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatJourneyWithGuidance(await journeys.pauseJourney(client, rest[0])));
             break;
         case "resume":
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey resume <journey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatJourneyWithGuidance(await journeys.resumeJourney(client, rest[0])));
             break;
         case "archive":
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey archive <journey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatJourneyWithGuidance(await journeys.archiveJourney(client, rest[0])));
             break;
         case "analytics":
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey analytics <journey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatJourneyAnalytics(await journeys.getJourneyAnalytics(client, rest[0])));
             break;
         case "list-nodes":
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey node list <journey-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatNodeList(await journeys.listNodes(client, rest[0])));
             break;
         case "add-node": {
             if (!rest[0] || !flags.name) {
                 console.error("Usage: ascendkit journey node add <journey-id> --name <node-name> [--action <json>] [--email-id <email>] [--terminal <true|false>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             const params = { name: flags.name };
             if (flags.action)
@@ -1488,7 +1611,7 @@ async function runJourney(client, action, rest) {
             if (flags["email-id"]) {
                 if (!params.action || params.action.type !== "send_email") {
                     console.error("--email-id requires a send_email action (use --action '{\"type\": \"send_email\", \"templateSlug\": \"...\"}')");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 params.action.fromIdentityEmail = flags["email-id"];
             }
@@ -1500,7 +1623,7 @@ async function runJourney(client, action, rest) {
         case "edit-node": {
             if (!rest[0] || !rest[1]) {
                 console.error("Usage: ascendkit journey node update <journey-id> <node-name> [--action <json>] [--email-id <email>] [--terminal <true|false>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             const params = {};
             if (flags.action)
@@ -1511,13 +1634,13 @@ async function runJourney(client, action, rest) {
                     const current = nodesData.nodes?.find((n) => n.name === rest[1]);
                     if (!current?.action || current.action.type !== "send_email") {
                         console.error("--email-id can only be set on send_email nodes");
-                        process.exit(1);
+                        return await exitCli(1);
                     }
                     params.action = current.action;
                 }
                 else if (params.action.type !== "send_email") {
                     console.error("--email-id requires a send_email action");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
                 params.action.fromIdentityEmail = flags["email-id"];
             }
@@ -1529,14 +1652,14 @@ async function runJourney(client, action, rest) {
         case "remove-node":
             if (!rest[0] || !rest[1]) {
                 console.error("Usage: ascendkit journey node remove <journey-id> <node-name>");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatSingleNode(await journeys.removeNode(client, rest[0], rest[1]), "Removed", rest[1]));
             break;
         case "list-transitions": {
             if (!rest[0]) {
                 console.error("Usage: ascendkit journey transition list <journey-id> [--from <node-name>] [--to <node-name>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatTransitionList(await journeys.listTransitions(client, rest[0], {
                 from_node: flags.from,
@@ -1547,7 +1670,7 @@ async function runJourney(client, action, rest) {
         case "add-transition": {
             if (!rest[0] || !flags.from || !flags.to || !(flags.on || flags.after || flags.trigger)) {
                 console.error("Usage: ascendkit journey transition add <journey-id> --from <node-name> --to <node-name> --on <event> | --after <delay> | --trigger <json> [--priority <n>] [--name <transition-name>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             let trigger;
             if (flags.on) {
@@ -1575,7 +1698,7 @@ async function runJourney(client, action, rest) {
         case "edit-transition": {
             if (!rest[0] || !rest[1]) {
                 console.error("Usage: ascendkit journey transition update <journey-id> <transition-name> [--on <event>] [--after <delay>] [--trigger <json>] [--priority <n>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             const params = {};
             if (flags.on) {
@@ -1595,13 +1718,13 @@ async function runJourney(client, action, rest) {
         case "remove-transition":
             if (!rest[0] || !rest[1]) {
                 console.error("Usage: ascendkit journey transition remove <journey-id> <transition-name>");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(formatSingleTransition(await journeys.removeTransition(client, rest[0], rest[1]), "Removed", rest[1]));
             break;
         default:
             console.error(`Unknown journey command: ${action}`);
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 async function runWebhook(client, action, rest) {
@@ -1610,7 +1733,7 @@ async function runWebhook(client, action, rest) {
         case "create":
             if (!flags.url) {
                 console.error("Usage: ascendkit webhook create --url <url> [--events <e1,e2,...>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await webhooks.createWebhook(client, {
                 url: flags.url,
@@ -1628,14 +1751,14 @@ async function runWebhook(client, action, rest) {
         case "get":
             if (!rest[0]) {
                 console.error("Usage: ascendkit webhook get <webhook-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await webhooks.getWebhook(client, rest[0]));
             break;
         case "update": {
             if (!rest[0]) {
                 console.error("Usage: ascendkit webhook update <webhook-id> [--flags]");
-                process.exit(1);
+                return await exitCli(1);
             }
             const updated = await webhooks.updateWebhook(client, rest[0], {
                 url: flags.url,
@@ -1651,21 +1774,21 @@ async function runWebhook(client, action, rest) {
         case "delete":
             if (!rest[0]) {
                 console.error("Usage: ascendkit webhook delete <webhook-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await webhooks.deleteWebhook(client, rest[0]));
             break;
         case "test":
             if (!rest[0]) {
                 console.error("Usage: ascendkit webhook test <webhook-id> [--event <event-type>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await webhooks.testWebhook(client, rest[0], flags.event));
             break;
         default:
             console.error(`Unknown webhook command: ${action}`);
             console.error('Run "ascendkit webhook --help" for usage');
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 async function runCampaign(client, action, rest) {
@@ -1675,10 +1798,10 @@ async function runCampaign(client, action, rest) {
         return;
     }
     switch (action) {
-        case "create":
+        case "create": {
             if (!flags.name || !flags.template || !flags.audience) {
                 console.error("Usage: ascendkit campaign create --name <name> --template <template-id> --audience <json> [--scheduled-at <datetime>]");
-                process.exit(1);
+                return await exitCli(1);
             }
             let createFilter;
             try {
@@ -1686,7 +1809,7 @@ async function runCampaign(client, action, rest) {
             }
             catch {
                 console.error("Invalid JSON for --audience flag. Provide a valid JSON object.");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await campaigns.createCampaign(client, {
                 name: flags.name,
@@ -1695,6 +1818,7 @@ async function runCampaign(client, action, rest) {
                 scheduledAt: flags["scheduled-at"],
             }));
             break;
+        }
         case "list": {
             const items = await campaigns.listCampaigns(client, flags.status);
             table(items, [
@@ -1710,14 +1834,14 @@ async function runCampaign(client, action, rest) {
         case "get":
             if (!rest[0]) {
                 console.error("Usage: ascendkit campaign show <campaign-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await campaigns.getCampaign(client, rest[0]));
             break;
-        case "update":
+        case "update": {
             if (!rest[0]) {
                 console.error("Usage: ascendkit campaign update <campaign-id> [--flags]");
-                process.exit(1);
+                return await exitCli(1);
             }
             let updateFilter;
             if (flags.audience) {
@@ -1726,7 +1850,7 @@ async function runCampaign(client, action, rest) {
                 }
                 catch {
                     console.error("Invalid JSON for --audience flag. Provide a valid JSON object.");
-                    process.exit(1);
+                    return await exitCli(1);
                 }
             }
             output(await campaigns.updateCampaign(client, rest[0], {
@@ -1736,45 +1860,45 @@ async function runCampaign(client, action, rest) {
                 scheduledAt: flags["scheduled-at"],
             }));
             break;
-        case "preview":
+        }
+        case "preview": {
             if (!rest[0]) {
                 console.error("Usage: ascendkit campaign preview <campaign-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
-            {
-                const detail = await campaigns.getCampaign(client, rest[0]);
-                if (!detail?.audienceFilter) {
-                    console.error("Campaign has no audience filter set.");
-                    process.exit(1);
-                }
-                output(await campaigns.previewAudience(client, detail.audienceFilter));
+            const detail = await campaigns.getCampaign(client, rest[0]);
+            if (!detail?.audienceFilter) {
+                console.error("Campaign has no audience filter set.");
+                return await exitCli(1);
             }
+            output(await campaigns.previewAudience(client, detail.audienceFilter));
             break;
+        }
         case "schedule":
             if (!rest[0] || !flags.at) {
                 console.error("Usage: ascendkit campaign schedule <campaign-id> --at <datetime>");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await campaigns.updateCampaign(client, rest[0], { scheduledAt: flags.at }));
             break;
         case "cancel":
             if (!rest[0]) {
                 console.error("Usage: ascendkit campaign cancel <campaign-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await campaigns.deleteCampaign(client, rest[0]));
             break;
         case "analytics":
             if (!rest[0]) {
                 console.error("Usage: ascendkit campaign analytics <campaign-id>");
-                process.exit(1);
+                return await exitCli(1);
             }
             output(await campaigns.getCampaignAnalytics(client, rest[0]));
             break;
         default:
             console.error(`Unknown campaign command: ${action}`);
             console.error('Run "ascendkit campaign --help" for usage');
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 async function runEmail(client, action, rest) {
@@ -1797,7 +1921,7 @@ async function runEmail(client, action, rest) {
         case "setup-domain":
             if (!rest[0]) {
                 console.error("Usage: ascendkit email-identity setup-domain <domain>");
-                process.exit(1);
+                return await exitCli(1);
             }
             await printEmailSetup(await email.setupDomain(client, rest[0]));
             break;
@@ -1820,7 +1944,7 @@ async function runEmail(client, action, rest) {
             const url = provider?.portalUrl;
             if (!url) {
                 console.error("Could not determine DNS provider URL for this domain.");
-                process.exit(1);
+                return await exitCli(1);
             }
             console.log(url);
             if (flags.open === "true") {
@@ -1829,7 +1953,8 @@ async function runEmail(client, action, rest) {
             break;
         }
         case "remove-domain":
-            output(await email.removeDomain(client));
+            await email.removeDomain(client);
+            console.log("Domain removed.");
             break;
         case "list": {
             const result = await email.listIdentities(client);
@@ -1840,33 +1965,37 @@ async function runEmail(client, action, rest) {
             const identityEmail = rest[0];
             if (!identityEmail) {
                 console.error("Usage: ascendkit email-identity add <email> [--display-name <name>]");
-                process.exit(1);
+                return await exitCli(1);
             }
-            output(await email.createIdentity(client, {
+            const added = await email.createIdentity(client, {
                 email: identityEmail,
                 displayName: flags["display-name"],
-            }));
+            });
+            printEmailIdentities(added.identities ?? []);
+            console.log("Verification email sent.");
             break;
         }
         case "resend": {
             const identityEmail = rest[0];
             if (!identityEmail) {
                 console.error("Usage: ascendkit email-identity resend <email>");
-                process.exit(1);
+                return await exitCli(1);
             }
-            output(await email.resendIdentityVerification(client, identityEmail));
+            await email.resendIdentityVerification(client, identityEmail);
+            console.log(`Verification email sent to ${identityEmail}.`);
             break;
         }
         case "set-default": {
             const identityEmail = rest[0];
             if (!identityEmail) {
                 console.error("Usage: ascendkit email-identity set-default <email> [--display-name <name>]");
-                process.exit(1);
+                return await exitCli(1);
             }
-            output(await email.setDefaultIdentity(client, {
+            const updated = await email.setDefaultIdentity(client, {
                 email: identityEmail,
                 displayName: flags["display-name"],
-            }));
+            });
+            printEmailIdentities(updated.identities ?? []);
             break;
         }
         case "remove":
@@ -1874,39 +2003,42 @@ async function runEmail(client, action, rest) {
             const identityEmail = rest[0];
             if (!identityEmail) {
                 console.error("Usage: ascendkit email-identity remove <email>");
-                process.exit(1);
+                return await exitCli(1);
             }
-            output(await email.removeIdentity(client, identityEmail));
+            const remaining = await email.removeIdentity(client, identityEmail);
+            console.log("Identity removed.");
+            printEmailIdentities(remaining.identities ?? []);
             break;
         }
         case "test": {
             const identityEmail = rest[0];
             if (!identityEmail || !flags.to) {
                 console.error("Usage: ascendkit email-identity test <email> --to <recipient>");
-                process.exit(1);
+                return await exitCli(1);
             }
-            output(await email.sendTestEmail(client, {
+            const testResult = await email.sendTestEmail(client, {
                 to: flags.to,
                 fromIdentityEmail: identityEmail,
-            }));
+            });
+            console.log(testResult.message ?? "Test email sent.");
             break;
         }
         default:
             console.error(`Unknown email-identity command: ${action}`);
-            process.exit(1);
+            return await exitCli(1);
     }
 }
 run().catch((err) => {
     console.error(err.message);
-    process.exit(1);
+    exitCli(1, err instanceof Error ? err : new Error(String(err)));
 });
 async function printEmailSetup(settings) {
-    output(settings);
     if (!settings.domain)
         return;
     const provider = settings.dnsProvider;
+    console.log(`Domain: ${settings.domain}`);
     if (provider?.name) {
-        console.log(`\nDetected DNS provider: ${provider.name} (${provider.confidence ?? "unknown"})`);
+        console.log(`DNS provider: ${provider.name} (${provider.confidence ?? "unknown"})`);
     }
     if (provider?.portalUrl) {
         console.log(`Provider console: ${provider.portalUrl}`);
@@ -1914,10 +2046,54 @@ async function printEmailSetup(settings) {
     if (provider?.assistantSetupUrl) {
         console.log(`Guided setup: ${provider.assistantSetupUrl}`);
     }
-    if (Array.isArray(settings.dnsRecords) && settings.dnsRecords.length > 0) {
-        console.log("\nAdd these DNS records:");
-        for (const rec of settings.dnsRecords) {
-            console.log(`  ${rec.type}\t${rec.name}\t${rec.value}`);
+    const records = Array.isArray(settings.dnsRecords) ? settings.dnsRecords : [];
+    if (records.length > 0) {
+        console.log("\nDNS records to add:");
+        for (const rec of records) {
+            console.log(`  ${rec.type.padEnd(6)} ${rec.name}  ${rec.value}`);
+        }
+        if (process.stdin.isTTY && process.stdout.isTTY) {
+            const defaultFile = `dns-records-${settings.domain}.txt`;
+            const { createInterface } = await import("node:readline/promises");
+            const rl = createInterface({ input: process.stdin, output: process.stdout });
+            try {
+                const answer = (await rl.question(`\nSave records to file [${defaultFile}]: `)).trim();
+                const filename = answer || defaultFile;
+                const { existsSync, writeFileSync } = await import("node:fs");
+                if (existsSync(filename)) {
+                    const overwrite = (await rl.question(`${filename} already exists. Overwrite? [y/N] `)).trim().toLowerCase();
+                    if (overwrite !== "y" && overwrite !== "yes") {
+                        console.log("Skipped.");
+                        return;
+                    }
+                }
+                const lines = [
+                    `; DNS records for ${settings.domain}`,
+                    `; Generated by AscendKit CLI`,
+                    "",
+                    ...records.map(rec => {
+                        let value;
+                        if (rec.type === "TXT") {
+                            value = `"${rec.value}"`;
+                        }
+                        else if (rec.type === "CNAME" || rec.type === "MX") {
+                            // Ensure absolute FQDN with trailing dot to prevent zone-relative expansion
+                            const target = rec.type === "MX" ? rec.value.replace(/^(\d+)\s+/, "$1 ") : rec.value;
+                            value = target.endsWith(".") ? target : `${target}.`;
+                        }
+                        else {
+                            value = rec.value;
+                        }
+                        const name = rec.name.endsWith(".") ? rec.name : `${rec.name}.`;
+                        return `${name}\t3600\tIN\t${rec.type}\t${value} ; cf_tags=cf-proxied:false`;
+                    }),
+                ];
+                writeFileSync(filename, lines.join("\n") + "\n");
+                console.log(`Saved to ${filename}`);
+            }
+            finally {
+                rl.close();
+            }
         }
     }
 }
@@ -1949,8 +2125,20 @@ function printEmailStatusSummary(settings, domainStatus, dnsCheck, identities) {
         return;
     }
     console.log(`Domain:        ${settings.domain} (${domainStatus.status || settings.verificationStatus || "unknown"})`);
-    if (dnsCheck?.summary) {
-        console.log(`DNS:           ${dnsCheck.summary.found}/${dnsCheck.summary.total} verified`);
+    if (dnsCheck) {
+        const { summary, records } = dnsCheck;
+        if (summary.notFound === 0 && summary.mismatch === 0 && summary.errored === 0) {
+            console.log("DNS:           all records verified");
+        }
+        else {
+            console.log(`DNS:           ${summary.found}/${summary.total} verified`);
+            const pending = records.filter(r => !r.found || r.mismatch);
+            if (pending.length > 0) {
+                console.log("Pending:");
+                for (const r of pending)
+                    console.log(`  ${r.type.padEnd(6)} ${r.name}`);
+            }
+        }
     }
     console.log("");
     printEmailIdentities(identities);