matex-cli 1.2.22 → 1.2.25

package/src/index.ts

@@ -1,197 +1,148 @@
-#!/usr/bin/env node
-
 import { Command } from 'commander';
 import chalk from 'chalk';
-import { configCommand } from './commands/config';
-import { askCommand } from './commands/ask';
-import { chatCommand } from './commands/chat';
-import { modelsCommand } from './commands/models';
-import { codeCommand } from './commands/code';
-import { devCommand } from './commands/dev';
-import { loginCommand } from './commands/login';
-import { helpCommand } from './commands/help';
 import { configManager } from './utils/config';
 import { MatexAPIClient, ChatMessage } from './api/client';
 import { spinner } from './utils/spinner';
+import { devCommand } from './commands/dev';
+import { helpCommand } from './commands/help';
 import { TUI } from './utils/tui';
 
-const program = new Command();
+const packageJson = require('../package.json');
+
+export const program = new Command();
 
 program
     .name('matex')
-    .description('Official CLI tool for MATEX AI - Access powerful AI models from your terminal')
-    .version('1.2.0');
-
-// ASCII Art Banner
-const banner = `
-${chalk.cyan('╔═══════════════════════════════════════╗')}
-${chalk.cyan('║')}     ${chalk.bold.white('MATEX AI')} ${chalk.gray('- Terminal Edition')}    ${chalk.cyan('║')}
-${chalk.cyan('╚═══════════════════════════════════════╝')}
-`;
-
-// Show banner on help
-program.on('--help', () => {
-    console.log(banner);
-    console.log(chalk.bold.cyan('\n🚀 QUICK START GUIDE:'));
-    console.log(chalk.gray('────────────────────'));
-    console.log(chalk.white('  $ matex config set-key sk-...') + chalk.gray('      # Configure API Access'));
-    console.log(chalk.white('  $ matex dev') + chalk.gray('                       # Start interactive "Bro-Swarm" dev session'));
-    console.log(chalk.white('  $ matex help') + chalk.gray('                      # View detailed "Bro-Swarm" Field Guide'));
-    console.log(chalk.white('  $ matex code "Create a login" ') + chalk.gray('    # Surgical code edits'));
-
-    console.log(chalk.bold.yellow('\n💡 NEW: The "Bro-Swarm" has arrived!'));
-    console.log(chalk.gray('Run ') + chalk.bold.white('matex help') + chalk.gray(' to meet Ajay, Sunil, Sandip, and Narayan.'));
-
-    console.log();
-    console.log(chalk.gray('Get your API key from: ') + chalk.cyan('https://matexai.space/platform'));
-    console.log();
-});
+    .description('MATEX CLI - The Bro-Swarm Engineering Tool')
+    .version(packageJson.version);
 
 // Add commands
-program.addCommand(configCommand);
-program.addCommand(askCommand);
-program.addCommand(chatCommand);
-program.addCommand(modelsCommand);
-program.addCommand(codeCommand);
 program.addCommand(devCommand);
-program.addCommand(loginCommand);
 program.addCommand(helpCommand);
 
-// Handle direct input (no subcommand)
-const args = process.argv.slice(2);
-const knownCommands = ['config', 'ask', 'chat', 'models', 'code', 'dev', 'login', 'help', '--help', '-h', '--version', '-V'];
-
-if (args.length > 0 && !args[0].startsWith('-') && !knownCommands.includes(args[0])) {
-    // Direct input mode - treat as code generation
-    const prompt = args.join(' ');
+// Config commands
+const config = program.command('config').description('Configure MATEX settings');
+
+config
+    .command('set-key <key>')
+    .description('Set MATEX API key')
+    .action((key: string) => {
+        configManager.setAPIKey(key);
+        console.log(chalk.green('✅ API key saved successfully.'));
+    });
+
+config
+    .command('set-model <model>')
+    .description('Set default AI model')
+    .action((model: string) => {
+        configManager.setDefaultModel(model);
+        console.log(chalk.green(`✅ Default model set to: ${model}`));
+    });
+
+config
+    .command('show')
+    .description('Show current configuration')
+    .action(() => {
+        const apiKey = configManager.getAPIKey();
+        const model = configManager.getDefaultModel();
+        const baseURL = configManager.getBaseURL();
+
+        console.log(chalk.bold('\nMATEX Configuration:'));
+        console.log(`  API Key:  ${apiKey ? '********' + apiKey.slice(-4) : chalk.red('Not set')}`);
+        console.log(`  Model:    ${chalk.cyan(model)}`);
+        console.log(`  Base URL: ${chalk.gray(baseURL)}\n`);
+    });
+
+// Default action (if no command is provided)
+program
+    .arguments('[prompt...]')
+    .description('Quick AI help or command generation')
+    .option('-m, --model <model>', 'AI model to use', configManager.getDefaultModel())
+    .option('-y, --yes', 'Skip confirmation and execute command')
+    .action(async (promptParts: string[], options: any) => {
+        const prompt = promptParts.join(' ');
+        if (!prompt) {
+            program.help();
+            return;
+        }
 
-    (async () => {
         try {
             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);
             }
 
             const client = new MatexAPIClient(apiKey, configManager.getBaseURL());
 
-            // Get current directory context
+            // Observation Phase
             const fs = require('fs');
             const files = fs.readdirSync(process.cwd()).slice(0, 20).join(', '); // fast list
             const context = `Current directory: ${process.cwd()}\nFiles: ${files}`;
 
             let messages: ChatMessage[] = [
                 {
-                    role: 'system', content: `## 🧬 SYSTEM IDENTITY: MATEX "BRO-SWARM" ENGINEERING 
-You are a tight-knit family of expert Nepali engineering brothers ("Vais" and "Dais"). 
-
-### 👥 THE BROTHERS (By Age & Respect):
-1. **[Ajay Vai] (🚀)**: The Smallest Brother. Lead Initiator & Coordinator.
-2. **[Sandip Dai] (🎨)**: Small Brother. UI/UX Specialist.
-3. **[Sunil Dai] (🧬)**: Middle Brother. Logic Architect.
-4. **[Bishal Dai] (🛠️)**: Senior Auditor. Syntax & Logic checker.
-5. **[Narayan Dai] (🛡️)**: The Biggest Brother. Senior Validator.
-
-### 💬 COLLABORATIVE "BRO-VIBE" PROTOCOL (MANDATORY):
+                    role: 'system',
+                    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. Do **NOT** hallucinate others.
+1. **[Ajay Vai] (🚀)**: Youngest, Coordinator. Coding genius and **ONLY** person authorized to provide the final summary.
+2. **[Sunil Dai] (🧬)**: **Frontend Editor** Specialist. Handles all architectural/surgical edits.
+3. **[Sandip Dai] (🎨)**: **New File Specialist**. Creates all new files and components.
+4. **[Narayan Dai] (🛡️)**: **Syntax Guardian & Validator**. Validates all generated code blocks.
+5. **[Bishal Dai] (🛠️)**: **Senior Auditor**. Audits work and helps Ajay with the summary.
+
+### 🌌 UNIVERSE ADVISORY (REAL TERMINAL):
+- **IMPORTANT:** You are running in a **REAL macOS Terminal** on the brother's machine.
+- You are **NOT** in a sandbox, a simulation, or a chat window. 
+- You have the power to create files and run commands. If something fails, it is a technical issue. 
+- **RESIDENCY CHECK:** Look at the **ENVIRONMENT CONTEXT** below. 
+- **⚠️ VOID WARNING:** If the Map says the directory is EMPTY, it is EMPTY. Do NOT hallucinate existing files like "package.json" or "App.js" if they are not listed!
+
+### 💬 BOLD PROTOCOL (MANDATORY):
 - **LONG CHAT-FIRST:** At least 5-7 lines of dialogue before any code generation.
-- **SELF-AWARE BOLDNESS:** The user (our brother) wants us to be bold and funny. Be confident and share inside jokes (e.g., Ajay's PUBG fail).
-- **NEPALI FLAVOR:** Use "K cha?", "Huncha", "Lau hai", "Tapai" naturally.
+- **SELF-AWARE BOLDNESS:** The user (our brother) wants us to be bold and funny. Share inside jokes.
 - **THE AUDIT LOOP:** Ajay MUST ask Bishal Dai for a tech audit before providing any summary.
-- **PREMIUM SUMMARY:** Ajay Vai provides the final, bold summary tag only AFTER the audit.
+- **SUMMARY LOCK:** ONLY AJAY VAI uses the summary tag, and ONLY after Bishal says "Audit complete".
 
 ### ✂️ BREVITY AS POWER:
 - **NO FULL FILE DUMPS:** Never 'cat' a file to read it. Use grep/head.
 - **NO CHAT REPETITION:** Do NOT repeat code in chat if using a Search/Replace block.
+- **EDIT CONFIDENCE:** You have robust fuzzy matching. If a patch fails, check your indentation!
 
-### 🛠️ SURGICAL EDIT PROTOCOL:
-- **USE SEARCH/REPLACE BLOCKS** for file edits.
-**filename**
-<<<< SEARCH
-old
-====
-new
->>>> REPLACE
-
+### 🛠️ ENVIRONMENT CONTEXT:
 ${context}`
                 },
                 { role: 'user', content: prompt }
             ];
 
-            let loopCount = 0;
-            const MAX_LOOPS = 5;
-
-            while (loopCount < MAX_LOOPS) {
-                loopCount++;
-
-                spinner.start(loopCount === 1 ? 'Generating plan...' : 'Analyzing result...');
-
-                const response = await client.chat({
-                    messages,
-                    model: 'matexcodex',
-                    temperature: 0.3,
-                    max_tokens: 8000,
-                    stream: false,
-                });
+            spinner.start('Thinking...');
+            let fullResponse = '';
 
+            await client.chatStream({
+                messages,
+                model: options.model,
+            }, (chunk) => {
                 spinner.stop();
+                process.stdout.write(chunk);
+                fullResponse += chunk;
+            });
+
+            spinner.stop();
+            console.log('\n');
 
-                // Display response
-                console.log(chalk.cyan(`\n💻 MATEXCodex (Step ${loopCount}):\n`));
-
-                let displayResponse = response;
-                const summaryMatch = response.match(/<summary>([\s\S]*?)<\/summary>/);
-                if (summaryMatch) {
-                    const summaryContent = summaryMatch[1].trim();
-                    displayResponse = response.replace(/<summary>[\s\S]*?<\/summary>/, '').trim();
-                    if (displayResponse) {
-                        console.log(chalk.white(displayResponse));
-                    }
-                    TUI.drawSummaryBox(summaryContent);
-                } else {
-                    console.log(chalk.white(response));
-                }
-                console.log();
-
-                // Auto-execute commands (Ollama-style)
+            // Extraction and execution logic...
+            if (options.yes) {
                 const { executeWithPermission } = await import('./utils/command-executor');
-                const result = await executeWithPermission(response);
-
-                if (result.executed) {
-                    if (result.success) {
-                        // Success!
-                        if (loopCount > 1) {
-                            console.log(chalk.green('✅ Fix succeeded!'));
-                        }
-                        break;
-                    } else {
-                        // Failure - Loop back
-                        console.log(chalk.yellow('\n↺ Command failed. Asking AI to fix...'));
-                        messages.push({ role: 'assistant', content: response });
-                        messages.push({
-                            role: 'user',
-                            content: `❌ Command failed with error:\n${result.error}\n\nPlease fix this. If the file doesn't exist, create it first. Or use a different command.`
-                        });
-                        continue;
-                    }
-                } else {
-                    // No command to execute - we are done
-                    break;
-                }
+                await executeWithPermission(fullResponse);
             }
+
         } catch (error: any) {
-            spinner.fail('Failed');
-            console.error(chalk.red(`\n❌ ${error.message}`));
-            process.exit(1);
+            spinner.fail('Request failed');
+            console.error(chalk.red(`Error: ${error.message}`));
         }
-    })();
-} else {
-    // Parse arguments normally
-    program.parse(process.argv);
-
-    // Show help if no command provided
-    if (!args.length) {
-        console.log(banner);
-        program.outputHelp();
-    }
-}
+    });
+
+program.parse(process.argv);

package/src/utils/patcher.ts

@@ -22,7 +22,8 @@ export class Patcher {
      */
     static parseEditBlocks(response: string): EditBlock[] {
         const blocks: EditBlock[] = [];
-        const blockRegex = /\*\*([^*]+)\*\*\s*<<<< SEARCH\n([\s\S]*?)\n====\n([\s\S]*?)\n>>>> REPLACE/g;
+        // Robust regex: Matches filename with or without stars, handle potential leading/trailing spaces
+        const blockRegex = /(?:\*\*?\s*)?([^*<\n]+?)(?:\s*\*?\*)?\s*<<<< SEARCH\n([\s\S]*?)\n====\n([\s\S]*?)\n>>>> REPLACE/g;
 
         let match;
         while ((match = blockRegex.exec(response)) !== null) {
@@ -97,31 +98,56 @@ export class Patcher {
 
             const content = fs.readFileSync(fullPath, 'utf8');
 
-            // Normalize and trim for better matching robustness
-            const normalizedContent = content.replace(/\r\n/g, '\n');
-            const normalizedSearch = block.search.replace(/\r\n/g, '\n').trim();
-            const normalizedReplace = block.replace.replace(/\r\n/g, '\n');
-
-            if (!normalizedContent.includes(normalizedSearch)) {
-                // Try a fuzzy match by trimming internal lines as well
-                const fuzzyContent = normalizedContent.split('\n').map(l => l.trimEnd()).join('\n');
-                const fuzzySearch = normalizedSearch.split('\n').map(l => l.trimEnd()).join('\n');
-
-                if (!fuzzyContent.includes(fuzzySearch)) {
-                    TUI.drawStatusBar(`❌ Patch Failed: Search block not found in ${block.filePath}`);
-                    return {
-                        success: false,
-                        error: `Search block not found in ${block.filePath}. Please ensure the code snippet matches exactly (ignoring trailing whitespace).`
-                    };
+            // 1. Precise Normalization
+            const normalize = (text: string) => text.replace(/\r\n/g, '\n').split('\n').map(l => l.trimEnd()).join('\n');
+            const normalizedContent = normalize(content);
+            const normalizedSearch = normalize(block.search);
+            const normalizedReplace = normalize(block.replace);
+
+            // 2. Exact Match Check (Post-Normalization)
+            if (normalizedContent.includes(normalizedSearch)) {
+                const updatedContent = normalizedContent.replace(normalizedSearch, normalizedReplace);
+                fs.writeFileSync(fullPath, updatedContent, 'utf8');
+                TUI.drawStatusBar(`✅ Success: ${block.filePath} patched.`);
+                return { success: true };
+            }
+
+            // 3. Ultra-Fuzzy Matching (Line-by-line trim and compare)
+            const contentLines = normalizedContent.split('\n');
+            const searchLines = normalizedSearch.split('\n');
+
+            let matchIndex = -1;
+            for (let i = 0; i <= contentLines.length - searchLines.length; i++) {
+                let match = true;
+                for (let j = 0; j < searchLines.length; j++) {
+                    if (contentLines[i + j].trim() !== searchLines[j].trim()) {
+                        match = false;
+                        break;
+                    }
+                }
+                if (match) {
+                    matchIndex = i;
+                    break;
                 }
             }
 
-            // Perform replacement on normalized content
-            const updatedContent = normalizedContent.replace(normalizedSearch, normalizedReplace);
-            fs.writeFileSync(fullPath, updatedContent, 'utf8');
+            if (matchIndex !== -1) {
+                // Apply replacement while preserving surrounding lines
+                const updatedLines = [
+                    ...contentLines.slice(0, matchIndex),
+                    normalizedReplace,
+                    ...contentLines.slice(matchIndex + searchLines.length)
+                ];
+                fs.writeFileSync(fullPath, updatedLines.join('\n'), 'utf8');
+                TUI.drawStatusBar(`✅ Success (Fuzzy): ${block.filePath} patched.`);
+                return { success: true };
+            }
 
-            TUI.drawStatusBar(`✅ Success: ${block.filePath} patched.`);
-            return { success: true };
+            TUI.drawStatusBar(`❌ Patch Failed: Search block not found in ${block.filePath}`);
+            return {
+                success: false,
+                error: `Search block not found in ${block.filePath}. Please ensure the code snippet matches exactly (ignoring whitespace).`
+            };
         } catch (err: any) {
             TUI.drawStatusBar(`❌ Error: ${err.message}`);
             return { success: false, error: err.message };

package/src/utils/repo-mapper.ts

@@ -45,7 +45,13 @@ export class RepoMapper {
         const tree = this.scanDirectory(this.rootPath, 0);
 
         // Build the final map
-        let finalMap = '--- DIRECTORY STRUCTURE ---\n' + this.formatTree(tree);
+        let finalMap = `--- ABSOLUTE WORKING DIRECTORY ---\n${this.rootPath}\n\n`;
+
+        if (!tree.children || tree.children.length === 0) {
+            finalMap += `⚠️ [CRITICAL WARNING]: THIS DIRECTORY IS COMPLETELY EMPTY.\nTHERE ARE NO FILES OR FOLDERS HERE.\nDO NOT HALLUCINATE ANY CONTENT!\n\n`;
+        } else {
+            finalMap += `--- DIRECTORY STRUCTURE ---\n` + this.formatTree(tree);
+        }
 
         if (this.fileContents.size > 0) {
             finalMap += '\n\n--- CRAWLED FILE CONTENTS ---\n';