@banaxi/banana-code 1.0.5 → 1.2.0

package/src/index.js

@@ -1,5 +1,6 @@
 import readline from 'readline';
 import chalk from 'chalk';
+import ora from 'ora';
 import { loadConfig, saveConfig, setupProvider } from './config.js';
 import { runStartup } from './startup.js';
 import { getSessionPermissions } from './permissions.js';
@@ -8,12 +9,18 @@ import { GeminiProvider } from './providers/gemini.js';
 import { ClaudeProvider } from './providers/claude.js';
 import { OpenAIProvider } from './providers/openai.js';
 import { OllamaProvider } from './providers/ollama.js';
+import { OllamaCloudProvider } from './providers/ollamaCloud.js';
 
 import { loadSession, saveSession, generateSessionId, getLatestSessionId, listSessions } from './sessions.js';
+import { printMarkdown } from './utils/markdown.js';
+import { estimateConversationTokens } from './utils/tokens.js';
 
 let config;
 let providerInstance;
 let currentSessionId;
+const commandHistory = [];
+let historyIndex = -1;
+let currentInputSaved = '';
 
 function createProvider(overrideConfig = null) {
     const activeConfig = overrideConfig || config;
@@ -21,6 +28,7 @@ function createProvider(overrideConfig = null) {
         case 'gemini': return new GeminiProvider(activeConfig);
         case 'claude': return new ClaudeProvider(activeConfig);
         case 'openai': return new OpenAIProvider(activeConfig);
+        case 'ollama_cloud': return new OllamaCloudProvider(activeConfig);
         case 'ollama': return new OllamaProvider(activeConfig);
         default:
             console.log(chalk.red(`Unknown provider: ${activeConfig.provider}. Defaulting to Ollama.`));
@@ -43,19 +51,20 @@ async function handleSlashCommand(command) {
                         { name: 'Google Gemini', value: 'gemini' },
                         { name: 'Anthropic Claude', value: 'claude' },
                         { name: 'OpenAI', value: 'openai' },
+                        { name: 'Ollama Cloud', value: 'ollama_cloud' },
                         { name: 'Ollama (Local)', value: 'ollama' }
                     ]
                 });
             }
 
-            if (['gemini', 'claude', 'openai', 'ollama'].includes(newProv)) {
+            if (['gemini', 'claude', 'openai', 'ollama_cloud', 'ollama'].includes(newProv)) {
                 // Use the shared setup logic to get keys/models
                 config = await setupProvider(newProv, config);
                 await saveConfig(config);
                 providerInstance = createProvider();
                 console.log(chalk.green(`Switched provider to ${newProv} (${config.model}).`));
             } else {
-                console.log(chalk.yellow(`Usage: /provider <gemini|claude|openai|ollama>`));
+                console.log(chalk.yellow(`Usage: /provider <gemini|claude|openai|ollama_cloud|ollama>`));
             }
             break;
         case '/model':
@@ -63,13 +72,15 @@ async function handleSlashCommand(command) {
             if (!newModel) {
                 // Interactive selection
                 const { select } = await import('@inquirer/prompts');
-                const { GEMINI_MODELS, CLAUDE_MODELS, OPENAI_MODELS, CODEX_MODELS } = await import('./constants.js');
+                const { GEMINI_MODELS, CLAUDE_MODELS, OPENAI_MODELS, CODEX_MODELS, OLLAMA_CLOUD_MODELS } = await import('./constants.js');
 
                 let choices = [];
                 if (config.provider === 'gemini') choices = GEMINI_MODELS;
                 else if (config.provider === 'claude') choices = CLAUDE_MODELS;
                 else if (config.provider === 'openai') {
                     choices = config.authType === 'oauth' ? CODEX_MODELS : OPENAI_MODELS;
+                } else if (config.provider === 'ollama_cloud') {
+                    choices = OLLAMA_CLOUD_MODELS;
                 } else if (config.provider === 'ollama') {
                     try {
                         const response = await fetch('http://localhost:11434/api/tags');
@@ -82,10 +93,25 @@ async function handleSlashCommand(command) {
                 }
 
                 if (choices.length > 0) {
+                    const finalChoices = [...choices];
+                    if (config.provider === 'ollama_cloud') {
+                        finalChoices.push({ name: chalk.magenta('✎ Enter custom model ID...'), value: 'CUSTOM_ID' });
+                    }
+                    
                     newModel = await select({
                         message: 'Select a model:',
-                        choices
+                        choices: finalChoices,
+                        loop: false,
+                        pageSize: Math.max(finalChoices.length, 15)
                     });
+
+                    if (newModel === 'CUSTOM_ID') {
+                        const { input } = await import('@inquirer/prompts');
+                        newModel = await input({
+                            message: 'Enter the exact model ID (e.g., gemma3:27b-cloud):',
+                            validate: (v) => v.trim().length > 0 || 'Model ID cannot be empty'
+                        });
+                    }
                 }
             }
 
@@ -106,11 +132,86 @@ async function handleSlashCommand(command) {
             providerInstance = createProvider(); // fresh instance = clear history
             console.log(chalk.green('Chat history cleared.'));
             break;
+        case '/clean':
+            if (!config.betaTools || !config.betaTools.includes('clean_command')) {
+                console.log(chalk.yellow("The /clean command is a beta feature. You need to enable it in the /beta menu first."));
+                break;
+            }
+            const msgCount = providerInstance.messages ? providerInstance.messages.length : 0;
+            if (msgCount <= 2) {
+                console.log(chalk.yellow("Not enough history to summarize."));
+                break;
+            }
+            
+            console.log(chalk.cyan("Summarizing context to save tokens..."));
+            const summarySpinner = ora({ text: 'Compressing history...', color: 'yellow', stream: process.stdout }).start();
+            
+            try {
+                // Temporarily disable terminal formatting for the summary request
+                const originalUseMarked = config.useMarkedTerminal;
+                config.useMarkedTerminal = false;
+                
+                // Create a temporary prompt asking for a summary
+                const summaryPrompt = "SYSTEM INSTRUCTION: Please provide a highly concise summary of our entire conversation so far. Focus ONLY on the overall goal, the current state of the project, any important decisions made, and what we were about to do next. Do not include pleasantries. This summary will be used as your memory going forward.";
+                
+                // Ask the AI to summarize
+                const summary = await providerInstance.sendMessage(summaryPrompt);
+                
+                // Restore settings
+                config.useMarkedTerminal = originalUseMarked;
+                summarySpinner.stop();
+                
+                // Re-initialize the provider to wipe old history
+                providerInstance = createProvider();
+                
+                // Inject the summary as the first message after the system prompt
+                const summaryMemory = `[PREVIOUS CONVERSATION SUMMARY]\n${summary}`;
+                
+                if (config.provider === 'gemini') {
+                    providerInstance.messages.push({ role: 'user', parts: [{ text: summaryMemory }] });
+                    providerInstance.messages.push({ role: 'model', parts: [{ text: "I have stored the summary of our previous conversation in my memory." }] });
+                } else if (config.provider === 'claude') {
+                    providerInstance.messages.push({ role: 'user', content: summaryMemory });
+                    providerInstance.messages.push({ role: 'assistant', content: "I have stored the summary of our previous conversation in my memory." });
+                } else {
+                    providerInstance.messages.push({ role: 'user', content: summaryMemory });
+                    providerInstance.messages.push({ role: 'assistant', content: "I have stored the summary of our previous conversation in my memory." });
+                }
+                
+                console.log(chalk.green(`\nContext successfully compressed!`));
+                if (config.debug) {
+                    console.log(chalk.gray(`\n[Saved Summary]:\n${summary}\n`));
+                }
+                
+                await saveSession(currentSessionId, {
+                    provider: config.provider,
+                    model: config.model || providerInstance.modelName,
+                    messages: providerInstance.messages
+                });
+                
+            } catch (err) {
+                summarySpinner.stop();
+                console.log(chalk.red(`Failed to compress context: ${err.message}`));
+            }
+            break;
         case '/context':
             let length = 0;
-            if (providerInstance.messages) length = providerInstance.messages.length;
-            else if (providerInstance.chat) length = (await providerInstance.chat.getHistory()).length;
-            console.log(chalk.cyan(`Current context contains approximately ${length} messages.`));
+            let messagesForEstimation = [];
+            
+            if (providerInstance.messages) {
+                length = providerInstance.messages.length;
+                messagesForEstimation = providerInstance.messages;
+            } else if (providerInstance.chat) {
+                messagesForEstimation = await providerInstance.chat.getHistory();
+                length = messagesForEstimation.length;
+            }
+            
+            const { estimateConversationTokens } = await import('./utils/tokens.js');
+            const estimatedTokens = estimateConversationTokens(messagesForEstimation);
+            
+            console.log(chalk.cyan(`Current context:`));
+            console.log(chalk.cyan(`- Messages: ${length}`));
+            console.log(chalk.cyan(`- Estimated Tokens: ~${estimatedTokens.toLocaleString()}`));
             break;
         case '/permissions':
             const perms = getSessionPermissions();
@@ -125,18 +226,27 @@ async function handleSlashCommand(command) {
             const { TOOLS } = await import('./tools/registry.js');
             const betaTools = TOOLS.filter(t => t.beta);
 
-            if (betaTools.length === 0) {
-                console.log(chalk.yellow("No beta tools available."));
+            let choices = betaTools.map(t => ({
+                name: t.label || t.name,
+                value: t.name,
+                checked: (config.betaTools || []).includes(t.name)
+            }));
+            
+            // Add beta commands that aren't tools
+            choices.push({
+                name: '/clean command (Context Compression)',
+                value: 'clean_command',
+                checked: (config.betaTools || []).includes('clean_command')
+            });
+
+            if (choices.length === 0) {
+                console.log(chalk.yellow("No beta features available."));
                 break;
             }
 
             const enabledBetaTools = await checkbox({
-                message: 'Select beta tools to activate (Space to toggle, Enter to confirm):',
-                choices: betaTools.map(t => ({
-                    name: t.label || t.name,
-                    value: t.name,
-                    checked: (config.betaTools || []).includes(t.name)
-                }))
+                message: 'Select beta features to activate (Space to toggle, Enter to confirm):',
+                choices: choices
             });
 
             if (enabledBetaTools.includes('duck_duck_go_scrape') && !(config.betaTools || []).includes('duck_duck_go_scrape')) {
@@ -158,15 +268,103 @@ async function handleSlashCommand(command) {
 
             config.betaTools = enabledBetaTools;
             await saveConfig(config);
-            providerInstance = createProvider(); // Re-init to update tools
+            if (providerInstance) {
+                const savedMessages = providerInstance.messages;
+                providerInstance = createProvider(); // Re-init to update tools
+                providerInstance.messages = savedMessages;
+            } else {
+                providerInstance = createProvider();
+            }
             console.log(chalk.green(`Beta tools updated: ${enabledBetaTools.join(', ') || 'none'}`));
             break;
+        case '/settings':
+            const { checkbox: settingsCheckbox } = await import('@inquirer/prompts');
+            const enabledSettings = await settingsCheckbox({
+                message: 'Select features to enable (Space to toggle, Enter to confirm):',
+                choices: [
+                    {
+                        name: 'Auto-feed workspace files to AI (uses .bananacodeignore / .gitignore)',
+                        value: 'autoFeedWorkspace',
+                        checked: config.autoFeedWorkspace || false
+                    },
+                    {
+                        name: 'Use syntax highlighting for AI output (requires waiting for full response)',
+                        value: 'useMarkedTerminal',
+                        checked: config.useMarkedTerminal || false
+                    },
+                    {
+                        name: 'Always show current token count in status bar',
+                        value: 'showTokenCount',
+                        checked: config.showTokenCount || false
+                    }
+                ]
+            });
+            
+            config.autoFeedWorkspace = enabledSettings.includes('autoFeedWorkspace');
+            config.useMarkedTerminal = enabledSettings.includes('useMarkedTerminal');
+            config.showTokenCount = enabledSettings.includes('showTokenCount');
+            await saveConfig(config);
+            if (providerInstance) {
+                const savedMessages = providerInstance.messages;
+                providerInstance = createProvider(); // Re-init to update tools/config
+                providerInstance.messages = savedMessages;
+            } else {
+                providerInstance = createProvider();
+            }
+            console.log(chalk.green(`Settings updated.`));
+            break;
         case '/debug':
             config.debug = !config.debug;
             await saveConfig(config);
-            providerInstance = createProvider(); // Re-init to pass debug flag
+            if (providerInstance) {
+                const savedMessages = providerInstance.messages;
+                providerInstance = createProvider(); // Re-init to pass debug flag
+                providerInstance.messages = savedMessages;
+            } else {
+                providerInstance = createProvider();
+            }
             console.log(chalk.magenta(`Debug mode ${config.debug ? 'enabled' : 'disabled'}.`));
             break;
+        case '/skills':
+            const { getAvailableSkills } = await import('./utils/skills.js');
+            const skills = getAvailableSkills();
+            if (skills.length === 0) {
+                console.log(chalk.yellow("No skills found."));
+                const os = await import('os');
+                const path = await import('path');
+                const skillsDir = path.join(os.homedir(), '.config', 'banana-code', 'skills');
+                console.log(chalk.gray(`Create skill directories with a SKILL.md file in ${skillsDir}`));
+            } else {
+                console.log(chalk.cyan.bold("\nLoaded Skills:"));
+                skills.forEach(skill => {
+                    console.log(chalk.green(`- ${skill.id}`) + `: ${skill.description}`);
+                });
+            }
+            break;
+        case '/plan':
+            config.planMode = true;
+            await saveConfig(config);
+            if (providerInstance) {
+                const savedMessages = providerInstance.messages;
+                providerInstance = createProvider();
+                providerInstance.messages = savedMessages;
+            } else {
+                providerInstance = createProvider();
+            }
+            console.log(chalk.magenta(`Plan mode enabled. For significant changes, the AI will now propose an implementation plan before writing code.`));
+            break;
+        case '/agent':
+            config.planMode = false;
+            await saveConfig(config);
+            if (providerInstance) {
+                const savedMessages = providerInstance.messages;
+                providerInstance = createProvider();
+                providerInstance.messages = savedMessages;
+            } else {
+                providerInstance = createProvider();
+            }
+            console.log(chalk.green(`Agent mode enabled. The AI will make changes directly.`));
+            break;
         case '/chats':
             const sessions = await listSessions();
             if (sessions.length === 0) {
@@ -183,13 +381,18 @@ async function handleSlashCommand(command) {
         case '/help':
             console.log(chalk.yellow(`
 Available commands:
-  /provider <name> - Switch AI provider (gemini, claude, openai, ollama)
+  /provider <name> - Switch AI provider (gemini, claude, openai, ollama_cloud, ollama)
   /model [name]    - Switch model within current provider (opens menu if name omitted)
   /chats           - List persistent chat sessions
   /clear           - Clear chat history
+  /clean           - Compress chat history into a summary to save tokens
   /context         - Show current context window size
   /permissions     - List session-approved permissions
   /beta            - Manage beta features and tools
+  /settings        - Manage app settings (workspace auto-feed, etc)
+  /skills          - List loaded agent skills
+  /plan            - Enable Plan Mode (AI proposes a plan for big changes)
+  /agent           - Enable Agent Mode (default, AI edits directly)
   /debug           - Toggle debug mode (show tool results)
   /help            - Show all commands
   /exit            - Quit Banana Code
@@ -229,7 +432,7 @@ function drawPromptBox(inputText, cursorPos) {
     const placeholder = 'Type your message or @path/to/file';
     const prefix = ' > ';
 
-    const visibleText = (inputText.length === 0) ? (prefix + chalk.gray(placeholder)) : (prefix + inputText);
+    const visibleText = (inputText.length === 0) ? (prefix + chalk.gray(placeholder)) : (prefix + chalk.white(inputText));
     const totalChars = (prefix.length + Math.max(inputText.length, placeholder.length));
     const rows = Math.ceil(totalChars / width) || 1;
 
@@ -249,8 +452,26 @@ function drawPromptBox(inputText, cursorPos) {
     // Redraw status bar and separator (they are always below the prompt)
     const modelDisplay = providerInstance ? providerInstance.modelName : (config.model || 'unknown');
     const providerDisplay = config.provider.toUpperCase();
-    const leftText = ` Provider: ${chalk.cyan(providerDisplay)} / Model: ${chalk.yellow(modelDisplay)}`;
-    const rightText = '? for shortcuts ';
+    const modeDisplay = config.planMode ? chalk.magenta('PLAN MODE') : chalk.green('AGENT MODE');
+    
+    let tokenDisplay = '';
+    if (config.showTokenCount && providerInstance) {
+        let msgs = providerInstance.messages || [];
+        // Support for Ollama chat history format if different
+        if (!providerInstance.messages && typeof providerInstance.chat?.getHistory === 'function') {
+            msgs = providerInstance.chat.getHistory(); // Note: this is async normally, but we use an approximation here or just skip it if it's strictly async. For now, assume providerInstance.messages is the standard.
+        }
+        const tokens = estimateConversationTokens(msgs);
+        let color = chalk.green;
+        if (tokens >= 128000) color = chalk.red;
+        else if (tokens >= 86000) color = chalk.hex('#FFA500'); // Orange
+        else if (tokens >= 64000) color = chalk.yellow;
+        
+        tokenDisplay = ` / Tokens: ${color(tokens.toLocaleString())}`;
+    }
+    
+    const leftText = ` Provider: ${chalk.cyan(providerDisplay)} / Model: ${chalk.yellow(modelDisplay)} / ${modeDisplay}${tokenDisplay}`;
+    const rightText = '/help for shortcuts ';
     const leftStripped = leftText.replace(/\x1b\[[0-9;]*m/g, '');
     const midPad = Math.max(0, width - leftStripped.length - rightText.length);
     const statusLine = chalk.gray(leftText + ' '.repeat(midPad) + rightText);
@@ -276,7 +497,7 @@ function drawPromptBoxInitial(inputText) {
     const placeholder = 'Type your message or @path/to/file';
     const prefix = ' > ';
 
-    const visibleText = (inputText.length === 0) ? (prefix + chalk.gray(placeholder)) : (prefix + inputText);
+    const visibleText = (inputText.length === 0) ? (prefix + chalk.gray(placeholder)) : (prefix + chalk.white(inputText));
     const totalChars = (prefix.length + Math.max(inputText.length, placeholder.length));
     const rows = Math.ceil(totalChars / width) || 1;
 
@@ -289,11 +510,29 @@ function drawPromptBoxInitial(inputText) {
         process.stdout.write(userBg(padLine(lineText, width)) + '\n');
     }
 
-    // Status bar: Current Provider / Model + right-aligned "? for shortcuts"
+    // Status bar: Current Provider / Model + right-aligned "/help for shortcuts"
     const modelDisplay = providerInstance ? providerInstance.modelName : (config.model || 'unknown');
     const providerDisplay = config.provider.toUpperCase();
-    const leftText = ` Provider: ${chalk.cyan(providerDisplay)} / Model: ${chalk.yellow(modelDisplay)}`;
-    const rightText = '? for shortcuts ';
+    const modeDisplay = config.planMode ? chalk.magenta('PLAN MODE') : chalk.green('AGENT MODE');
+    
+    let tokenDisplay = '';
+    if (config.showTokenCount && providerInstance) {
+        let msgs = providerInstance.messages || [];
+        // Support for Ollama chat history format if different
+        if (!providerInstance.messages && typeof providerInstance.chat?.getHistory === 'function') {
+            msgs = providerInstance.chat.getHistory(); // Note: this is async normally, but we use an approximation here or just skip it if it's strictly async. For now, assume providerInstance.messages is the standard.
+        }
+        const tokens = estimateConversationTokens(msgs);
+        let color = chalk.green;
+        if (tokens >= 128000) color = chalk.red;
+        else if (tokens >= 86000) color = chalk.hex('#FFA500'); // Orange
+        else if (tokens >= 64000) color = chalk.yellow;
+        
+        tokenDisplay = ` / Tokens: ${color(tokens.toLocaleString())}`;
+    }
+    
+    const leftText = ` Provider: ${chalk.cyan(providerDisplay)} / Model: ${chalk.yellow(modelDisplay)} / ${modeDisplay}${tokenDisplay}`;
+    const rightText = '/help for shortcuts ';
 
     const leftStripped = leftText.replace(/\x1b\[[0-9;]*m/g, '');
     const midPad = Math.max(0, width - leftStripped.length - rightText.length);
@@ -378,6 +617,10 @@ function promptUser() {
 
             if (str === '\r' || str === '\n') {                 // Enter
                 exitRequested = false;
+                if (inputBuffer.trim() && inputBuffer !== commandHistory[commandHistory.length - 1]) {
+                    commandHistory.push(inputBuffer);
+                }
+                historyIndex = -1;
                 resolve(inputBuffer);
                 return;
             }
@@ -411,6 +654,33 @@ function promptUser() {
                 return;
             }
 
+            if (str === '\x1b[A') {                             // Arrow Up
+                if (historyIndex === -1) {
+                    currentInputSaved = inputBuffer;
+                }
+                if (historyIndex < commandHistory.length - 1) {
+                    historyIndex++;
+                    inputBuffer = commandHistory[commandHistory.length - 1 - historyIndex];
+                    cursorPos = inputBuffer.length;
+                    drawPromptBox(inputBuffer, cursorPos);
+                }
+                return;
+            }
+
+            if (str === '\x1b[B') {                             // Arrow Down
+                if (historyIndex > -1) {
+                    historyIndex--;
+                    if (historyIndex === -1) {
+                        inputBuffer = currentInputSaved;
+                    } else {
+                        inputBuffer = commandHistory[commandHistory.length - 1 - historyIndex];
+                    }
+                    cursorPos = inputBuffer.length;
+                    drawPromptBox(inputBuffer, cursorPos);
+                }
+                return;
+            }
+
             if (str === '\x1b[H' || str === '\x01') {           // Home / Ctrl+A
                 cursorPos = 0; drawPromptBox(inputBuffer, cursorPos);
                 return;
@@ -462,20 +732,23 @@ async function main() {
                     for (const msg of session.messages) {
                         if (msg.role === 'system') continue;
 
-                        if (session.provider === 'gemini') {
+                        if (config.provider === 'gemini') {
                             if (msg.role === 'user') {
                                 if (msg.parts[0]?.text) console.log(`${chalk.yellow('🍌 >')} ${msg.parts[0].text}`);
                                 else if (msg.parts[0]?.functionResponse) {
-                                    console.log(chalk.yellow(`[Tool Result: ${msg.parts[0].functionResponse.name}]`));
+                                    console.log(chalk.yellow(`[Tool Result Received]`));
                                 }
                             } else if (msg.role === 'model') {
                                 msg.parts.forEach(p => {
-                                    if (p.text) process.stdout.write(chalk.cyan(p.text));
+                                    if (p.text) {
+                                        if (config.useMarkedTerminal) printMarkdown(p.text);
+                                        else process.stdout.write(chalk.cyan(p.text));
+                                    }
                                     if (p.functionCall) console.log(chalk.yellow(`\n[Banana Calling Tool: ${p.functionCall.name}]`));
                                 });
                                 console.log();
                             }
-                        } else if (session.provider === 'claude') {
+                        } else if (config.provider === 'claude') {
                             if (msg.role === 'user') {
                                 if (typeof msg.content === 'string') console.log(`${chalk.yellow('🍌 >')} ${msg.content}`);
                                 else {
@@ -484,26 +757,36 @@ async function main() {
                                     });
                                 }
                             } else if (msg.role === 'assistant') {
-                                if (typeof msg.content === 'string') console.log(chalk.cyan(msg.content));
-                                else {
+                                if (typeof msg.content === 'string') {
+                                    if (config.useMarkedTerminal) printMarkdown(msg.content);
+                                    else process.stdout.write(chalk.cyan(msg.content));
+                                } else {
                                     msg.content.forEach(c => {
-                                        if (c.type === 'text') process.stdout.write(chalk.cyan(c.text));
+                                        if (c.type === 'text') {
+                                            if (config.useMarkedTerminal) printMarkdown(c.text);
+                                            else process.stdout.write(chalk.cyan(c.text));
+                                        }
                                         if (c.type === 'tool_use') console.log(chalk.yellow(`\n[Banana Calling Tool: ${c.name}]`));
                                     });
-                                    console.log();
                                 }
+                                console.log();
                             }
                         } else {
                             // OpenAI, Ollama
                             if (msg.role === 'user') {
                                 console.log(`${chalk.yellow('🍌 >')} ${msg.content}`);
                             } else if (msg.role === 'assistant' || msg.role === 'output_text') {
-                                if (msg.content) console.log(chalk.cyan(msg.content));
+                                if (msg.content) {
+                                    if (config.useMarkedTerminal) printMarkdown(msg.content);
+                                    else process.stdout.write(chalk.cyan(msg.content));
+                                }
                                 if (msg.tool_calls) {
                                     msg.tool_calls.forEach(tc => {
-                                        console.log(chalk.yellow(`[Banana Calling Tool: ${tc.function.name}]`));
+                                        const name = tc.function ? tc.function.name : tc.name;
+                                        console.log(chalk.yellow(`\n[Banana Calling Tool: ${name}]`));
                                     });
                                 }
+                                console.log();
                             } else if (msg.role === 'tool') {
                                 console.log(chalk.yellow(`[Tool Result Received]`));
                             }
@@ -535,8 +818,49 @@ async function main() {
             if (trimmed.startsWith('/')) {
                 await handleSlashCommand(trimmed);
             } else {
+                let finalInput = trimmed;
+                const fileMentions = trimmed.match(/@@?([\w/.-]+)/g);
+                if (fileMentions) {
+                    let addedFiles = 0;
+                    const fsSync = await import('fs');
+                    const path = await import('path');
+                    for (const mention of fileMentions) {
+                        let filepath;
+                        if (mention.startsWith('@@')) {
+                            filepath = mention.substring(2);
+                        } else {
+                            filepath = path.join(process.cwd(), mention.substring(1));
+                        }
+                        
+                        try {
+                            const stat = fsSync.statSync(filepath);
+                            if (stat.isFile()) {
+                                const content = fsSync.readFileSync(filepath, 'utf8');
+                                finalInput += `\n\n--- File Context: ${filepath} ---\n${content}\n--- End of ${filepath} ---`;
+                                addedFiles++;
+                            }
+                        } catch (e) {
+                            console.log(chalk.yellow(`Warning: Could not read file for mention ${mention}`));
+                        }
+                    }
+                    if (addedFiles > 0) {
+                        console.log(chalk.gray(`(Attached ${addedFiles} file(s) to context)`));
+                    }
+                }
+
+                if (config.autoFeedWorkspace) {
+                    const { getWorkspaceTree } = await import('./utils/workspace.js');
+                    const tree = await getWorkspaceTree();
+                    const { getSystemPrompt } = await import('./prompt.js');
+                    let newSysPrompt = getSystemPrompt(config);
+                    newSysPrompt += `\n\n--- Workspace File Tree ---\n${tree}\n--- End of Tree ---`;
+                    if (typeof providerInstance.updateSystemPrompt === 'function') {
+                        providerInstance.updateSystemPrompt(newSysPrompt);
+                    }
+                }
+
                 process.stdout.write(chalk.cyan('✦ '));
-                await providerInstance.sendMessage(trimmed);
+                await providerInstance.sendMessage(finalInput);
                 console.log(); // Extra newline after AI response
                 // Save session after AI message
                 await saveSession(currentSessionId, {

package/src/prompt.js

@@ -1,5 +1,6 @@
 import os from 'os';
 import { getAvailableTools } from './tools/registry.js';
+import { getAvailableSkills } from './utils/skills.js';
 
 export function getSystemPrompt(config = {}) {
     const platform = os.platform();
@@ -16,6 +17,7 @@ export function getSystemPrompt(config = {}) {
     const availableToolsList = getAvailableTools(config);
     const availableToolsNames = availableToolsList.map(t => t.name).join(', ');
     const hasPatchTool = availableToolsList.some(t => t.name === 'patch_file');
+    const skills = getAvailableSkills();
 
     let prompt = `You are Banana Code, a terminal-based AI coding assistant running on ${osDescription}. You help users write, debug, and understand code. You have access to tools: ${availableToolsNames}. 
 
@@ -27,6 +29,26 @@ SAFETY RULES:
 
 Always use tools when they would help. Be concise but thorough. `;
 
+    if (skills && skills.length > 0) {
+        prompt += `\n\n# Available Agent Skills\n\nYou have access to the following specialized skills. To activate a skill and receive its detailed instructions, call the \`activate_skill\` tool with the skill's name.\n\n<available_skills>\n`;
+        for (const skill of skills) {
+            prompt += `  <skill>\n    <name>${skill.id}</name>\n    <description>${skill.description}</description>\n  </skill>\n`;
+        }
+        prompt += `</available_skills>\n\nOnce a skill is activated, its instructions and resources are returned wrapped in <activated_skill> tags. You MUST treat the content within <instructions> as expert procedural guidance for the duration of the task.\n`;
+    }
+
+    if (config.planMode) {
+        prompt += `
+[PLAN MODE ENABLED]
+The user is operating in "Plan Mode".
+- For very small, trivial changes (like fixing a typo or a one-line bug), you may execute the change directly using your tools.
+- For ANY change that has a significant impact, modifies multiple areas, or adds a new feature, you MUST NOT write or patch code immediately.
+- Instead, you MUST output a detailed "Implementation Plan" outlining the files you will change and the specific steps you will take.
+- Stop and ask the user: "Does this plan look good, or would you like to make any changes?"
+- ONLY proceed to use the 'write_file' or 'patch_file' tools AFTER the user has explicitly approved the plan.
+`;
+    }
+
     if (hasPatchTool) {
         prompt += `
 When editing existing files, PREFER using the 'patch_file' tool for surgical, targeted changes instead of 'write_file', especially for large files. This prevents accidental truncation and is much more efficient. Only use 'write_file' when creating new files or when making very extensive changes to a small file.`;