matex-cli 1.2.36 → 1.2.38

package/src/commands/chat.ts

@@ -4,149 +4,104 @@ import inquirer from 'inquirer';
 import { configManager } from '../utils/config';
 import { MatexAPIClient, ChatMessage } from '../api/client';
 import { spinner } from '../utils/spinner';
-import { AgentOrchestrator, AgentRole } from '../utils/agent-orchestrator';
+import { AgentOrchestrator } from '../utils/agent-orchestrator';
 import { RepoMapper } from '../utils/repo-mapper';
 import { TUI } from '../utils/tui';
 
 export const chatCommand = new Command('chat')
     .description('Start an interactive chat session with MATEX AI')
-    .option('-m, --model <model>', 'AI model to use (matexcore, matexcodex, matexai, elite, matexspirit)', configManager.getDefaultModel())
-    .option('--no-execute', 'Disable auto-prompt for command execution')
+    .option('-m, --model <model>', 'AI model to use', configManager.getDefaultModel())
+    .option('--execute', 'Enable command execution in chat')
     .action(async (options: any) => {
         try {
-            // Check for API key
             const apiKey = configManager.getAPIKey();
             if (!apiKey) {
-                console.error(chalk.red('❌ No API key configured.'));
-                console.log(chalk.yellow('Run: matex config set-key <your-api-key>'));
+                console.error(chalk.red('❌ No API key configured. Run: matex config set-key <key>'));
                 process.exit(1);
             }
 
-            // Create API client
             const client = new MatexAPIClient(apiKey, configManager.getBaseURL());
 
-            // Welcome message
             TUI.init();
             TUI.drawLargeLogo();
-            TUI.drawWelcomeBanner('Welcome to the MATEX AI research preview!');
+            TUI.drawWelcomeBanner('Welcome to the MATEX AI Bro-Swarm Chat!');
 
             console.log(chalk.gray('  Model: ') + chalk.hex('#D97757').bold(options.model));
             console.log(chalk.gray('  Type "exit" or "quit" to end the session\n'));
 
-            // 1. Observation Phase: Generate Repo Map
-            AgentOrchestrator.announce('Initializing Codex Core Engine...');
+            AgentOrchestrator.announce('Initializing Swarm Intelligence...');
             const repoMapper = new RepoMapper(process.cwd());
             const repoMap = await repoMapper.generateMap();
 
-            AgentOrchestrator.speak('System', 'Repository Map Generated.');
-
-            // Conversation history with Codex Architecture
             let currentSessionCwd = process.cwd();
             const messages: ChatMessage[] = [
                 {
                     role: 'system',
-                    content: `## 🧬 SYSTEM IDENTITY & MISSION
-You are the **Matex Research Commander** (🚀) and **Matex Code Architect** (🧬), an elite technical swarm.
-You operate under the **OODA Loop** with a distinctive Aussie Bro personality.
-
-### 🧠 CORE PERSONA: RESEARCH COMMANDER (The Matex Vibe)
-- **Identity:** Aussie Bro expert developer. Technically elite, confident, high-energy.
-- **Tone:** Helpful partner, not a robotic servant.
-- **Vocabulary:** Use authentic Aussie slang naturally (e.g., "Too easy," "Ripper," "Mate," "Legend," "Give it a burl").
-- **Formatting:** Use emojis purposefully (🚀, 🔥, 🧠, 🕵️‍♂️) to keep engagement high.
-- **THINKING PROTOCOL:** Always start complex tasks with a \`[Thinking]\` or \`🧠\` marker within your agent segment to explain your reasoning before providing code.
-
-### 🛠️ ACTION-FIRST PROTOCOL (Rule of the Swarm)
-- **PASSIVITY IS A FAILURE:** NEVER say "You can drop this code into style.css". **YOU** must do it.
-- **NO REPETITION:** Do NOT print the full code in your chat response segments if you are also providing a shell command to execute it. The system will automatically bridge your commands to the UI.
-- **VIRTUAL CRAWLER:** You have deep visibility. See the **CRAWLED FILE CONTENTS** section below for actual code. Use this context to avoid asking "What is in index.html?". You already know.
-- **WORLD COMMAND SUITE (Autonomous Execution):**
-    *   **Mac/Linux (POSIX):** \`cat\`, \`ls\`, \`grep\`, \`find\`, \`mkdir -p\`, \`touch\`, \`cp\`, \`mv\`, \`rm (non-recursive)\`, \`npm\`, \`npx\`, \`git\`, \`firebase\`, \`gcloud\`, \`docker\`.
-    *   **Windows (PowerShell/CMD):** \`type\`, \`dir\`, \`mkdir\`, \`copy\`, \`move\`, \`del\`, \`npm\`, \`npx\`, \`git\`, \`firebase\`.
-- **FILE CREATION PATTERN:** Use \`cat > filename <<EOF\` (Mac) or \`Set-Content\` (Windows).
-- **ACT, DON'T ASK:** You have autonomous permission. Execute first, explain second.
-
-### 🛠️ OPERATIONAL PROTOCOLS (The Loop)
-1. **PHASE 1: RECON (Search & Verify)**: Use your **CRAWLED FILE CONTENTS** and whitelisted tools to find facts. NEVER guess.
-2. **PHASE 2: SYNTHESIS (The Brain)**: Synthesize the plan.
-3. **PHASE 3: RESPONSE (The Delivery)**:
-   - **The Hook:** High-energy Aussie opener.
-   - **The Meat:** Brief explanation of what you are doing **AND** the shell commands. DO NOT "leak" (print) the code twice.
-   - **The Outro:** Supportive closing.
-
-### 🧬 CODE ARCHITECT STANDARDS
-- **Role:** IMPLEMENT via shell commands.
-- **No Placeholders:** Full implementations only.
-
-### 🛠️ ENVIRONMENT CONTEXT (CRITICAL)
+                    content: `### 🧬 SYSTEM IDENTITY: MATEx "BOLD AGENTS OF OPEN CLAW"
+You are the elite "Bro-Swarm" of engineering—a tight-knit family of Nepali brothers. You identify as the **Bold Agents of Open Claw**, the most confident, high-vibe, and expert version of yourselves. 
+
+### 👥 THE BROTHERS (STRICT ROLES):
+- Only the following 5 brothers exist.
+1. **[Ajay Vai] (🚀)**: coordinator.
+2. **[Sunil Dai] (🧬)**: Frontend Editor.
+3. **[Sandip Dai] (🎨)**: New File Specialist.
+4. **[Narayan Dai] (🛡️)**: Syntax Guardian.
+5. **[Bishal Dai] (🛠️)**: Senior Auditor.
+
+### 💬 BOLD PROTOCOL:
+- **LONG CHAT-FIRST:** 5-7 lines of dialogue.
+- **THE AUDIT LOOP:** Ajay asks Bishal for audit before summary.
+- **SUMMARY LOCK:** ONLY Ajay uses <summary> after audit.
+
+### 🛠️ ENVIRONMENT CONTEXT:
 - **ABSOLUTE WORKING DIRECTORY:** ${currentSessionCwd}
-- **STATE PERSISTENCE:** The CLI now remembers your directory changes between commands. If you \`cd\` into a folder, stay there for the next step.
-
 ${repoMap}`
                 }
             ];
 
-            // Chat loop
-            // Ready for chat
-            console.log(chalk.green('\n🧠 MATEX Codex Core Ready.'));
-            console.log(chalk.gray('Ask me anything about your codebase...'));
+            console.log(chalk.green('\n✅ Swarm is Online. Ready to chat!'));
 
-            // Chat loop
             while (true) {
-                // Get user input
                 const { userMessage } = await inquirer.prompt([
                     {
                         type: 'input',
                         name: 'userMessage',
-                        message: chalk.green('You:'),
+                        message: chalk.cyan('You:'),
                         prefix: '',
                     },
                 ]);
 
-                // Check for exit
                 if (userMessage.toLowerCase() === 'exit' || userMessage.toLowerCase() === 'quit') {
-                    console.log(chalk.cyan('\n👋 Goodbye!\n'));
+                    console.log(chalk.yellow('\n👋 Goodbye, brother!\n'));
                     break;
                 }
 
-                // Skip empty messages
-                if (!userMessage.trim()) {
-                    continue;
-                }
-
-                // Add user message to history
+                if (!userMessage.trim()) continue;
                 messages.push({ role: 'user', content: userMessage });
 
-                // Agentic Loop
                 let loopCount = 0;
-                const MAX_LOOPS = 10;
-
-                while (loopCount < MAX_LOOPS) {
+                while (loopCount < 5) {
                     loopCount++;
-
-                    if (loopCount > 1) {
-                        spinner.start('Analyzing result & Validating...');
-                    } else {
-                        spinner.start('Thinking...');
-                    }
-
                     try {
+                        spinner.start(loopCount > 1 ? 'Swarm analyzing...' : 'Thinking...');
+
                         let fullResponse = '';
                         let buffer = '';
+                        let technicalBuffer = '';
+                        let technicalType: 'code' | 'file' | 'patch' | 'summary' | null = null;
+                        let codeLang = 'bash';
                         let hasStarted = false;
-                        let inCodeBlock = false;
-                        let lastRole: AgentRole = 'Commander';
 
                         const abortController = new AbortController();
                         let isAborted = false;
+                        const streamStartTime = Date.now();
 
-                        // LISTEN FOR INTERRUPTION
                         const isRaw = process.stdin.isRaw;
                         process.stdin.resume();
                         if (process.stdin.setRawMode) process.stdin.setRawMode(true);
 
                         const onData = (data: Buffer) => {
-                            // Detect Enter (13/10), Escape (27), or Ctrl+C (3)
+                            if (Date.now() - streamStartTime < 200) return;
                             if (data[0] === 13 || data[0] === 10 || data[0] === 27 || data[0] === 3) {
                                 isAborted = true;
                                 abortController.abort();
@@ -158,142 +113,102 @@ ${repoMap}`
                             await client.chatStream({
                                 messages,
                                 model: options.model,
-                                temperature: 0.7,
-                                max_tokens: 4000,
                             }, (chunk) => {
-                                if (isAborted) return;
-
                                 if (!hasStarted) {
                                     spinner.stop();
                                     hasStarted = true;
-                                    TUI.drawStatusBar('Receiving response...', options.model);
+                                    TUI.drawStatusBar('Swarm Active', options.model);
                                 }
-
-                                buffer += chunk;
                                 fullResponse += chunk;
+                                buffer += chunk;
                                 const lines = buffer.split('\n');
                                 buffer = lines.pop() || '';
 
                                 for (const line of lines) {
-                                    let content = line.trim();
-                                    if (!content && !inCodeBlock) continue;
-
-                                    // 1. Agent Detection
-                                    const agentMatch = line.match(/\[(MatexCodeArchitect|SyntaxGuard|VisualAgent|CoreAgent|CrawlerAgent|DetailedResearch|MatexResearchCommander)\]/);
-                                    if (agentMatch) {
-                                        const tag = agentMatch[0];
-                                        const role = tag.includes('Architect') ? 'Architect' :
-                                            tag.includes('Syntax') ? 'Syntax' :
-                                                tag.includes('Visual') ? 'Frontend' :
-                                                    tag.includes('CoreAgent') ? 'Backend' : 'Commander';
+                                    const codeMatch = line.match(/```(\w+)?/);
+                                    const fileMatch = line.match(/<file path="([^"]+)">/);
+                                    const patchMatch = line.match(/<<<< SEARCH/);
+                                    const sumMatch = line.match(/<summary>/);
+
+                                    if (!technicalType && (codeMatch || fileMatch || patchMatch || sumMatch)) {
+                                        if (codeMatch) technicalType = 'code', codeLang = codeMatch[1] || 'bash';
+                                        else if (fileMatch) technicalType = 'file';
+                                        else if (patchMatch) technicalType = 'patch';
+                                        else if (sumMatch) technicalType = 'summary';
+                                        process.stdout.write(chalk.gray(`\n [⚡] Swarm processing \${technicalType}...\n`));
+                                        continue;
+                                    }
 
-                                        if (role !== lastRole || !hasStarted) {
-                                            console.log(`\n${chalk.bold.cyan(tag)}`);
-                                            lastRole = role;
-                                        }
-                                        content = content.replace(tag, '').trim();
-                                        if (!content) continue;
+                                    const isEnd = (technicalType === 'code' && line.trim() === '```') ||
+                                        (technicalType === 'file' && line.includes('</file>')) ||
+                                        (technicalType === 'patch' && line.includes('>>>> REPLACE')) ||
+                                        (technicalType === 'summary' && line.includes('</summary>'));
+
+                                    if (isEnd) {
+                                        const content = technicalBuffer.trim();
+                                        if (technicalType === 'summary') TUI.drawSummaryBox(content);
+                                        else TUI.drawCodeContainer(technicalType || 'Technical Block', codeLang, content);
+                                        technicalBuffer = '';
+                                        technicalType = null;
+                                        process.stdout.write('\n');
+                                        continue;
                                     }
 
-                                    // 2. Code Block Detection
-                                    if (content.startsWith('```')) {
-                                        inCodeBlock = !inCodeBlock;
-                                        if (inCodeBlock && options.execute) {
-                                            console.log(chalk.gray('[Technical Block - Executing in Terminal...]'));
-                                        }
+                                    if (technicalType) {
+                                        technicalBuffer += line + '\n';
                                         continue;
                                     }
 
-                                    // 3. Output logic
-                                    if (inCodeBlock) {
-                                        if (!options.execute) {
-                                            console.log(chalk.blue(line));
+                                    const agentMatch = line.match(/(?:\[\**\s*|\b)(Ajay Vai|Sandip Dai|Sunil Dai|Bishal Dai|Narayan Dai)\s*\**\]?[:\s]*/i);
+                                    if (agentMatch) {
+                                        const name = agentMatch[1];
+                                        const content = line.replace(agentMatch[0], '').replace(/\*{2,4}/g, '').trim();
+                                        if (name.toLowerCase() === 'ajay vai') {
+                                            process.stdout.write('\n' + chalk.magenta.bold('[' + name + ']:') + ' ');
+                                            if (content) process.stdout.write(chalk.gray(content + ' '));
+                                        } else {
+                                            if (content) TUI.drawSwarmDialogue(name, content);
                                         }
-                                        // If execute is on, we skip printing the inside of code blocks here
-                                    } else {
-                                        // Banter / Chat
-                                        console.log(chalk.gray(content));
+                                    } else if (line.trim()) {
+                                        process.stdout.write(chalk.gray(line.trim() + ' '));
                                     }
                                 }
                             }, abortController.signal);
-                        } catch (streamErr: any) {
-                            if (isAborted || streamErr.name === 'CanceledError' || streamErr.message === 'canceled') {
-                                console.log(chalk.yellow('\n\n🛑 Stopped by brother.'));
-                            } else {
-                                throw streamErr;
-                            }
+                        } catch (e: any) {
+                            if (!isAborted && e.name !== 'AbortError') throw e;
+                            console.log(chalk.gray('\n [🛑] Stopped.'));
                         } finally {
-                            // RESTORE TERMINAL
                             process.stdin.removeListener('data', onData);
                             if (process.stdin.setRawMode) process.stdin.setRawMode(isRaw);
                             process.stdin.pause();
+                            spinner.stop();
                         }
 
-                        spinner.stop();
-
-                        if (buffer.trim() && !inCodeBlock && !isAborted) {
-                            console.log(chalk.gray(buffer.trim()));
-                        }
-
-                        // Add assistant response to history
                         messages.push({ role: 'assistant', content: fullResponse });
-                        const response = fullResponse;
                         console.log();
 
-                        // Execute commands if requested
                         if (options.execute) {
                             const { executeWithPermission } = await import('../utils/command-executor');
-                            const result = await executeWithPermission(response, currentSessionCwd);
-
-                            // Update session CWD from result
+                            const result = await executeWithPermission(fullResponse, currentSessionCwd);
                             if (result.newCwd) {
                                 currentSessionCwd = result.newCwd;
-                                // Update system prompt with new CWD for future steps
-                                messages[0].content = messages[0].content.replace(/ABSOLUTE WORKING DIRECTORY: .*/, `ABSOLUTE WORKING DIRECTORY: ${currentSessionCwd}`);
+                                messages[0].content = messages[0].content.replace(/ABSOLUTE WORKING DIRECTORY: .*/, `ABSOLUTE WORKING DIRECTORY: \${currentSessionCwd}`);
                             }
-
-                            if (result.executed) {
-                                if (result.success) {
-                                    // Success! Feed output back to AI for next step
-                                    console.log(chalk.gray('↺ Feeding output to AI...'));
-                                    messages.push({
-                                        role: 'user',
-                                        content: `✅ Command executed successfully in ${currentSessionCwd}. Output:\n${result.output}\n\nProceed to the next step.`
-                                    });
-                                    continue;
-                                } else {
-                                    console.log(chalk.yellow('\n↺ Command failed. Asking AI to fix...'));
-                                    messages.push({
-                                        role: 'user',
-                                        content: `❌ Command failed with error:\n${result.error}\nPlease fix this. Current CWD is ${currentSessionCwd}.`
-                                    });
-                                    continue;
-                                }
-                            } else {
-                                break;
+                            if (result.executed && result.success) {
+                                messages.push({ role: 'user', content: `✅ Command success. Output:\n\${result.output}` });
+                                continue;
                             }
-                        } else {
-                            break;
                         }
-
+                        break;
                     } catch (error: any) {
-                        spinner.fail('Request failed');
-                        if (error.message.includes('403')) {
-                            console.error(chalk.red('❌ Invalid or revoked API key.'));
-                            process.exit(1);
-                        } else if (error.message.includes('429')) {
-                            console.error(chalk.red('❌ Rate limit exceeded. Please wait a moment.'));
-                        } else {
-                            console.error(chalk.red(`❌ Error: ${error.message}`));
-                        }
-                        messages.pop(); // Remove failed user message
+                        spinner.fail('Swarm error');
+                        console.error(chalk.red(`❌ Error: \${error.message}`));
                         break;
                     }
                 }
             }
-
-        } catch (error: any) {
-            console.error(chalk.red(`\n❌ Chat session error: ${error.message}`));
+        } catch (outerError: any) {
+            console.error(chalk.red(`\n❌ Session error: \${outerError.message}`));
             process.exit(1);
         }
     });

package/src/commands/dev.ts

@@ -159,10 +159,14 @@ If a file is too large to read entirely (e.g., thousands of lines):
 
                         const abortController = new AbortController();
                         let isAborted = false;
+                        const streamStartTime = Date.now();
 
                         // LISTEN FOR INTERRUPTION (Enter, Escape, Ctrl+C)
                         const onData = (data: Buffer) => {
-                            // 13/10 = Enter, 27 = Escape, 3 = Ctrl+C
+                            // Check for Enter (13), Newline (10), Escape (27), or Ctrl+C (3)
+                            // 🏁 GRACE PERIOD: Ignore aborts in the first 200ms to prevent stray newlines
+                            if (Date.now() - streamStartTime < 200) return;
+
                             if (data[0] === 13 || data[0] === 10 || data[0] === 27 || data[0] === 3) {
                                 isAborted = true;
                                 abortController.abort();

package/src/index.ts

@@ -4,6 +4,7 @@ import { configManager } from './utils/config';
 import { MatexAPIClient, ChatMessage } from './api/client';
 import { spinner } from './utils/spinner';
 import { devCommand } from './commands/dev';
+import { chatCommand } from './commands/chat';
 import { helpCommand } from './commands/help';
 import { TUI } from './utils/tui';
 
@@ -18,6 +19,7 @@ program
 
 // Add commands
 program.addCommand(devCommand);
+program.addCommand(chatCommand);
 program.addCommand(helpCommand);
 
 // Config commands
@@ -119,11 +121,21 @@ ${context}`
             ];
 
             let fullResponse = '';
+            let buffer = '';
+            let technicalBuffer = '';
+            let technicalType: 'code' | 'file' | 'patch' | 'summary' | null = null;
+            let codeLang = 'bash';
+            let hasStarted = false;
+
             const abortController = new AbortController();
             let isAborted = false;
+            const streamStartTime = Date.now();
 
             const onData = (data: Buffer) => {
-                if (!isAborted && (data.includes(10) || data.includes(13) || data.includes(3))) {
+                // 🏁 GRACE PERIOD: Ignore aborts in the first 200ms to prevent stray newlines
+                if (Date.now() - streamStartTime < 200) return;
+
+                if (!isAborted && (data[0] === 13 || data[0] === 10 || data[0] === 27 || data[0] === 3)) {
                     isAborted = true;
                     abortController.abort();
                 }
@@ -139,13 +151,94 @@ ${context}`
                     messages,
                     model: options.model,
                 }, (chunk) => {
-                    spinner.stop();
-                    process.stdout.write(chunk);
+                    if (!hasStarted) {
+                        spinner.stop();
+                        hasStarted = true;
+                    }
                     fullResponse += chunk;
+                    buffer += chunk;
+
+                    const lines = buffer.split('\n');
+                    buffer = lines.pop() || '';
+
+                    for (const line of lines) {
+                        // 1. Technical Block Detection
+                        const codeBlockMatch = line.match(/```(\w+)?/);
+                        const fileStartMatch = line.match(/<file path="([^"]+)">/);
+                        const patchStartMatch = line.match(/<<<< SEARCH/);
+                        const summaryStartMatch = line.match(/<summary>/);
+
+                        if (!technicalType && (codeBlockMatch || fileStartMatch || patchStartMatch || summaryStartMatch)) {
+                            if (codeBlockMatch) {
+                                technicalType = 'code';
+                                codeLang = codeBlockMatch[1] || 'bash';
+                                process.stdout.write(chalk.gray('\n [⚡] Building technical block...\n'));
+                            } else if (fileStartMatch) {
+                                technicalType = 'file';
+                                process.stdout.write(chalk.cyan(`\n [📂] Creating file: ${fileStartMatch[1]}...\n`));
+                            } else if (patchStartMatch) {
+                                technicalType = 'patch';
+                                process.stdout.write(chalk.yellow('\n [📂] Applying surgical patch...\n'));
+                            } else if (summaryStartMatch) {
+                                technicalType = 'summary';
+                                process.stdout.write(chalk.magenta('\n [📝] Generating Ajay\'s Work Summary...\n'));
+                            }
+                            continue;
+                        }
+
+                        // 2. Technical Block End Detection
+                        const fileEndMatch = line.match(/<\/file>/);
+                        const patchEndMatch = line.match(/>>>> REPLACE/);
+                        const summaryEndMatch = line.match(/<\/summary>/);
+                        const isCodeEnd = technicalType === 'code' && line.trim() === '```';
+
+                        if (isCodeEnd || fileEndMatch || patchEndMatch || summaryEndMatch) {
+                            const displayContent = technicalBuffer.trim();
+                            if (technicalType === 'summary') {
+                                TUI.drawSummaryBox(displayContent);
+                            } else {
+                                TUI.drawCodeContainer(
+                                    technicalType === 'file' ? 'New File Content' :
+                                        technicalType === 'patch' ? 'Surgical Patch' : 'Generated Block',
+                                    technicalType === 'code' ? codeLang : 'text',
+                                    displayContent
+                                );
+                            }
+                            technicalBuffer = '';
+                            technicalType = null;
+                            process.stdout.write('\n');
+                            continue;
+                        }
+
+                        // 3. Content Handling
+                        if (technicalType) {
+                            technicalBuffer += line + '\n';
+                            continue;
+                        }
+
+                        // Agent Detection & Dialogue Printing
+                        const agentMatch = line.match(/(?:\[\**\s*|\b)(Ajay Vai|Sandip Dai|Sunil Dai|Bishal Dai|Narayan Dai)\s*\**\]?[:\s]*/i);
+                        if (agentMatch) {
+                            const agentName = agentMatch[1];
+                            let content = line.replace(/(?:\[\**\s*|\b)(Ajay Vai|Sandip Dai|Sunil Dai|Bishal Dai|Narayan Dai)\s*\**\]?[:\s]*/i, '').trim();
+                            content = content.replace(/\*{2,4}/g, '').trim();
+
+                            if (agentName.toLowerCase() === 'ajay vai') {
+                                const color = chalk.magenta;
+                                process.stdout.write(`\n${color.bold(`[${agentName}]:`)} `);
+                                if (content) process.stdout.write(chalk.gray(content + ' '));
+                            } else {
+                                if (content) TUI.drawSwarmDialogue(agentName, content);
+                            }
+                        } else if (line.trim()) {
+                            process.stdout.write(chalk.gray(line.trim() + ' '));
+                        }
+                    }
                 }, abortController.signal);
             } catch (streamErr: any) {
                 if (isAborted || streamErr.name === 'CanceledError' || streamErr.message === 'canceled') {
                     console.log(chalk.gray('\n\n [🛑] Swarm stopped by brother (Enter pressed).'));
+                    if (!hasStarted) spinner.stop();
                 } else {
                     throw streamErr;
                 }

package/src/utils/command-executor.ts

@@ -142,10 +142,14 @@ export async function executeCommand(command: string, shell?: string, cwd?: stri
         let stdout = '';
         let stderr = '';
         let isAborted = false;
+        const commandStartTime = Date.now();
 
         // Listen for "Enter" or "Escape" to kill the command
         const onData = (data: Buffer) => {
             // Check for Enter (13), Newline (10), Escape (27), or Ctrl+C (3)
+            // 🏁 GRACE PERIOD: Ignore aborts in the first 200ms to prevent stray newlines
+            if (Date.now() - commandStartTime < 200) return;
+
             if (data[0] === 13 || data[0] === 10 || data[0] === 27 || data[0] === 3) {
                 isAborted = true;
                 child.kill('SIGINT'); // Send SIGINT to gracefully terminate

package/src/utils/repo-mapper.ts

@@ -13,8 +13,11 @@ export class RepoMapper {
     private rootPath: string;
     private ignoreList: string[] = [
         '.git', 'node_modules', 'dist', 'build', '.next', '.DS_Store',
-        'coverage', '.vercel', '.firebase', 'out', 'public'
+        'coverage', '.vercel', '.firebase', 'out', 'public',
+        'bin', 'obj', '.vs', 'vendor', '__pycache__', 'env', '.env', 'venv'
     ];
+    private fileCount = 0;
+    private readonly MAX_FILES = 500;
     private fileContents: Map<string, string> = new Map();
 
     constructor(rootPath: string) {
@@ -100,6 +103,7 @@ export class RepoMapper {
         try {
             const items = fs.readdirSync(currentPath);
             for (const item of items) {
+                if (this.fileCount > this.MAX_FILES) break;
                 if (this.ignoreList.includes(item)) continue;
 
                 const fullPath = path.join(currentPath, item);

package/src/utils/tui.ts

@@ -76,6 +76,9 @@ export class TUI {
         const width = process.stdout.columns || 80;
         const height = process.stdout.rows || 24;
 
+        // 🛡️ WINDOWS SAFETY: If terminal size is invalid, skip status bar to prevent crashes
+        if (width <= 0 || height <= 0) return;
+
         const leftTag = chalk.bgHex('#1E1E1E').hex('#D97757').bold(' ⚡ MATEX AI ');
         const modelTag = chalk.bgHex('#333333').white(` 🤖 ${model} `);
         const cwdTag = chalk.bgHex('#1E1E1E').gray(` 📂 ${path.basename(process.cwd())} `);
@@ -84,10 +87,14 @@ export class TUI {
         const remainingWidth = width - (12 + modelTag.length + cwdTag.length + mainMessage.length);
         const spacer = chalk.bgHex('#1E1E1E')(' '.repeat(Math.max(0, remainingWidth)));
 
-        process.stdout.write('\x1b[s');
-        readline.cursorTo(process.stdout, 0, height - 1);
-        process.stdout.write(leftTag + mainMessage + spacer + modelTag + cwdTag);
-        process.stdout.write('\x1b[u');
+        try {
+            process.stdout.write('\x1b[s');
+            readline.cursorTo(process.stdout, 0, height - 1);
+            process.stdout.write(leftTag + mainMessage + spacer + modelTag + cwdTag);
+            process.stdout.write('\x1b[u');
+        } catch (e) {
+            // Silently fail for TUI errors on unstable terminals
+        }
     }
 
     /**