navada-edge-cli 2.2.2 → 2.4.0

package/lib/agent.js

@@ -95,7 +95,52 @@ const localTools = {
 };
 
 // ---------------------------------------------------------------------------
-// Anthropic Claude API — conversational agent
+// Free tier — proxied through NAVADA Edge Dashboard (key stays on ASUS)
+// ---------------------------------------------------------------------------
+// Dashboard proxy endpoints — tries Cloudflare tunnel first, then direct
+// Users on Tailscale hit the direct IP; public users hit the tunnel
+const FREE_TIER_ENDPOINTS = [
+  'http://100.88.118.128:7900/api/v1/chat',           // Direct (fastest for Tailscale users)
+  'https://api.navada-edge-server.uk/api/v1/chat',    // Cloudflare tunnel (public fallback)
+];
+
+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: 30000,
+      });
+
+      if (r.status === 429) {
+        return {
+          content: `Free tier limit reached (30 requests/min).
+
+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,
+        };
+      }
+
+      if (r.status === 200) {
+        return { content: r.data?.choices?.[0]?.message?.content || '', isRateLimit: false };
+      }
+    } catch {
+      continue; // Try next endpoint
+    }
+  }
+
+  throw new Error('Free tier unavailable. Add your own key: /login <key>');
+}
+
+// ---------------------------------------------------------------------------
+// Anthropic Claude API — conversational agent with tool use
 // ---------------------------------------------------------------------------
 async function chat(userMessage, conversationHistory = []) {
   // Smart key detection — check all possible locations
@@ -110,8 +155,9 @@ async function chat(userMessage, conversationHistory = []) {
     || (apiKey && apiKey.startsWith('sk-ant') ? apiKey : '')
     || '';
 
+  // No personal key — use Grok free tier
   if (!effectiveKey) {
-    return fallbackChat(userMessage);
+    return grokChat(userMessage, conversationHistory);
   }
 
   const tools = [
@@ -273,8 +319,21 @@ async function executeTool(name, input) {
   }
 }
 
+async function grokChat(userMessage, conversationHistory = []) {
+  const messages = [
+    ...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 callFreeTier(messages);
+  return result.content || 'No response from free tier. Try /login <key> for full agent.';
+}
+
 async function fallbackChat(msg) {
-  // Try MCP → Qwen → OpenAI → helpful error
+  // Try MCP → Qwen → OpenAI → Grok free tier
   if (navada.config.mcp) {
     try {
       const r = await navada.mcp.call('chat', { message: msg });
@@ -290,14 +349,12 @@ async function fallbackChat(msg) {
   if (navada.config.openaiKey) {
     try { return await navada.ai.openai.chat(msg); } catch {}
   }
-  return `I need an API key to chat. Quick fix:
-
-  /login sk-ant-your-anthropic-key    (recommended — enables full agent with tool use)
-  /login sk-your-openai-key           (GPT-4o)
-  /init hfToken hf_your_token         (Qwen Coder — FREE)
-  /setup                              (guided wizard)
-
-/commands still work without a key — try /help`;
+  // Grok is always available as the free fallback
+  try {
+    const result = await callFreeTier([{ role: 'user', content: msg }]);
+    return result.content;
+  } catch {}
+  return `All providers failed. Check your internet connection or try again.`;
 }
 
 // ---------------------------------------------------------------------------

package/lib/cli.js

@@ -92,11 +92,10 @@ async function run(argv) {
     // Interactive mode — always start. User can /setup if needed.
     showWelcome();
 
-    // Hint if no key configured
-    const hasKey = config.getApiKey() || config.get('anthropicKey') || process.env.ANTHROPIC_API_KEY;
-    if (!hasKey) {
-      console.log(ui.warn('No API key set. Type /login <key> or /setup to configure.'));
-      console.log(ui.dim('You can still use /commands. Natural chat requires an API key.'));
+    // Show tier info
+    const hasPersonalKey = config.getApiKey() || config.get('anthropicKey') || process.env.ANTHROPIC_API_KEY;
+    if (!hasPersonalKey) {
+      console.log(ui.dim('Free tier active (Grok). /login <your-key> for full agent with tool use.'));
       console.log('');
     }
 

package/package.json

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