npm-noxyai 1.0.11 → 1.0.12

package/index-noxyai.js

@@ -18,15 +18,13 @@ function loadConfig() {
     try { 
       const config = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
       if (config.agentMode === undefined) config.agentMode = true;
-      if (config.autoDeduct === undefined) config.autoDeduct = false;
       return config;
     } catch(e) {}
   }
   return { 
     token: null, 
     model: 'auto', 
-    agentMode: true,
-    autoDeduct: false
+    agentMode: true
   };
 }
 
@@ -46,41 +44,13 @@ function printLogo() {
 ` + '\x1b[0m');
 }
 
-function printFunnyArt() {
-  const art = `
-      ▓▓  ▓▓                      
-    ▓▓  ▓▓  ▓▓                    
-  ▓▓▓▓      ▓▓                    
-▓▓      ██  ▓▓                    
-▓▓░░░░      ▓▓                    
-  ▓▓▓▓░░    ▓▓                    
-      ▓▓    ▓▓                    
-      ▓▓    ▓▓                ▓▓  
-      ▓▓    ▓▓              ▓▓  ▓▓
-      ▓▓    ▓▓              ▓▓  ▓▓
-      ▓▓      ▓▓▓▓▓▓▓▓▓▓▓▓▓▓  ░░▓▓
-      ▓▓                      ▓▓  
-      ▓▓░░                    ▓▓  
-      ▓▓░░                  ░░▓▓  
-      ▓▓░░                  ░░▓▓  
-        ▓▓░░░░  ░░░░░░░░░░  ▓▓    
-        ▓▓▓▓▓▓  ▓▓▓▓▓▓▓▓▓▓  ▓▓    
-        ▓▓  ▓▓  ▓▓  ▓▓  ▓▓  ▓▓    
-        ▓▓  ▓▓  ▓▓  ▓▓  ▓▓  ▓▓    
-        ▓▓░░▓▓░░▓▓  ▓▓░░▓▓░░▓▓    
-        ▓▓░░▓▓░░▓▓  ▓▓░░▓▓░░▓▓    
-        ▓▓░░▓▓░░▓▓  ▓▓░░▓▓░░▓▓    
-          ▓▓  ▓▓      ▓▓  ▓▓`;
-  console.log('\x1b[35m' + art + '\x1b[0m');
-}
-
 let spinnerInterval;
 function startSpinner(text) {
   const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
   let i = 0;
   process.stdout.write('\x1b[?25l');
   spinnerInterval = setInterval(() => {
-    process.stdout.write('\r\x1b[36m${frames[i]} ${text}\x1b[0m');
+    process.stdout.write(`\r\x1b[36m${frames[i]} ${text}\x1b[0m`);
     i = (i + 1) % frames.length;
   }, 80);
 }
@@ -105,11 +75,11 @@ function openBrowser(url) {
   else spawn('xdg-open', [url], { stdio: 'ignore' });
 }
 
-// --- SEARCH FUNCTION (Now uses backend) ---
+// --- SEARCH FUNCTION ---
 async function searchWeb(query) {
   try {
     const config = loadConfig();
-    const res = await fetch('${BASE_URL}/api/io?action=search&q=' + encodeURIComponent(query), {
+    const res = await fetch(`${BASE_URL}/api/io?action=search&q=${encodeURIComponent(query)}`, {
       headers: { 'Authorization': 'Bearer ' + config.token }
     });
     const data = await res.json();
@@ -119,33 +89,6 @@ async function searchWeb(query) {
   }
 }
 
-// --- CREDIT DEDUCTION WITH MANUAL APPROVAL ---
-async function requestCreditDeduction(usage, model) {
-  const config = loadConfig();
-  
-  if (config.autoDeduct) {
-    return { approved: true, cost: usage.estimatedCost };
-  }
-  
-  console.log('\n\x1b[33m💰 Credit Usage Summary:\x1b[0m');
-  console.log('   Prompt Tokens: ${usage.promptTokens}');
-  console.log('   Response Tokens: ${usage.responseTokens}');
-  if (usage.reasoningTokens) {
-    console.log('   \x1b[31mReasoning Tokens: ${usage.reasoningTokens}\x1b[0m');
-  }
-  console.log('   Total Tokens: ${usage.totalTokens}');
-  console.log('   \x1b[32mEstimated Cost: ${usage.estimatedCost} credits\x1b[0m');
-  
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  
-  return new Promise((resolve) => {
-    rl.question('\n\x1b[33mApprove credit deduction? (y/n): \x1b[0m', (answer) => {
-      rl.close();
-      resolve({ approved: answer.toLowerCase() === 'y', cost: usage.estimatedCost });
-    });
-  });
-}
-
 // --- CORE FUNCTIONS ---
 async function login() {
   printLogo();
@@ -155,7 +98,7 @@ async function login() {
     const { deviceCode, verificationUrl, interval } = await initRes.json();
 
     console.log('=============================================');
-    console.log('URL: ${verificationUrl}');
+    console.log(`URL: ${verificationUrl}`);
     console.log('=============================================\n');
     
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -203,18 +146,18 @@ async function login() {
 
 function runTerminalCommand(cmd) {
   return new Promise((resolve, reject) => {
-    console.log('\n\x1b[33m⚡ Running:\x1b[0m ${cmd}\n');
+    console.log(`\n\x1b[33m⚡ Running:\x1b[0m ${cmd}\n`);
     const isServer = cmd.includes('dev') || cmd.includes('serve') || cmd.includes('host') || cmd.includes('start');
     const child = spawn(cmd, { shell: true, stdio: 'inherit' });
 
     if (isServer) {
-      console.log('\n\x1b[36m[i] Server detected. Running in foreground. Press Ctrl+C to stop.\x1b[0m');
+      console.log(`\n\x1b[36m[i] Server detected. Running in foreground. Press Ctrl+C to stop.\x1b[0m`);
       setTimeout(() => resolve(), 2500); 
     }
 
     child.on('close', (code) => {
       if (!isServer) {
-        if (code !== 0) reject('Command failed with exit code ${code}');
+        if (code !== 0) reject(`Command failed with exit code ${code}`);
         else resolve();
       }
     });
@@ -225,7 +168,7 @@ function runTerminalCommand(cmd) {
 function getLocalContext() {
   try {
     const files = fs.readdirSync(process.cwd()).filter(f => !f.startsWith('node_modules') && !f.startsWith('.git')).slice(0, 30);
-    return '\n[SYSTEM: You are in ${process.cwd()}. Files here: ${files.join(', ')}]\n';
+    return `\n[SYSTEM: You are in ${process.cwd()}. Files here: ${files.join(', ')}]\n`;
   } catch (e) { return ""; }
 }
 
@@ -260,16 +203,15 @@ async function chat(prompt, depth = 0) {
       return console.error('\n❌ API Error: ' + errorText);
     }
 
-    const modelDisplay = config.model === 'auto' ? 'Llama 3.3 70B' : config.model;
-    const agentStatus = config.agentMode ? '🤖 Agent Mode' : '💬 Chat Mode';
-    console.log('\n${agentStatus} \x1b[36mNoxyAI (${modelDisplay}):\x1b[0m\n');
+    const modelDisplay = config.model === 'auto' ? 'Mamba-Codestral 7B' : config.model;
+    const agentStatus = config.agentMode ? '🤖 Agent' : '💬 Chat';
+    console.log(`\n${agentStatus} \x1b[36mNoxyAI (${modelDisplay}):\x1b[0m\n`);
 
     const reader = res.body.getReader();
     const decoder = new TextDecoder('utf-8');
     let fullResponse = "";
-    let fullReasoning = "";
     let usage = null;
-    let isQwen = false;
+    let searchSources = [];
 
     while (true) {
       const { done, value } = await reader.read();
@@ -284,17 +226,12 @@ async function chat(prompt, depth = 0) {
           try {
             const parsed = JSON.parse(data);
             
-            if (parsed.isQwen) {
-              isQwen = true;
-            }
-            
+            // Reasoning in GREEN
             if (parsed.reasoning) {
-              fullReasoning += parsed.reasoning;
-              if (isQwen) {
-                process.stdout.write('\x1b[31m' + parsed.reasoning + '\x1b[0m');
-              }
+              process.stdout.write('\x1b[32m' + parsed.reasoning + '\x1b[0m');
             }
             
+            // Normal response
             if (parsed.text) {
               fullResponse += parsed.text;
               process.stdout.write(parsed.text);
@@ -308,34 +245,7 @@ async function chat(prompt, depth = 0) {
       }
     }
     
-    if (usage && depth === 0) {
-      const approval = await requestCreditDeduction(usage, config.model);
-      
-      if (approval.approved) {
-        const deductRes = await fetch(BASE_URL + '/api/io/deduct', {
-          method: 'POST',
-          headers: { 
-            'Content-Type': 'application/json', 
-            'Authorization': 'Bearer ' + config.token 
-          },
-          body: JSON.stringify({ 
-            amount: approval.cost,
-            model: config.model,
-            tokens: usage.totalTokens
-          })
-        });
-        
-        if (deductRes.ok) {
-          console.log('\n\x1b[32m✅ Credits deducted successfully!\x1b[0m');
-        } else {
-          console.log('\n\x1b[31m❌ Credit deduction failed\x1b[0m');
-        }
-      } else {
-        console.log('\n\x1b[33m⚠️  Credit deduction cancelled\x1b[0m');
-        return;
-      }
-    }
-    
+    // Only process agent actions if agent mode is ON
     if (!config.agentMode) {
       console.log('\n');
       return;
@@ -344,42 +254,62 @@ async function chat(prompt, depth = 0) {
     console.log('\n\n\x1b[32m[Agent] Processing actions...\x1b[0m');
     let agentFeedback = "";
 
+    // Tool: Read Files
     const readRegex = /<read>([\s\S]*?)<\/read>/g;
     let match;
     while ((match = readRegex.exec(fullResponse)) !== null) {
       const filePath = match[1].trim();
       try {
         const content = fs.readFileSync(filePath, 'utf8');
-        console.log('\x1b[34m📖 Read file:\x1b[0m ${filePath}');
-        agentFeedback += '\n[FILE: ${filePath}]\n\`\`\`\n${content}\n\`\`\`\n';
+        console.log(`\x1b[34m📖 Read file:\x1b[0m ${filePath}`);
+        agentFeedback += `\n[FILE: ${filePath}]\n\`\`\`\n${content}\n\`\`\`\n`;
       } catch (err) {
-        console.log('\x1b[31m❌ Failed to read:\x1b[0m ${filePath}');
-        agentFeedback += '\n[ERROR reading ${filePath}: ${err.message}]\n';
+        console.log(`\x1b[31m❌ Failed to read:\x1b[0m ${filePath}`);
+        agentFeedback += `\n[ERROR reading ${filePath}: ${err.message}]\n`;
       }
     }
 
+    // Tool: Search Web with sources
     const searchRegex = /<search>([\s\S]*?)<\/search>/g;
     while ((match = searchRegex.exec(fullResponse)) !== null) {
       const query = match[1].trim();
-      console.log('\x1b[35m🔍 Searching Web:\x1b[0m ${query}');
+      console.log(`\x1b[35m🔍 Searching Web:\x1b[0m ${query}`);
       try {
         const searchData = await searchWeb(query);
-        const snippets = searchData.items ? searchData.items.map(i => '- ${i.title}: ${i.snippet}').join('\n') : "No results.";
-        agentFeedback += '\n[SEARCH RESULTS FOR "${query}"]\n${snippets}\n';
+        if (searchData.items) {
+          searchSources = searchData.items.slice(0, 5).map(i => ({
+            title: i.title,
+            link: i.link,
+            snippet: i.snippet
+          }));
+          
+          console.log(`\x1b[35m📚 Sources found:\x1b[0m`);
+          searchSources.forEach((s, i) => {
+            console.log(`  \x1b[36m${i+1}. ${s.title}\x1b[0m`);
+            console.log(`     \x1b[90m${s.link}\x1b[0m`);
+          });
+          
+          const snippets = searchData.items.map(i => `- ${i.title}: ${i.snippet}\n  Source: ${i.link}`).join('\n');
+          agentFeedback += `\n[SEARCH RESULTS FOR "${query}"]\n${snippets}\n`;
+        } else {
+          agentFeedback += `\n[SEARCH RESULTS FOR "${query}"]\nNo results found.\n`;
+        }
       } catch (err) {
-        agentFeedback += '\n[SEARCH FAILED: ${err.message}]\n';
+        agentFeedback += `\n[SEARCH FAILED: ${err.message}]\n`;
       }
     }
 
+    // Tool: Write Files
     const fileRegex = /<file path="([^"]+)">([\s\S]*?)<\/file>/g;
     while ((match = fileRegex.exec(fullResponse)) !== null) {
       const filePath = match[1], content = match[2];
       const dir = path.dirname(filePath);
       if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
       fs.writeFileSync(filePath, content.trim());
-      console.log('\x1b[32m✔ Wrote file:\x1b[0m ${filePath}');
+      console.log(`\x1b[32m✔ Wrote file:\x1b[0m ${filePath}`);
     }
 
+    // Tool: Execute Commands
     const execRegex = /<execute>([\s\S]*?)<\/execute>/g;
     const commands = [];
     while ((match = execRegex.exec(fullResponse)) !== null) commands.push(match[1].trim());
@@ -388,20 +318,20 @@ async function chat(prompt, depth = 0) {
       try {
         await runTerminalCommand(cmd);
       } catch (err) {
-        console.log('\x1b[31m❌ Command Failed:\x1b[0m ${err}');
-        agentFeedback += '\n[COMMAND ERROR running "${cmd}": ${err}]\n';
+        console.log(`\x1b[31m❌ Command Failed:\x1b[0m ${err}`);
+        agentFeedback += `\n[COMMAND ERROR running "${cmd}": ${err}]\n`;
       }
     }
 
     if (agentFeedback) {
-      console.log('\n\x1b[33m🔄 Sending data back to Agent...\x1b[0m');
-      await chat('Here are the results of your actions:\n${agentFeedback}\nWhat is the next step? Output <file> or <execute> if ready, or <read>/<search> if you need more info.', depth + 1);
+      console.log(`\n\x1b[33m🔄 Sending data back to Agent...\x1b[0m`);
+      await chat(`Here are the results of your actions:\n${agentFeedback}\nWhat is the next step? Output <file> or <execute> if ready, or <read>/<search> if you need more info.`, depth + 1);
       return;
     }
 
     console.log('\n\x1b[32m════════════════════════════════════════\x1b[0m');
-    console.log('\x1b[32m✨ Task Completed!\x1b[0m');
-    console.log('\n\x1b[32m════════════════════════════════════════\x1b[0m\n');
+    console.log(`\x1b[32m✨ Task Completed!\x1b[0m`);
+    console.log('\x1b[32m════════════════════════════════════════\x1b[0m\n');
 
   } catch (error) { 
     stopSpinner();
@@ -413,20 +343,17 @@ function startInteractiveMode() {
   const config = loadConfig();
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   printLogo();
-  printFunnyArt();
   
   const agentStatus = config.agentMode ? '\x1b[32mON\x1b[0m' : '\x1b[31mOFF\x1b[0m';
-  const deductStatus = config.autoDeduct ? '\x1b[32mAUTO\x1b[0m' : '\x1b[33mMANUAL\x1b[0m';
   
-  console.log('\x1b[33mWelcome to NoxyAI Interactive Mode!\x1b[0m');
-  console.log('Current Model: \x1b[32m${config.model}\x1b[0m');
-  console.log('Agent Mode: ${agentStatus} | Credit Mode: ${deductStatus}');
-  console.log('\nCommands:');
-  console.log('  \x1b[36m/agent\x1b[0m      - Toggle Agent Mode (3-model collaboration)');
-  console.log('  \x1b[36m/auto\x1b[0m       - Toggle Auto Credit Deduction');
-  console.log('  \x1b[36m/model\x1b[0m      - Change AI Model');
-  console.log('  \x1b[36m/clear\x1b[0m      - Clear screen');
-  console.log('  \x1b[36m/exit\x1b[0m       - Exit\n');
+  console.log(`\x1b[33mWelcome to NoxyAI Interactive Mode!\x1b[0m`);
+  console.log(`Current Model: \x1b[32m${config.model}\x1b[0m`);
+  console.log(`Agent Mode: ${agentStatus}`);
+  console.log(`\nCommands:`);
+  console.log(`  \x1b[36m/agent\x1b[0m      - Toggle Agent Mode (3-model collaboration)`);
+  console.log(`  \x1b[36m/model\x1b[0m      - Change AI Model`);
+  console.log(`  \x1b[36m/clear\x1b[0m      - Clear screen`);
+  console.log(`  \x1b[36m/exit\x1b[0m       - Exit\n`);
   
   function ask() {
     const prompt = config.agentMode ? '\x1b[36mNoxyAI [Agent] > \x1b[0m' : '\x1b[36mNoxyAI [Chat] > \x1b[0m';
@@ -441,44 +368,38 @@ function startInteractiveMode() {
       else if (lower === '/clear') {
         console.clear();
         printLogo();
-        printFunnyArt();
         ask();
       }
-      else if (lower === '/agent') {
+      else if (lower === '/agent' || lower === '/agent on' || lower === '/agent off') {
         config.agentMode = !config.agentMode;
         saveConfig(config);
         const status = config.agentMode ? '\x1b[32mON\x1b[0m' : '\x1b[31mOFF\x1b[0m';
-        console.log('\n\x1b[33m🤖 Agent Mode: ${status}\x1b[0m');
+        console.log(`\n\x1b[33m🤖 Agent Mode: ${status}\x1b[0m`);
         if (config.agentMode) {
-          console.log('\n\x1b[36mAgent mode uses 3 models working together:\x1b[0m');
-          console.log('  • Search & Analysis');
-          console.log('  • Reasoning & Planning');
-          console.log('  • Code Generation & Execution\n');
+          console.log('\x1b[36mAgent mode uses 3 models working together:\x1b[0m');
+          console.log('  • Mamba-Codestral 7B (Fast Coding)');
+          console.log('  • Qwen3 80B (Deep Reasoning)');
+          console.log('  • GLM-4 9B (General Purpose)\n');
         }
         ask();
       }
-      else if (lower === '/auto') {
-        config.autoDeduct = !config.autoDeduct;
-        saveConfig(config);
-        const status = config.autoDeduct ? '\x1b[32mAUTO\x1b[0m' : '\x1b[33mMANUAL\x1b[0m';
-        console.log('\n\x1b[33m💰 Credit Deduction Mode: ${status}\x1b[0m\n');
-        ask();
-      }
       else if (lower === '/model') {
         console.log('\n\x1b[33mSelect an AI Model:\x1b[0m');
-        console.log('  \x1b[36m1)\x1b[0m Auto (Llama 3.3 70B - Fast/Coding)');
-        console.log('  \x1b[36m2)\x1b[0m Qwen3 Next 80B Thinking (Deep Reasoning) \x1b[31m[Reasoning in Red]\x1b[0m');
-        console.log('  \x1b[36m3)\x1b[0m GLM 4.7');
+        console.log('  \x1b[36m1)\x1b[0m Auto (Mamba-Codestral 7B - Fast/Coding)');
+        console.log('  \x1b[36m2)\x1b[0m Qwen3 Next 80B Thinking \x1b[32m[Reasoning in Green]\x1b[0m');
+        console.log('  \x1b[36m3)\x1b[0m Mistral Mamba-Codestral 7B');
+        console.log('  \x1b[36m4)\x1b[0m GLM-4 9B Chat');
         
-        rl.question('\nEnter number (1-3): ', (choice) => {
+        rl.question('\nEnter number (1-4): ', (choice) => {
           let selected = 'auto';
           if (choice === '2') selected = 'Qwen3';
-          if (choice === '3') selected = 'GLM';
+          if (choice === '3') selected = 'Mamba-Codestral';
+          if (choice === '4') selected = 'GLM-4';
           
           config.model = selected;
           saveConfig(config);
           
-          console.log('\n\x1b[32m✔ Model successfully changed to: ${selected}\x1b[0m\n');
+          console.log(`\n\x1b[32m✔ Model changed to: ${selected}\x1b[0m\n`);
           ask();
         });
         return;
@@ -494,22 +415,22 @@ function startInteractiveMode() {
   ask();
 }
 
+// Command handling
 if (command === 'login') login();
 else if (command === 'logout') logout();
 else if (command === 'help' || command === '--help') {
   printLogo();
-  console.log('\n  \x1b[32mnoxyai\x1b[0m                   Start Interactive Mode');
-  console.log('  \x1b[32mnoxyai chat "<prompt>"\x1b[0m   Run single prompt');
-  console.log('\n  Interactive Commands:');
-  console.log('    \x1b[36m/agent\x1b[0m    Toggle Agent Mode (3-model collaboration)');
-  console.log('    \x1b[36m/auto\x1b[0m     Toggle Auto Credit Deduction');
-  console.log('    \x1b[36m/model\x1b[0m    Change AI Model\n');
+  console.log(`\n  \x1b[32mnoxyai\x1b[0m                   Start Interactive Mode`);
+  console.log(`  \x1b[32mnoxyai chat "<prompt>"\x1b[0m   Run single prompt`);
+  console.log(`\n  Interactive Commands:`);
+  console.log(`    \x1b[36m/agent\x1b[0m    Toggle Agent Mode (3-model collaboration)`);
+  console.log(`    \x1b[36m/model\x1b[0m    Change AI Model\n`);
 }
 else if (command === 'chat') { 
   chat(args.slice(1).join(' ')).then(() => process.exit(0)); 
 }
 else if (!command) startInteractiveMode();
 else { 
-  console.error('❌ Unknown command. Run "noxyai help"'); 
+  console.error(`❌ Unknown command. Run "noxyai help"`); 
   process.exit(1); 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-noxyai",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "CLI for NoxyAI",
   "main": "index-noxyai.js",
   "bin": {