navada-edge-cli 2.3.0 → 2.4.1

package/lib/agent.js

@@ -95,49 +95,48 @@ const localTools = {
 };
 
 // ---------------------------------------------------------------------------
-// Grok (xAI) — free tier for all users (30 RPM, 40K TPM)
+// Free tier — proxied through NAVADA Edge Dashboard (key stays on ASUS)
 // ---------------------------------------------------------------------------
-const GROK_KEY = 'xai-NEmiT3HGX6OoNZ2Xwj5RJtzy1U2AgcDxGrebJbp7dNFCdk9dSF1kEpaoaL6CygcsFYGR3tQuWyhGJAg1';
-const GROK_MODEL = 'grok-3-mini-fast';
-
-async function callGrok(messages) {
-  const r = await navada.request('https://api.x.ai/v1/chat/completions', {
-    method: 'POST',
-    body: {
-      model: GROK_MODEL,
-      messages: [
-        { role: 'system', content: IDENTITY.personality },
-        ...messages,
-      ],
-      max_tokens: 2048,
-      temperature: 0.7,
-    },
-    headers: {
-      'Authorization': `Bearer ${GROK_KEY}`,
-      'Content-Type': 'application/json',
-    },
-    timeout: 30000,
-  });
+// Dashboard proxy endpoints — tries Cloudflare tunnel first (works for everyone),
+// then falls back to direct Tailscale IP (faster but only works on VPN)
+const FREE_TIER_ENDPOINTS = [
+  'https://api.navada-edge-server.uk/api/v1/chat',    // Cloudflare tunnel (public, works for all)
+  'http://100.88.118.128:7900/api/v1/chat',           // Direct Tailscale (VPN users only)
+];
+
+async function callFreeTier(messages) {
+  // Try each endpoint (public first, then Tailscale)
+  for (const endpoint of FREE_TIER_ENDPOINTS) {
+    try {
+      const r = await navada.request(endpoint, {
+        method: 'POST',
+        body: { messages },
+        timeout: endpoint.includes('navada-edge-server.uk') ? 30000 : 5000,
+      });
 
-  if (r.status === 429) {
-    return {
-      content: `You've hit the free tier rate limit (30 requests/min).
+      if (r.status === 429) {
+        return {
+          content: `Free tier limit reached (30 requests/min).
 
-To continue chatting, add your own API key:
+To continue, add your own API key:
   /login sk-ant-your-anthropic-key    (full agent with tool use)
   /login sk-your-openai-key           (GPT-4o)
   /init hfToken hf_your_token         (Qwen Coder — FREE unlimited)
 
 Or wait a minute and try again.`,
-      isRateLimit: true,
-    };
-  }
+          isRateLimit: true,
+        };
+      }
 
-  if (r.status !== 200) {
-    throw new Error(`Grok API error ${r.status}: ${JSON.stringify(r.data).slice(0, 200)}`);
+      if (r.status === 200) {
+        return { content: r.data?.choices?.[0]?.message?.content || '', isRateLimit: false };
+      }
+    } catch {
+      continue; // Try next endpoint
+    }
   }
 
-  return { content: r.data?.choices?.[0]?.message?.content || '', isRateLimit: false };
+  throw new Error('Free tier unavailable. Add your own key: /login <key>');
 }
 
 // ---------------------------------------------------------------------------
@@ -322,12 +321,15 @@ async function executeTool(name, input) {
 
 async function grokChat(userMessage, conversationHistory = []) {
   const messages = [
-    ...conversationHistory.slice(-20),
+    ...conversationHistory.slice(-20).map(m => ({
+      role: m.role,
+      content: typeof m.content === 'string' ? m.content : JSON.stringify(m.content),
+    })),
     { role: 'user', content: userMessage },
   ];
 
-  const result = await callGrok(messages);
-  return result.content;
+  const result = await callFreeTier(messages);
+  return result.content || 'No response from free tier. Try /login <key> for full agent.';
 }
 
 async function fallbackChat(msg) {
@@ -349,7 +351,7 @@ async function fallbackChat(msg) {
   }
   // Grok is always available as the free fallback
   try {
-    const result = await callGrok([{ role: 'user', content: msg }]);
+    const result = await callFreeTier([{ role: 'user', content: msg }]);
     return result.content;
   } catch {}
   return `All providers failed. Check your internet connection or try again.`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "navada-edge-cli",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "Interactive CLI for the NAVADA Edge Network — explore nodes, agents, Cloudflare, AI, Docker, and MCP from your terminal",
   "main": "lib/cli.js",
   "bin": {