npm-noxyai 1.0.19 → 1.0.20

package/index-noxyai.js

@@ -129,10 +129,12 @@ async function login() {
       const platform = os.platform();
       if (platform === 'darwin') execSync(`echo "${userCode}" | pbcopy`);
       else if (platform === 'win32') execSync(`echo ${userCode} | clip`);
-      else if (platform === 'linux' && execSync('which xclip').toString()) 
+      else if (platform === 'linux' && execSync('which xclip 2>/dev/null').toString()) 
         execSync(`echo "${userCode}" | xclip -selection clipboard`);
       console.log('\x1b[32m✓ Code copied to clipboard!\x1b[0m');
-    } catch (e) {}
+    } catch (e) {
+      // Clipboard not available, ignore
+    }
     
     rl.question('\x1b[36mPress ENTER to open browser or type "q" to cancel:\x1b[0m ', (answer) => {
       if (answer.toLowerCase() === 'q') {
@@ -155,7 +157,7 @@ async function login() {
       if (Date.now() - startTime > maxTime) {
         clearInterval(pollInterval); 
         stopSpinner();
-        console.log('\x1b[31m❌ Login timeout. Please try again.\x1b[0m');
+        console.log('\n\x1b[31m❌ Login timeout. Please try again.\x1b[0m');
         process.exit(1);
       }
       
@@ -175,6 +177,7 @@ async function login() {
           config.token = data.token; 
           config.userEmail = data.email;
           config.userId = data.userId;
+          config.lastLogin = Date.now();
           saveConfig(config);
           console.clear(); 
           printLogo();
@@ -248,7 +251,7 @@ function runTerminalCommand(cmd, options = {}) {
   });
 }
 
-// Enhanced context gathering
+// FIXED: Safe context gathering without Git errors
 function getLocalContext() {
   try {
     const cwd = process.cwd();
@@ -260,10 +263,20 @@ function getLocalContext() {
       ? JSON.parse(fs.readFileSync(path.join(cwd, 'package.json'), 'utf8'))
       : null;
     
+    // FIX: Silent Git branch check - no error output
     const gitBranch = (() => {
       try {
-        return execSync('git branch --show-current', { encoding: 'utf8' }).trim();
-      } catch (e) { return null; }
+        // Check if .git directory exists first
+        if (fs.existsSync(path.join(cwd, '.git'))) {
+          return execSync('git branch --show-current', { 
+            encoding: 'utf8', 
+            stdio: ['pipe', 'pipe', 'pipe'] // Suppress stderr
+          }).trim();
+        }
+        return null;
+      } catch (e) { 
+        return null; // Silently fail
+      }
     })();
     
     return `\n[SYSTEM CONTEXT]
@@ -300,13 +313,57 @@ function cacheSearchResults(query, results) {
   }));
 }
 
+// FIXED: Better session validation
+async function validateSession(config) {
+  if (!config.token) return false;
+  
+  // Check if session is recent (within 24h)
+  if (config.lastLogin && Date.now() - config.lastLogin < 86400000) {
+    return true;
+  }
+  
+  try {
+    const res = await fetch(BASE_URL + '/api/cli/validate', {
+      method: 'POST',
+      headers: {
+        'Authorization': 'Bearer ' + config.token,
+        'Content-Type': 'application/json'
+      }
+    });
+    
+    if (res.ok) {
+      config.lastLogin = Date.now();
+      saveConfig(config);
+      return true;
+    }
+    
+    return false;
+  } catch (e) {
+    // Network error - assume valid if we have a token
+    return true;
+  }
+}
+
 async function chat(prompt, depth = 0) {
   const config = loadConfig();
+  
+  // FIXED: Better session validation
   if (!config.token) { 
-    console.error('\x1b[31m❌ Unauthorized: Run "noxyai login" first\x1b[0m'); 
+    console.error('\x1b[31m❌ Not logged in. Run "noxyai login" first\x1b[0m'); 
     return; 
   }
   
+  // FIXED: Don't immediately invalidate session on network errors
+  const isValid = await validateSession(config);
+  if (!isValid) {
+    console.error('\x1b[31m❌ Session expired. Please login again.\x1b[0m');
+    config.token = null;
+    config.userEmail = null;
+    config.lastLogin = null;
+    saveConfig(config);
+    return;
+  }
+  
   if (depth > 8) { 
     console.error('\n\x1b[31m❌ Maximum recursion depth reached. Breaking loop.\x1b[0m'); 
     return; 
@@ -343,17 +400,31 @@ async function chat(prompt, depth = 0) {
     
     if (!res.ok) {
       const errorText = await res.text();
+      
+      // FIXED: Better error handling
       if (res.status === 401) {
-        console.error('\x1b[31m❌ Session expired. Please login again.\x1b[0m');
+        console.error('\x1b[31m❌ Invalid or expired session.\x1b[0m');
+        console.error('\x1b[33mPlease run:\x1b[0m \x1b[36mnoxyai login\x1b[0m\n');
         config.token = null;
+        config.userEmail = null;
+        config.lastLogin = null;
         saveConfig(config);
         return;
       }
+      
       if (res.status === 402) {
-        console.error('\x1b[31m❌ Insufficient credits. Visit: https://noxyai.com/pricing\x1b[0m');
+        console.error('\x1b[31m❌ Insufficient credits.\x1b[0m');
+        console.error('\x1b[33mVisit:\x1b[0m \x1b[36mhttps://noxyai.com/pricing\x1b[0m\n');
         return;
       }
-      return console.error(`\x1b[31m❌ API Error (${res.status}):\x1b[0m ${errorText}`);
+      
+      if (res.status === 429) {
+        console.error('\x1b[31m❌ Rate limit exceeded. Please wait a moment.\x1b[0m');
+        return;
+      }
+      
+      console.error(`\x1b[31m❌ API Error (${res.status}):\x1b[0m ${errorText.substring(0, 200)}`);
+      return;
     }
     
     console.log(`\n🤖 \x1b[36mNoxyAI (${config.model}):\x1b[0m\n`);
@@ -650,7 +721,8 @@ async function chat(prompt, depth = 0) {
 
   } catch (error) { 
     stopSpinner(); 
-    console.error('\n\x1b[31m❌ Connection error:\x1b[0m ' + error.message); 
+    console.error('\n\x1b[31m❌ Connection error:\x1b[0m ' + error.message);
+    console.error('\x1b[33mTip: Check your internet connection and try again.\x1b[0m');
   }
 }
 
@@ -746,6 +818,7 @@ if (command === 'login') {
   const c = loadConfig(); 
   c.token = null; 
   c.userEmail = null;
+  c.lastLogin = null;
   saveConfig(c); 
   console.log('\x1b[32m✓ Successfully logged out.\x1b[0m\n'); 
   process.exit(0); 
@@ -779,7 +852,7 @@ if (command === 'login') {
   `);
   process.exit(0); 
 } else if (command === 'version' || command === '--version' || command === '-v') {
-  console.log('NoxyAI CLI v1.0.0');
+  console.log('NoxyAI CLI v1.0.1');
   process.exit(0);
 } else if (!command) {
   startInteractiveMode();

package/package.json

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