@iterable/mcp 1.2.2 → 1.3.1

package/dist/keys-cli.js

@@ -6,21 +6,385 @@ import { readFileSync } from "fs";
 import inquirer from "inquirer";
 import path from "path";
 import { fileURLToPath } from "url";
+import { COMMAND_NAME, KEYS_COMMAND_TABLE } from "./utils/command-info.js";
 const { dirname, join } = path;
 import { getSpinner, loadUi } from "./utils/cli-env.js";
+import { promptForIterableBaseUrl } from "./utils/endpoint-prompt.js";
 import { getKeyStorageMessage } from "./utils/formatting.js";
 import { promptForApiKey } from "./utils/password-prompt.js";
+import { sanitizeString } from "./utils/sanitize.js";
 // Get package version
 const packageJson = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), "..", "package.json"), "utf-8"));
+/**
+ * Display key details including permissions
+ *
+ * @param meta - The key metadata to display
+ * @param ui - UI utilities (chalk, formatKeyValue, linkColor)
+ */
+export function displayKeyDetails(meta, ui) {
+    const { chalk, formatKeyValue, linkColor } = ui;
+    console.log(formatKeyValue("Name", meta.name, chalk.white.bold));
+    console.log(formatKeyValue("ID", meta.id, chalk.gray));
+    console.log(formatKeyValue("Endpoint", meta.baseUrl, linkColor()));
+    const pii = meta.env?.ITERABLE_USER_PII === "true"
+        ? chalk.green("Enabled")
+        : chalk.gray("Disabled");
+    const writes = meta.env?.ITERABLE_ENABLE_WRITES === "true"
+        ? chalk.green("Enabled")
+        : chalk.gray("Disabled");
+    const sends = meta.env?.ITERABLE_ENABLE_SENDS === "true"
+        ? chalk.green("Enabled")
+        : chalk.gray("Disabled");
+    console.log(formatKeyValue("User PII", pii));
+    console.log(formatKeyValue("Writes", writes));
+    console.log(formatKeyValue("Sends", sends));
+}
+/**
+ * Find a key by ID or name, with helpful error messages and suggestions
+ *
+ * @param keyManager - The key manager instance
+ * @param idOrName - The key ID or name to find (if undefined/empty, shows usage and exits)
+ * @param commandName - The command name for usage messages (e.g., "update", "delete")
+ * @param ui - UI utilities (chalk, showError, showInfo)
+ * @returns The found key metadata
+ * @throws Exits process if key not found or missing
+ */
+async function findKeyOrExit(keyManager, idOrName, commandName, ui) {
+    const { chalk, showError, showInfo } = ui;
+    if (!idOrName) {
+        console.log();
+        showError("Missing key name or ID");
+        console.log();
+        console.log(chalk.white.bold("  USAGE"));
+        console.log(chalk.white(`    ${COMMAND_NAME} keys ${commandName} <name-or-id>`));
+        console.log();
+        console.log(chalk.white.bold("  EXAMPLE"));
+        console.log(chalk.cyan(`    ${COMMAND_NAME} keys ${commandName} production`));
+        console.log();
+        showInfo("If your key name has spaces, wrap it in quotes");
+        console.log(chalk.gray(`    Example: ${COMMAND_NAME} keys ${commandName} "My Prod Key"`));
+        console.log();
+        process.exit(1);
+    }
+    const keys = await keyManager.listKeys();
+    const key = keys.find((k) => k.id === idOrName || k.name === idOrName);
+    if (!key) {
+        showError(`Key not found: ${idOrName}`);
+        showInfo(`Run '${COMMAND_NAME} keys list' to view all keys`);
+        process.exit(1);
+    }
+    return key;
+}
+/**
+ * Interactive flow to save (add or update) an API key
+ *
+ * Handles the complete flow including:
+ * - Prompting for key details
+ * - Saving the key
+ * - Optionally activating new keys
+ * - Showing restart notice for active keys
+ *
+ * @param keyManager - The key manager instance
+ * @param existingKey - If provided, updates this key; otherwise adds a new key
+ * @param ui - UI utilities (chalk, icons, etc.)
+ * @param spinner - Spinner for loading states
+ * @param options - Optional configuration
+ *   - advanced: if true, shows permission checkboxes; if false/undefined, uses secure defaults
+ *   - skipRestartNotice: skip showing restart notice at the end
+ *   - prefilledApiKey: if provided, skip API key prompt and use this value
+ *   - autoActivate: if true, automatically activates new keys (for installer); if false, prompts user
+ * @returns The saved key's ID
+ */
+export async function saveKeyInteractive(keyManager, existingKeyArg, ui, spinner, options) {
+    const { chalk, icons, showError, showSuccess, showInfo, formatKeyValue, linkColor, showBox, } = ui;
+    // Use local variables so we can reassign if duplicate detected
+    let isUpdate = !!existingKeyArg;
+    let existingKey = existingKeyArg;
+    // Helper to activate a key after selecting or updating a key
+    const maybeActivateKey = async (key) => {
+        if (key.isActive) {
+            console.log();
+            showSuccess(`"${key.name}" is already your active key`);
+            return key;
+        }
+        let shouldActivate = true;
+        if (!options?.autoActivate) {
+            const { activateNow } = await inquirer.prompt([
+                {
+                    type: "confirm",
+                    name: "activateNow",
+                    message: `Set "${key.name}" as your active API key now?`,
+                    default: !isUpdate, // Default to yes for new keys, no for updates
+                },
+            ]);
+            shouldActivate = activateNow;
+        }
+        if (shouldActivate) {
+            spinner.start("Activating key...");
+            await keyManager.setActiveKey(key.id);
+            spinner.succeed("Key activated successfully");
+            console.log();
+            showSuccess(`"${key.name}" is now your active API key`);
+            const updatedKey = (await keyManager.getKeyMetadata(key.id));
+            if (!options?.skipRestartNotice) {
+                console.log();
+                showBox("Action Required", [
+                    chalk.yellow("Restart your AI tools to use this key"),
+                    "",
+                    chalk.gray("The MCP server will automatically load the active key when it starts"),
+                ], { icon: icons.zap, theme: "warning" });
+            }
+            return updatedKey;
+        }
+        else {
+            console.log();
+            showInfo(`Keeping your current active key. Run '${COMMAND_NAME} keys activate "${key.name}"' to switch later.`);
+            return key;
+        }
+    };
+    // Step 1: Get API key value (prompt, use prefilled, or retrieve existing)
+    let apiKey;
+    if (isUpdate) {
+        const { updateApiKey } = await inquirer.prompt([
+            {
+                type: "confirm",
+                name: "updateApiKey",
+                message: "Update the API key value?",
+                default: false,
+            },
+        ]);
+        if (updateApiKey) {
+            console.log();
+            apiKey = await promptForApiKey(icons.lock + "  Enter your new Iterable API key: ");
+        }
+        else {
+            spinner.start("Retrieving existing API key...");
+            try {
+                const existingApiKey = await keyManager.getKey(existingKey.id);
+                if (!existingApiKey) {
+                    spinner.fail("Failed to retrieve existing API key");
+                    showError("Could not access the existing API key value");
+                    console.log();
+                    showInfo("You'll need to enter a new API key value");
+                    apiKey = await promptForApiKey(icons.lock + "  Enter your Iterable API key: ");
+                }
+                else {
+                    spinner.succeed("Using existing API key");
+                    apiKey = existingApiKey;
+                }
+            }
+            catch (error) {
+                spinner.fail("Failed to retrieve existing API key");
+                showError(error instanceof Error ? error.message : "Could not access key");
+                console.log();
+                showInfo("You'll need to enter a new API key value");
+                apiKey = await promptForApiKey(icons.lock + "  Enter your Iterable API key: ");
+            }
+        }
+    }
+    else {
+        if (options?.prefilledApiKey) {
+            apiKey = options.prefilledApiKey;
+            showSuccess("Using API key from environment variable");
+        }
+        else {
+            apiKey = await promptForApiKey(icons.lock + "  Enter your Iterable API key: ");
+        }
+    }
+    // Step 2: For new keys, check if this API key value already exists
+    if (!isUpdate) {
+        spinner.start("Checking for duplicate keys...");
+        const existingKeyWithValue = await keyManager.findKeyByValue(apiKey);
+        spinner.stop();
+        if (existingKeyWithValue) {
+            console.log();
+            showInfo(`This API key is already stored as "${existingKeyWithValue.name}"`);
+            console.log();
+            displayKeyDetails(existingKeyWithValue, {
+                chalk,
+                formatKeyValue,
+                linkColor,
+            });
+            console.log();
+            const { updateExisting } = await inquirer.prompt([
+                {
+                    type: "confirm",
+                    name: "updateExisting",
+                    message: `Update this key with new settings?`,
+                    default: true,
+                },
+            ]);
+            if (!updateExisting) {
+                console.log();
+                await maybeActivateKey(existingKeyWithValue);
+                console.log();
+                return existingKeyWithValue.id;
+            }
+            // User wants to update - convert this to an update operation
+            console.log();
+            showInfo(`Updating existing key: "${existingKeyWithValue.name}"`);
+            console.log();
+            isUpdate = true;
+            existingKey = existingKeyWithValue;
+        }
+    }
+    // Step 3: Prompt for endpoint
+    let baseUrl;
+    try {
+        baseUrl = await promptForIterableBaseUrl({
+            inquirer,
+            icons,
+            chalk,
+            showError,
+            ...(existingKey?.baseUrl ? { defaultBaseUrl: existingKey.baseUrl } : {}),
+        });
+    }
+    catch {
+        process.exit(1);
+        return "";
+    }
+    if (isUpdate && existingKey.baseUrl !== baseUrl) {
+        console.log();
+        showInfo(`Endpoint changing from ${existingKey.baseUrl} to ${baseUrl}`);
+        console.log();
+    }
+    // Step 4: Prompt for name
+    const validateKeyName = async (input) => {
+        if (!input)
+            return "Name is required";
+        if (input.length > 50)
+            return "Name must be 50 characters or less";
+        // Check for duplicate names (skip if updating and keeping the same name)
+        if (input !== existingKey?.name) {
+            const keys = await keyManager.listKeys();
+            if (keys.some((k) => k.name === input)) {
+                return `A key named "${input}" already exists. Please choose a different name.`;
+            }
+        }
+        return true;
+    };
+    const { name } = await inquirer.prompt([
+        {
+            type: "input",
+            name: "name",
+            message: isUpdate
+                ? "Enter a new name, or press Enter to keep current name:"
+                : "Enter a name for this API key:",
+            default: existingKey?.name || "default",
+            validate: validateKeyName,
+        },
+    ]);
+    // Step 5: Configure permissions
+    const currentEnv = existingKey?.env || {};
+    let selectedEnv = {
+        ITERABLE_USER_PII: currentEnv.ITERABLE_USER_PII || "false",
+        ITERABLE_ENABLE_WRITES: currentEnv.ITERABLE_ENABLE_WRITES || "false",
+        ITERABLE_ENABLE_SENDS: currentEnv.ITERABLE_ENABLE_SENDS || "false",
+    };
+    if (options?.advanced) {
+        const currentPerms = [];
+        if (selectedEnv.ITERABLE_USER_PII === "true")
+            currentPerms.push("pii");
+        if (selectedEnv.ITERABLE_ENABLE_WRITES === "true")
+            currentPerms.push("writes");
+        if (selectedEnv.ITERABLE_ENABLE_SENDS === "true")
+            currentPerms.push("sends");
+        const { permFlags } = await inquirer.prompt([
+            {
+                type: "checkbox",
+                name: "permFlags",
+                message: "Select permissions to enable (default: none):",
+                choices: [
+                    { name: "View PII (access user data)", value: "pii" },
+                    {
+                        name: "Write operations (create/update/delete)",
+                        value: "writes",
+                    },
+                    { name: "Sends (campaigns/journeys/events)", value: "sends" },
+                ],
+                pageSize: 6,
+                default: currentPerms,
+            },
+        ]);
+        selectedEnv = {
+            ITERABLE_USER_PII: permFlags.includes("pii")
+                ? "true"
+                : "false",
+            ITERABLE_ENABLE_WRITES: permFlags.includes("writes")
+                ? "true"
+                : "false",
+            ITERABLE_ENABLE_SENDS: permFlags.includes("sends")
+                ? "true"
+                : "false",
+        };
+    }
+    else {
+        console.log();
+        if (isUpdate) {
+            showInfo("Keeping existing permissions");
+        }
+        else {
+            showInfo("Using secure default permissions (PII, Writes, and Sends disabled)");
+        }
+        showInfo(`Run with --advanced to configure advanced permissions`);
+        console.log();
+    }
+    // Step 6: Save the key
+    spinner.start(isUpdate ? "Updating API key..." : "Storing API key securely...");
+    try {
+        const id = isUpdate
+            ? await keyManager.updateKey(existingKey.id, name, apiKey, baseUrl, selectedEnv)
+            : await keyManager.addKey(name, apiKey, baseUrl, selectedEnv);
+        spinner.succeed(isUpdate
+            ? "API key updated successfully!"
+            : "API key stored successfully!");
+        console.log();
+        console.log(formatKeyValue("Name", name, chalk.white.bold));
+        console.log(formatKeyValue("ID", id, chalk.gray));
+        console.log(formatKeyValue("Endpoint", baseUrl, linkColor()));
+        console.log(formatKeyValue("User PII", selectedEnv.ITERABLE_USER_PII === "true"
+            ? chalk.green("Enabled")
+            : chalk.gray("Disabled")));
+        console.log(formatKeyValue("Writes", selectedEnv.ITERABLE_ENABLE_WRITES === "true"
+            ? chalk.green("Enabled")
+            : chalk.gray("Disabled")));
+        console.log(formatKeyValue("Sends", selectedEnv.ITERABLE_ENABLE_SENDS === "true"
+            ? chalk.green("Enabled")
+            : chalk.gray("Disabled")));
+        console.log();
+        showSuccess(isUpdate
+            ? "Your API key has been updated (encrypted at rest)"
+            : "Your API key is now securely stored (encrypted at rest)");
+        const savedKey = await keyManager.getKeyMetadata(id);
+        if (savedKey) {
+            await maybeActivateKey(savedKey);
+        }
+        else {
+            showError("Failed to get key metadata after saving");
+            process.exit(1);
+        }
+        return id;
+    }
+    catch (error) {
+        spinner.fail(isUpdate ? "Failed to update API key" : "Failed to add API key");
+        const msg = error instanceof Error ? sanitizeString(error.message) : "Unknown error";
+        showError(msg);
+        process.exit(1);
+    }
+}
 /**
  * Handle the 'keys' command and its subcommands
  */
 export async function handleKeysCommand() {
     const args = process.argv.slice(2);
     const subCommand = args[1];
+    // Parse common flags and get positional arguments
+    const hasAdvancedFlag = args.includes("--advanced");
+    const positionalArgs = args.filter((arg) => !arg.startsWith("--"));
     const chalk = (await import("chalk")).default;
     const { createTable, formatKeyValue, icons, showBox, showError, showInfo, showIterableLogo, showSection, showSuccess, linkColor, } = await loadUi();
     const spinner = await getSpinner();
+    // Dynamic import for testability (Jest mocks need runtime imports)
     const { getKeyManager } = await import("./key-manager.js");
     const keyManager = getKeyManager();
     try {
@@ -46,7 +410,7 @@ export async function handleKeysCommand() {
                     chalk.gray("You haven't added any API keys yet."),
                     "",
                     chalk.cyan("Get started by running:"),
-                    chalk.bold.white("  iterable-mcp setup"),
+                    chalk.bold.white(`  ${COMMAND_NAME} setup`),
                 ], { icon: icons.key, theme: "info" });
             }
             else {
@@ -60,7 +424,7 @@ export async function handleKeysCommand() {
                         "View PII?",
                         "Writes?",
                         "Sends?",
-                        "Created",
+                        "Modified",
                         "Status",
                     ],
                     style: "normal",
@@ -69,7 +433,9 @@ export async function handleKeysCommand() {
                     const statusBadge = key.isActive
                         ? chalk.bgGreen.black(" ACTIVE ")
                         : chalk.gray("INACTIVE");
-                    const createdDate = new Date(key.created).toLocaleDateString("en-US", {
+                    // Show updated date if available, otherwise created date
+                    const dateToShow = key.updated || key.created;
+                    const formattedDate = new Date(dateToShow).toLocaleDateString("en-US", {
                         year: "numeric",
                         month: "short",
                         day: "numeric",
@@ -91,22 +457,19 @@ export async function handleKeysCommand() {
                         pii,
                         writes,
                         sends,
-                        chalk.gray(createdDate),
+                        chalk.gray(formattedDate),
                         statusBadge,
                     ]);
                 }
                 console.log(table.toString());
                 console.log();
-                // Show key management tips
-                const tips = [
-                    "Use " +
-                        chalk.cyan("keys activate <name>") +
-                        " to switch between keys",
-                    "Use " + chalk.cyan("keys add") + " to add a new API key",
+                // Show key management commands
+                showBox("Key Management", [
+                    ...KEYS_COMMAND_TABLE.map(([cmd, desc]) => `${chalk.cyan(cmd)} - ${chalk.gray(desc)}`),
+                    "",
                     getKeyStorageMessage(),
-                ];
-                showBox("Quick Tips", tips, {
-                    icon: icons.bulb,
+                ], {
+                    icon: icons.key,
                     theme: "info",
                     padding: 1,
                 });
@@ -116,289 +479,86 @@ export async function handleKeysCommand() {
         case "add": {
             console.clear();
             showIterableLogo(packageJson.version);
-            // Interactive add flow (no flags; all prompts)
-            const { name } = await inquirer.prompt([
-                {
-                    type: "input",
-                    name: "name",
-                    message: "Enter a name for this API key:",
-                    default: "default",
-                    validate: (input) => {
-                        if (!input)
-                            return "Name is required";
-                        if (input.length > 50)
-                            return "Name must be 50 characters or less";
-                        return true;
-                    },
-                },
-            ]);
-            const { promptForIterableBaseUrl } = await import("./utils/endpoint-prompt.js");
-            let baseUrl;
-            try {
-                baseUrl = await promptForIterableBaseUrl({
-                    inquirer,
-                    icons,
-                    chalk,
-                    showError,
-                });
-            }
-            catch {
-                process.exit(1);
-                return;
-            }
-            const apiKey = await promptForApiKey("\n  " + icons.lock + "  Enter your Iterable API key: ");
-            // Basic by default: conservative env flags; optional advanced profile
-            let selectedEnv = {
-                ITERABLE_USER_PII: "false",
-                ITERABLE_ENABLE_WRITES: "false",
-                ITERABLE_ENABLE_SENDS: "false",
-            };
-            const { doAdvanced } = await inquirer.prompt([
-                {
-                    type: "confirm",
-                    name: "doAdvanced",
-                    message: "Configure advanced permissions now?",
-                    default: false,
-                },
-            ]);
-            if (doAdvanced) {
-                const { permFlags } = await inquirer.prompt([
-                    {
-                        type: "checkbox",
-                        name: "permFlags",
-                        message: "Select permissions to enable (default: none):",
-                        choices: [
-                            { name: "View PII (access user data)", value: "pii" },
-                            {
-                                name: "Write operations (create/update/delete)",
-                                value: "writes",
-                            },
-                            { name: "Sends (campaigns/journeys/events)", value: "sends" },
-                        ],
-                        pageSize: 6,
-                        default: [],
-                    },
-                ]);
-                selectedEnv = {
-                    ITERABLE_USER_PII: permFlags.includes("pii")
-                        ? "true"
-                        : "false",
-                    ITERABLE_ENABLE_WRITES: permFlags.includes("writes")
-                        ? "true"
-                        : "false",
-                    ITERABLE_ENABLE_SENDS: permFlags.includes("sends")
-                        ? "true"
-                        : "false",
-                };
-            }
-            // Check if this API key value already exists
-            spinner.start("Checking for duplicate keys...");
-            const existingKeyWithValue = await keyManager.findKeyByValue(apiKey);
-            spinner.stop();
-            if (existingKeyWithValue) {
-                console.log();
-                showInfo(`This API key is already stored as "${existingKeyWithValue.name}"`);
-                if (!existingKeyWithValue.isActive) {
-                    console.log();
-                    console.log(chalk.gray("  To activate this key, run:"));
-                    console.log(chalk.cyan(`    iterable-mcp keys activate "${existingKeyWithValue.name}"`));
-                }
-                else {
-                    console.log();
-                    showSuccess(`"${existingKeyWithValue.name}" is already your active key`);
-                }
-                console.log();
-                break;
-            }
-            // Add the key
-            spinner.start("Storing API key securely...");
-            try {
-                const id = await keyManager.addKey(name, apiKey, baseUrl, {
-                    ...selectedEnv,
-                });
-                spinner.succeed("API key stored successfully!");
-                console.log();
-                console.log(formatKeyValue("Name", name, chalk.white.bold));
-                console.log(formatKeyValue("ID", id, chalk.gray));
-                console.log(formatKeyValue("Endpoint", baseUrl, linkColor()));
-                console.log(formatKeyValue("User PII", selectedEnv.ITERABLE_USER_PII === "true"
-                    ? chalk.green("Enabled")
-                    : chalk.gray("Disabled")));
-                console.log(formatKeyValue("Writes", selectedEnv.ITERABLE_ENABLE_WRITES === "true"
-                    ? chalk.green("Enabled")
-                    : chalk.gray("Disabled")));
-                console.log(formatKeyValue("Sends", selectedEnv.ITERABLE_ENABLE_SENDS === "true"
-                    ? chalk.green("Enabled")
-                    : chalk.gray("Disabled")));
-                console.log();
-                showSuccess("Your API key is now securely stored (encrypted at rest)");
-                // Offer to set newly added key as active
-                const { activateNow } = await inquirer.prompt([
-                    {
-                        type: "confirm",
-                        name: "activateNow",
-                        message: `Set "${name}" as your active API key now?`,
-                        default: true,
-                    },
-                ]);
-                if (activateNow) {
-                    spinner.start("Activating key...");
-                    await keyManager.setActiveKey(id);
-                    spinner.succeed("Key activated");
-                    showSuccess(`"${name}" is now your active key`);
-                }
-                else {
-                    showInfo(`Keeping your current active key. Run 'iterable-mcp keys activate "${name}"' to switch later.`);
-                }
-            }
-            catch (error) {
-                const { sanitizeString } = await import("./utils/sanitize.js");
-                spinner.fail("Failed to add API key");
-                const msg = error instanceof Error
-                    ? sanitizeString(error.message)
-                    : "Unknown error";
-                showError(msg);
-                process.exit(1);
-            }
+            await saveKeyInteractive(keyManager, null, {
+                chalk,
+                icons,
+                showError,
+                showSuccess,
+                showInfo,
+                formatKeyValue,
+                linkColor,
+                showBox,
+            }, spinner, hasAdvancedFlag ? { advanced: true } : undefined);
+            break;
+        }
+        case "update": {
+            console.clear();
+            showIterableLogo(packageJson.version);
+            const existingKey = await findKeyOrExit(keyManager, positionalArgs[2], "update", {
+                chalk,
+                showError,
+                showInfo,
+            });
+            console.log();
+            showInfo(`Updating key: "${existingKey.name}"`);
+            console.log();
+            await saveKeyInteractive(keyManager, existingKey, {
+                chalk,
+                icons,
+                showError,
+                showSuccess,
+                showInfo,
+                formatKeyValue,
+                linkColor,
+                showBox,
+            }, spinner, { advanced: hasAdvancedFlag });
             break;
         }
         case "activate": {
             console.clear();
             showIterableLogo(packageJson.version);
-            const idOrName = args.slice(2).join(" ").trim();
-            if (!idOrName) {
+            // Find the key first to get better error messages
+            const keyToActivate = await findKeyOrExit(keyManager, positionalArgs[2], "activate", { chalk, showError, showInfo });
+            spinner.start(`Activating key "${keyToActivate.name}"...`);
+            try {
+                await keyManager.getKey(keyToActivate.id);
+            }
+            catch (error) {
+                spinner.fail("Failed to activate key");
+                showError(error instanceof Error ? error.message : "Failed to access key");
                 console.log();
-                showError("Missing key name or ID");
+                showInfo(`This key's value is not accessible. Update it with: ${COMMAND_NAME} keys update <name-or-id>`);
+                process.exit(1);
+            }
+            await keyManager.setActiveKey(keyToActivate.id);
+            spinner.stop();
+            const meta = await keyManager.getActiveKeyMetadata();
+            if (meta) {
                 console.log();
-                console.log(chalk.white.bold("  USAGE"));
-                console.log(chalk.white("    iterable-mcp keys activate <name-or-id>"));
+                showSuccess(`Switched to "${meta.name}"`);
                 console.log();
-                console.log(chalk.white.bold("  EXAMPLE"));
-                console.log(chalk.cyan("    iterable-mcp keys activate production"));
+                displayKeyDetails(meta, { chalk, formatKeyValue, linkColor });
                 console.log();
-                process.exit(1);
             }
-            try {
-                spinner.start(`Activating key "${idOrName}"...`);
-                // First check if the key value is accessible
-                try {
-                    await keyManager.getKey(idOrName);
-                }
-                catch (error) {
-                    spinner.fail("Failed to activate key");
-                    showError(error instanceof Error ? error.message : "Failed to access key");
-                    console.log();
-                    showInfo("This key's value is not accessible. Delete and re-add it with: iterable-mcp keys delete <id> && iterable-mcp keys add");
-                    process.exit(1);
-                }
-                await keyManager.setActiveKey(idOrName);
-                spinner.stop();
-                const meta = await keyManager.getActiveKeyMetadata();
-                if (meta) {
-                    console.log();
-                    showSuccess(`Switched to "${meta.name}"`);
-                    console.log();
-                    console.log(formatKeyValue("Name", meta.name, chalk.white.bold));
-                    console.log(formatKeyValue("ID", meta.id, chalk.gray));
-                    console.log(formatKeyValue("Endpoint", meta.baseUrl, linkColor()));
-                    const pii = meta.env?.ITERABLE_USER_PII === "true"
-                        ? chalk.green("Enabled")
-                        : chalk.gray("Disabled");
-                    const writes = meta.env?.ITERABLE_ENABLE_WRITES === "true"
-                        ? chalk.green("Enabled")
-                        : chalk.gray("Disabled");
-                    const sends = meta.env?.ITERABLE_ENABLE_SENDS === "true"
-                        ? chalk.green("Enabled")
-                        : chalk.gray("Disabled");
-                    console.log(formatKeyValue("User PII", pii));
-                    console.log(formatKeyValue("Writes", writes));
-                    console.log(formatKeyValue("Sends", sends));
-                    console.log();
-                }
-                else {
-                    console.log();
-                    showSuccess(`"${idOrName}" is now your active API key`);
-                }
-                showBox("Action Required", [
-                    chalk.yellow("Restart your AI tools to use this key"),
-                    "",
-                    chalk.gray("The MCP server will automatically load the active key when it starts"),
-                ], { icon: icons.zap, theme: "warning" });
-            }
-            catch (_error) {
-                // This only catches "key not found" errors from setActiveKey
-                // (API key inaccessibility is handled in the inner try-catch above)
-                spinner.fail("Failed to activate key");
-                const keys = await keyManager.listKeys();
-                const suggestions = keys
-                    .filter((k) => k.name.toLowerCase().includes(idOrName.toLowerCase()) ||
-                    k.id.toLowerCase().includes(idOrName.toLowerCase()))
-                    .slice(0, 5);
-                showError(`Key not found: ${idOrName}`);
-                if (suggestions.length) {
-                    console.log();
-                    console.log(chalk.white.bold("  Did you mean one of these?"));
-                    console.log();
-                    for (const s of suggestions) {
-                        console.log(chalk.cyan(`    • "${s.name}"`) + chalk.gray(` (ID: ${s.id})`));
-                    }
-                    console.log();
-                }
-                showInfo("If your key name has spaces, wrap it in quotes");
-                console.log(chalk.gray('    Example: iterable-mcp keys activate "My Prod Key"'));
+            else {
                 console.log();
-                process.exit(1);
+                showSuccess(`"${keyToActivate.name}" is now your active API key`);
             }
+            showBox("Action Required", [
+                chalk.yellow("Restart your AI tools to use this key"),
+                "",
+                chalk.gray("The MCP server will automatically load the active key when it starts"),
+            ], { icon: icons.zap, theme: "warning" });
             break;
         }
         case "delete": {
             console.clear();
             showIterableLogo(packageJson.version);
-            const idOrName = args[2];
-            if (!idOrName) {
-                console.log();
-                showError("Missing key name or ID");
-                console.log();
-                console.log(chalk.white.bold("  USAGE"));
-                console.log(chalk.white("    iterable-mcp keys delete <id-or-name>"));
-                console.log();
-                showInfo("Use the key ID (not name) for deletion to ensure uniqueness");
-                console.log(chalk.gray("  Run 'iterable-mcp keys list' to see key IDs"));
-                console.log();
-                process.exit(1);
-            }
-            // Resolve id or name to an ID for deletion
-            let resolved = idOrName;
-            let resolvedMeta = null;
-            try {
-                const keys = await keyManager.listKeys();
-                const meta = keys.find((k) => k.id === idOrName || k.name === idOrName);
-                if (!meta) {
-                    // Provide suggestions
-                    const suggestions = keys
-                        .filter((k) => k.name.toLowerCase().includes(idOrName.toLowerCase()) ||
-                        k.id.toLowerCase().includes(idOrName.toLowerCase()))
-                        .slice(0, 5);
-                    showError(`Key not found: ${idOrName}`);
-                    if (suggestions.length) {
-                        console.log();
-                        console.log(chalk.white.bold("  Did you mean one of these?"));
-                        console.log();
-                        for (const s of suggestions) {
-                            console.log(chalk.cyan(`    • "${s.name}"`) + chalk.gray(` (ID: ${s.id})`));
-                        }
-                        console.log();
-                    }
-                    showInfo("Run 'iterable-mcp keys list' to view all keys");
-                    process.exit(1);
-                }
-                resolved = meta.id;
-                resolvedMeta = { id: meta.id, name: meta.name };
-            }
-            catch (_error) {
-                showError("Unable to resolve key by name or ID");
-                process.exit(1);
-            }
+            const keyToDelete = await findKeyOrExit(keyManager, positionalArgs[2], "delete", {
+                chalk,
+                showError,
+                showInfo,
+            });
             // Confirm deletion (non-interactive in tests)
             let confirmDelete = false;
             if (process.env.NODE_ENV !== "test") {
@@ -406,7 +566,7 @@ export async function handleKeysCommand() {
                     {
                         type: "confirm",
                         name: "confirmDelete",
-                        message: `Permanently delete key "${resolvedMeta?.name ?? idOrName}" (ID: ${resolved})?`,
+                        message: `Permanently delete key "${keyToDelete.name}" (ID: ${keyToDelete.id})?`,
                         default: false,
                     },
                 ]));
@@ -417,10 +577,10 @@ export async function handleKeysCommand() {
             }
             spinner.start("Deleting API key...");
             try {
-                await keyManager.deleteKey(resolved);
+                await keyManager.deleteKey(keyToDelete.id);
                 spinner.succeed("API key deleted successfully");
                 console.log();
-                console.log(formatKeyValue("ID", resolved, chalk.gray));
+                console.log(formatKeyValue("ID", keyToDelete.id, chalk.gray));
                 console.log();
                 showSuccess("Key securely removed");
             }
@@ -438,10 +598,11 @@ export async function handleKeysCommand() {
             console.log();
             const commandsTable = createTable({
                 head: ["Command", "Description"],
-                colWidths: [30, 50],
+                colWidths: [45, 40],
                 style: "normal",
             });
-            commandsTable.push(["list", chalk.gray("View all your stored API keys")], ["add", chalk.gray("Add a new API key (interactive)")], ["activate <name-or-id>", chalk.gray("Switch to a different key")], ["delete <id-or-name>", chalk.gray("Remove a key by ID or name")]);
+            // Apply chalk gray to descriptions for styling
+            commandsTable.push(...KEYS_COMMAND_TABLE.map(([cmd, desc]) => [cmd, chalk.gray(desc)]));
             console.log(commandsTable.toString());
             console.log();
             console.log();
@@ -450,24 +611,23 @@ export async function handleKeysCommand() {
             console.log(chalk.white.bold("  Add API keys"));
             console.log(chalk.gray("  (Interactive prompts: name, region, API key, PII, Writes, Sends)"));
             console.log();
-            console.log(chalk.cyan("    iterable-mcp keys add"));
+            console.log(chalk.cyan(`    ${COMMAND_NAME} keys add`));
             console.log();
             console.log();
             console.log(chalk.white.bold("  Manage your keys"));
             console.log();
-            console.log(chalk.cyan("    iterable-mcp keys list"));
-            console.log(chalk.cyan("    iterable-mcp keys activate production"));
-            console.log(chalk.cyan("    iterable-mcp keys delete 3f5d2b07-5b1c-4e86-8f3c-9a1b2c3d4e5f"));
+            console.log(chalk.cyan(`    ${COMMAND_NAME} keys list`));
+            console.log(chalk.cyan(`    ${COMMAND_NAME} keys add`));
+            console.log(chalk.cyan(`    ${COMMAND_NAME} keys update production`));
+            console.log(chalk.cyan(`    ${COMMAND_NAME} keys activate production`));
+            console.log(chalk.cyan(`    ${COMMAND_NAME} keys delete 3f5d2b07-5b1c-4e86-8f3c-9a1b2c3d4e5f`));
             console.log();
-            const tips = [
+            showBox("Important Notes", [
                 "API keys are prompted interactively - never stored in shell history",
                 "Each API key is tightly coupled to its endpoint (US/EU/custom)",
                 getKeyStorageMessage(),
-                "Use 'keys list' to see all your keys and their details",
                 "The active key (● ACTIVE) is what your AI tools will use",
-                "To update a key: delete the old one and add a new one",
-            ];
-            showBox("Tips & Best Practices", tips, {
+            ], {
                 icon: icons.bulb,
                 theme: "info",
                 padding: 1,