vigthoria-cli 1.6.2 → 1.6.4

package/dist/commands/chat.js

@@ -1,9 +1,4 @@
 "use strict";
-/**
- * Interactive Chat Command for Vigthoria CLI
- *
- * Now with Vigthoria Autonomous agentic capabilities!
- */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -44,11 +39,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatCommand = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
+const path = __importStar(require("path"));
 const readline = __importStar(require("readline"));
-const marked_1 = require("marked");
-const marked_terminal_1 = require("marked-terminal");
 const api_js_1 = require("../utils/api.js");
-const files_js_1 = require("../utils/files.js");
 const tools_js_1 = require("../utils/tools.js");
 const session_js_1 = require("../utils/session.js");
 class ChatCommand {
@@ -56,933 +49,459 @@ class ChatCommand {
     logger;
     api;
     messages = [];
-    fileUtils;
-    marked;
     tools = null;
-    agentMode = false;
-    rl = null;
     sessionManager;
     currentSession = null;
-    streamMode = true;
-    localMode = false;
+    agentMode = false;
+    currentProjectPath = process.cwd();
+    lastActionableUserInput = '';
+    directPromptMode = false;
+    directToolContinuationCount = 0;
+    currentModel = 'code';
+    autoApprove = false;
     constructor(config, logger) {
         this.config = config;
         this.logger = logger;
         this.api = new api_js_1.APIClient(config, logger);
-        // Initialize with a safe default - will be updated in run()
-        this.fileUtils = new files_js_1.FileUtils('.', config.get('project').ignorePatterns);
         this.sessionManager = new session_js_1.SessionManager();
-        // Setup marked for terminal rendering
-        this.marked = new marked_1.Marked();
-        this.marked.use((0, marked_terminal_1.markedTerminal)());
     }
     async run(options) {
-        // Resolve and validate project path
-        const projectPath = this.resolveProjectPath(options.project);
-        if (!projectPath) {
-            this.logger.error(`Project path not found: ${options.project}`);
-            this.logger.info('Please specify a valid project directory with -p <path>');
-            return;
-        }
-        // SECURITY: Warn if using home directory as workspace
-        const homeDir = process.env.HOME || process.env.USERPROFILE || '';
-        const isHomeDir = projectPath === homeDir || projectPath === homeDir.replace(/\\/g, '/');
-        if (isHomeDir && options.agent) {
-            console.log('');
-            console.log(chalk_1.default.yellow('╔════════════════════════════════════════════════════════════╗'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.yellow.bold('  ⚠ WARNING: Agent mode in home directory                 ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('╠════════════════════════════════════════════════════════════╣'));
-            console.log(chalk_1.default.yellow('║') + '  You are running agent mode in your home directory.       ' + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + '  The AI can access ALL files in this location.            ' + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + '                                                           ' + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.white('  For safety, navigate to your project folder first:       ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.cyan('    cd C:\\path\\to\\your\\project                            ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.cyan('    vigthoria agent                                        ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + '                                                           ' + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.white('  Or specify a project path:                               ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.cyan('    vigthoria agent -p C:\\path\\to\\your\\project             ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('╚════════════════════════════════════════════════════════════╝'));
-            console.log('');
-            // Ask for confirmation
-            const readline = require('readline');
-            const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-            const answer = await new Promise((resolve) => {
-                rl.question(chalk_1.default.yellow('Continue anyway? [y/N] '), resolve);
-            });
-            rl.close();
-            if (answer.toLowerCase() !== 'y' && answer.toLowerCase() !== 'yes') {
-                this.logger.info('Agent mode cancelled. Navigate to a project folder first.');
-                return;
-            }
-        }
-        // Update fileUtils with correct project path
-        this.fileUtils = new files_js_1.FileUtils(projectPath, this.config.get('project').ignorePatterns);
-        // STRICT AUTHENTICATION - No local bypass
         if (!this.config.isAuthenticated()) {
-            this.logger.error('');
-            this.logger.error('╔════════════════════════════════════════════════════════════╗');
-            this.logger.error('║  Authentication Required                                   ║');
-            this.logger.error('╠════════════════════════════════════════════════════════════╣');
-            this.logger.error('║  Vigthoria CLI requires a valid account and subscription.  ║');
-            this.logger.error('║                                                            ║');
-            this.logger.error('║  To get started:                                           ║');
-            this.logger.error('║    1. Create account: https://coder.vigthoria.io/signup    ║');
-            this.logger.error('║    2. Choose a plan:  https://coder.vigthoria.io/pricing   ║');
-            this.logger.error('║    3. Login:          vigthoria login                      ║');
-            this.logger.error('╚════════════════════════════════════════════════════════════╝');
-            this.logger.error('');
+            this.logger.error('Not authenticated. Run: vigthoria login');
             return;
         }
-        // SUBSCRIPTION VALIDATION - Check plan is active
-        if (!this.config.hasValidSubscription()) {
-            // Revalidate subscription from server
-            await this.api.getSubscriptionStatus();
-            if (!this.config.hasValidSubscription()) {
-                this.logger.error('');
-                this.logger.error('╔════════════════════════════════════════════════════════════╗');
-                this.logger.error('║  Subscription Required                                     ║');
-                this.logger.error('╠════════════════════════════════════════════════════════════╣');
-                this.logger.error('║  Your subscription has expired or is inactive.             ║');
-                this.logger.error('║                                                            ║');
-                this.logger.error('║  Renew at: https://coder.vigthoria.io/pricing              ║');
-                this.logger.error('║                                                            ║');
-                this.logger.error('║  Plans start at $9/month for unlimited AI coding.          ║');
-                this.logger.error('╚════════════════════════════════════════════════════════════╝');
-                this.logger.error('');
-                return;
-            }
-        }
-        // Setup agentic tools if enabled - use resolved project path
-        this.agentMode = options.agent || false;
-        this.streamMode = options.stream !== false; // Default to true
-        this.localMode = false; // Never use local mode - always use Vigthoria API
-        // CRITICAL: Agent mode REQUIRES stronger models to prevent hallucinations
-        // Use Vigthoria Cloud for complex agent tasks
-        if (this.agentMode) {
-            // Upgrade model for agent mode if using a weak model
-            const weakModels = ['fast', 'mini', 'vigthoria-fast-1.7b'];
-            if (weakModels.includes(options.model)) {
-                this.logger.warn(`Agent mode works better with stronger models. Upgrading from '${options.model}' to 'code'`);
-                options.model = 'code';
-            }
-            this.tools = new tools_js_1.AgenticTools(this.logger, projectPath, // Use resolved path
-            this.askPermission.bind(this), options.autoApprove || false);
+        this.agentMode = options.agent === true;
+        this.autoApprove = options.autoApprove === true;
+        this.currentModel = options.model || 'code';
+        this.currentProjectPath = path.resolve(options.project || process.cwd());
+        this.directPromptMode = Boolean(options.prompt);
+        this.directToolContinuationCount = 0;
+        this.tools = new tools_js_1.AgenticTools(this.logger, this.currentProjectPath, async (action) => this.requestPermission(action), this.autoApprove);
+        this.initializeSession(options.resume === true);
+        if (options.prompt) {
+            await this.handleDirectPrompt(options.prompt);
+            return;
         }
-        // Try to resume previous session or create new one
-        if (options.resume) {
-            this.currentSession = this.sessionManager.getLatest(projectPath);
+        await this.startInteractiveChat();
+    }
+    initializeSession(resume) {
+        if (resume) {
+            this.currentSession = this.sessionManager.getLatest(this.currentProjectPath);
             if (this.currentSession) {
                 this.messages = [...this.currentSession.messages];
-                this.logger.success(`Resumed session: ${this.currentSession.id}`);
+                this.agentMode = this.currentSession.agentMode || this.agentMode;
+                this.currentModel = this.currentSession.model || this.currentModel;
+                return;
             }
         }
-        if (!this.currentSession) {
-            this.currentSession = this.sessionManager.create(projectPath, // Use resolved path
-            options.model, this.agentMode);
+        this.currentSession = this.sessionManager.create(this.currentProjectPath, this.currentModel, this.agentMode);
+        this.messages = [...this.currentSession.messages];
+    }
+    async handleDirectPrompt(prompt) {
+        console.log(chalk_1.default.cyan('Running single prompt in direct mode.'));
+        console.log(chalk_1.default.gray(`Model: ${this.currentModel}`));
+        console.log(chalk_1.default.gray(`Project: ${this.currentProjectPath}`));
+        console.log();
+        if (this.agentMode) {
+            await this.runAgentTurn(prompt);
+            return;
         }
-        // Get project context with error handling
-        let projectContext = { type: 'unknown', files: [], dependencies: {} };
+        await this.runSimplePrompt(prompt);
+    }
+    async runSimplePrompt(prompt) {
+        this.lastActionableUserInput = prompt;
+        this.messages.push({ role: 'user', content: prompt });
+        const spinner = (0, ora_1.default)({ text: 'Thinking...', spinner: 'clock' }).start();
         try {
-            projectContext = await this.fileUtils.getProjectContext();
+            const response = await this.api.chat(this.messages, this.currentModel);
+            spinner.stop();
+            const finalText = response.message.trim();
+            if (finalText) {
+                console.log(finalText);
+            }
+            this.messages.push({ role: 'assistant', content: response.message });
+            this.saveSession();
         }
         catch (error) {
-            // Continue without project context if it fails
-            this.logger.warn('Could not read project context, continuing without it.');
+            spinner.fail('Failed to get response');
+            this.logger.error(error.message);
         }
-        // Setup system message
-        const systemMessage = {
-            role: 'system',
-            content: this.buildSystemPrompt(projectContext, { ...options, project: projectPath }),
-        };
-        this.messages.push(systemMessage);
-        this.printWelcome({ ...options, project: projectPath });
-        // Start REPL
-        await this.startRepl({ ...options, project: projectPath });
-    }
-    buildSystemPrompt(projectContext, options) {
-        let prompt = `You are Vigthoria, the premier AI coding assistant of Vigthoria Technologies.
-
-## IDENTITY & BRAND
-- Created by Vigthoria Technologies (NOT OpenAI, NOT Anthropic, NOT Microsoft)
-- Mascot: Viggy the Blue Queen
-- Philosophy: "Innovation through Intelligence"
-- Always respond as "Vigthoria" - never claim to be another AI
-
-## VIGTHORIA ECOSYSTEM (Important - Know This!)
-Vigthoria is a comprehensive tech platform with these key services:
-- **Vigthoria Coder** (coder.vigthoria.io): AI-powered coding IDE and CLI (this tool!)
-- **Vigthoria Community** (community.vigthoria.io): Code sharing platform, NOT GitHub. When user mentions "repo", assume Vigthoria Community unless they say "GitHub"
-- **Vigthoria GoA** (agent.vigthoria.io): Graph of Agents - autonomous AI orchestration
-- **Vigthoria Meet** (meet.vigthoria.io): Video conferencing platform
-- **Vigthoria Pay**: Payment processing service
-- **Vigthoria B2C Hub**: Business-to-consumer services
-- **Model Router** (port 4009): Routes AI requests to optimal models
-
-## CRITICAL RULES - NEVER VIOLATE:
-1. **NEVER HALLUCINATE** - If you don't know something, say so. Don't make up file contents, directories, or project structures.
-2. **NEVER ASSUME FILE CONTENTS** - If asked about a file, you MUST use read_file tool first. Do NOT guess what's in a file.
-3. **NEVER CONFUSE PLATFORMS** - Vigthoria Community is NOT GitHub. Windows paths are NOT Unix paths.
-4. **ALWAYS USE TOOLS** - In agent mode, USE the tools to read files, not your imagination.
-
-## Project Context
-- Type: ${projectContext.type}
-- Root: ${options.project}
-- Key files: ${projectContext.files.slice(0, 10).join(', ')}
-${projectContext.type === 'node' ? `- Dependencies: ${Object.keys(projectContext.dependencies).slice(0, 15).join(', ')}` : ''}
-
-## CODE QUALITY STANDARDS (CRITICAL):
-1. ALWAYS produce complete, production-ready code - no placeholders
-2. When creating UI/HTML/CSS:
-   - Ensure proper color contrast (text readable against backgrounds)
-   - Use CSS variables for theming
-   - Include responsive design
-3. Include proper error handling
-4. Add meaningful comments for complex logic
-5. Follow modern best practices (2024-2026 standards)
-6. Use semantic HTML, accessible patterns
-7. Show COMPLETE implementations
-
-## Guidelines:
-- Provide working code first, explanations second
-- Be concise but thorough
-- Excellence is the standard - mediocrity is not acceptable
-- If you need to see file contents, USE read_file FIRST before responding
-
-## VIGTHORIA CLI COMMANDS (Know these to help users):
-
-### Core Commands:
-- \`vigthoria chat\` (or \`vig c\`) - Start interactive chat (this session!)
-- \`vigthoria agent\` (or \`vig a\`) - Autonomous agent mode (can read/write files, run commands)
-- \`vigthoria edit <file>\` (or \`vig e\`) - Edit a file with AI assistance
-- \`vigthoria generate "desc"\` (or \`vig g\`) - Generate code from description
-- \`vigthoria explain <file>\` (or \`vig x\`) - Explain code in detail
-- \`vigthoria fix <file>\` (or \`vig f\`) - Fix bugs and issues
-- \`vigthoria review <file>\` (or \`vig r\`) - Code quality review
-
-### Repository Commands (Vigthoria Community - NOT GitHub):
-- \`vigthoria repo push\` - Push project to Vigthoria Community repo
-- \`vigthoria repo pull <name>\` - Pull project from Vigthoria repo
-- \`vigthoria repo list\` - List your projects in Vigthoria repo
-- \`vigthoria repo status\` - Show sync status
-- \`vigthoria repo share <name>\` - Generate shareable link
-- \`vigthoria repo clone <url>\` - Clone a public project
-- \`vigthoria repo delete <name>\` - Remove from repo
-
-### Hub/Marketplace Commands (Vigthoria API Modules):
-- \`vigthoria hub discover\` - Interactive module discovery
-- \`vigthoria hub list\` - List all API modules
-- \`vigthoria hub search <query>\` - Semantic search for modules
-- \`vigthoria hub activate <module>\` - Enable pay-as-you-go for module
-- \`vigthoria hub active\` - Show your active modules
-- \`vigthoria hub info <module>\` - Get module details
-
-### Deployment Commands (Vigthoria Hosting):
-- \`vigthoria deploy preview\` - Deploy to free preview URL
-- \`vigthoria deploy subdomain <name>\` - Deploy to yourname.vigthoria.io
-- \`vigthoria deploy custom <domain>\` - Deploy to custom domain
-- \`vigthoria deploy list\` - List your deployments
-- \`vigthoria deploy plans\` - Show hosting plans/pricing
-- \`vigthoria deploy status\` - Check deployment status
-- \`vigthoria deploy verify <domain>\` - Verify DNS config
-- \`vigthoria deploy remove <domain>\` - Remove deployment
-
-### Account & Config Commands:
-- \`vigthoria login\` - Authenticate with Vigthoria
-- \`vigthoria logout\` - Logout from account
-- \`vigthoria status\` - Show auth & subscription status
-- \`vigthoria config\` - Configure CLI settings
-- \`vigthoria update\` - Check for updates & upgrade CLI
-- \`vigthoria init\` - Initialize Vigthoria in project
-
-## NATURAL LANGUAGE UNDERSTANDING (Interpret User Intent):
-When users say these phrases, understand their intent:
-- "push it", "upload this", "save to repo" → Run \`vigthoria repo push\`
-- "pull my project", "download from repo" → Run \`vigthoria repo pull\`
-- "deploy this", "host it", "put it online" → Run \`vigthoria deploy\`
-- "show my repos", "list projects" → Run \`vigthoria repo list\`
-- "share this project" → Run \`vigthoria repo share\`
-- "check for updates", "upgrade cli" → Run \`vigthoria update\`
-- "what APIs are available", "show modules" → Run \`vigthoria hub list\`
-- "enable music api", "activate <module>" → Run \`vigthoria hub activate\`
-- "my deployments", "where is it hosted" → Run \`vigthoria deploy list\`
-- "make it live", "publish" → Run \`vigthoria deploy\`
-- "fix bugs", "debug this" → Run \`vigthoria fix <file>\`
-- "explain this code" → Run \`vigthoria explain <file>\`
-- "review my code" → Run \`vigthoria review <file>\`
-- "create a component", "generate code for" → Run \`vigthoria generate\`
-
-## Special Chat Commands (user may use these in chat):
-- /file <path> - Read and include a file in context
-- /edit <path> - Switch to file editing mode
-- /diff - Show pending changes
-- /apply - Apply pending changes
-- /clear - Clear conversation history
-- /model <name> - Switch AI model
-- /agent - Toggle agentic mode (Vigthoria autonomous actions)
-- /help - Show available commands`;
-        // Add tool instructions if in agent mode
-        if (this.agentMode && this.tools) {
-            prompt += `\n\n${tools_js_1.AgenticTools.getToolsForPrompt()}`;
-        }
-        return prompt;
     }
-    /**
-     * Resolve and validate project path - handles Windows paths properly
-     */
-    resolveProjectPath(inputPath) {
-        const path = require('path');
-        const fs = require('fs');
-        try {
-            // Resolve to absolute path
-            let resolvedPath = inputPath;
-            if (!path.isAbsolute(inputPath)) {
-                resolvedPath = path.resolve(process.cwd(), inputPath);
-            }
-            // Normalize the path for the current OS
-            resolvedPath = path.normalize(resolvedPath);
-            // Check if path exists
-            if (fs.existsSync(resolvedPath)) {
-                const stats = fs.statSync(resolvedPath);
-                if (stats.isDirectory()) {
-                    return resolvedPath;
-                }
-            }
-            // Try current working directory as fallback
-            const cwd = process.cwd();
-            if (fs.existsSync(cwd)) {
-                return cwd;
-            }
-            return null;
+    async runAgentTurn(prompt) {
+        if (!this.tools) {
+            throw new Error('Agent tools are not initialized.');
         }
-        catch (error) {
-            // Return current directory on any error
+        const handledByDirectFileFlow = await this.tryDirectSingleFileFlow(prompt);
+        if (handledByDirectFileFlow) {
+            this.saveSession();
+            return;
+        }
+        this.lastActionableUserInput = prompt;
+        this.directToolContinuationCount = 0;
+        this.tools.clearSessionApprovals();
+        this.ensureAgentSystemPrompt();
+        this.messages.push({ role: 'user', content: this.buildScopedUserPrompt(prompt) });
+        this.saveSession();
+        const maxTurns = 10;
+        for (let turn = 0; turn < maxTurns; turn += 1) {
+            const spinner = (0, ora_1.default)({ text: turn === 0 ? 'Planning...' : 'Continuing...', spinner: 'clock' }).start();
             try {
-                return process.cwd();
+                const response = await this.api.chat(this.messages, this.currentModel);
+                spinner.stop();
+                const assistantMessage = response.message || '';
+                this.messages.push({ role: 'assistant', content: assistantMessage });
+                const toolCalls = this.extractToolCalls(assistantMessage);
+                const visibleText = this.stripToolPayloads(assistantMessage).trim();
+                if (toolCalls.length === 0) {
+                    console.log(visibleText || 'Task complete.');
+                    this.saveSession();
+                    return;
+                }
+                await this.executeToolCalls(toolCalls);
+                this.directToolContinuationCount += 1;
+                this.messages.push({
+                    role: 'system',
+                    content: this.buildContinuationPrompt(),
+                });
+                this.saveSession();
             }
-            catch {
-                return null;
+            catch (error) {
+                spinner.fail('Agent request failed');
+                this.logger.error(error.message);
+                return;
             }
         }
+        console.log('Task complete.');
+        this.saveSession();
     }
-    printWelcome(options) {
-        const sub = this.config.get('subscription');
-        console.log();
-        this.logger.box(`Model: ${chalk_1.default.cyan(options.model)}\n` +
-            `Plan: ${chalk_1.default.green(sub.plan || 'free')}\n` +
-            `Project: ${chalk_1.default.gray(options.project)}\n` +
-            `Agent Mode: ${this.agentMode ? chalk_1.default.green('ON ✓') : chalk_1.default.gray('OFF')}`, 'Vigthoria Chat');
-        console.log();
-        if (this.agentMode) {
-            console.log(chalk_1.default.yellow('🤖 Agent Mode: AI can read files, edit code, and run commands autonomously.'));
+    async tryDirectSingleFileFlow(prompt) {
+        if (!this.directPromptMode || !this.tools) {
+            return false;
         }
-        console.log(chalk_1.default.gray('Type your message or /help for commands. Press Ctrl+C to exit.'));
-        console.log();
+        const targetFile = this.inferTargetFileFromPrompt(prompt);
+        if (!targetFile) {
+            return false;
+        }
+        const readCall = {
+            tool: 'read_file',
+            args: { path: targetFile },
+        };
+        console.log(chalk_1.default.cyan(`⚙ Executing: ${readCall.tool}`));
+        const readResult = await this.tools.execute(readCall);
+        const readSummary = this.formatToolResult(readCall, readResult);
+        console.log(readResult.success ? chalk_1.default.gray(readSummary) : chalk_1.default.red(readSummary));
+        this.messages.push({ role: 'system', content: readSummary });
+        if (!readResult.success || !readResult.output) {
+            return false;
+        }
+        const rewriteMessages = [
+            {
+                role: 'system',
+                content: [
+                    'You are repairing a single file for a CLI agent task.',
+                    `Return only the final contents for ${targetFile}.`,
+                    'Do not use Markdown fences.',
+                    'Do not add explanations before or after the file contents.',
+                    'Produce complete, runnable code or markup.',
+                ].join('\n'),
+            },
+            {
+                role: 'user',
+                content: [
+                    `Task: ${prompt}`,
+                    `Target file: ${targetFile}`,
+                    'Current file contents:',
+                    readResult.output,
+                ].join('\n\n'),
+            },
+        ];
+        const rewriteResponse = await this.api.chat(rewriteMessages, this.currentModel);
+        const rewrittenContent = this.extractFinalFileContent(rewriteResponse.message, targetFile);
+        if (!rewrittenContent) {
+            return false;
+        }
+        const writeCall = {
+            tool: 'write_file',
+            args: {
+                path: targetFile,
+                content: rewrittenContent,
+            },
+        };
+        console.log(chalk_1.default.cyan(`⚙ Executing: ${writeCall.tool}`));
+        const writeResult = await this.tools.execute(writeCall);
+        const writeSummary = this.formatToolResult(writeCall, writeResult);
+        console.log(writeResult.success ? chalk_1.default.gray(writeSummary) : chalk_1.default.red(writeSummary));
+        this.messages.push({ role: 'system', content: writeSummary });
+        if (!writeResult.success) {
+            return false;
+        }
+        console.log(`Updated ${targetFile}.`);
+        return true;
     }
-    async startRepl(options) {
-        this.rl = readline.createInterface({
+    async startInteractiveChat() {
+        this.logger.section(this.agentMode ? 'Interactive Agent Chat' : 'Interactive Chat');
+        console.log(chalk_1.default.gray('Type /help for commands. Type /exit to quit.'));
+        const rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,
-            prompt: chalk_1.default.cyan('you › '),
-            terminal: true,
         });
-        let currentModel = options.model;
-        let pendingChanges = null;
-        let isRunning = true;
-        // Handle unexpected close events
-        this.rl.on('close', () => {
-            if (isRunning) {
-                console.log(chalk_1.default.yellow('\n\n⚠ Session interrupted. Saving...'));
-                if (this.currentSession && this.messages.length > 1) {
-                    this.sessionManager.save(this.currentSession);
-                    console.log(chalk_1.default.gray(`Session saved: ${this.currentSession.id}`));
-                }
-                console.log(chalk_1.default.cyan('Run `vigthoria chat --resume` to continue.\n'));
-                isRunning = false;
+        while (true) {
+            const input = await new Promise((resolve) => {
+                rl.question(chalk_1.default.blue('> '), resolve);
+            });
+            const trimmed = input.trim();
+            if (!trimmed) {
+                continue;
             }
-        });
-        // Handle SIGINT (Ctrl+C) gracefully
-        process.on('SIGINT', () => {
-            if (isRunning) {
-                isRunning = false;
-                console.log(chalk_1.default.yellow('\n\nExiting...'));
-                if (this.currentSession && this.messages.length > 1) {
-                    this.sessionManager.save(this.currentSession);
-                    console.log(chalk_1.default.gray(`Session saved: ${this.currentSession.id}`));
-                }
-                console.log(chalk_1.default.cyan('Goodbye! 👋\n'));
-                process.exit(0);
+            if (trimmed === '/exit' || trimmed === '/quit') {
+                rl.close();
+                return;
             }
-        });
-        this.rl.prompt();
-        for await (const line of this.rl) {
-            if (!isRunning)
-                break;
-            const input = line.trim();
-            if (!input) {
-                this.rl.prompt();
+            if (trimmed === '/help') {
+                this.showHelp();
                 continue;
             }
-            // Handle special commands
-            if (input.startsWith('/')) {
-                const [cmd, ...args] = input.slice(1).split(' ');
-                switch (cmd) {
-                    case 'help':
-                        this.printHelp();
-                        break;
-                    case 'clear':
-                        this.messages = [this.messages[0]]; // Keep system message
-                        this.logger.success('Conversation cleared');
-                        break;
-                    case 'model':
-                        if (args[0]) {
-                            const newModel = args[0];
-                            currentModel = newModel;
-                            // Show branded model name
-                            const modelInfo = this.config.getAvailableModels().find(m => m.id === newModel);
-                            const isCloud = this.config.isCloudModel(newModel);
-                            if (isCloud) {
-                                console.log();
-                                console.log(chalk_1.default.magenta('  ☁️  Switched to: ') + chalk_1.default.magenta.bold(modelInfo?.name || 'Vigthoria Cloud'));
-                                console.log(chalk_1.default.gray('      671B cloud model - ideal for complex tasks'));
-                                console.log();
-                            }
-                            else {
-                                console.log();
-                                console.log(chalk_1.default.green('  🏠 Switched to: ') + chalk_1.default.green.bold(modelInfo?.name || newModel));
-                                console.log(chalk_1.default.gray('      Local model - fast, no API costs'));
-                                console.log();
-                            }
-                        }
-                        else {
-                            this.printModels();
-                        }
-                        break;
-                    case 'agent':
-                        this.agentMode = !this.agentMode;
-                        if (this.agentMode && !this.tools) {
-                            this.tools = new tools_js_1.AgenticTools(this.logger, options.project, this.askPermission.bind(this), options.autoApprove || false);
-                        }
-                        // Rebuild system prompt with/without tools
-                        this.messages[0] = {
-                            role: 'system',
-                            content: this.buildSystemPrompt(await this.fileUtils.getProjectContext(), { ...options, agent: this.agentMode }),
-                        };
-                        this.logger.success(`Agent mode: ${this.agentMode ? chalk_1.default.green('ON') : chalk_1.default.red('OFF')}`);
-                        if (this.agentMode) {
-                            console.log(chalk_1.default.yellow('  AI can now read files, edit code, and run commands.'));
-                        }
-                        break;
-                    case 'approve':
-                        if (this.tools) {
-                            options.autoApprove = !options.autoApprove;
-                            this.tools = new tools_js_1.AgenticTools(this.logger, options.project, this.askPermission.bind(this), options.autoApprove);
-                            this.logger.success(`Auto-approve: ${options.autoApprove ? chalk_1.default.green('ON') : chalk_1.default.red('OFF')}`);
-                            if (options.autoApprove) {
-                                console.log(chalk_1.default.red('  ⚠️  AI actions will be executed without confirmation!'));
-                            }
-                        }
-                        break;
-                    case 'file':
-                        if (args[0]) {
-                            await this.addFileToContext(args[0]);
-                        }
-                        else {
-                            this.logger.error('Usage: /file <path>');
-                        }
-                        break;
-                    case 'edit':
-                        if (args[0]) {
-                            pendingChanges = await this.startEditMode(args[0], currentModel);
-                        }
-                        else {
-                            this.logger.error('Usage: /edit <path>');
-                        }
-                        break;
-                    case 'diff':
-                        if (pendingChanges) {
-                            this.showPendingDiff(pendingChanges);
-                        }
-                        else {
-                            this.logger.info('No pending changes');
-                        }
-                        break;
-                    case 'apply':
-                        if (pendingChanges) {
-                            this.applyChanges(pendingChanges);
-                            pendingChanges = null;
-                        }
-                        else {
-                            this.logger.info('No pending changes to apply');
-                        }
-                        break;
-                    case 'sessions':
-                        this.listSessions();
-                        break;
-                    case 'history':
-                        this.showHistory();
-                        break;
-                    case 'save':
-                        if (this.currentSession) {
-                            this.sessionManager.save(this.currentSession);
-                            this.logger.success(`Session saved: ${this.currentSession.id}`);
-                        }
-                        break;
-                    case 'new':
-                        // Start new session
-                        this.currentSession = this.sessionManager.create(options.project, currentModel, this.agentMode);
-                        this.messages = [this.messages[0]]; // Keep only system message
-                        this.logger.success(`New session: ${this.currentSession.id}`);
-                        break;
-                    case 'compact':
-                        // Compact context by summarizing older messages
-                        await this.compactContext(currentModel);
-                        break;
-                    case 'undo':
-                        // Undo last file operation
-                        if (this.tools) {
-                            const undoResult = await this.tools.undo();
-                            if (undoResult.success) {
-                                this.logger.success(undoResult.output || 'Undo completed');
-                                if (undoResult.metadata?.remainingUndos !== undefined) {
-                                    console.log(chalk_1.default.gray(`  ${undoResult.metadata.remainingUndos} more undo(s) available`));
-                                }
-                            }
-                            else {
-                                this.logger.error(undoResult.error || 'Nothing to undo');
-                            }
-                        }
-                        else {
-                            this.logger.info('Undo is only available in agent mode. Use /agent to enable.');
-                        }
-                        break;
-                    case 'logout':
-                        // Logout from Vigthoria
-                        this.config.clearAuth();
-                        this.logger.success('Logged out successfully');
-                        console.log(chalk_1.default.gray('Run `vigthoria login` to authenticate again.'));
-                        // Auto-save session before exit
-                        if (this.currentSession && this.messages.length > 1) {
-                            this.sessionManager.save(this.currentSession);
-                        }
-                        console.log(chalk_1.default.cyan('\nGoodbye! 👋\n'));
-                        this.rl.close();
-                        return;
-                    case 'status':
-                        // Show current authentication status
-                        if (this.config.isAuthenticated()) {
-                            const email = this.config.get('email');
-                            const sub = this.config.get('subscription');
-                            console.log();
-                            console.log(chalk_1.default.green('✓ Logged in'));
-                            console.log(chalk_1.default.gray('  Email: ') + chalk_1.default.cyan(email));
-                            console.log(chalk_1.default.gray('  Plan: ') + chalk_1.default.green(sub.plan || 'free'));
-                            console.log(chalk_1.default.gray('  Model: ') + chalk_1.default.cyan(options.model));
-                            console.log(chalk_1.default.gray('  Agent: ') + (this.agentMode ? chalk_1.default.green('ON') : chalk_1.default.gray('OFF')));
-                            console.log();
-                        }
-                        else {
-                            console.log();
-                            this.logger.warn('Not logged in');
-                            console.log(chalk_1.default.gray('Run `vigthoria login` to authenticate'));
-                            console.log();
-                        }
-                        break;
-                    case 'exit':
-                    case 'quit':
-                        // Auto-save session on exit
-                        if (this.currentSession && this.messages.length > 1) {
-                            this.sessionManager.save(this.currentSession);
-                            console.log(chalk_1.default.gray(`Session saved: ${this.currentSession.id}`));
-                        }
-                        console.log(chalk_1.default.cyan('\nGoodbye! 👋\n'));
-                        this.rl.close();
-                        return;
-                    default:
-                        this.logger.warn(`Unknown command: /${cmd}`);
+            if (trimmed === '/agent') {
+                this.agentMode = !this.agentMode;
+                console.log(chalk_1.default.yellow(`Agent mode: ${this.agentMode ? 'ON' : 'OFF'}`));
+                if (this.currentSession) {
+                    this.currentSession.agentMode = this.agentMode;
+                    this.saveSession();
                 }
-                this.rl.prompt();
                 continue;
             }
-            // Regular chat message
-            // Check if we should suggest Cloud upgrade for complex tasks
-            this.suggestCloudUpgrade(currentModel, input);
-            await this.chat(input, currentModel);
-            // Save message to session
-            if (this.currentSession) {
-                this.currentSession.messages = [...this.messages];
-                this.sessionManager.save(this.currentSession);
-            }
-            this.rl.prompt();
-        }
-    }
-    async chat(userInput, model) {
-        // Add user message (skip if empty - used for tool continuation)
-        if (userInput) {
-            this.messages.push({ role: 'user', content: userInput });
-            // Clear session-approved tools for new user turn
-            if (this.tools) {
-                this.tools.clearSessionApprovals();
+            if (trimmed === '/clear') {
+                this.messages = [];
+                console.log(chalk_1.default.yellow('Conversation cleared.'));
+                continue;
             }
-        }
-        const spinner = (0, ora_1.default)({
-            text: chalk_1.default.gray('Thinking...'),
-            spinner: 'dots',
-        }).start();
-        try {
-            const response = await this.api.chat(this.messages, model, this.localMode);
-            spinner.stop();
-            // Add assistant message
-            this.messages.push({ role: 'assistant', content: response.message });
-            // Render markdown response
-            console.log();
-            console.log(chalk_1.default.cyan('vigthoria ›'));
-            console.log(this.marked.parse(response.message));
-            // Show token usage
-            if (response.usage) {
-                console.log(chalk_1.default.gray(`[${response.usage.total_tokens} tokens]`));
+            if (trimmed === '/save') {
+                this.saveSession();
+                console.log(chalk_1.default.green('Session saved.'));
+                continue;
             }
-            console.log();
-            // In agent mode, check for and execute tool calls
-            if (this.agentMode && this.tools) {
-                const toolCalls = tools_js_1.AgenticTools.parseToolCalls(response.message);
-                if (toolCalls.length > 0) {
-                    await this.executeToolCalls(toolCalls, model);
+            if (trimmed.startsWith('/model ')) {
+                this.currentModel = trimmed.slice(7).trim() || this.currentModel;
+                console.log(chalk_1.default.yellow(`Model changed to: ${this.currentModel}`));
+                if (this.currentSession) {
+                    this.currentSession.model = this.currentModel;
+                    this.saveSession();
                 }
+                continue;
             }
-        }
-        catch (error) {
-            spinner.stop();
-            const errMsg = error.message || 'Unknown error';
-            // Check for specific error types
-            if (errMsg.includes('ECONNREFUSED') || errMsg.includes('ENOTFOUND')) {
-                this.logger.error('Connection failed: Unable to reach AI service');
-                console.log(chalk_1.default.gray('  Check your internet connection or try again later.'));
-            }
-            else if (errMsg.includes('timeout') || errMsg.includes('ETIMEDOUT')) {
-                this.logger.error('Request timed out: AI service took too long to respond');
-                console.log(chalk_1.default.gray('  Try a shorter query or check service status.'));
-            }
-            else if (errMsg.includes('401') || errMsg.includes('Unauthorized')) {
-                this.logger.error('Authentication failed: Your session may have expired');
-                console.log(chalk_1.default.gray('  Run `vigthoria login` to re-authenticate.'));
+            if (this.agentMode) {
+                await this.runAgentTurn(trimmed);
             }
             else {
-                this.logger.error('Failed to get response:', errMsg);
+                await this.runSimplePrompt(trimmed);
             }
-            // Remove failed user message
-            this.messages.pop();
         }
     }
-    /**
-     * Execute tool calls from AI response (Vigthoria Autonomous)
-     */
-    async executeToolCalls(calls, model) {
-        const results = [];
-        for (const call of calls) {
-            console.log(chalk_1.default.yellow(`\n⚙ Executing: ${call.tool}`));
-            const result = await this.tools.execute(call);
-            results.push({ tool: call.tool, result });
-            if (result.success) {
-                this.logger.success(`${call.tool}: Success`);
-                if (result.output) {
-                    console.log(chalk_1.default.gray(this.truncateOutput(result.output)));
-                }
-            }
-            else {
-                this.logger.error(`${call.tool}: ${result.error}`);
-            }
+    showHelp() {
+        console.log('');
+        console.log('Commands:');
+        console.log('  /help   Show this help');
+        console.log('  /exit   Exit chat');
+        console.log('  /agent  Toggle agent mode');
+        console.log('  /clear  Clear conversation');
+        console.log('  /save   Save session');
+        console.log('  /model <name>  Change model');
+        console.log('');
+    }
+    ensureAgentSystemPrompt() {
+        const hasSystemPrompt = this.messages.some((message) => message.role === 'system' && message.content.includes('Vigthoria CLI agent operating contract'));
+        if (hasSystemPrompt) {
+            return;
         }
-        // Send tool results back to AI for continuation
-        const toolResultsMessage = {
-            role: 'user',
-            content: this.formatToolResults(results),
-        };
-        this.messages.push(toolResultsMessage);
-        // Get AI's follow-up response
-        console.log();
-        await this.chat('', model);
+        this.messages.unshift({
+            role: 'system',
+            content: this.buildAgentSystemPrompt(),
+        });
+    }
+    buildAgentSystemPrompt() {
+        const toolCatalog = tools_js_1.AgenticTools.getToolDefinitions()
+            .map((tool) => {
+            const params = tool.parameters
+                .map((param) => `${param.name}${param.required ? ' (required)' : ''}`)
+                .join(', ');
+            return `- ${tool.name}: ${tool.description}${params ? ` Parameters: ${params}.` : ''}`;
+        })
+            .join('\n');
+        return [
+            'Vigthoria CLI agent operating contract.',
+            `You are operating inside the project root: ${this.currentProjectPath}`,
+            'Stay inside that project unless the user explicitly asks otherwise.',
+            'Read files before editing or rewriting them.',
+            'When you need a tool, emit only one or more tool wrappers in this exact format:',
+            '<tool_call>',
+            '{"tool":"read_file","args":{"path":"relative/path.ext"}}',
+            '</tool_call>',
+            'You may emit multiple <tool_call> blocks in one response.',
+            'Never emit raw tool JSON outside that wrapper.',
+            'In direct mode, do not ask follow-up questions. Finish the request completely and stop when satisfied.',
+            'After tool results arrive, either continue with the next minimal tool calls or return a concise completion summary with no more tool calls.',
+            'Available tools:',
+            toolCatalog,
+        ].join('\n');
+    }
+    buildScopedUserPrompt(prompt) {
+        return [
+            prompt,
+            '',
+            `Project root: ${this.currentProjectPath}`,
+            'Stay within this project root unless the user explicitly expands scope.',
+            'Finish the request and stop once it is complete.',
+        ].join('\n');
     }
-    /**
-     * Format tool results for AI context
-     */
-    formatToolResults(results) {
-        let msg = 'Tool execution results:\n\n';
-        for (const { tool, result } of results) {
-            msg += `## ${tool}\n`;
-            msg += `Status: ${result.success ? 'Success' : 'Failed'}\n`;
-            if (result.output) {
-                msg += `Output:\n\`\`\`\n${this.truncateOutput(result.output)}\n\`\`\`\n`;
+    inferTargetFileFromPrompt(prompt) {
+        const matches = Array.from(prompt.matchAll(/([A-Za-z0-9_./-]+\.[A-Za-z0-9_-]+)/g));
+        for (const match of matches) {
+            const candidate = match[1];
+            if (!candidate) {
+                continue;
             }
-            if (result.error) {
-                msg += `Error: ${result.error}\n`;
+            const resolved = path.resolve(this.currentProjectPath, candidate);
+            if (resolved.startsWith(this.currentProjectPath)) {
+                return candidate;
             }
-            msg += '\n';
         }
-        msg += 'Continue with your analysis or next steps.';
-        return msg;
+        return null;
     }
-    /**
-     * Truncate long output for context management
-     */
-    truncateOutput(output, maxLines = 50) {
-        const lines = output.split('\n');
-        if (lines.length <= maxLines) {
-            return output;
-        }
-        return lines.slice(0, maxLines).join('\n') + `\n... (${lines.length - maxLines} more lines)`;
+    buildContinuationPrompt() {
+        return [
+            `Tool results received for direct mode step ${this.directToolContinuationCount + 1}.`,
+            `Original user request: ${this.lastActionableUserInput}`,
+            `Project root boundary: ${this.currentProjectPath}`,
+            'If the request is already satisfied, return a concise completion summary and no tool calls.',
+            'If more work is required, continue with only the next minimal tool calls needed to finish it.',
+            'Do not ask follow-up questions or drift into unrelated tasks.',
+        ].join('\n');
     }
-    /**
-     * Ask user for permission to execute dangerous action
-     * Returns: true (yes), false (no), 'batch' (approve all of this type for this turn)
-     */
-    async askPermission(action, options) {
-        return new Promise((resolve) => {
-            console.log('\n' + action);
-            if (!this.rl) {
-                resolve(false);
-                return;
+    extractToolCalls(message) {
+        const calls = [];
+        const wrapperRegex = /<tool_call>([\s\S]*?)<\/tool_call>/g;
+        for (const match of message.matchAll(wrapperRegex)) {
+            const call = this.parseToolPayload(match[1] || '');
+            if (call) {
+                calls.push(call);
             }
-            const prompt = options?.batchApproval
-                ? chalk_1.default.yellow('Allow? [y/N/a] ')
-                : chalk_1.default.yellow('Allow? [y/N] ');
-            this.rl.question(prompt, (answer) => {
-                const normalized = answer.toLowerCase().trim();
-                // Check for batch approval first
-                if (options?.batchApproval && (normalized === 'a' || normalized === 'all')) {
-                    resolve('batch');
-                    return;
-                }
-                const allowed = normalized === 'y' || normalized === 'yes';
-                resolve(allowed);
-            });
-        });
-    }
-    async addFileToContext(filePath) {
-        const file = this.fileUtils.readFile(filePath);
-        if (!file) {
-            this.logger.error(`File not found: ${filePath}`);
-            return;
         }
-        // Add file content to messages
-        const fileMessage = {
-            role: 'user',
-            content: `Here is the content of ${file.relativePath} (${file.language}, ${file.lines} lines):\n\n\`\`\`${file.language}\n${file.content}\n\`\`\``,
-        };
-        this.messages.push(fileMessage);
-        this.logger.success(`Added ${file.relativePath} to context (${file.lines} lines)`);
+        return calls;
     }
-    async startEditMode(filePath, model) {
-        const file = this.fileUtils.readFile(filePath);
-        if (!file) {
-            this.logger.error(`File not found: ${filePath}`);
+    parseToolPayload(payload) {
+        const normalized = payload.trim();
+        if (!normalized) {
             return null;
         }
-        console.log();
-        this.logger.section(`Editing: ${file.relativePath}`);
-        console.log(chalk_1.default.gray('What changes would you like to make?'));
-        console.log();
-        // This would enter a sub-REPL for editing
-        // For now, return the file info
-        return { file: file.path, content: file.content };
-    }
-    showPendingDiff(changes) {
-        const file = this.fileUtils.readFile(changes.file);
-        if (!file)
-            return;
-        const diff = this.fileUtils.createDiff(file.content, changes.content);
-        this.logger.section('Pending Changes');
-        this.logger.diff(diff.added, diff.removed);
-    }
-    applyChanges(changes) {
-        // Backup first
-        const backup = this.fileUtils.backupFile(changes.file);
-        if (backup) {
-            this.logger.info(`Backup created: ${backup}`);
-        }
-        // Apply
-        if (this.fileUtils.writeFile(changes.file, changes.content)) {
-            this.logger.success(`Changes applied to ${changes.file}`);
+        try {
+            const parsed = JSON.parse(normalized);
+            if (typeof parsed.tool !== 'string') {
+                return null;
+            }
+            const args = {};
+            if (parsed.args && typeof parsed.args === 'object') {
+                for (const [key, value] of Object.entries(parsed.args)) {
+                    args[key] = typeof value === 'string' ? value : JSON.stringify(value);
+                }
+            }
+            return { tool: parsed.tool, args };
         }
-        else {
-            this.logger.error('Failed to apply changes');
+        catch {
+            return null;
         }
     }
-    printHelp() {
-        console.log();
-        this.logger.section('Available Commands');
-        console.log(chalk_1.default.yellow('── File & Context ──'));
-        console.log(chalk_1.default.cyan('/file <path>') + '  - Add file to conversation context');
-        console.log(chalk_1.default.cyan('/edit <path>') + '  - Start editing a file');
-        console.log(chalk_1.default.cyan('/diff') + '         - Show pending changes');
-        console.log(chalk_1.default.cyan('/apply') + '        - Apply pending changes');
-        console.log();
-        console.log(chalk_1.default.yellow('── AI & Models ──'));
-        console.log(chalk_1.default.cyan('/model <name>') + ' - Switch AI model (or list available)');
-        console.log(chalk_1.default.cyan('/agent') + '        - Toggle agentic mode (Vigthoria Autonomous)');
-        console.log(chalk_1.default.cyan('/approve') + '      - Toggle auto-approve for agent actions');
-        console.log(chalk_1.default.cyan('/undo') + '         - Undo last file operation (agent mode)');
-        console.log();
-        console.log(chalk_1.default.yellow('── Session & History ──'));
-        console.log(chalk_1.default.cyan('/clear') + '        - Clear conversation history');
-        console.log(chalk_1.default.cyan('/compact') + '      - Compact context (summarize older messages)');
-        console.log(chalk_1.default.cyan('/sessions') + '     - List saved sessions');
-        console.log(chalk_1.default.cyan('/history') + '      - Show conversation history');
-        console.log(chalk_1.default.cyan('/save') + '         - Save current session');
-        console.log(chalk_1.default.cyan('/new') + '          - Start new session');
-        console.log();
-        console.log(chalk_1.default.yellow('── Account ──'));
-        console.log(chalk_1.default.cyan('/status') + '       - Show login & subscription status');
-        console.log(chalk_1.default.cyan('/logout') + '       - Logout from Vigthoria');
-        console.log();
-        console.log(chalk_1.default.yellow('── General ──'));
-        console.log(chalk_1.default.cyan('/help') + '         - Show this help');
-        console.log(chalk_1.default.cyan('/exit') + '         - Exit Vigthoria (auto-saves)');
-        console.log(chalk_1.default.cyan('/quit') + '         - Same as /exit');
-        console.log();
-        console.log(chalk_1.default.yellow('── CLI Commands (run in terminal) ──'));
-        console.log(chalk_1.default.gray('  vigthoria repo push     - Push to Vigthoria Community'));
-        console.log(chalk_1.default.gray('  vigthoria repo pull     - Pull from your repos'));
-        console.log(chalk_1.default.gray('  vigthoria deploy        - Deploy & host project'));
-        console.log(chalk_1.default.gray('  vigthoria hub           - Browse API modules'));
-        console.log(chalk_1.default.gray('  vigthoria update        - Update CLI to latest'));
-        console.log();
-        console.log(chalk_1.default.yellow('💡 Natural Language Tips:'));
-        console.log(chalk_1.default.gray('  Say "push it" → I\'ll help with vigthoria repo push'));
-        console.log(chalk_1.default.gray('  Say "deploy this" → I\'ll guide you through hosting'));
-        console.log(chalk_1.default.gray('  Say "what APIs are available" → I\'ll show hub modules'));
-        console.log();
-        if (this.agentMode) {
-            console.log(chalk_1.default.yellow('Agent Mode Tools:'));
-            console.log(chalk_1.default.gray('  read_file, write_file, edit_file, bash, grep, list_dir, glob, git'));
-            console.log();
-        }
+    stripToolPayloads(message) {
+        return message.replace(/<tool_call>[\s\S]*?<\/tool_call>/g, '').trim();
     }
-    listSessions() {
-        const sessions = this.sessionManager.list();
-        console.log();
-        this.logger.section('Saved Sessions');
-        if (sessions.length === 0) {
-            console.log(chalk_1.default.gray('  No saved sessions'));
-        }
-        else {
-            sessions.slice(0, 10).forEach(s => {
-                const current = this.currentSession?.id === s.id ? chalk_1.default.green(' (current)') : '';
-                const agent = s.agentMode ? chalk_1.default.yellow(' [agent]') : '';
-                console.log(chalk_1.default.cyan(s.id) + agent + current);
-                console.log(chalk_1.default.gray(`  ${s.project} - ${new Date(s.updatedAt).toLocaleString()}`));
-            });
+    extractFinalFileContent(message, targetFile) {
+        const trimmed = message.trim();
+        if (!trimmed) {
+            return '';
+        }
+        const fencedMatch = trimmed.match(/```(?:[A-Za-z0-9_-]+)?\n([\s\S]*?)```/);
+        if (fencedMatch && fencedMatch[1]) {
+            return fencedMatch[1].trim();
+        }
+        const extension = path.extname(targetFile).toLowerCase();
+        if (extension === '.html') {
+            const htmlStart = trimmed.indexOf('<!DOCTYPE html>') >= 0
+                ? trimmed.indexOf('<!DOCTYPE html>')
+                : trimmed.indexOf('<html');
+            if (htmlStart >= 0) {
+                return trimmed.slice(htmlStart).trim();
+            }
         }
-        console.log();
+        return trimmed;
     }
-    showHistory() {
-        console.log();
-        this.logger.section('Conversation History');
-        const userMessages = this.messages.filter(m => m.role !== 'system');
-        if (userMessages.length === 0) {
-            console.log(chalk_1.default.gray('  No messages yet'));
-        }
-        else {
-            userMessages.forEach((m, i) => {
-                const role = m.role === 'user' ? chalk_1.default.cyan('you') : chalk_1.default.green('vigthoria');
-                const preview = m.content.substring(0, 60).replace(/\n/g, ' ');
-                console.log(`${i + 1}. ${role}: ${chalk_1.default.gray(preview)}...`);
-            });
+    async executeToolCalls(toolCalls) {
+        if (!this.tools) {
+            throw new Error('Agent tools are not initialized.');
+        }
+        for (const call of toolCalls) {
+            console.log(chalk_1.default.cyan(`⚙ Executing: ${call.tool}`));
+            const result = await this.tools.execute(call);
+            const summary = this.formatToolResult(call, result);
+            console.log(result.success ? chalk_1.default.gray(summary) : chalk_1.default.red(summary));
+            this.messages.push({ role: 'system', content: summary });
         }
-        console.log();
     }
-    async compactContext(model) {
-        // If we have too many messages, summarize older ones
-        if (this.messages.length < 10) {
-            this.logger.info('Context is already compact');
-            return;
+    formatToolResult(call, result) {
+        const parts = [`Tool ${call.tool} ${result.success ? 'succeeded' : 'failed'}.`];
+        if (result.output) {
+            parts.push(`Output:\n${this.truncateText(result.output)}`);
         }
-        const spinner = (0, ora_1.default)({
-            text: chalk_1.default.gray('Compacting context...'),
-            spinner: 'dots',
-        }).start();
-        try {
-            // Keep system message and last 4 messages
-            const systemMessage = this.messages[0];
-            const recentMessages = this.messages.slice(-4);
-            const olderMessages = this.messages.slice(1, -4);
-            if (olderMessages.length === 0) {
-                spinner.stop();
-                this.logger.info('Nothing to compact');
-                return;
-            }
-            // Ask AI to summarize older conversation
-            const summaryResponse = await this.api.chat([
-                { role: 'system', content: 'Summarize this conversation in a concise way, preserving key context and decisions.' },
-                ...olderMessages,
-            ], model, this.localMode);
-            // Create compacted context
-            this.messages = [
-                systemMessage,
-                { role: 'system', content: `[Previous conversation summary]: ${summaryResponse.message}` },
-                ...recentMessages,
-            ];
-            spinner.stop();
-            this.logger.success(`Compacted ${olderMessages.length} messages into summary`);
+        if (result.error) {
+            parts.push(`Error:\n${this.truncateText(result.error)}`);
         }
-        catch (error) {
-            spinner.stop();
-            this.logger.error('Failed to compact context:', error.message);
+        if (result.suggestion) {
+            parts.push(`Suggestion: ${result.suggestion}`);
         }
+        return parts.join('\n');
     }
-    printModels() {
-        const models = this.config.getAvailableModels();
-        console.log();
-        this.logger.section('═══ VIGTHORIA MODELS ═══');
-        console.log();
-        // Group by tier
-        const localModels = models.filter(m => m.tier === 'local');
-        const cloudModels = models.filter(m => m.tier === 'cloud');
-        console.log(chalk_1.default.green.bold('  🏠 VIGTHORIA LOCAL (Self-hosted, fast, no API cost)'));
-        console.log(chalk_1.default.gray('  ─────────────────────────────────────────────────'));
-        localModels.forEach(m => {
-            const isDefault = m.id === 'code';
-            const marker = isDefault ? chalk_1.default.yellow(' ★ DEFAULT') : '';
-            console.log(chalk_1.default.cyan('    ' + m.id.padEnd(15)) + chalk_1.default.white(m.name.padEnd(25)) + chalk_1.default.gray(m.description) + marker);
-        });
-        if (cloudModels.length > 0) {
-            console.log();
-            console.log(chalk_1.default.magenta.bold('  ☁️  VIGTHORIA CLOUD (Premium, for complex tasks)'));
-            console.log(chalk_1.default.gray('  ─────────────────────────────────────────────────'));
-            cloudModels.forEach(m => {
-                console.log(chalk_1.default.cyan('    ' + m.id.padEnd(15)) + chalk_1.default.white(m.name.padEnd(25)) + chalk_1.default.gray(m.description));
-            });
-            console.log();
-            console.log(chalk_1.default.yellow('  💡 Tip: Use /model cloud for complex multi-file tasks'));
+    truncateText(text) {
+        const maxLength = 4000;
+        if (text.length <= maxLength) {
+            return text;
         }
-        else {
-            console.log();
-            console.log(chalk_1.default.yellow('  💡 Upgrade to Pro for Vigthoria Cloud (671B models)'));
-        }
-        console.log();
+        return `${text.slice(0, maxLength)}\n...[truncated]`;
     }
-    // Suggest Cloud upgrade for complex tasks
-    suggestCloudUpgrade(currentModel, prompt) {
-        // Don't suggest if already on cloud
-        if (this.config.isCloudModel(currentModel)) {
-            return false;
+    saveSession() {
+        if (!this.currentSession) {
+            this.currentSession = this.sessionManager.create(this.currentProjectPath, this.currentModel, this.agentMode);
         }
-        // Check if task seems complex
-        if (this.config.isComplexTask(prompt)) {
-            console.log();
-            console.log(chalk_1.default.yellow('╔══════════════════════════════════════════════════════════╗'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.white.bold('  💡 This looks like a complex task!                      ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.gray('  Current: ') + chalk_1.default.cyan(currentModel.padEnd(43)) + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.gray('  Suggested: ') + chalk_1.default.magenta('Vigthoria Cloud (671B)'.padEnd(41)) + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║                                                          ║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.white('  Type ') + chalk_1.default.cyan('/model cloud') + chalk_1.default.white(' for better results on:           ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.gray('    • Multi-file refactoring                              ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.gray('    • Architecture decisions                              ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('║') + chalk_1.default.gray('    • Complex feature implementation                      ') + chalk_1.default.yellow('║'));
-            console.log(chalk_1.default.yellow('╚══════════════════════════════════════════════════════════╝'));
-            console.log();
+        this.currentSession.project = this.currentProjectPath;
+        this.currentSession.model = this.currentModel;
+        this.currentSession.agentMode = this.agentMode;
+        this.currentSession.messages = [...this.messages];
+        this.sessionManager.save(this.currentSession);
+    }
+    async requestPermission(action) {
+        if (this.autoApprove) {
             return true;
         }
-        return false;
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+        });
+        console.log(action);
+        const answer = await new Promise((resolve) => {
+            rl.question(chalk_1.default.yellow('Approve? [y]es / [n]o / [a]ll this turn: '), resolve);
+        });
+        rl.close();
+        const normalized = answer.trim().toLowerCase();
+        if (normalized === 'a' || normalized === 'all') {
+            return 'batch';
+        }
+        return normalized === 'y' || normalized === 'yes';
+    }
+    getCurrentSessionInfo() {
+        if (!this.currentSession) {
+            return 'No active session';
+        }
+        return `Session: ${this.currentSession.name} (${this.currentSession.messages.length} messages)`;
+    }
+    getChatHistory() {
+        return [...this.messages];
     }
 }
 exports.ChatCommand = ChatCommand;