@iterable/mcp 1.2.2 → 1.3.0

package/dist/install.js

@@ -7,12 +7,11 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { promisify } from "util";
 import { getKeyManager } from "./key-manager.js";
+import { displayKeyDetails, saveKeyInteractive } from "./keys-cli.js";
+import { COMMAND_NAME, KEYS_COMMAND_TABLE, NPX_PACKAGE_NAME, } from "./utils/command-info.js";
 import { getKeyStorageMessage } from "./utils/formatting.js";
 const { dirname, join } = path;
 // IMPORTANT: UI imports are loaded lazily inside functions to avoid ESM issues in Jest/CommonJS.
-// Executable/package names
-const LOCAL_BINARY_NAME = "iterable-mcp";
-const NPX_PACKAGE_NAME = "@iterable/mcp";
 // Get package version
 const packageJson = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), "..", "package.json"), "utf-8"));
 const TOOL_NAMES = {
@@ -20,6 +19,7 @@ const TOOL_NAMES = {
     "claude-desktop": "Claude Desktop",
     "claude-code": "Claude Code",
     "gemini-cli": "Gemini CLI",
+    windsurf: "Windsurf",
     manual: "Manual Setup",
 };
 const TOOL_CONFIGS = {
@@ -34,6 +34,7 @@ const TOOL_CONFIGS = {
         }
     })(),
     cursor: path.join(os.homedir(), ".cursor", "mcp.json"),
+    windsurf: path.join(os.homedir(), ".codeium", "windsurf", "mcp_config.json"),
     "gemini-cli": path.join(os.homedir(), ".gemini", "settings.json"),
 };
 const execFileAsync = promisify(execFile);
@@ -128,16 +129,13 @@ export const setupMcpServer = async () => {
     const advanced = args.includes("--advanced");
     const autoUpdate = args.includes("--auto-update");
     let tools = [
-        ...(args.includes("--claude-desktop") ? ["claude-desktop"] : []),
         ...(args.includes("--cursor") ? ["cursor"] : []),
+        ...(args.includes("--claude-desktop") ? ["claude-desktop"] : []),
         ...(args.includes("--claude-code") ? ["claude-code"] : []),
         ...(args.includes("--gemini-cli") ? ["gemini-cli"] : []),
+        ...(args.includes("--windsurf") ? ["windsurf"] : []),
         ...(args.includes("--manual") ? ["manual"] : []),
     ];
-    // Detect how the command was invoked
-    const isNpx = process.argv[1]?.includes("npx") ||
-        process.env.npm_execpath?.includes("npx");
-    const commandName = isNpx ? `npx ${NPX_PACKAGE_NAME}` : LOCAL_BINARY_NAME;
     if (showHelp) {
         const { createTable, icons, showBox, showIterableLogo, showSection } = await import("./utils/ui.js");
         const chalk = (await import("chalk")).default;
@@ -150,11 +148,14 @@ export const setupMcpServer = async () => {
             colWidths: [45, 40],
             style: "normal",
         });
-        setupTable.push([`${commandName} setup --claude-desktop`, "Configure for Claude Desktop"], [`${commandName} setup --cursor`, "Configure for Cursor"], [`${commandName} setup --claude-code`, "Configure for Claude Code"], [`${commandName} setup --gemini-cli`, "Configure for Gemini CLI"], [`${commandName} setup --manual`, "Show manual config instructions"], [
-            `${commandName} setup --cursor --claude-desktop`,
+        setupTable.push([`${COMMAND_NAME} setup --cursor`, "Configure for Cursor"], [
+            `${COMMAND_NAME} setup --claude-desktop`,
+            "Configure for Claude Desktop",
+        ], [`${COMMAND_NAME} setup --claude-code`, "Configure for Claude Code"], [`${COMMAND_NAME} setup --gemini-cli`, "Configure for Gemini CLI"], [`${COMMAND_NAME} setup --windsurf`, "Configure for Windsurf"], [`${COMMAND_NAME} setup --manual`, "Show manual config instructions"], [
+            `${COMMAND_NAME} setup --cursor --claude-desktop`,
             "Configure multiple tools",
-        ], [`${commandName} setup --cursor --debug`, "Enable debug logging"], [
-            `${commandName} setup --cursor --auto-update`,
+        ], [`${COMMAND_NAME} setup --cursor --debug`, "Enable debug logging"], [
+            `${COMMAND_NAME} setup --cursor --auto-update`,
             "Always use latest version",
         ]);
         console.log(setupTable.toString());
@@ -167,7 +168,7 @@ export const setupMcpServer = async () => {
             colWidths: [45, 40],
             style: "normal",
         });
-        keysTable.push([`${commandName} keys list`, "View all stored API keys"], [`${commandName} keys add`, "Add a new API key"], [`${commandName} keys activate <name>`, "Switch to a different key"], [`${commandName} keys delete <id>`, "Remove a key by ID"]);
+        keysTable.push(...KEYS_COMMAND_TABLE);
         console.log(keysTable.toString());
         console.log();
         console.log();
@@ -195,7 +196,7 @@ export const setupMcpServer = async () => {
         console.log();
         showBox("Quick Start", [
             chalk.white.bold("1. Run setup for your AI tool:"),
-            chalk.cyan(`   ${commandName} setup --cursor`),
+            chalk.cyan(`   ${COMMAND_NAME} setup --cursor`),
             "",
             chalk.white.bold("2. Restart your AI tool"),
             "",
@@ -209,38 +210,11 @@ export const setupMcpServer = async () => {
         ], { icon: icons.lock, theme: "info", padding: 1 });
         return;
     }
-    // New behavior: if no tools were provided as flags, prompt user to select one or more
-    if (tools.length === 0) {
-        // Show logo first when no flags provided
-        const { showIterableLogo } = await import("./utils/ui.js");
-        console.clear();
-        showIterableLogo(packageJson.version);
-        const { selectedTools } = await inquirer.prompt([
-            {
-                type: "checkbox",
-                name: "selectedTools",
-                message: "Select your AI tools to configure:",
-                choices: [
-                    { name: "Cursor", value: "cursor" },
-                    { name: "Claude Desktop", value: "claude-desktop" },
-                    { name: "Claude Code (CLI)", value: "claude-code" },
-                    { name: "Gemini CLI", value: "gemini-cli" },
-                    { name: "Other / Manual Setup", value: "manual" },
-                ],
-                validate: (arr) => Array.isArray(arr) && arr.length > 0
-                    ? true
-                    : "Please select at least one tool",
-            },
-        ]);
-        tools = selectedTools;
-    }
-    // Start the setup flow
+    // Start the setup flow - show logo and load UI
     console.clear();
-    const { formatKeyValue, icons, showCompletion, showError, showInfo, showIterableLogo, showSection, showSuccess, showWarning, linkColor, valueColor, } = await import("./utils/ui.js");
+    const { formatKeyValue, icons, showCompletion, showError, showInfo, showIterableLogo, showSection, showSuccess, showWarning, linkColor, } = await import("./utils/ui.js");
     const chalk = (await import("chalk")).default;
     showIterableLogo(packageJson.version);
-    // Succinct overview of what will be configured
-    console.log(chalk.gray(`Running setup to configure: ${tools.map((t) => TOOL_NAMES[t]).join(", ")}`));
     console.log();
     const ora = (await import("ora")).default;
     const spinner = ora();
@@ -250,9 +224,6 @@ export const setupMcpServer = async () => {
         showSection("API Key Configuration", icons.key);
         console.log();
         let apiKey;
-        let keyName;
-        let baseUrl;
-        let usedKeyName;
         let usedExistingKey = false;
         let selectedExistingMeta;
         // 1) Offer using API key from environment
@@ -285,6 +256,8 @@ export const setupMcpServer = async () => {
                 ]);
                 if (useExisting) {
                     const { formatKeychainChoiceLabel } = await import("./utils/ui.js");
+                    // Find the active key to use as default
+                    const activeKey = keys.find((k) => k.isActive);
                     const { chosenId } = await inquirer.prompt([
                         {
                             type: "list",
@@ -295,6 +268,7 @@ export const setupMcpServer = async () => {
                                 value: k.id,
                                 short: k.name,
                             })),
+                            default: activeKey?.id,
                             pageSize: Math.min(10, keys.length),
                         },
                     ]);
@@ -302,11 +276,8 @@ export const setupMcpServer = async () => {
                         const meta = keys.find((k) => k.id === chosenId);
                         if (!meta)
                             throw new Error("Selected key metadata not found");
-                        baseUrl = meta.baseUrl;
-                        usedKeyName = meta.name;
                         usedExistingKey = true;
                         selectedExistingMeta = meta;
-                        showSuccess(`Using existing key "${meta.name}"`);
                     }
                     catch (e) {
                         showError(e instanceof Error
@@ -315,265 +286,128 @@ export const setupMcpServer = async () => {
                         process.exit(1);
                     }
                 }
+                else {
+                    console.log();
+                }
             }
         }
-        // 3) If neither env nor existing key chosen, prompt for a new key
         if (!apiKey && !usedExistingKey) {
-            const { newApiKey } = await inquirer.prompt([
-                {
-                    type: "password",
-                    name: "newApiKey",
-                    message: "Enter your Iterable API key:",
-                    validate: (input) => {
-                        if (!input)
-                            return "API key is required";
-                        if (!/^[a-f0-9]{32}$/.test(input))
-                            return "API key must be a 32-character lowercase hexadecimal string";
-                        return true;
-                    },
-                    mask: "*",
-                },
-            ]);
-            apiKey = newApiKey;
-        }
-        // Step 2: API Endpoint Selection
-        console.log();
-        showSection("API Endpoint Configuration", icons.globe);
-        console.log();
-        if (!baseUrl) {
-            if (process.env.ITERABLE_BASE_URL) {
-                baseUrl = process.env.ITERABLE_BASE_URL;
-                showSuccess(`Using API endpoint from environment: ${baseUrl}`);
+            const keyManager = getKeyManager();
+            await keyManager.initialize();
+            const { getSpinner } = await import("./utils/cli-env.js");
+            const keySpinner = await getSpinner();
+            try {
+                const newKeyId = await saveKeyInteractive(keyManager, null, {
+                    chalk,
+                    icons,
+                    showError,
+                    showSuccess,
+                    showInfo,
+                    formatKeyValue,
+                    linkColor,
+                    showBox: (await import("./utils/ui.js")).showBox,
+                }, keySpinner, {
+                    skipRestartNotice: true,
+                    advanced,
+                    autoActivate: true,
+                });
+                selectedExistingMeta =
+                    (await keyManager.getKeyMetadata(newKeyId)) ?? undefined;
             }
-            else {
-                const { promptForIterableBaseUrl } = await import("./utils/endpoint-prompt.js");
-                try {
-                    baseUrl = await promptForIterableBaseUrl({
-                        inquirer,
-                        icons,
-                        chalk,
-                        showError,
-                    });
-                }
-                catch {
-                    process.exit(1);
-                }
+            catch (error) {
+                showError(error instanceof Error ? error.message : "Failed to add key");
+                process.exit(1);
             }
         }
-        else {
-            showSuccess(`Using API endpoint from selected key: ${baseUrl}`);
-        }
-        console.log();
-        console.log(formatKeyValue("Selected endpoint", baseUrl, linkColor()));
-        console.log();
-        // Step 3: Store the key securely
-        let existingKeyWithValue = null;
-        const keyManager = getKeyManager();
-        spinner.start("Initializing secure key storage...");
-        await keyManager.initialize();
-        spinner.succeed("Key storage ready");
-        // Check if key already exists
-        if (!usedExistingKey && apiKey) {
-            spinner.start("Checking for existing keys...");
-            existingKeyWithValue = await keyManager.findKeyByValue(apiKey);
-            spinner.stop();
-        }
-        if (usedExistingKey) {
-            // Offer to activate the selected existing key if not already active
+        else if (usedExistingKey) {
+            const keyManager = getKeyManager();
+            await keyManager.initialize();
+            console.log();
             if (!selectedExistingMeta?.isActive) {
-                const { activateExisting } = await inquirer.prompt([
-                    {
-                        type: "confirm",
-                        name: "activateExisting",
-                        message: `Set "${selectedExistingMeta?.name}" as your active API key?`,
-                        default: true,
-                    },
-                ]);
-                if (activateExisting) {
-                    await keyManager.setActiveKey(selectedExistingMeta.id);
-                    showSuccess(`"${selectedExistingMeta?.name}" is now your active key`);
-                }
-                else {
-                    showInfo("Keeping your current active key");
-                }
+                const { getSpinner } = await import("./utils/cli-env.js");
+                const activateSpinner = await getSpinner();
+                activateSpinner.start("Activating key...");
+                await keyManager.setActiveKey(selectedExistingMeta.id);
+                activateSpinner.succeed("Key activated successfully");
+                showSuccess(`"${selectedExistingMeta?.name}" is now your active API key`);
             }
             else {
                 showSuccess(`"${selectedExistingMeta?.name}" is already your active key`);
             }
-        }
-        else if (existingKeyWithValue) {
-            showInfo(`This API key is already stored as "${existingKeyWithValue.name}"`);
-            usedKeyName = existingKeyWithValue.name;
-            if (!existingKeyWithValue.isActive) {
-                const { activateExisting } = await inquirer.prompt([
-                    {
-                        type: "confirm",
-                        name: "activateExisting",
-                        message: `Set "${existingKeyWithValue.name}" as your active API key?`,
-                        default: true,
-                    },
-                ]);
-                if (activateExisting) {
-                    await keyManager.setActiveKey(existingKeyWithValue.id);
-                    showSuccess(`"${existingKeyWithValue.name}" is now your active key`);
-                }
-                else {
-                    showInfo("Keeping your current active key");
-                }
-            }
-            else {
-                showSuccess(`"${existingKeyWithValue.name}" is already your active key`);
-            }
+            console.log();
+            displayKeyDetails(selectedExistingMeta, {
+                chalk,
+                formatKeyValue,
+                linkColor,
+            });
+            console.log();
+            showInfo(`To modify permissions, run: ${chalk.cyan(`${COMMAND_NAME} keys update "${selectedExistingMeta?.name}"`)}`);
         }
         else {
-            // New key - prompt for name
-            const { newKeyName } = await inquirer.prompt([
-                {
-                    type: "input",
-                    name: "newKeyName",
-                    message: "Enter a name for this API key:",
-                    default: "default",
-                    validate: (input) => {
-                        if (input && input.length > 50)
-                            return "Key name must be 50 characters or less";
-                        return true;
-                    },
-                },
-            ]);
-            keyName = newKeyName || "default";
-            spinner.start("Storing API key securely...");
+            const keyManager = getKeyManager();
+            await keyManager.initialize();
+            const { getSpinner } = await import("./utils/cli-env.js");
+            const keySpinner = await getSpinner();
             try {
-                const newKeyId = await keyManager.addKey(keyName, apiKey, baseUrl);
-                spinner.succeed("API key stored successfully!");
-                console.log();
-                console.log(formatKeyValue("Name", keyName, chalk.white.bold));
-                console.log(formatKeyValue("ID", newKeyId, chalk.gray));
-                console.log(formatKeyValue("Endpoint", baseUrl, chalk.cyan));
-                console.log();
-                usedKeyName = keyName;
-                // Check if we should activate this key
-                const allKeys = await keyManager.listKeys();
-                if (allKeys.length > 1) {
-                    const { activateNew } = await inquirer.prompt([
-                        {
-                            type: "confirm",
-                            name: "activateNew",
-                            message: `Set "${keyName}" as your active API key?`,
-                            default: true,
-                        },
-                    ]);
-                    if (activateNew) {
-                        await keyManager.setActiveKey(newKeyId);
-                        showSuccess(`"${keyName}" is now your active key`);
-                    }
-                    else {
-                        showInfo(`Keeping your current active key. Run 'iterable-mcp keys activate "${keyName}"' to switch later.`);
-                    }
-                }
+                const newKeyId = await saveKeyInteractive(keyManager, null, {
+                    chalk,
+                    icons,
+                    showError,
+                    showSuccess,
+                    showInfo,
+                    formatKeyValue,
+                    linkColor,
+                    showBox: (await import("./utils/ui.js")).showBox,
+                }, keySpinner, {
+                    skipRestartNotice: true,
+                    advanced,
+                    prefilledApiKey: apiKey,
+                    autoActivate: true,
+                });
+                selectedExistingMeta =
+                    (await keyManager.getKeyMetadata(newKeyId)) ?? undefined;
             }
             catch (error) {
-                const { sanitizeString } = await import("./utils/sanitize.js");
-                spinner.fail("Failed to store API key");
-                console.log();
-                const msg = error instanceof Error
-                    ? sanitizeString(error.message)
-                    : "Unknown error";
-                showError(msg);
-                console.log();
-                showInfo("Your API key was not stored. You can re-run 'iterable-mcp setup' to try again.");
-                showInfo("If the problem persists, verify storage access and disk permissions.");
+                showError(error instanceof Error ? error.message : "Failed to add key");
                 process.exit(1);
             }
         }
-        // Step 4: Privacy & Security Settings (Basic by default; Advanced via --advanced)
+        if (!selectedExistingMeta) {
+            showError("Failed to get key metadata after setup");
+            process.exit(1);
+        }
+        let mcpEnv = pickPersistablePermissionEnv(selectedExistingMeta.env || {});
+        if (args.includes("--debug")) {
+            mcpEnv.ITERABLE_DEBUG = "true";
+            mcpEnv.LOG_LEVEL = "debug";
+        }
+        mcpEnv = enforceSendsRequiresWrites(mcpEnv, (msg) => showWarning(msg));
+        // Step 5: Configure AI Tools
         console.log();
-        showSection("Privacy & Security Settings", icons.lock);
+        showSection("Configure AI Tools", icons.zap);
         console.log();
-        // Default conservative env flags
-        let selectedEnv = {
-            ITERABLE_USER_PII: "false",
-            ITERABLE_ENABLE_WRITES: "false",
-            ITERABLE_ENABLE_SENDS: "false",
-        };
-        if (advanced) {
-            const { permFlags } = await inquirer.prompt([
+        if (tools.length === 0) {
+            const { selectedTools } = await inquirer.prompt([
                 {
                     type: "checkbox",
-                    name: "permFlags",
-                    message: "Select permissions to enable (default: none):",
+                    name: "selectedTools",
+                    message: "Select your AI tools to configure:",
                     choices: [
-                        { name: "View PII (access user data)", value: "pii" },
-                        {
-                            name: "Write operations (create/update/delete)",
-                            value: "writes",
-                        },
-                        { name: "Sends (campaigns/journeys/events)", value: "sends" },
+                        { name: "Cursor", value: "cursor" },
+                        { name: "Claude Desktop", value: "claude-desktop" },
+                        { name: "Claude Code (CLI)", value: "claude-code" },
+                        { name: "Gemini CLI", value: "gemini-cli" },
+                        { name: "Windsurf", value: "windsurf" },
+                        { name: "Other / Manual Setup", value: "manual" },
                     ],
-                    pageSize: 6,
-                    default: [],
+                    validate: (arr) => Array.isArray(arr) && arr.length > 0
+                        ? true
+                        : "Please select at least one tool",
                 },
             ]);
-            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",
-            };
-        }
-        let mcpEnv = {
-            ITERABLE_USER_PII: selectedEnv.ITERABLE_USER_PII,
-            ITERABLE_ENABLE_WRITES: selectedEnv.ITERABLE_ENABLE_WRITES,
-            ITERABLE_ENABLE_SENDS: selectedEnv.ITERABLE_ENABLE_SENDS,
-        };
-        if (args.includes("--debug")) {
-            mcpEnv.ITERABLE_DEBUG = "true";
-            mcpEnv.LOG_LEVEL = "debug";
-        }
-        // Enforce permission invariants before displaying
-        mcpEnv = enforceSendsRequiresWrites(mcpEnv, (msg) => showWarning(msg));
-        console.log();
-        console.log(formatKeyValue("User PII Access", mcpEnv.ITERABLE_USER_PII === "true"
-            ? chalk.green("Enabled")
-            : chalk.gray("Disabled")));
-        console.log(formatKeyValue("Write Operations", mcpEnv.ITERABLE_ENABLE_WRITES === "true"
-            ? chalk.green("Enabled")
-            : chalk.gray("Disabled")));
-        console.log(formatKeyValue("Sends", mcpEnv.ITERABLE_ENABLE_SENDS === "true"
-            ? chalk.green("Enabled")
-            : chalk.gray("Disabled")));
-        // Only show the default note when all flags are disabled
-        if (mcpEnv.ITERABLE_USER_PII !== "true" &&
-            mcpEnv.ITERABLE_ENABLE_WRITES !== "true" &&
-            mcpEnv.ITERABLE_ENABLE_SENDS !== "true") {
-            console.log();
-            console.log(chalk.gray("Note: These are disabled by default. If you absolutely need to enable these, run 'iterable-mcp setup --advanced'"));
-        }
-        else {
+            tools = selectedTools;
             console.log();
-            showWarning("Warning: Elevated capabilities enabled. Sends, writes, and/or PII access may now occur.");
-        }
-        console.log();
-        // If we used an existing key, persist the chosen settings to it
-        if (usedKeyName) {
-            try {
-                await keyManager.updateKeyEnv(usedKeyName, pickPersistablePermissionEnv(mcpEnv));
-            }
-            catch (err) {
-                if (process.env.ITERABLE_DEBUG === "true") {
-                    console.warn("Non-fatal: failed to persist per-key env settings", err);
-                }
-            }
         }
-        // Step 5: Configure AI Tools
-        console.log();
-        showSection("Configuring AI Tools", icons.zap);
-        console.log();
-        // Ask about auto-update unless flag was provided
         let useAutoUpdate = autoUpdate;
         if (!autoUpdate) {
             const { enableAutoUpdate } = await inquirer.prompt([
@@ -584,6 +418,7 @@ export const setupMcpServer = async () => {
                     default: false,
                 },
             ]);
+            console.log();
             useAutoUpdate = enableAutoUpdate;
         }
         const iterableMcpConfig = buildMcpConfig({
@@ -591,35 +426,6 @@ export const setupMcpServer = async () => {
             env: omitPersistablePermissionEnv(mcpEnv),
             autoUpdate: useAutoUpdate,
         });
-        // Preflight confirmation summary before applying changes
-        console.log(chalk.gray("Summary:"));
-        console.log(formatKeyValue("Tools", tools.map((t) => TOOL_NAMES[t]).join(", "), valueColor()));
-        if (usedKeyName) {
-            console.log(formatKeyValue("API Key", usedKeyName, valueColor()));
-        }
-        console.log(formatKeyValue("Endpoint", baseUrl, valueColor()));
-        console.log(formatKeyValue("User PII", mcpEnv.ITERABLE_USER_PII === "true"
-            ? chalk.green("Enabled")
-            : chalk.gray("Disabled")));
-        console.log(formatKeyValue("Writes", mcpEnv.ITERABLE_ENABLE_WRITES === "true"
-            ? chalk.green("Enabled")
-            : chalk.gray("Disabled")));
-        console.log(formatKeyValue("Sends", mcpEnv.ITERABLE_ENABLE_SENDS === "true"
-            ? chalk.green("Enabled")
-            : chalk.gray("Disabled")));
-        console.log();
-        const { proceed } = await inquirer.prompt([
-            {
-                type: "confirm",
-                name: "proceed",
-                message: "Proceed with configuration?",
-                default: true,
-            },
-        ]);
-        if (!proceed) {
-            showInfo("Setup cancelled by user. No changes were made.");
-            return;
-        }
         const fileBasedTools = tools.filter((tool) => tool in TOOL_CONFIGS);
         const needsClaudeCode = tools.includes("claude-code");
         const needsManual = tools.includes("manual");
@@ -649,11 +455,10 @@ export const setupMcpServer = async () => {
                 spinner.fail("Claude CLI not found");
                 showError("Please install Claude Code first: https://docs.claude.com/en/docs/claude-code/overview");
                 console.log();
-                showInfo("After installing, re-run: iterable-mcp setup --claude-code");
+                showInfo(`After installing, re-run: ${COMMAND_NAME} setup --claude-code`);
                 process.exit(1);
             }
             const configJson = JSON.stringify(iterableMcpConfig);
-            // Remove existing config (ignore errors)
             await execFileAsync("claude", ["mcp", "remove", "iterable"]).catch(() => { });
             spinner.start("Configuring Claude Code...");
             await new Promise((resolve, reject) => {
@@ -673,11 +478,9 @@ export const setupMcpServer = async () => {
             spinner.succeed("Claude Code configured successfully");
         }
         if (needsManual) {
-            console.log();
             showSection("Manual Configuration", icons.rocket);
             console.log();
             const { type, command, args, env } = iterableMcpConfig;
-            showInfo("Your API key has been stored.");
             showInfo("Add the MCP server to your AI tool with these settings:");
             console.log();
             console.log(chalk.white.bold("  Type:") + `     ${type}`);
@@ -693,16 +496,17 @@ export const setupMcpServer = async () => {
             console.log();
             showInfo("Refer to your AI tool's documentation for configuration instructions.");
         }
-        // Build configured tools list
         const configuredTools = [];
         if (fileBasedTools.includes("cursor"))
             configuredTools.push("Cursor");
         if (fileBasedTools.includes("claude-desktop"))
             configuredTools.push("Claude Desktop");
-        if (fileBasedTools.includes("gemini-cli"))
-            configuredTools.push("Gemini CLI");
         if (needsClaudeCode)
             configuredTools.push("Claude Code");
+        if (fileBasedTools.includes("gemini-cli"))
+            configuredTools.push("Gemini CLI");
+        if (fileBasedTools.includes("windsurf"))
+            configuredTools.push("Windsurf");
         if (needsManual)
             configuredTools.push("your AI tool");
         const toolsList = configuredTools.length === 1
@@ -712,7 +516,6 @@ export const setupMcpServer = async () => {
                 : configuredTools.slice(0, -1).join(", ") +
                     ", and " +
                     configuredTools[configuredTools.length - 1];
-        // Success!
         console.log();
         const nextSteps = [
             ...(needsManual ? ["Configure your AI tool as described above"] : []),
@@ -724,8 +527,8 @@ export const setupMcpServer = async () => {
         ];
         const tips = [
             `Try: 'list my Iterable campaigns' in ${toolsList}`,
-            "Manage keys with 'iterable-mcp keys list'",
-            "Switch keys with 'iterable-mcp keys activate <name>'",
+            `Manage keys with '${COMMAND_NAME} keys list'`,
+            `Switch keys with '${COMMAND_NAME} keys activate <name>'`,
         ];
         showCompletion("Setup Complete!", nextSteps, tips);
     }