megabuff 0.6.0 → 0.8.0

package/dist/index.js

@@ -6,9 +6,24 @@ import OpenAI from "openai";
 import Anthropic from "@anthropic-ai/sdk";
 import { GoogleGenerativeAI } from "@google/generative-ai";
 import * as clipboardy from "clipboardy";
-import { getApiKeyInfo, setApiKey, removeApiKey, hasApiKey, getConfig, getProvider, setProvider, setModel, getModel, normalizeProvider, getProviderForModel, MODEL_PROVIDER_MAP, PROVIDERS } from "./config.js";
+import chalk from "chalk";
+import { getApiKeyInfo, setApiKey, removeApiKey, hasApiKey, getConfig, getProvider, setProvider, setModel, getModel, normalizeProvider, getProviderForModel, MODEL_PROVIDER_MAP, PROVIDERS, getThemeName, setThemeName } from "./config.js";
 import { getDefaultModel } from "./models.js";
+import { themes, getAllThemeNames, isValidTheme } from "./themes.js";
+import { getCurrentTheme, clearThemeCache } from "./theme-utils.js";
 const program = new Command();
+// Initialize theme at startup
+let theme = await getCurrentTheme();
+// Configure help to use theme colors
+program.configureHelp({
+    styleTitle: (str) => theme.colors.highlight(str),
+    styleCommandText: (str) => theme.colors.primary(str),
+    styleCommandDescription: (str) => theme.colors.secondary(str),
+    styleDescriptionText: (str) => theme.colors.secondary(str),
+    styleOptionText: (str) => theme.colors.info(str),
+    styleArgumentText: (str) => theme.colors.accent(str),
+    styleSubcommandText: (str) => theme.colors.primary(str),
+});
 function isDevMode() {
     // `npm run dev` sets npm_lifecycle_event=dev
     if (process.env.npm_lifecycle_event === "dev")
@@ -23,7 +38,7 @@ function debugLog(...args) {
     if (!isDevMode())
         return;
     // stderr to avoid polluting stdout output/pipes
-    console.error("[megabuff:debug]", ...args);
+    console.error(theme.colors.dim("[megabuff:debug]"), ...args);
 }
 function maskSecret(secret) {
     if (!secret)
@@ -74,7 +89,7 @@ async function getInput(inlinePrompt, options) {
         output: process.stdout,
     });
     debugLog("input.source=interactive");
-    console.log("Enter your prompt (press Ctrl+D when done):");
+    console.log(theme.colors.primary("Enter your prompt (press Ctrl+D when done):"));
     const lines = [];
     rl.on("line", (line) => {
         lines.push(line);
@@ -221,8 +236,8 @@ function createSpinner(message) {
     let timer;
     let lastLen = 0;
     const render = (text) => {
-        const frame = frames[i++ % frames.length];
-        const line = `${frame} ${text}`;
+        const frame = theme.colors.primary(frames[i++ % frames.length]);
+        const line = `${frame} ${theme.colors.dim(text)}`;
         const padded = line + " ".repeat(Math.max(0, lastLen - line.length));
         lastLen = Math.max(lastLen, line.length);
         process.stderr.write(`\r${padded}`);
@@ -241,7 +256,7 @@ function createSpinner(message) {
                 clearInterval(timer);
             timer = undefined;
             const text = finalText ?? message;
-            const padded = text + " ".repeat(Math.max(0, lastLen - text.length));
+            const padded = theme.colors.success(`✓ ${text}`) + " ".repeat(Math.max(0, lastLen - text.length));
             process.stderr.write(`\r${padded}\n`);
         },
         fail(finalText) {
@@ -251,7 +266,7 @@ function createSpinner(message) {
                 clearInterval(timer);
             timer = undefined;
             const text = finalText ?? message;
-            const padded = text + " ".repeat(Math.max(0, lastLen - text.length));
+            const padded = theme.colors.error(`✗ ${text}`) + " ".repeat(Math.max(0, lastLen - text.length));
             process.stderr.write(`\r${padded}\n`);
         }
     };
@@ -270,14 +285,14 @@ function formatProviderLabel(p) {
 async function promptFirstRunConfig() {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     try {
-        console.log("\nNo BYOK token configured yet.");
-        console.log("Select the provider that will supply the token:\n");
+        console.log(theme.colors.warning("\n⚡ No BYOK token configured yet."));
+        console.log(theme.colors.primary("Select the provider that will supply the token:\n"));
         PROVIDERS.forEach((p, idx) => {
-            console.log(`  ${idx + 1}) ${formatProviderLabel(p)}`);
+            console.log(theme.colors.secondary(`  ${chalk.bold(idx + 1)}) ${formatProviderLabel(p)}`));
         });
         let provider;
         while (!provider) {
-            const raw = await rl.question("\nProvider (number or name): ");
+            const raw = await rl.question(theme.colors.primary("\nProvider (number or name): "));
             const trimmed = raw.trim();
             const asNum = Number(trimmed);
             if (Number.isFinite(asNum) && asNum >= 1 && asNum <= PROVIDERS.length) {
@@ -286,14 +301,14 @@ async function promptFirstRunConfig() {
             }
             provider = normalizeProvider(trimmed);
             if (!provider) {
-                console.log(`Please choose one of: ${PROVIDERS.join(", ")}`);
+                console.log(theme.colors.warning(`Please choose one of: ${PROVIDERS.join(", ")}`));
             }
         }
-        const apiKey = (await rl.question("Enter your BYOK token: ")).trim();
+        const apiKey = (await rl.question(theme.colors.primary("Enter your BYOK token: "))).trim();
         if (!apiKey) {
             throw new Error("No token provided.");
         }
-        const store = (await rl.question("Store in system keychain? (Y/n): ")).trim().toLowerCase();
+        const store = (await rl.question(theme.colors.primary("Store in system keychain? (Y/n): "))).trim().toLowerCase();
         const useKeychain = store === "" || store === "y" || store === "yes";
         if (!provider) {
             throw new Error("No provider selected.");
@@ -308,24 +323,40 @@ async function promptFirstRunConfig() {
  * Output the result based on options
  */
 async function outputResult(original, optimized, options) {
+    // Calculate statistics
+    const originalWords = original.trim().split(/\s+/).length;
+    const optimizedWords = optimized.trim().split(/\s+/).length;
+    const wordDiff = optimizedWords - originalWords;
+    const wordDiffPercent = originalWords > 0 ? ((wordDiff / originalWords) * 100).toFixed(1) : "0";
+    const wordDiffSign = wordDiff > 0 ? "+" : "";
     // Copy to clipboard by default (unless --no-copy is used)
     if (options.copy !== false) {
         try {
             await clipboardy.default.write(optimized);
-            console.error("✓ Copied to clipboard — press Ctrl+V (or Paste) to use the optimized prompt");
             console.error("");
-            console.error("──────────────────────────────────────────────────");
+            console.error(theme.colors.primary("╭─────────────────────────────────────────────────╮"));
+            console.error(theme.colors.primary("│") + theme.colors.success("  ✓ Copied to clipboard!                       ") + theme.colors.primary("│"));
+            console.error(theme.colors.primary("╰─────────────────────────────────────────────────╯"));
+            console.error(theme.colors.dim("  Press ") + theme.colors.accent("Ctrl+V") + theme.colors.dim(" to paste your optimized prompt"));
+            console.error("");
+            console.error(theme.colors.dim("  📊 Stats: ") + theme.colors.info(`${originalWords} → ${optimizedWords} words `) +
+                theme.colors.dim("(") + (wordDiff > 0 ? theme.colors.warning : theme.colors.success)(`${wordDiffSign}${wordDiffPercent}%`) + theme.colors.dim(")"));
+            console.error("");
+            console.error(theme.colors.primary("─".repeat(50)));
             console.error("");
         }
         catch (error) {
             const errMsg = error instanceof Error ? error.message : String(error);
-            console.error(`⚠ Failed to copy to clipboard: ${errMsg}`);
+            console.error(theme.colors.warning(`⚠ Failed to copy to clipboard: ${errMsg}`));
         }
     }
     // If output file specified, write to file
     if (options.output) {
         await fs.writeFile(options.output, optimized, "utf-8");
-        console.error(`✓ Optimized prompt saved to: ${options.output}`);
+        console.error("");
+        console.error(theme.colors.success(`✓ Optimized prompt saved to: `) + theme.colors.highlight(options.output));
+        console.error(theme.colors.dim(`  ${optimizedWords} words • ${optimized.length} characters`));
+        console.error("");
         // Still print to stdout for piping
         if (!options.interactive) {
             console.log(optimized);
@@ -334,19 +365,62 @@ async function outputResult(original, optimized, options) {
     }
     // If interactive mode, show comparison
     if (options.interactive) {
-        console.log("\n" + "=".repeat(50));
-        console.log("ORIGINAL PROMPT:");
-        console.log("=".repeat(50));
-        console.log(original);
-        console.log("\n" + "=".repeat(50));
-        console.log("OPTIMIZED PROMPT:");
-        console.log("=".repeat(50));
-        console.log(optimized);
-        console.log("=".repeat(50) + "\n");
+        const termWidth = process.stdout.columns || 80;
+        const boxWidth = Math.min(termWidth - 4, 100);
+        console.log("");
+        console.log(theme.colors.primary("╭" + "─".repeat(boxWidth - 2) + "╮"));
+        console.log(theme.colors.primary("│") + theme.colors.highlight(" 📝 ORIGINAL PROMPT ".padEnd(boxWidth - 2)) + theme.colors.primary("│"));
+        console.log(theme.colors.primary("╰" + "─".repeat(boxWidth - 2) + "╯"));
+        console.log("");
+        // Word wrap the original prompt
+        const originalLines = wrapText(original, boxWidth - 4);
+        originalLines.forEach(line => {
+            console.log(theme.colors.dim("  ") + theme.colors.secondary(line));
+        });
+        console.log("");
+        console.log(theme.colors.dim("  📊 ") + theme.colors.info(`${originalWords} words`) + theme.colors.dim(" • ") + theme.colors.info(`${original.length} chars`));
+        console.log("");
+        console.log(theme.colors.success("╭" + "─".repeat(boxWidth - 2) + "╮"));
+        console.log(theme.colors.success("│") + theme.colors.highlight(" ✨ OPTIMIZED PROMPT ".padEnd(boxWidth - 2)) + theme.colors.success("│"));
+        console.log(theme.colors.success("╰" + "─".repeat(boxWidth - 2) + "╯"));
+        console.log("");
+        // Word wrap the optimized prompt
+        const optimizedLines = wrapText(optimized, boxWidth - 4);
+        optimizedLines.forEach(line => {
+            console.log(theme.colors.dim("  ") + theme.colors.primary(line));
+        });
+        console.log("");
+        console.log(theme.colors.dim("  📊 ") + theme.colors.info(`${optimizedWords} words`) + theme.colors.dim(" • ") + theme.colors.info(`${optimized.length} chars`) +
+            theme.colors.dim(" • ") + (wordDiff > 0 ? theme.colors.warning : theme.colors.success)(`${wordDiffSign}${wordDiff} words (${wordDiffSign}${wordDiffPercent}%)`));
+        console.log("");
         return;
     }
     // Default: print to stdout (pipeable)
     console.log(optimized);
+    console.error("");
+    console.error(theme.colors.primary("─".repeat(50)));
+    console.error("");
+}
+/**
+ * Simple word wrap utility
+ */
+function wrapText(text, maxWidth) {
+    const words = text.split(/\s+/);
+    const lines = [];
+    let currentLine = "";
+    for (const word of words) {
+        if (currentLine.length + word.length + 1 <= maxWidth) {
+            currentLine += (currentLine ? " " : "") + word;
+        }
+        else {
+            if (currentLine)
+                lines.push(currentLine);
+            currentLine = word;
+        }
+    }
+    if (currentLine)
+        lines.push(currentLine);
+    return lines;
 }
 // Helper function to get available models by provider
 function getModelsByProvider(provider) {
@@ -358,24 +432,24 @@ function getModelsByProvider(provider) {
 async function interactiveConfig() {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     try {
-        console.log("\n╭─────────────────────────────────────╮");
-        console.log("│   MegaBuff Configuration Setup     │");
-        console.log("╰─────────────────────────────────────╯\n");
-        console.log("What would you like to configure?\n");
-        console.log("  1) Set API token for a provider");
-        console.log("  2) Set default provider");
-        console.log("  3) Set model (auto-selects provider)");
-        console.log("  4) View current configuration");
-        console.log("  5) Exit\n");
-        const choice = await rl.question("Enter your choice (1-5): ");
+        console.log(theme.colors.primary("\n╭─────────────────────────────────────╮"));
+        console.log(theme.colors.primary("│") + theme.colors.highlight("   MegaBuff Configuration Setup     ") + theme.colors.primary("│"));
+        console.log(theme.colors.primary("╰─────────────────────────────────────╯\n"));
+        console.log(theme.colors.secondary("What would you like to configure?\n"));
+        console.log(theme.colors.secondary(`  ${chalk.bold("1)")} Set API token for a provider`));
+        console.log(theme.colors.secondary(`  ${chalk.bold("2)")} Set default provider`));
+        console.log(theme.colors.secondary(`  ${chalk.bold("3)")} Set model (auto-selects provider)`));
+        console.log(theme.colors.secondary(`  ${chalk.bold("4)")} View current configuration`));
+        console.log(theme.colors.secondary(`  ${chalk.bold("5)")} Exit\n`));
+        const choice = await rl.question(theme.colors.primary("Enter your choice (1-5): "));
         switch (choice.trim()) {
             case "1": {
                 // Set token
-                console.log("\nSelect provider:\n");
+                console.log(theme.colors.primary("\nSelect provider:\n"));
                 PROVIDERS.forEach((p, idx) => {
-                    console.log(`  ${idx + 1}) ${formatProviderLabel(p)}`);
+                    console.log(theme.colors.secondary(`  ${chalk.bold(idx + 1)}) ${formatProviderLabel(p)}`));
                 });
-                const providerChoice = await rl.question("\nProvider (number or name): ");
+                const providerChoice = await rl.question(theme.colors.primary("\nProvider (number or name): "));
                 const providerNum = Number(providerChoice);
                 let provider;
                 if (Number.isFinite(providerNum) && providerNum >= 1 && providerNum <= PROVIDERS.length) {
@@ -385,30 +459,30 @@ async function interactiveConfig() {
                     provider = normalizeProvider(providerChoice);
                 }
                 if (!provider) {
-                    console.error(`Error: Invalid provider. Valid options: ${PROVIDERS.join(", ")}`);
+                    console.error(theme.colors.error(`Error: Invalid provider. Valid options: ${PROVIDERS.join(", ")}`));
                     process.exit(1);
                 }
-                const token = (await rl.question("Enter your API token: ")).trim();
+                const token = (await rl.question(theme.colors.primary("Enter your API token: "))).trim();
                 if (!token) {
-                    console.error("Error: No token provided");
+                    console.error(theme.colors.error("Error: No token provided"));
                     process.exit(1);
                 }
-                const store = (await rl.question("Store in system keychain? (Y/n): ")).trim().toLowerCase();
+                const store = (await rl.question(theme.colors.primary("Store in system keychain? (Y/n): "))).trim().toLowerCase();
                 const useKeychain = store === "" || store === "y" || store === "yes";
                 await setApiKey(provider, token, useKeychain);
-                console.log(`\n✓ ${provider} token saved${useKeychain ? " securely in system keychain" : " to config file"}`);
+                console.log(theme.colors.success(`\n✓ ${provider} token saved`) + theme.colors.dim(useKeychain ? " securely in system keychain" : " to config file"));
                 if (!useKeychain) {
-                    console.log("  Tip: Run with --keychain flag next time for more secure storage");
+                    console.log(theme.colors.dim("  Tip: Run with --keychain flag next time for more secure storage"));
                 }
                 break;
             }
             case "2": {
                 // Set default provider
-                console.log("\nSelect default provider:\n");
+                console.log(theme.colors.primary("\nSelect default provider:\n"));
                 PROVIDERS.forEach((p, idx) => {
-                    console.log(`  ${idx + 1}) ${formatProviderLabel(p)}`);
+                    console.log(theme.colors.secondary(`  ${chalk.bold(idx + 1)}) ${formatProviderLabel(p)}`));
                 });
-                const providerChoice = await rl.question("\nProvider (number or name): ");
+                const providerChoice = await rl.question(theme.colors.primary("\nProvider (number or name): "));
                 const providerNum = Number(providerChoice);
                 let provider;
                 if (Number.isFinite(providerNum) && providerNum >= 1 && providerNum <= PROVIDERS.length) {
@@ -418,38 +492,38 @@ async function interactiveConfig() {
                     provider = normalizeProvider(providerChoice);
                 }
                 if (!provider) {
-                    console.error(`Error: Invalid provider. Valid options: ${PROVIDERS.join(", ")}`);
+                    console.error(theme.colors.error(`Error: Invalid provider. Valid options: ${PROVIDERS.join(", ")}`));
                     process.exit(1);
                 }
                 await setProvider(provider);
-                console.log(`\n✓ Default provider set to: ${provider}`);
+                console.log(theme.colors.success(`\n✓ Default provider set to: `) + theme.colors.highlight(provider));
                 break;
             }
             case "3": {
                 // Set model (auto-selects provider)
-                console.log("\nAvailable models by provider:\n");
+                console.log(theme.colors.primary("\nAvailable models by provider:\n"));
                 PROVIDERS.forEach((provider) => {
                     const models = getModelsByProvider(provider);
                     if (models.length > 0) {
-                        console.log(`${formatProviderName(provider)}:`);
-                        models.forEach(model => console.log(`  - ${model}`));
+                        console.log(theme.colors.warning(`${formatProviderName(provider)}:`));
+                        models.forEach(model => console.log(theme.colors.secondary(`  - ${model}`)));
                         console.log();
                     }
                 });
-                const modelInput = (await rl.question("Enter model name: ")).trim();
+                const modelInput = (await rl.question(theme.colors.primary("Enter model name: "))).trim();
                 if (!modelInput) {
-                    console.error("Error: No model provided");
+                    console.error(theme.colors.error("Error: No model provided"));
                     process.exit(1);
                 }
                 const provider = getProviderForModel(modelInput);
                 if (!provider) {
-                    console.error(`Error: Unknown model '${modelInput}'`);
-                    console.error("Tip: Use one of the models listed above");
+                    console.error(theme.colors.error(`Error: Unknown model '${modelInput}'`));
+                    console.error(theme.colors.warning("Tip: Use one of the models listed above"));
                     process.exit(1);
                 }
                 await setModel(modelInput);
-                console.log(`\n✓ Model set to: ${modelInput}`);
-                console.log(`✓ Provider auto-set to: ${provider}`);
+                console.log(theme.colors.success(`\n✓ Model set to: `) + theme.colors.highlight(modelInput));
+                console.log(theme.colors.success(`✓ Provider auto-set to: `) + theme.colors.highlight(provider));
                 break;
             }
             case "4": {
@@ -458,26 +532,29 @@ async function interactiveConfig() {
                 const currentProvider = await getProvider();
                 const currentModel = await getModel();
                 const effectiveModel = currentModel ?? getDefaultModel(currentProvider);
+                const currentThemeName = await getThemeName();
+                const currentTheme = themes[currentThemeName];
                 const providerStatuses = await Promise.all(PROVIDERS.map(async (p) => [p, await hasApiKey(p)]));
-                console.log("\n╭─────────────────────────────────────╮");
-                console.log("│      Current Configuration          │");
-                console.log("╰─────────────────────────────────────╯\n");
-                console.log(`Provider: ${currentProvider}`);
-                console.log(`Model: ${currentModel ? effectiveModel : `${effectiveModel} (default for provider)`}`);
-                console.log(`Storage: ${config.useKeychain ? "System Keychain" : "Config File"}`);
-                console.log("\nAPI Tokens:");
+                console.log(theme.colors.primary("\n╭─────────────────────────────────────╮"));
+                console.log(theme.colors.primary("│") + theme.colors.highlight("      Current Configuration          ") + theme.colors.primary("│"));
+                console.log(theme.colors.primary("╰─────────────────────────────────────╯\n"));
+                console.log(theme.colors.secondary(`Provider: `) + theme.colors.highlight(currentProvider));
+                console.log(theme.colors.secondary(`Model: `) + theme.colors.highlight(currentModel ? effectiveModel : `${effectiveModel}`) + theme.colors.dim(currentModel ? "" : " (default for provider)"));
+                console.log(theme.colors.secondary(`Storage: `) + theme.colors.highlight(config.useKeychain ? "System Keychain" : "Config File"));
+                console.log(theme.colors.secondary(`Theme: `) + theme.colors.highlight(currentTheme.name));
+                console.log(theme.colors.secondary("\nAPI Tokens:"));
                 for (const [p, ok] of providerStatuses) {
-                    console.log(`  ${p}: ${ok ? "✓ Configured" : "✗ Not configured"}`);
+                    console.log(`  ${theme.colors.secondary(p)}: ${ok ? theme.colors.success("✓ Configured") : theme.colors.dim("✗ Not configured")}`);
                 }
-                console.log(`\nConfig file: ~/.megabuff/config.json`);
+                console.log(theme.colors.dim(`\nConfig file: ~/.megabuff/config.json`));
                 break;
             }
             case "5": {
-                console.log("\nExiting...");
+                console.log(theme.colors.primary("\nExiting..."));
                 break;
             }
             default: {
-                console.error("Invalid choice. Please enter 1-5.");
+                console.error(theme.colors.error("Invalid choice. Please enter 1-5."));
                 process.exit(1);
             }
         }
@@ -496,11 +573,15 @@ const configCmd = program
         await interactiveConfig();
     }
     else {
-        console.error("Error: Interactive mode requires a TTY. Use subcommands instead:");
-        console.error("  megabuff config token <token> --provider <provider>");
-        console.error("  megabuff config provider <provider>");
-        console.error("  megabuff config model <model>");
-        console.error("  megabuff config show");
+        console.error("");
+        console.error(theme.colors.error("❌ Error: ") + theme.colors.warning("Interactive mode requires a TTY"));
+        console.error("");
+        console.error(theme.colors.dim("   Use these subcommands instead:"));
+        console.error(theme.colors.accent("     megabuff config token <token> --provider <provider>"));
+        console.error(theme.colors.accent("     megabuff config provider <provider>"));
+        console.error(theme.colors.accent("     megabuff config model <model>"));
+        console.error(theme.colors.accent("     megabuff config show"));
+        console.error("");
         process.exit(1);
     }
 });
@@ -514,38 +595,55 @@ configCmd
     try {
         const provider = normalizeProvider(options.provider);
         if (!provider) {
-            console.error(`Error: Invalid provider '${options.provider}'. Valid options: ${PROVIDERS.join(", ")}`);
+            console.error("");
+            console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(`Invalid provider '${options.provider}'`));
+            console.error("");
+            console.error(theme.colors.dim("   Valid providers: ") + theme.colors.info(PROVIDERS.join(", ")));
+            console.error("");
             process.exit(1);
         }
         let finalToken = token;
         if (!finalToken) {
             if (!process.stdin.isTTY) {
-                console.error("Error: Missing token argument. Provide it inline or run in an interactive terminal.");
+                console.error("");
+                console.error(theme.colors.error("❌ Error: ") + theme.colors.warning("Missing token argument"));
+                console.error("");
+                console.error(theme.colors.dim("   Provide it inline or run in an interactive terminal"));
+                console.error("");
                 process.exit(1);
             }
             const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
             try {
-                finalToken = (await rl.question("Enter your API token: ")).trim();
+                finalToken = (await rl.question(theme.colors.primary("🔑 Enter your API token: "))).trim();
             }
             finally {
                 rl.close();
             }
         }
         if (!finalToken) {
-            console.error("Error: No token provided");
+            console.error("");
+            console.error(theme.colors.error("❌ Error: ") + theme.colors.warning("No token provided"));
+            console.error("");
             process.exit(1);
         }
         await setApiKey(provider, finalToken, options.keychain || false);
+        console.error("");
         if (options.keychain) {
-            console.log(`✓ ${provider} token saved securely in system keychain`);
+            console.log(theme.colors.success(`✓ ${formatProviderName(provider)} token saved securely! 🔐`));
+            console.log(theme.colors.dim("  Stored in system keychain for maximum security"));
         }
         else {
-            console.log(`✓ ${provider} token saved to config file`);
-            console.log("  Tip: Use --keychain flag for more secure storage");
+            console.log(theme.colors.success(`✓ ${formatProviderName(provider)} token saved! 💾`));
+            console.log(theme.colors.dim("  Stored in ") + theme.colors.accent("~/.megabuff/config.json"));
+            console.log("");
+            console.log(theme.colors.info("  💡 Tip: ") + theme.colors.dim("Use ") + theme.colors.accent("--keychain") + theme.colors.dim(" flag for more secure storage"));
         }
+        console.error("");
     }
     catch (error) {
-        console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+        console.error("");
+        console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(error instanceof Error ? error.message : String(error)));
+        console.error("");
         process.exit(1);
     }
 });
@@ -557,19 +655,33 @@ configCmd
     try {
         if (!providerArg) {
             const p = await getProvider();
-            console.log(`Default provider: ${p}`);
+            const providerEmoji = p === "openai" ? "🤖" : p === "anthropic" ? "🧠" : p === "google" ? "✨" : "🔧";
+            console.log("");
+            console.log(theme.colors.dim("  Current default provider:"));
+            console.log(theme.colors.primary(`  ${providerEmoji} `) + theme.colors.highlight(formatProviderName(p)));
+            console.log("");
             return;
         }
         const p = normalizeProvider(providerArg);
         if (!p) {
-            console.error(`Error: Invalid provider '${providerArg}'. Valid options: ${PROVIDERS.join(", ")}`);
+            console.error("");
+            console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(`Invalid provider '${providerArg}'`));
+            console.error("");
+            console.error(theme.colors.dim("   Valid providers: ") + theme.colors.info(PROVIDERS.join(", ")));
+            console.error("");
             process.exit(1);
         }
         await setProvider(p);
-        console.log(`✓ Default provider set to: ${p}`);
+        const providerEmoji = p === "openai" ? "🤖" : p === "anthropic" ? "🧠" : p === "google" ? "✨" : "🔧";
+        console.log("");
+        console.log(theme.colors.success(`✓ Default provider updated!`));
+        console.log(theme.colors.dim("  Now using: ") + theme.colors.highlight(`${providerEmoji} ${formatProviderName(p)}`));
+        console.log("");
     }
     catch (error) {
-        console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+        console.error("");
+        console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(error instanceof Error ? error.message : String(error)));
+        console.error("");
         process.exit(1);
     }
 });
@@ -583,29 +695,44 @@ configCmd
             const m = await getModel();
             const p = await getProvider();
             const effectiveModel = m ?? getDefaultModel(p);
-            console.log(`Current model: ${m ? effectiveModel : `${effectiveModel} (default for provider)`}`);
-            console.log(`Current provider: ${p}`);
+            const providerEmoji = p === "openai" ? "🤖" : p === "anthropic" ? "🧠" : p === "google" ? "✨" : "🔧";
+            console.log("");
+            console.log(theme.colors.dim("  Current configuration:"));
+            console.log(theme.colors.primary(`  ${providerEmoji} Model: `) + theme.colors.highlight(effectiveModel) + theme.colors.dim(m ? "" : " (default)"));
+            console.log(theme.colors.dim(`     Provider: `) + theme.colors.info(formatProviderName(p)));
+            console.log("");
             return;
         }
         const provider = getProviderForModel(modelArg);
         if (!provider) {
-            console.error(`Error: Unknown model '${modelArg}'`);
-            console.error("\nAvailable models:");
+            console.error("");
+            console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(`Unknown model '${modelArg}'`));
+            console.error("");
+            console.error(theme.colors.dim("   Available models:"));
+            console.error("");
             PROVIDERS.forEach(p => {
                 const models = getModelsByProvider(p);
                 if (models.length > 0) {
-                    console.error(`\n${formatProviderName(p)}:`);
-                    models.forEach(m => console.error(`  - ${m}`));
+                    const providerEmoji = p === "openai" ? "🤖" : p === "anthropic" ? "🧠" : p === "google" ? "✨" : "🔧";
+                    console.error(theme.colors.primary(`   ${providerEmoji} ${formatProviderName(p)}:`));
+                    models.forEach(m => console.error(theme.colors.dim(`      • `) + theme.colors.info(m)));
+                    console.error("");
                 }
             });
             process.exit(1);
         }
         await setModel(modelArg);
-        console.log(`✓ Model set to: ${modelArg}`);
-        console.log(`✓ Provider auto-set to: ${provider}`);
+        const providerEmoji = provider === "openai" ? "🤖" : provider === "anthropic" ? "🧠" : provider === "google" ? "✨" : "🔧";
+        console.log("");
+        console.log(theme.colors.success(`✓ Configuration updated!`));
+        console.log(theme.colors.dim("  Model: ") + theme.colors.highlight(modelArg));
+        console.log(theme.colors.dim("  Provider: ") + theme.colors.highlight(`${providerEmoji} ${formatProviderName(provider)}`));
+        console.log("");
     }
     catch (error) {
-        console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+        console.error("");
+        console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(error instanceof Error ? error.message : String(error)));
+        console.error("");
         process.exit(1);
     }
 });
@@ -618,19 +745,34 @@ configCmd
         const selectedProvider = await getProvider();
         const selectedModel = await getModel();
         const effectiveModel = selectedModel ?? getDefaultModel(selectedProvider);
+        const currentThemeName = await getThemeName();
+        const currentTheme = themes[currentThemeName];
         const providerStatuses = await Promise.all(PROVIDERS.map(async (p) => [p, await hasApiKey(p)]));
-        console.log("Current configuration:");
-        console.log(`  Provider: ${selectedProvider}`);
-        console.log(`  Model: ${selectedModel ? effectiveModel : `${effectiveModel} (default for provider)`}`);
-        console.log(`  Storage: ${config.useKeychain ? "System Keychain" : "Config File"}`);
-        console.log("\nAPI Tokens:");
+        const providerEmoji = selectedProvider === "openai" ? "🤖" : selectedProvider === "anthropic" ? "🧠" : selectedProvider === "google" ? "✨" : "🔧";
+        console.log("");
+        console.log(theme.colors.primary("╭────────────────────────────────────────────╮"));
+        console.log(theme.colors.primary("│") + theme.colors.highlight("  ⚙️  MegaBuff Configuration              ") + theme.colors.primary("│"));
+        console.log(theme.colors.primary("╰────────────────────────────────────────────╯"));
+        console.log("");
+        console.log(theme.colors.dim("  Active Settings:"));
+        console.log(theme.colors.primary(`  ${providerEmoji} Provider: `) + theme.colors.highlight(formatProviderName(selectedProvider)));
+        console.log(theme.colors.primary(`  🎯 Model: `) + theme.colors.highlight(effectiveModel) + theme.colors.dim(selectedModel ? "" : " (default)"));
+        console.log(theme.colors.primary(`  💾 Storage: `) + theme.colors.highlight(config.useKeychain ? "System Keychain 🔐" : "Config File"));
+        console.log(theme.colors.primary(`  🎨 Theme: `) + theme.colors.highlight(currentTheme.name));
+        console.log("");
+        console.log(theme.colors.dim("  API Token Status:"));
         for (const [p, ok] of providerStatuses) {
-            console.log(`  ${p}: ${ok ? "✓ Configured" : "✗ Not configured"}`);
+            const emoji = p === "openai" ? "🤖" : p === "anthropic" ? "🧠" : p === "google" ? "✨" : "🔧";
+            console.log(`  ${emoji} ${theme.colors.secondary(formatProviderName(p).padEnd(16))}: ${ok ? theme.colors.success("✓ Configured") : theme.colors.dim("✗ Not configured")}`);
         }
-        console.log(`\nConfig location: ~/.megabuff/config.json`);
+        console.log("");
+        console.log(theme.colors.dim("  📁 Config location: ") + theme.colors.accent("~/.megabuff/config.json"));
+        console.log("");
     }
     catch (error) {
-        console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+        console.error("");
+        console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(error instanceof Error ? error.message : String(error)));
+        console.error("");
         process.exit(1);
     }
 });
@@ -642,10 +784,190 @@ configCmd
     try {
         const provider = await getProvider(options.provider);
         await removeApiKey(provider);
-        console.log(`✓ ${provider} token removed from config and keychain`);
+        console.log("");
+        console.log(theme.colors.success(`✓ ${formatProviderName(provider)} token removed successfully! 🗑️`));
+        console.log(theme.colors.dim("  Cleared from config file and system keychain"));
+        console.log("");
     }
     catch (error) {
-        console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+        console.error("");
+        console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(error instanceof Error ? error.message : String(error)));
+        console.error("");
+        process.exit(1);
+    }
+});
+// Theme command
+const themeCmd = program
+    .command("theme")
+    .description("Manage color themes")
+    .action(async () => {
+    // Show current theme when no subcommand
+    const currentThemeName = await getThemeName();
+    const currentTheme = themes[currentThemeName];
+    const { colors } = currentTheme;
+    console.log("");
+    console.log(theme.colors.primary("╭────────────────────────────────────────────╮"));
+    console.log(theme.colors.primary("│") + theme.colors.highlight("  🎨 Current Theme                       ") + theme.colors.primary("│"));
+    console.log(theme.colors.primary("╰────────────────────────────────────────────╯"));
+    console.log("");
+    console.log(theme.colors.primary(`  Theme: `) + theme.colors.highlight(currentTheme.name));
+    console.log(theme.colors.dim(`  ${currentTheme.description}`));
+    console.log("");
+    console.log(theme.colors.dim("  Color preview:"));
+    const preview = [
+        colors.primary("primary"),
+        colors.success("success"),
+        colors.error("error"),
+        colors.warning("warning"),
+        colors.info("info"),
+        colors.accent("accent")
+    ].join(" ");
+    console.log(`  ${preview}`);
+    console.log("");
+    console.log(theme.colors.dim("  💡 Commands:"));
+    console.log(theme.colors.accent("     megabuff theme list") + theme.colors.dim(" - See all themes"));
+    console.log(theme.colors.accent("     megabuff theme set <name>") + theme.colors.dim(" - Change theme"));
+    console.log("");
+});
+themeCmd
+    .command("list")
+    .description("List all available themes")
+    .action(async () => {
+    const currentTheme = await getThemeName();
+    const themeNames = getAllThemeNames();
+    console.log("");
+    console.log(theme.colors.primary("╭────────────────────────────────────────────────────────────────────╮"));
+    console.log(theme.colors.primary("│") + theme.colors.highlight("  🎨 Available Themes                                             ") + theme.colors.primary("│"));
+    console.log(theme.colors.primary("╰────────────────────────────────────────────────────────────────────╯"));
+    console.log("");
+    for (const themeName of themeNames) {
+        const t = themes[themeName];
+        const isCurrent = themeName === currentTheme;
+        const { colors } = t;
+        // Theme name with indicator if current
+        if (isCurrent) {
+            console.log(colors.success(`  ● ${t.name}`) + theme.colors.dim(" ⭐ (active)"));
+        }
+        else {
+            console.log(colors.primary(`    ${t.name}`));
+        }
+        console.log(colors.dim(`    ${t.description}`));
+        // Show color preview
+        const preview = [
+            colors.primary("primary"),
+            colors.success("success"),
+            colors.error("error"),
+            colors.warning("warning"),
+            colors.info("info"),
+            colors.accent("accent")
+        ].join(" ");
+        console.log(`    ${preview}`);
+        console.log();
+    }
+    console.log(theme.colors.dim(`  To change theme: `) + theme.colors.accent(`megabuff theme set <theme-name>`));
+    console.log(theme.colors.dim(`  To preview theme: `) + theme.colors.accent(`megabuff theme preview <theme-name>`));
+    console.log("");
+});
+themeCmd
+    .command("set")
+    .description("Set the active theme")
+    .argument("<theme>", "Theme name")
+    .action(async (themeName) => {
+    try {
+        const normalizedTheme = themeName.toLowerCase();
+        if (!isValidTheme(normalizedTheme)) {
+            console.error("");
+            console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(`Unknown theme '${themeName}'`));
+            console.error("");
+            console.error(theme.colors.dim("   Available themes:"));
+            getAllThemeNames().forEach(name => {
+                console.error(theme.colors.info(`     • ${name}`));
+            });
+            console.error("");
+            process.exit(1);
+        }
+        await setThemeName(normalizedTheme);
+        clearThemeCache(); // Clear cache so next command uses new theme
+        const newTheme = themes[normalizedTheme];
+        const { colors } = newTheme;
+        console.log("");
+        console.log(colors.success(`✓ Theme changed successfully! 🎨`));
+        console.log(colors.dim(`  Now using: `) + colors.highlight(newTheme.name));
+        console.log(colors.dim(`  ${newTheme.description}`));
+        // Show preview
+        console.log("");
+        console.log(colors.dim("  Color preview:"));
+        const preview = [
+            colors.primary("primary"),
+            colors.success("success"),
+            colors.error("error"),
+            colors.warning("warning"),
+            colors.info("info"),
+            colors.accent("accent")
+        ].join(" ");
+        console.log(`  ${preview}`);
+        console.log("");
+    }
+    catch (error) {
+        console.error("");
+        console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(error instanceof Error ? error.message : String(error)));
+        console.error("");
+        process.exit(1);
+    }
+});
+themeCmd
+    .command("preview")
+    .description("Preview a theme without setting it")
+    .argument("<theme>", "Theme name to preview")
+    .action(async (themeName) => {
+    try {
+        const normalizedTheme = themeName.toLowerCase();
+        if (!isValidTheme(normalizedTheme)) {
+            console.error("");
+            console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(`Unknown theme '${themeName}'`));
+            console.error("");
+            console.error(theme.colors.dim("   Available themes:"));
+            getAllThemeNames().forEach(name => {
+                console.error(theme.colors.info(`     • ${name}`));
+            });
+            console.error("");
+            process.exit(1);
+        }
+        const previewTheme = themes[normalizedTheme];
+        const { colors } = previewTheme;
+        console.log("");
+        console.log(colors.primary("╭────────────────────────────────────────────────────────╮"));
+        console.log(colors.primary("│") + colors.highlight(`  🎨 ${previewTheme.name} Theme Preview                   `.padEnd(55)) + colors.primary("│"));
+        console.log(colors.primary("╰────────────────────────────────────────────────────────╯"));
+        console.log("");
+        console.log(colors.dim(`  ${previewTheme.description}`));
+        console.log("");
+        console.log(colors.dim("  Color Palette:"));
+        console.log("");
+        console.log(colors.primary("  ● Primary text and headings"));
+        console.log(colors.secondary("  ● Secondary text and descriptions"));
+        console.log(colors.success("  ✓ Success messages and confirmations"));
+        console.log(colors.error("  ✗ Error messages and warnings"));
+        console.log(colors.warning("  ⚠ Warning and important notes"));
+        console.log(colors.info("  ℹ Info messages and details"));
+        console.log(colors.highlight("  ★ Highlighted and emphasized text"));
+        console.log(colors.accent("  ◆ Accent colors and special elements"));
+        console.log(colors.dim("  ○ Dimmed and secondary information"));
+        console.log("");
+        const currentTheme = await getThemeName();
+        if (currentTheme !== normalizedTheme) {
+            console.log(colors.dim("  To activate this theme: ") + colors.accent(`megabuff theme set ${normalizedTheme}`));
+            console.log("");
+        }
+        else {
+            console.log(colors.success("  ⭐ This is your current active theme!"));
+            console.log("");
+        }
+    }
+    catch (error) {
+        console.error("");
+        console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(error instanceof Error ? error.message : String(error)));
+        console.error("");
         process.exit(1);
     }
 });
@@ -669,7 +991,10 @@ program
         });
         const original = await getInput(inlinePrompt, options);
         if (!original.trim()) {
-            console.error("Error: No prompt provided");
+            console.error("");
+            console.error(theme.colors.error("❌ Error: ") + theme.colors.warning("No prompt provided"));
+            console.error(theme.colors.dim("   Provide a prompt inline, via --file, or through stdin"));
+            console.error("");
             process.exit(1);
         }
         let provider = await getProvider(options.provider);
@@ -688,16 +1013,23 @@ program
             debugLog("token.resolved.afterFirstRun", { provider, source, token: maskSecret(apiKey) });
         }
         if (!apiKey) {
-            throw new Error(`No token configured for provider '${provider}'. ` +
-                `Run: megabuff config set --provider ${provider} <token> ` +
-                `or set the appropriate environment variable.`);
+            console.error("");
+            console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(`No API key configured for ${formatProviderName(provider)}`));
+            console.error("");
+            console.error(theme.colors.dim("   Configure your API key using:"));
+            console.error(theme.colors.accent(`   megabuff config set --provider ${provider} <your-api-key>`));
+            console.error("");
+            console.error(theme.colors.dim("   Or set an environment variable for this provider"));
+            console.error("");
+            process.exit(1);
         }
         // Get the configured model (if any) for this provider
         const configuredModel = await getModel();
         const modelToUse = configuredModel && getProviderForModel(configuredModel) === provider ? configuredModel : undefined;
         debugLog("model.selected", { configuredModel, modelToUse, provider });
         // Route to the appropriate provider's optimization function
-        const spinner = createSpinner(`Optimizing with ${formatProviderName(provider)}${modelToUse ? ` (${modelToUse})` : ""}...`);
+        const providerEmoji = provider === "openai" ? "🤖" : provider === "anthropic" ? "🧠" : "✨";
+        const spinner = createSpinner(`${providerEmoji} Optimizing your prompt with ${formatProviderName(provider)}${modelToUse ? ` (${modelToUse})` : ""}...`);
         spinner.start();
         let optimized;
         const t0 = Date.now();
@@ -712,21 +1044,28 @@ program
                 optimized = await optimizePromptGemini(original, apiKey, modelToUse);
             }
             else {
-                throw new Error(`Provider '${provider}' is not supported yet in optimize. ` +
-                    `Supported providers: openai, anthropic, google`);
+                console.error("");
+                console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(`Provider '${provider}' is not supported for optimization`));
+                console.error("");
+                console.error(theme.colors.dim("   Supported providers: ") + theme.colors.info("openai, anthropic, google"));
+                console.error("");
+                process.exit(1);
             }
+            const duration = ((Date.now() - t0) / 1000).toFixed(1);
             debugLog("optimize.done", { provider, ms: Date.now() - t0, optimizedLength: optimized.length });
-            spinner.stop(`✓ Optimized with ${formatProviderName(provider)}`);
+            spinner.stop(`✨ Optimization complete in ${duration}s!`);
         }
         catch (e) {
             debugLog("optimize.error", { provider, ms: Date.now() - t0, error: e instanceof Error ? e.message : String(e) });
-            spinner.fail(`✗ Optimization failed (${formatProviderName(provider)})`);
+            spinner.fail(`💥 Optimization failed with ${formatProviderName(provider)}`);
             throw e;
         }
         await outputResult(original, optimized, options);
     }
     catch (error) {
-        console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+        console.error("");
+        console.error(theme.colors.error("❌ Error: ") + theme.colors.warning(error instanceof Error ? error.message : String(error)));
+        console.error("");
         process.exit(1);
     }
 });