npm-noxyai 1.0.13 → 1.0.15

package/index-noxyai.js

@@ -12,27 +12,14 @@ const CONFIG_FILE = path.join(os.homedir(), '.noxyai.json');
 const args = process.argv.slice(2);
 const command = args[0];
 
-// --- CONFIG MANAGEMENT ---
 function loadConfig() {
   if (fs.existsSync(CONFIG_FILE)) {
-    try { 
-      const config = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-      if (config.agentMode === undefined) config.agentMode = false; // Default OFF
-      return config;
-    } catch(e) {}
+    try { return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8')); } catch(e){}
   }
-  return { 
-    token: null, 
-    model: 'auto', 
-    agentMode: false  // Default to Chat mode
-  };
+  return { token: null, model: 'auto', agentMode: false };
 }
+function saveConfig(config) { fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2)); }
 
-function saveConfig(config) {
-  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
-}
-
-// --- UI HELPERS ---
 function printLogo() {
   console.log('\x1b[36m' + `
 ███╗   ██╗ ██████╗ ██╗  ██╗██╗   ██╗ █████╗ ██╗
@@ -48,100 +35,48 @@ let spinnerInterval;
 function startSpinner(text) {
   const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
   let i = 0;
-  process.stdout.write('\x1b[?25l');
+  process.stdout.write('\x1b[?25l'); 
   spinnerInterval = setInterval(() => {
     process.stdout.write(`\r\x1b[36m${frames[i]} ${text}\x1b[0m`);
     i = (i + 1) % frames.length;
   }, 80);
 }
-
 function stopSpinner() {
   clearInterval(spinnerInterval);
   process.stdout.write('\r\x1b[K\x1b[?25h');
 }
 
-function logout() {
-  const config = loadConfig();
-  config.token = null;
-  saveConfig(config);
-  console.log('✅ Successfully logged out.');
-}
-
-function openBrowser(url) {
-  const platform = os.platform();
-  if (platform === 'android') spawn('termux-open-url', [url], { stdio: 'ignore' });
-  else if (platform === 'darwin') spawn('open', [url], { stdio: 'ignore' });
-  else if (platform === 'win32') spawn('cmd.exe', ['/c', 'start', '""', url], { stdio: 'ignore' });
-  else spawn('xdg-open', [url], { stdio: 'ignore' });
-}
-
-// --- SEARCH FUNCTION ---
-async function searchWeb(query) {
-  try {
-    const config = loadConfig();
-    const res = await fetch(`${BASE_URL}/api/io?action=search&q=${encodeURIComponent(query)}`, {
-      headers: { 'Authorization': 'Bearer ' + config.token }
-    });
-    const data = await res.json();
-    return data;
-  } catch (err) {
-    return { error: err.message };
-  }
-}
-
-// --- CORE FUNCTIONS ---
 async function login() {
   printLogo();
   console.log('Initializing secure login...\n');
   try {
     const initRes = await fetch(BASE_URL + '/api/cli/init', { method: 'POST' });
     const { deviceCode, verificationUrl, interval } = await initRes.json();
-
-    console.log('=============================================');
-    console.log(`URL: ${verificationUrl}`);
-    console.log('=============================================\n');
+    console.log(`URL: ${verificationUrl}\n`);
     
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     rl.question('Press ENTER to automatically open the browser...', () => {
-      openBrowser(verificationUrl);
+      const platform = os.platform();
+      if (platform === 'android') spawn('termux-open-url', [verificationUrl], { stdio: 'ignore' });
+      else spawn('xdg-open', [verificationUrl], { stdio: 'ignore' });
       rl.close();
       startSpinner('Waiting for authentication...');
     });
 
     const pollInterval = setInterval(async () => {
-      try {
-        const pollRes = await fetch(BASE_URL + '/api/cli/poll', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ deviceCode })
-        });
-        
-        const data = await pollRes.json();
-
-        if (data.status === 'success') {
-          clearInterval(pollInterval);
-          stopSpinner();
-          const config = loadConfig();
-          config.token = data.token;
-          saveConfig(config);
-          
-          console.clear();
-          printLogo();
-          console.log('✅ Login successful! Terminal connected.');
-          console.log('Type "noxyai" to start interactive mode.\n');
-          process.exit(0);
-        } else if (data.error) {
-          clearInterval(pollInterval);
-          stopSpinner();
-          console.error('\n❌ Login failed: ' + data.error);
-          process.exit(1);
-        }
-      } catch (e) {}
+      const pollRes = await fetch(BASE_URL + '/api/cli/poll', { method: 'POST', body: JSON.stringify({ deviceCode }) });
+      const data = await pollRes.json();
+      if (data.status === 'success') {
+        clearInterval(pollInterval); stopSpinner();
+        const config = loadConfig(); config.token = data.token; saveConfig(config);
+        console.clear(); printLogo();
+        console.log('✅ Login successful! Type "noxyai" to start.\n'); process.exit(0);
+      } else if (data.error) {
+        clearInterval(pollInterval); stopSpinner();
+        console.error('\n❌ Login failed: ' + data.error); process.exit(1);
+      }
     }, interval * 1000);
-
-  } catch (error) {
-    console.error('Failed to connect to NoxyAI server.', error.message);
-  }
+  } catch (error) { console.error('Failed to connect.', error.message); }
 }
 
 function runTerminalCommand(cmd) {
@@ -149,18 +84,11 @@ function runTerminalCommand(cmd) {
     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(`\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}`);
-        else resolve();
-      }
-    });
+    child.on('close', (code) => { if (!isServer) { if (code !== 0) reject(`Exit code ${code}`); else resolve(); } });
     child.on('error', (error) => reject(error.message));
   });
 }
@@ -175,140 +103,91 @@ function getLocalContext() {
 async function chat(prompt, depth = 0) {
   const config = loadConfig();
   if (!config.token) { console.error('❌ Unauthorized: Run "noxyai login"'); return; }
-  if (depth > 6) { console.error('\n❌ Reached max reasoning depth. Stopping.'); return; }
+  if (depth > 6) { console.error('\n❌ Reached max reasoning depth.'); return; }
 
-  // Only add file context in Agent Mode
   const enhancedPrompt = (depth === 0 && config.agentMode) ? getLocalContext() + prompt : prompt;
-  
   startSpinner(depth === 0 ? 'NoxyAI is thinking...' : 'NoxyAI is analyzing results...');
 
   try {
     const res = await fetch(BASE_URL + '/api/io', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + config.token },
-      body: JSON.stringify({ 
-        prompt: enhancedPrompt, 
-        model: config.model,
-        agentMode: config.agentMode 
-      })
+      body: JSON.stringify({ prompt: enhancedPrompt, model: config.model, agentMode: config.agentMode })
     });
 
     stopSpinner();
-
-    if (!res.ok) {
-      const errorText = await res.text();
-      if (res.status === 402) {
-        console.log('\n\x1b[31m' + errorText + '\x1b[0m');
-        return;
-      }
-      return console.error('\n❌ API Error: ' + errorText);
-    }
-
-    const modelDisplay = config.model === 'auto' ? 'Mamba-Codestral 7B' : 
-                        config.model === 'Qwen3' ? 'Qwen3 80B' : 'Mamba-Codestral 7B';
-    const agentStatus = config.agentMode ? '🤖 Agent' : '💬 Chat';
-    console.log(`\n${agentStatus} \x1b[36mNoxyAI (${modelDisplay}):\x1b[0m\n`);
+    if (!res.ok) return console.error('\n❌ API Error: ' + await res.text());
+    console.log(`\n🤖 \x1b[36mNoxyAI (${config.model}):\x1b[0m\n`);
 
     const reader = res.body.getReader();
     const decoder = new TextDecoder('utf-8');
     let fullResponse = "";
-    let usage = null;
-    let searchSources = [];
 
     while (true) {
       const { done, value } = await reader.read();
       if (done) break;
-      
       const lines = decoder.decode(value, { stream: true }).split('\n');
       for (const line of lines) {
         if (line.startsWith('data: ')) {
           const data = line.slice(6).trim();
           if (data === '[DONE]') break;
-          
           try {
             const parsed = JSON.parse(data);
-            
-            // Reasoning in GREEN
-            if (parsed.reasoning) {
-              process.stdout.write('\x1b[32m' + parsed.reasoning + '\x1b[0m');
-            }
-            
-            // Normal response
-            if (parsed.text) {
+            if (parsed.isReasoning) {
+              process.stdout.write('\x1b[31m' + parsed.text + '\x1b[0m');
+            } else if (parsed.text) {
               fullResponse += parsed.text;
               process.stdout.write(parsed.text);
-            }
-            
-            if (parsed.usage) {
-              usage = parsed.usage;
+            } else if (parsed.cost) {
+              console.log(`\n\n\x1b[33m💳 Tokens Used: ${Math.round(parsed.cost/10)} | Credits Deducted: ${parsed.cost}\x1b[0m`);
             }
           } catch (e) {}
         }
       }
     }
     
-    console.log('\n');
-    
-    // ONLY process agent actions if agent mode is ON AND there are action tags
-    if (!config.agentMode) {
-      return;
-    }
-    
-    // Check if response contains action tags before processing
-    const hasActionTags = /<read>|<search>|<file path=|<execute>/.test(fullResponse);
-    if (!hasActionTags) {
-      return;
-    }
-    
-    console.log('\x1b[32m[Agent] Processing actions...\x1b[0m');
+    if (!config.agentMode) { console.log(); return; }
+
+    console.log('\n\x1b[32m[Agent] Processing actions...\x1b[0m');
     let agentFeedback = "";
 
-    // Tool: Read Files
-    const readRegex = /<read>([\s\S]*?)<\/read>/g;
-    let match;
+    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`;
-      } catch (err) {
-        console.log(`\x1b[31m❌ Failed to read:\x1b[0m ${filePath}`);
-        agentFeedback += `\n[ERROR reading ${filePath}: ${err.message}]\n`;
-      }
+      } catch (err) { agentFeedback += `\n[ERROR reading ${filePath}: ${err.message}]\n`; }
     }
 
-    // Tool: Search Web with sources
+    // 🚨 UPDATED WEB SEARCH TOOL
     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}`);
       try {
-        const searchData = await searchWeb(query);
+        const searchRes = await fetch(BASE_URL + '/api/search', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + config.token },
+          body: JSON.stringify({ query })
+        });
+        const searchData = await searchRes.json();
+        
+        let snippets = "No results.";
         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`;
+          console.log(`\x1b[32m📚 Sources Extracted:\x1b[0m`);
+          snippets = searchData.items.map(i => {
+            // Print directly to terminal with RED URL
+            console.log(`  - ${i.title}\n    \x1b[31m${i.link}\x1b[0m`);
+            // Send the URL context back to the AI
+            return `- Title: ${i.title}\n  Snippet: ${i.snippet}\n  URL: ${i.link}`;
+          }).join('\n\n');
         }
-      } catch (err) {
-        agentFeedback += `\n[SEARCH FAILED: ${err.message}]\n`;
-      }
+        agentFeedback += `\n[SEARCH RESULTS FOR "${query}"]\n${snippets}\n(Please summarize and cite these URLs.)\n`;
+      } catch (err) { 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];
@@ -318,23 +197,17 @@ async function chat(prompt, depth = 0) {
       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());
-    
     for (const cmd of commands) {
-      try {
-        await runTerminalCommand(cmd);
-      } catch (err) {
-        console.log(`\x1b[31m❌ Command Failed:\x1b[0m ${err}`);
-        agentFeedback += `\n[COMMAND ERROR running "${cmd}": ${err}]\n`;
-      }
+      try { await runTerminalCommand(cmd); } 
+      catch (err) { 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(`\x1b[33m🔄 Sending data back to Agent...\x1b[0m`);
+      await chat(`Action results:\n${agentFeedback}\nNext step? Output <file> or <execute> if ready, or <read>/<search>.`, depth + 1);
       return;
     }
 
@@ -342,106 +215,52 @@ async function chat(prompt, depth = 0) {
     console.log(`\x1b[32m✨ Task Completed!\x1b[0m`);
     console.log('\x1b[32m════════════════════════════════════════\x1b[0m\n');
 
-  } catch (error) { 
-    stopSpinner();
-    console.error('\n❌ Connection error: ' + error.message); 
-  }
+  } catch (error) { stopSpinner(); console.error('\n❌ Connection error: ' + error.message); }
 }
 
 function startInteractiveMode() {
   const config = loadConfig();
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   printLogo();
-  
-  const agentStatus = config.agentMode ? '\x1b[32mON\x1b[0m' : '\x1b[31mOFF\x1b[0m';
-  
   console.log(`\x1b[33mWelcome to NoxyAI Interactive Mode!\x1b[0m`);
-  console.log(`Current Model: \x1b[32m${config.model === 'auto' ? 'Mamba-Codestral 7B' : config.model}\x1b[0m`);
-  console.log(`Agent Mode: ${agentStatus}`);
-  console.log(`\nCommands:`);
-  console.log(`  \x1b[36m/agent\x1b[0m      - Toggle Agent Mode (file/code operations)`);
-  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[90mTip: In Chat mode, AI responds normally. In Agent mode, it can read/write files and run commands.\x1b[0m\n`);
+  console.log(`Model: \x1b[32m${config.model}\x1b[0m | Agent Mode: ${config.agentMode ? '\x1b[32mON\x1b[0m' : '\x1b[31mOFF\x1b[0m'}`);
+  console.log(`Commands: \x1b[36m/model\x1b[0m, \x1b[36m/agent\x1b[0m, \x1b[36m/clear\x1b[0m, \x1b[36m/exit\x1b[0m\n`);
   
   function ask() {
-    const prompt = config.agentMode ? '\x1b[36mNoxyAI [Agent] > \x1b[0m' : '\x1b[36mNoxyAI [Chat] > \x1b[0m';
-    rl.question(prompt, async (input) => {
+    rl.question('\x1b[36mNoxyAI > \x1b[0m', async (input) => {
       const trimmed = input.trim();
       const lower = trimmed.toLowerCase();
 
-      if (lower === 'exit' || lower === '/exit') {
-        console.log('\n\x1b[36mGoodbye! 👋\x1b[0m\n');
-        process.exit(0);
-      } 
-      else if (lower === '/clear') {
-        console.clear();
-        printLogo();
-        ask();
-      }
-      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`);
-        if (config.agentMode) {
-          console.log('\x1b[36mAgent mode features:\x1b[0m');
-          console.log('  • Read & write files');
-          console.log('  • Execute terminal commands');
-          console.log('  • Web search integration');
-          console.log('  • Multi-step autonomous tasks\n');
-        } else {
-          console.log('\x1b[36mChat mode: Normal AI conversation without file access\x1b[0m\n');
-        }
+      if (lower === 'exit' || lower === '/exit') process.exit(0);
+      else if (lower === '/clear') { console.clear(); printLogo(); ask(); } 
+      else if (lower === '/agent') {
+        const c = loadConfig(); c.agentMode = !c.agentMode; saveConfig(c);
+        console.log(`\n\x1b[33mAgent Mode is now ${c.agentMode ? '\x1b[32mON (File/Web access enabled)' : '\x1b[31mOFF (Standard Chat)'}\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 (Mamba-Codestral 7B)');
-        console.log('  \x1b[36m2)\x1b[0m Qwen3 80B \x1b[32m[Reasoning in Green]\x1b[0m');
-        console.log('  \x1b[36m3)\x1b[0m Mamba-Codestral 7B');
-        
+        console.log('  \x1b[36m1)\x1b[0m Auto (Llama 3.3 70B)');
+        console.log('  \x1b[36m2)\x1b[0m Qwen3 Next 80B (Deep Reasoning)');
+        console.log('  \x1b[36m3)\x1b[0m Mistral Mamba Codestral 7B');
         rl.question('\nEnter number (1-3): ', (choice) => {
           let selected = 'auto';
           if (choice === '2') selected = 'Qwen3';
-          if (choice === '3') selected = 'Mamba-Codestral';
-          
-          config.model = selected;
-          saveConfig(config);
-          
-          console.log(`\n\x1b[32m✔ Model changed to: ${selected}\x1b[0m\n`);
-          ask();
+          if (choice === '3') selected = 'Mamba';
+          const c = loadConfig(); c.model = selected; saveConfig(c);
+          console.log(`\n\x1b[32m✔ Model changed to: ${selected}\x1b[0m\n`); ask();
         });
         return;
       } 
-      else if (trimmed) {
-        await chat(trimmed);
-        ask(); 
-      } else {
-        ask();
-      }
+      else if (trimmed) { await chat(trimmed); ask(); } 
+      else ask();
     });
   }
   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 (file/code operations)`);
-  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 === 'logout') { const c = loadConfig(); c.token = null; saveConfig(c); console.log('Logged out.'); }
+else if (command === 'help' || command === '--help') { printLogo(); console.log(`  \x1b[32mnoxyai\x1b[0m     Start Interactive Mode\n`); }
 else if (!command) startInteractiveMode();
-else { 
-  console.error(`❌ Unknown command. Run "noxyai help"`); 
-  process.exit(1); 
-}
+else { console.error(`❌ Unknown command.`); process.exit(1); }

package/package.json

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