@dastageer_44/eco-code 1.1.0 → 1.2.0

package/dist/index.js

@@ -12,12 +12,14 @@ import * as readline from 'readline';
 import * as p from '@clack/prompts';
 import chalk from 'chalk';
 import ora from 'ora';
+import OpenAI from 'openai';
 import { ConfigManager } from './config.js';
 import { OpenRouterService } from './services/openrouter.js';
 import { AgentHarness } from './harness/agent.js';
 import { printBanner, printHelp } from './ui/banner.js';
+import { renderMarkdown } from './ui/markdown.js';
 import { runCommand } from './tools/shell-ops.js';
-import { checkAndPromptUpdate } from './services/updater.js';
+import { checkAndPromptUpdate, triggerManualUpdate } from './services/updater.js';
 const SPINNER_VERBS = [
     'Thinking', 'Reasoning', 'Analyzing', 'Synthesizing',
     'Drafting', 'Evaluating', 'Planning', 'Processing'
@@ -30,89 +32,243 @@ function getPackageVersion() {
         const pkgPath = path.resolve(path.dirname(new URL(import.meta.url).pathname.replace(/^\/([A-Z]:)/, '$1')), '../package.json');
         if (fs.existsSync(pkgPath)) {
             const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-            return pkg.version || '1.0.0';
+            return pkg.version || '1.2.0';
         }
     }
     catch { }
-    return '1.0.0';
+    return '1.2.0';
 }
 const config = new ConfigManager();
 /**
- * Robust Readline Prompt Manager that stays alive on Windows/macOS/Linux
- * and catches instant '/' keypress without requiring Enter.
+ * Antigravity-style Interactive Terminal Prompt
+ * Listens to raw keypress events immediately on Windows, macOS, and Linux.
+ * When the user types '/', it pops open a live autocomplete dropdown directly under the prompt line.
  */
 class PromptManager {
-    rl;
+    sigintCount = 0;
+    isPaused = false;
     constructor() {
-        this.rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-            terminal: true,
-        });
+        readline.emitKeypressEvents(process.stdin);
     }
-    ask(promptStr) {
+    ask(promptPrefix, getStats) {
         return new Promise((resolve) => {
-            this.rl.resume();
-            const onData = (chunk) => {
-                const str = chunk.toString();
-                // If line is empty and user pressed '/', trigger instant slash menu
-                if (this.rl.line.trim() === '' && str === '/') {
-                    process.stdin.removeListener('data', onData);
-                    readline.clearLine(process.stdout, 0);
+            const stats = getStats ? getStats() : null;
+            let compactDesc = 'Compact conversation history';
+            if (stats) {
+                compactDesc = `Compact history ${chalk.dim(stats.progressBar)} ${chalk.green(`${stats.percentage}% used`)}`;
+                if (stats.isCritical) {
+                    compactDesc = `Compact history ${chalk.red.bold(stats.progressBar)} ${chalk.red.bold(`${stats.percentage}% used (⚠️ Recommended)`)}`;
+                }
+            }
+            const allCommands = [
+                { value: '/plan', name: '/plan', desc: '📝 Toggle between Plan Mode and Auto Mode' },
+                { value: '/models', name: '/models', desc: 'Browse & switch free AI models' },
+                { value: '/compact', name: '/compact', desc: compactDesc },
+                { value: '/resume', name: '/resume', desc: 'Restore previous session context' },
+                { value: '/undo', name: '/undo', desc: '🗑️ Discard all uncommitted code changes' },
+                { value: '/rewind', name: '/rewind', desc: '⏪ Undo the last Git commit (git reset HEAD~1)' },
+                { value: '/refresh', name: '/refresh', desc: 'Check for latest free models' },
+                { value: '/taste', name: '/taste', desc: 'View or add project coding style rules' },
+                { value: '/key', name: '/key', desc: 'Update OpenRouter API Key' },
+                { value: '/clear', name: '/clear', desc: 'Reset conversation history' },
+                { value: '/update', name: '/update', desc: '🔄 Check for and install CLI updates' },
+                { value: '/help', name: '/help', desc: 'Show help summary' },
+                { value: '/exit', name: '/exit', desc: 'Quit the agent' },
+            ];
+            const wasRaw = process.stdin.isRaw;
+            if (process.stdin.setRawMode)
+                process.stdin.setRawMode(true);
+            process.stdin.resume();
+            let buffer = '';
+            let cursorPos = 0;
+            let selectedIndex = 0;
+            let renderedDropdownLines = 0;
+            const render = () => {
+                if (this.isPaused)
+                    return;
+                // 1. Erase previously rendered dropdown lines below
+                if (renderedDropdownLines > 0) {
                     readline.cursorTo(process.stdout, 0);
-                    this.rl.pause();
-                    resolve('/');
+                    for (let i = 0; i < renderedDropdownLines; i++) {
+                        process.stdout.write('\x1b[1B\x1b[2K');
+                    }
+                    process.stdout.write(`\x1b[${renderedDropdownLines}A`);
                 }
+                // 2. Erase prompt line and re-render prompt + buffer
+                readline.cursorTo(process.stdout, 0);
+                process.stdout.write('\x1b[2K');
+                process.stdout.write(promptPrefix + buffer);
+                renderedDropdownLines = 0;
+                // 3. If buffer starts with '/', render live dropdown beneath
+                if (buffer.startsWith('/')) {
+                    const query = buffer.slice(1).toLowerCase().trim();
+                    const filtered = allCommands.filter((c) => c.name.toLowerCase().includes(query) || c.desc.toLowerCase().includes(query));
+                    if (selectedIndex >= filtered.length) {
+                        selectedIndex = Math.max(0, filtered.length - 1);
+                    }
+                    const lines = [];
+                    lines.push(`  ${chalk.dim('─'.repeat(55))}`);
+                    if (filtered.length === 0) {
+                        lines.push(`  ${chalk.dim('(no matching commands)')}`);
+                    }
+                    else {
+                        filtered.slice(0, 7).forEach((cmd, idx) => {
+                            const isSelected = idx === selectedIndex;
+                            const pointer = isSelected ? chalk.cyan('❯') : ' ';
+                            const nameStr = isSelected ? chalk.cyan.bold(cmd.name.padEnd(10)) : chalk.white(cmd.name.padEnd(10));
+                            const descStr = isSelected ? chalk.white(cmd.desc) : chalk.dim(cmd.desc);
+                            lines.push(`  ${pointer} ${nameStr} ${chalk.dim('—')} ${descStr}`);
+                        });
+                    }
+                    lines.push(`  ${chalk.dim('↑/↓ Navigate · enter Select · tab Complete · esc to cancel')}`);
+                    process.stdout.write('\n' + lines.join('\n'));
+                    renderedDropdownLines = lines.length;
+                    // Move cursor back up to prompt line
+                    process.stdout.write(`\x1b[${renderedDropdownLines}A`);
+                }
+                // 4. Position cursor accurately on prompt line
+                const visiblePrompt = promptPrefix.replace(/\x1b\[[0-9;]*m/g, '');
+                readline.cursorTo(process.stdout, visiblePrompt.length + cursorPos);
             };
-            process.stdin.on('data', onData);
-            this.rl.question(promptStr, (answer) => {
-                process.stdin.removeListener('data', onData);
-                resolve(answer);
-            });
+            const cleanup = () => {
+                process.stdin.removeListener('keypress', onKeypress);
+                if (renderedDropdownLines > 0) {
+                    readline.cursorTo(process.stdout, 0);
+                    for (let i = 0; i < renderedDropdownLines; i++) {
+                        process.stdout.write('\x1b[1B\x1b[2K');
+                    }
+                    process.stdout.write(`\x1b[${renderedDropdownLines}A`);
+                    readline.cursorTo(process.stdout, 0);
+                }
+                if (process.stdin.setRawMode && !wasRaw) {
+                    process.stdin.setRawMode(false);
+                }
+            };
+            const onKeypress = (str, key) => {
+                if (this.isPaused)
+                    return;
+                if (key) {
+                    if (key.ctrl && key.name === 'c') {
+                        this.sigintCount++;
+                        if (this.sigintCount >= 3) {
+                            cleanup();
+                            console.log('\nHappy coding! 👋');
+                            process.exit(0);
+                        }
+                        else {
+                            cleanup();
+                            console.log(`\n${chalk.yellow(`(Press Ctrl+C ${3 - this.sigintCount} more time(s) to exit)`)}`);
+                            process.stdout.write('\n');
+                            resolve('');
+                            return;
+                        }
+                    }
+                    if (key.name === 'return' || key.name === 'enter') {
+                        let finalVal = buffer.trim();
+                        if (buffer.startsWith('/')) {
+                            const query = buffer.slice(1).toLowerCase().trim();
+                            const filtered = allCommands.filter((c) => c.name.toLowerCase().includes(query) || c.desc.toLowerCase().includes(query));
+                            if (filtered.length > 0) {
+                                finalVal = filtered[selectedIndex].value;
+                            }
+                        }
+                        cleanup();
+                        process.stdout.write('\n');
+                        this.sigintCount = 0;
+                        resolve(finalVal);
+                        return;
+                    }
+                    if (key.name === 'up' && buffer.startsWith('/')) {
+                        const query = buffer.slice(1).toLowerCase().trim();
+                        const filtered = allCommands.filter((c) => c.name.toLowerCase().includes(query) || c.desc.toLowerCase().includes(query));
+                        if (filtered.length > 0) {
+                            selectedIndex = (selectedIndex - 1 + filtered.length) % filtered.length;
+                            render();
+                        }
+                        return;
+                    }
+                    if (key.name === 'down' && buffer.startsWith('/')) {
+                        const query = buffer.slice(1).toLowerCase().trim();
+                        const filtered = allCommands.filter((c) => c.name.toLowerCase().includes(query) || c.desc.toLowerCase().includes(query));
+                        if (filtered.length > 0) {
+                            selectedIndex = (selectedIndex + 1) % filtered.length;
+                            render();
+                        }
+                        return;
+                    }
+                    if (key.name === 'tab' && buffer.startsWith('/')) {
+                        const query = buffer.slice(1).toLowerCase().trim();
+                        const filtered = allCommands.filter((c) => c.name.toLowerCase().includes(query) || c.desc.toLowerCase().includes(query));
+                        if (filtered.length > 0) {
+                            buffer = filtered[selectedIndex].name;
+                            cursorPos = buffer.length;
+                            render();
+                        }
+                        return;
+                    }
+                    if (key.name === 'escape') {
+                        buffer = '';
+                        cursorPos = 0;
+                        selectedIndex = 0;
+                        render();
+                        return;
+                    }
+                    if (key.name === 'backspace') {
+                        if (cursorPos > 0) {
+                            buffer = buffer.slice(0, cursorPos - 1) + buffer.slice(cursorPos);
+                            cursorPos--;
+                            selectedIndex = 0;
+                            render();
+                        }
+                        return;
+                    }
+                    if (key.name === 'left') {
+                        if (cursorPos > 0) {
+                            cursorPos--;
+                            render();
+                        }
+                        return;
+                    }
+                    if (key.name === 'right') {
+                        if (cursorPos < buffer.length) {
+                            cursorPos++;
+                            render();
+                        }
+                        return;
+                    }
+                }
+                // Handle normal characters
+                if (str && str.length === 1 && str.charCodeAt(0) >= 32) {
+                    buffer = buffer.slice(0, cursorPos) + str + buffer.slice(cursorPos);
+                    cursorPos += str.length;
+                    selectedIndex = 0;
+                    render();
+                }
+            };
+            process.stdin.on('keypress', onKeypress);
+            render();
         });
     }
     pause() {
-        this.rl.pause();
+        this.isPaused = true;
+        if (process.stdin.setRawMode)
+            process.stdin.setRawMode(false);
     }
     resume() {
-        this.rl.resume();
-    }
-    close() {
-        this.rl.close();
+        this.isPaused = false;
     }
+    close() { }
 }
-async function promptOnboardingApiKey() {
-    p.intro(chalk.bgGreen.black(' eco-code Setup '));
-    const method = await p.select({
-        message: 'How would you like to configure your OpenRouter API Key?',
-        options: [
-            { value: 'interactive', label: '1. Paste API Key here in terminal (Recommended)' },
-            { value: 'env', label: '2. Show how to set OPENROUTER_API_KEY environment variable' },
-            { value: 'config', label: `3. Show config file path (~/.eco-code/config.json)` },
-        ],
-    });
-    if (p.isCancel(method)) {
-        p.outro('Setup cancelled.');
-        process.exit(0);
-    }
-    if (method === 'env') {
-        p.note(`Windows (PowerShell):\n  $env:OPENROUTER_API_KEY="sk-or-v1-..."\n\nLinux / macOS / Bash:\n  export OPENROUTER_API_KEY="sk-or-v1-..."\n\nGet a free key at: https://openrouter.ai/keys`, 'Environment Variable Setup');
-    }
-    else if (method === 'config') {
-        p.note(`File location:\n  ${config.getConfigPath()}\n\nContent:\n  {\n    "apiKey": "sk-or-v1-..."\n  }`, 'Config File Setup');
-    }
-    const entered = await p.password({
-        message: 'Enter your OpenRouter API Key:',
-        validate: (val) => (!val || !val.trim() ? 'API key cannot be empty' : undefined),
-    });
-    if (p.isCancel(entered)) {
-        p.outro('Setup cancelled.');
-        process.exit(0);
-    }
-    const key = entered.trim();
-    config.setApiKey(key);
-    p.note(`Saved API key to: ${config.getConfigPath()}`, 'Key Saved');
-    return key;
+function printMissingApiKeyInstructions() {
+    console.log(`\n${chalk.red.bold('  ❌ No OpenRouter API Key configured.')}\n`);
+    console.log(`  To use ${chalk.green.bold('eco-code')}, set your OpenRouter API key:\n`);
+    console.log(`  ${chalk.cyan.bold('Windows (PowerShell):')}`);
+    console.log(`    ${chalk.white('$env:OPENROUTER_API_KEY="sk-or-v1-your-key-here"')}\n`);
+    console.log(`  ${chalk.cyan.bold('Linux / macOS (Bash / Zsh):')}`);
+    console.log(`    ${chalk.white('export OPENROUTER_API_KEY="sk-or-v1-your-key-here"')}\n`);
+    console.log(`  ${chalk.cyan.bold('Or in ~/.eco-code/config.json:')}`);
+    console.log(`    ${chalk.white('{\n      "apiKey": "sk-or-v1-your-key-here"\n    }')}\n`);
+    console.log(`  ${chalk.dim('Get a free API key at:')} ${chalk.underline('https://openrouter.ai/keys')}\n`);
 }
 async function selectModelInteractive(models, currentModel) {
     const options = models.slice(0, 15).map((m) => {
@@ -133,32 +289,6 @@ async function selectModelInteractive(models, currentModel) {
     }
     return models.find((m) => m.id === chosen) || models[0];
 }
-async function handleSlashCommandMenu(stats) {
-    let compactLabel = `/compact  - Compact history ${chalk.dim(stats.progressBar)} ${chalk.green(`${stats.percentage}% used`)}`;
-    if (stats.isCritical) {
-        compactLabel = `/compact  - Compact history ${chalk.red.bold(stats.progressBar)} ${chalk.red.bold(`${stats.percentage}% used (⚠️ Recommended now!)`)}`;
-    }
-    else if (stats.isWarning) {
-        compactLabel = `/compact  - Compact history ${chalk.yellow(stats.progressBar)} ${chalk.yellow(`${stats.percentage}% used (Consider compacting)`)}`;
-    }
-    const action = await p.select({
-        message: 'Select command:',
-        options: [
-            { value: '/compact', label: compactLabel },
-            { value: '/models', label: '/models   - Browse & switch free models' },
-            { value: '/refresh', label: '/refresh  - Check for latest free models' },
-            { value: '/resume', label: '/resume   - Restore previous session context' },
-            { value: '/taste', label: '/taste    - View or add project coding style rules' },
-            { value: '/key', label: '/key      - Update OpenRouter API Key' },
-            { value: '/clear', label: '/clear    - Reset conversation history' },
-            { value: '/help', label: '/help     - Show help summary' },
-            { value: '/exit', label: '/exit     - Quit the agent' },
-        ],
-    });
-    if (p.isCancel(action))
-        return null;
-    return action;
-}
 function printContextUsageHint(stats) {
     const usedK = (stats.usedTokens / 1000).toFixed(1);
     const maxK = (stats.maxTokens / 1000).toFixed(1);
@@ -171,43 +301,52 @@ function printContextUsageHint(stats) {
 }
 async function main() {
     const version = getPackageVersion();
-    printBanner(version);
     // Auto-check for updates on launch
-    await checkAndPromptUpdate(version, 'eco-code');
+    await checkAndPromptUpdate(version, '@dastageer_44/eco-code');
     let apiKey = config.getApiKey();
-    if (!apiKey) {
-        apiKey = await promptOnboardingApiKey();
-    }
-    let openRouter = new OpenRouterService(apiKey, config);
-    const spinner = ora({ text: 'Checking models...', color: 'green' }).start();
+    let openRouter = null;
     let freeModels = [];
-    try {
-        const result = await openRouter.getOrFetchFreeModels(false);
-        freeModels = result.models;
-        if (freeModels.length === 0) {
-            spinner.fail('No free models found on OpenRouter.');
-            console.log(chalk.yellow('\nPlease check your API key or visit https://openrouter.ai/models?max_price=0'));
-            process.exit(1);
+    let currentModelInfo = null;
+    let activeModel = config.getDefaultModel() || 'openrouter/auto';
+    if (apiKey) {
+        openRouter = new OpenRouterService(apiKey, config);
+        const spinner = ora({ text: 'Checking models...', color: 'green' }).start();
+        try {
+            const result = await openRouter.getOrFetchFreeModels(false);
+            freeModels = result.models;
+            if (freeModels.length > 0) {
+                currentModelInfo = freeModels.find((m) => m.id === config.getDefaultModel()) || freeModels[0];
+                activeModel = currentModelInfo.id;
+                config.setDefaultModel(activeModel);
+            }
+            spinner.stop();
+        }
+        catch (err) {
+            spinner.fail('Failed to connect to OpenRouter.');
+            console.error(chalk.red(err.message));
         }
-        spinner.succeed(chalk.green('Models updated'));
-    }
-    catch (err) {
-        spinner.fail('Failed to connect to OpenRouter.');
-        console.error(chalk.red(err.message));
-        console.log(chalk.yellow(`\nCheck your API key in ${config.getConfigPath()} or run /key.`));
-        process.exit(1);
     }
-    let currentModelInfo = freeModels.find((m) => m.id === config.getDefaultModel()) || freeModels[0];
-    let activeModel = currentModelInfo.id;
-    config.setDefaultModel(activeModel);
-    console.log(`  ${chalk.dim('Active Model:')} ${chalk.green.bold(activeModel)} ${chalk.dim(`(${currentModelInfo.contextLength.toLocaleString()} tokens)`)}`);
-    console.log(`  ${chalk.dim('Press / for commands menu, /exit to quit.')}\n`);
-    const harness = new AgentHarness(openRouter.getClient(), activeModel, currentModelInfo.contextLength, config, process.cwd());
+    const modelDisplay = apiKey && currentModelInfo
+        ? `${activeModel} (${currentModelInfo.contextLength.toLocaleString()} tokens)`
+        : chalk.yellow('No API Key (type /key to configure)');
+    printBanner(version, modelDisplay, process.cwd());
+    const initialClient = openRouter
+        ? openRouter.getClient()
+        : new OpenAI({ apiKey: 'unconfigured', baseURL: 'https://openrouter.ai/api/v1' });
+    const harness = new AgentHarness(initialClient, activeModel, currentModelInfo?.contextLength || 8192, config, process.cwd());
     const promptMgr = new PromptManager();
+    // Force Plan Mode on startup
+    config.setAgentMode('plan');
+    harness.updateSystemPrompt('plan');
+    if (!apiKey) {
+        console.log(chalk.yellow(`  ⚠️  No OpenRouter API key detected. Type ${chalk.cyan.bold('/key')} or set ${chalk.cyan('$env:OPENROUTER_API_KEY')} to start.\n`));
+    }
     // Main interactive loop
     while (true) {
-        const promptStr = `${chalk.green.bold('eco-code')} ${chalk.cyan('❯')} `;
-        const rawInput = await promptMgr.ask(promptStr);
+        const currentMode = config.getAgentMode().toUpperCase();
+        const modeColor = currentMode === 'PLAN' ? chalk.blue : chalk.red;
+        const promptStr = `${chalk.white.bold('eco-code')} ${modeColor(`[${currentMode}]`)} ${chalk.gray('>')} `;
+        const rawInput = await promptMgr.ask(promptStr, () => harness.getContextStats());
         if (rawInput === null || rawInput === undefined) {
             console.log('\nHappy coding! 👋');
             promptMgr.close();
@@ -216,29 +355,23 @@ async function main() {
         let prompt = rawInput.trim();
         if (!prompt)
             continue;
-        // INSTANT TRIGGER: If user pressed '/' or typed '/menu'
-        if (prompt === '/' || prompt === '/menu') {
-            promptMgr.pause();
-            const stats = harness.getContextStats();
-            const chosenCmd = await handleSlashCommandMenu(stats);
-            promptMgr.resume();
-            if (!chosenCmd)
-                continue;
-            prompt = chosenCmd;
-        }
         // --- Slash Commands Execution ---
         if (prompt === '/exit' || prompt === 'exit' || prompt === 'quit') {
             console.log('\nHappy coding! 👋\n');
             promptMgr.close();
             process.exit(0);
         }
-        if (prompt === '/help') {
+        if (prompt === '/help' || prompt === '?' || prompt === 'help') {
             printHelp();
             const stats = harness.getContextStats();
             console.log(`  ${chalk.bold('Current Context:')} ${stats.progressBar} ${chalk.green(`${stats.percentage}%`)} (${(stats.usedTokens / 1000).toFixed(1)}k / ${(stats.maxTokens / 1000).toFixed(1)}k tokens)\n`);
             continue;
         }
         if (prompt === '/model' || prompt === '/models') {
+            if (!apiKey || freeModels.length === 0) {
+                console.log(chalk.yellow('\n  ⚠️  No active API key. Type /key or set $env:OPENROUTER_API_KEY to browse free models.\n'));
+                continue;
+            }
             promptMgr.pause();
             const selected = await selectModelInteractive(freeModels, activeModel);
             promptMgr.resume();
@@ -250,6 +383,10 @@ async function main() {
             continue;
         }
         if (prompt === '/refresh') {
+            if (!apiKey || !openRouter) {
+                console.log(chalk.yellow('\n  ⚠️  No active API key. Type /key or set $env:OPENROUTER_API_KEY first.\n'));
+                continue;
+            }
             const refSpinner = ora('Checking for latest free models...').start();
             try {
                 const res = await openRouter.getOrFetchFreeModels(true);
@@ -278,21 +415,47 @@ async function main() {
             continue;
         }
         if (prompt === '/resume') {
-            const session = config.loadLatestSession();
-            if (session && session.messages && session.messages.length > 1) {
-                harness.setHistory(session.messages);
-                if (session.model) {
-                    activeModel = session.model;
+            const sessions = config.listSessions();
+            if (!sessions || sessions.length === 0) {
+                console.log(`\n  ${chalk.yellow('ℹ')} No previous sessions found to resume.\n`);
+                continue;
+            }
+            let selectedSession = null;
+            if (sessions.length === 1) {
+                selectedSession = sessions[0];
+            }
+            else {
+                promptMgr.pause();
+                const options = sessions.slice(0, 10).map((s) => {
+                    const d = new Date(s.timestamp);
+                    const dateStr = d.toLocaleDateString() + ' ' + d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
+                    const title = s.title || `Session with ${s.messages.length} messages`;
+                    return {
+                        value: s.id,
+                        label: `${chalk.cyan(dateStr)} — ${chalk.white(title)} ${chalk.dim(`(${s.model || 'unknown'})`)}`,
+                    };
+                });
+                const selectedId = await p.select({
+                    message: 'Select session to resume:',
+                    options,
+                });
+                promptMgr.resume();
+                if (p.isCancel(selectedId)) {
+                    continue;
+                }
+                selectedSession = config.loadSession(selectedId);
+            }
+            if (selectedSession && selectedSession.messages && selectedSession.messages.length > 0) {
+                harness.setHistory(selectedSession.messages);
+                if (selectedSession.model) {
+                    activeModel = selectedSession.model;
                     const found = freeModels.find((m) => m.id === activeModel);
                     harness.setModel(activeModel, found?.contextLength);
                 }
                 const stats = harness.getContextStats();
-                console.log(`\n  ${chalk.green('✔')} Restored previous session (${chalk.green(session.messages.length)} messages, model: ${chalk.cyan(session.model)}).`);
+                console.log(`\n  ${chalk.green('✔')} Restored session: "${chalk.white(selectedSession.title || 'Session')}" (${chalk.green(selectedSession.messages.length)} messages, model: ${chalk.cyan(selectedSession.model)}).`);
                 console.log(`  ${chalk.cyan('Context Status:')} ${stats.progressBar} ${chalk.green(`${stats.percentage}% used`)}\n`);
             }
-            else {
-                console.log(`\n  ${chalk.yellow('ℹ')} No previous session found to resume.\n`);
-            }
             continue;
         }
         if (prompt === '/taste') {
@@ -315,19 +478,34 @@ async function main() {
         if (prompt === '/key') {
             promptMgr.pause();
             const newKey = await p.password({
-                message: 'Enter new OpenRouter API Key:',
+                message: 'Enter your OpenRouter API Key:',
             });
             promptMgr.resume();
             if (!p.isCancel(newKey) && newKey.trim()) {
                 apiKey = newKey.trim();
                 config.setApiKey(apiKey);
                 openRouter = new OpenRouterService(apiKey, config);
+                harness.setClient(openRouter.getClient());
                 console.log(`\n  ${chalk.green('✔')} API key updated.\n`);
+                const refSpinner = ora('Fetching free models...').start();
                 try {
                     const res = await openRouter.getOrFetchFreeModels(true);
                     freeModels = res.models;
+                    if (freeModels.length > 0) {
+                        currentModelInfo = freeModels[0];
+                        activeModel = currentModelInfo.id;
+                        config.setDefaultModel(activeModel);
+                        harness.setModel(activeModel, currentModelInfo.contextLength);
+                        refSpinner.succeed(chalk.green(`Connected! Active Model: ${chalk.bold(activeModel)}`));
+                    }
+                    else {
+                        refSpinner.warn('No free models found on this account.');
+                    }
+                }
+                catch (e) {
+                    refSpinner.fail(`Failed to load models: ${e.message}`);
                 }
-                catch { }
+                console.log();
             }
             continue;
         }
@@ -336,27 +514,58 @@ async function main() {
             console.log(`\n  ${chalk.green('✔')} Context and conversation history cleared.\n`);
             continue;
         }
-        // Safeguard for typos on slash commands (e.g. /mode;)
-        if (prompt.startsWith('/')) {
-            console.log(chalk.yellow(`\n  Unrecognized command "${prompt}". Opening command options:\n`));
+        if (prompt === '/update') {
             promptMgr.pause();
-            const stats = harness.getContextStats();
-            const chosenCmd = await handleSlashCommandMenu(stats);
+            await triggerManualUpdate(version, '@dastageer_44/eco-code');
             promptMgr.resume();
-            if (chosenCmd) {
-                if (chosenCmd === '/compact') {
-                    const { before, after } = harness.compactContext();
-                    const newStats = harness.getContextStats();
-                    console.log(`\n  ${chalk.green('✔')} Compacted context from ${chalk.yellow(before)} to ${chalk.green(after)} messages (${newStats.percentage}% used).\n`);
-                }
-                else if (chosenCmd === '/help') {
-                    printHelp();
-                }
-                else if (chosenCmd === '/exit') {
-                    console.log('\nHappy coding! 👋\n');
-                    promptMgr.close();
-                    process.exit(0);
-                }
+            console.log();
+            continue;
+        }
+        if (prompt === '/plan') {
+            const currentMode = config.getAgentMode();
+            const newMode = currentMode === 'plan' ? 'auto' : 'plan';
+            config.setAgentMode(newMode);
+            harness.updateSystemPrompt(newMode);
+            console.log(`\n  ${chalk.green('✔')} Switched to ${chalk.bold(newMode.toUpperCase() + ' MODE')}.`);
+            if (newMode === 'plan') {
+                console.log(chalk.dim('  The agent will now propose changes for your approval before writing code.\n'));
+            }
+            else {
+                console.log(chalk.dim('  The agent will now automatically execute all changes.\n'));
+            }
+            continue;
+        }
+        if (prompt === '/undo') {
+            promptMgr.pause();
+            const confirm = await p.confirm({
+                message: chalk.red.bold('WARNING: This will DESTROY all uncommitted code/files (git reset --hard & clean). Are you sure?'),
+            });
+            promptMgr.resume();
+            if (confirm && !p.isCancel(confirm)) {
+                const undoSpinner = ora('Discarding uncommitted changes...').start();
+                const out = await runCommand({ command: 'git reset --hard HEAD && git clean -fd' }, process.cwd());
+                undoSpinner.succeed(chalk.white('Uncommitted changes discarded.'));
+                console.log(`\n${chalk.gray(out)}\n`);
+            }
+            else {
+                console.log(`\n  ${chalk.gray('ℹ')} Undo cancelled.\n`);
+            }
+            continue;
+        }
+        if (prompt === '/rewind') {
+            promptMgr.pause();
+            const confirm = await p.confirm({
+                message: chalk.red.bold('WARNING: This will delete the last Git commit and discard those changes (git reset HEAD~1 --hard). Are you sure?'),
+            });
+            promptMgr.resume();
+            if (confirm && !p.isCancel(confirm)) {
+                const rewindSpinner = ora('Rewinding 1 commit...').start();
+                const out = await runCommand({ command: 'git reset HEAD~1 --hard' }, process.cwd());
+                rewindSpinner.succeed(chalk.white('Rewound 1 commit.'));
+                console.log(`\n${chalk.gray(out)}\n`);
+            }
+            else {
+                console.log(`\n  ${chalk.gray('ℹ')} Rewind cancelled.\n`);
             }
             continue;
         }
@@ -371,7 +580,18 @@ async function main() {
             }
             continue;
         }
+        // Ensure API Key exists before calling model
+        if (!apiKey) {
+            console.log(`\n${chalk.red.bold('  ❌ OpenRouter API Key Required')}`);
+            console.log(`  To chat and write code with free models, configure your key:\n`);
+            console.log(`  ${chalk.cyan.bold('Windows (PowerShell):')}     ${chalk.white('$env:OPENROUTER_API_KEY="sk-or-v1-..."')}`);
+            console.log(`  ${chalk.cyan.bold('Linux / macOS (Bash/Zsh):')}  ${chalk.white('export OPENROUTER_API_KEY="sk-or-v1-..."')}`);
+            console.log(`  ${chalk.cyan.bold('Or type:')}                  ${chalk.white('/key')}\n`);
+            console.log(`  ${chalk.dim('Get a free key at:')} ${chalk.underline('https://openrouter.ai/keys')}\n`);
+            continue;
+        }
         // --- Run Agent Turn with Tool Calling ---
+        console.log(); // Force a blank line to scroll terminal down immediately
         const turnSpinner = ora({ text: `${getRandomVerb()}...`, color: 'cyan' }).start();
         // Optionally cycle the verb every 3 seconds if not running a tool
         let isToolRunning = false;
@@ -394,11 +614,63 @@ async function main() {
             });
             clearInterval(verbInterval);
             turnSpinner.stop();
-            console.log(`\n${result}\n`);
+            console.log(`\n${renderMarkdown(result)}\n`);
+            const history = harness.getHistory();
+            const submittedPlan = history.some(msg => msg.role === 'assistant' &&
+                msg.tool_calls?.some((tc) => tc.type === 'function' && tc.function.name === 'submit_plan'));
+            if (config.getAgentMode() === 'plan' && submittedPlan) {
+                promptMgr.pause();
+                const planChoice = await p.select({
+                    message: 'How would you like to proceed?',
+                    options: [
+                        { value: 'yes_once', label: '1. Execute Plan (This Time)' },
+                        { value: 'yes_always', label: '2. Execute Plan (Always Auto)' },
+                        { value: 'no', label: '3. Cancel & Reply (I have feedback / answers)' },
+                    ],
+                });
+                promptMgr.resume();
+                if (planChoice === 'no' || p.isCancel(planChoice)) {
+                    console.log(chalk.yellow('  ℹ Plan paused. You can type your reply or feedback below.\n'));
+                }
+                if (planChoice === 'yes_always') {
+                    config.setAgentMode('auto');
+                    harness.updateSystemPrompt('auto');
+                }
+                if (planChoice === 'yes_once' || planChoice === 'yes_always') {
+                    console.log(chalk.cyan('\nExecuting plan...\n'));
+                    const execSpinner = ora({ text: `${getRandomVerb()}...`, color: 'cyan' }).start();
+                    let isExecToolRunning = false;
+                    const execInterval = setInterval(() => {
+                        if (!isExecToolRunning)
+                            execSpinner.text = `${getRandomVerb()}...`;
+                    }, 3000);
+                    try {
+                        const execResult = await harness.runTurn('User approved the plan. Proceed with execution using write tools.', {
+                            onToolStart: (toolName, args) => {
+                                isExecToolRunning = true;
+                                const detail = args.path || args.command || args.query || '';
+                                execSpinner.text = `Running ${chalk.yellow(toolName)} ${chalk.dim(detail ? '(' + detail + ')' : '')}...`;
+                            },
+                            onToolEnd: (toolName) => {
+                                isExecToolRunning = false;
+                                execSpinner.text = `Tool ${chalk.yellow(toolName)} finished. ${getRandomVerb()}...`;
+                            },
+                        }, 'auto'); // Pass 'auto' mode override
+                        clearInterval(execInterval);
+                        execSpinner.stop();
+                        console.log(`\n${renderMarkdown(execResult)}\n`);
+                    }
+                    catch (e) {
+                        clearInterval(execInterval);
+                        execSpinner.fail(chalk.red('Error during execution'));
+                        console.error(chalk.red(`\n${e.message}\n`));
+                    }
+                }
+            }
             // Print context usage reminder if usage is moderate/high
             const stats = harness.getContextStats();
             printContextUsageHint(stats);
-            console.log(chalk.dim(`  Total Session Tokens: ${stats.sessionTotalTokens.toLocaleString()}`));
+            console.log(chalk.dim(`  Total Session Tokens: ${chalk.bold(stats.sessionTotalTokens.toLocaleString())}`));
         }
         catch (err) {
             clearInterval(verbInterval);