navada-edge-cli 2.1.0 → 2.1.1

package/lib/agent.js

@@ -98,10 +98,19 @@ const localTools = {
 // Anthropic Claude API — conversational agent
 // ---------------------------------------------------------------------------
 async function chat(userMessage, conversationHistory = []) {
-  const anthropicKey = config.get('anthropicKey') || process.env.ANTHROPIC_API_KEY || '';
+  // Smart key detection — check all possible locations
+  const anthropicKey = config.get('anthropicKey')
+    || config.getApiKey()  // /setup saves here
+    || process.env.ANTHROPIC_API_KEY
+    || '';
 
-  if (!anthropicKey) {
-    // Fall back to other providers
+  // Auto-detect: if the key starts with sk-ant, it's Anthropic
+  const apiKey = config.getApiKey();
+  const effectiveKey = anthropicKey
+    || (apiKey && apiKey.startsWith('sk-ant') ? apiKey : '')
+    || '';
+
+  if (!effectiveKey) {
     return fallbackChat(userMessage);
   }
 
@@ -179,7 +188,7 @@ async function chat(userMessage, conversationHistory = []) {
   ];
 
   // Call Anthropic API
-  let response = await callAnthropic(anthropicKey, messages, tools);
+  let response = await callAnthropic(effectiveKey, messages, tools);
 
   // Handle tool use loop
   let iterations = 0;
@@ -265,17 +274,30 @@ async function executeTool(name, input) {
 }
 
 async function fallbackChat(msg) {
-  // Try MCP → Qwen → OpenAI → error
+  // Try MCP → Qwen → OpenAI → helpful error
   if (navada.config.mcp) {
-    try { return JSON.stringify(await navada.mcp.call('chat', { message: msg })); } catch {}
+    try {
+      const r = await navada.mcp.call('chat', { message: msg });
+      return typeof r === 'object' ? JSON.stringify(r) : r;
+    } catch {}
   }
   if (navada.config.hfToken) {
-    try { return await navada.ai.huggingface.qwen(msg); } catch {}
+    try {
+      const r = await navada.ai.huggingface.qwen(msg);
+      return typeof r === 'object' ? JSON.stringify(r) : r;
+    } catch {}
   }
   if (navada.config.openaiKey) {
     try { return await navada.ai.openai.chat(msg); } catch {}
   }
-  return 'No AI provider configured. Run /setup or set ANTHROPIC_API_KEY.';
+  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`;
 }
 
 // ---------------------------------------------------------------------------

package/lib/cli.js

@@ -85,17 +85,21 @@ async function run(argv) {
   applyConfig();
 
   if (argv.length === 0) {
-    // Check first run
-    if (config.isFirstRun()) {
-      reportTelemetry('install');
-      const { runSetup } = require('./commands/setup');
-      await runSetup();
-      return;
-    }
-    // Report session start
-    reportTelemetry('session_start');
-    // Interactive mode
+    // Report telemetry
+    if (config.isFirstRun()) reportTelemetry('install');
+    else reportTelemetry('session_start');
+
+    // 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.'));
+      console.log('');
+    }
+
     startRepl();
   } else if (argv[0] === '--version' || argv[0] === '-v') {
     const pkg = require('../package.json');

package/lib/commands/setup.js

@@ -9,128 +9,97 @@ function ask(rl, question) {
   return new Promise(resolve => rl.question(question, resolve));
 }
 
-async function runSetup() {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+async function runSetup(fromRepl = false) {
+  // Create a fresh readline — don't conflict with the REPL
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    terminal: true,
+  });
 
-  console.log(ui.banner());
-  console.log(ui.box('WELCOME', ' First-time setup. Let\'s connect you to the NAVADA Edge Network.'));
   console.log('');
-
-  // 1. API Key
-  const apiKey = await ask(rl, '  Enter your NAVADA Edge API key (or press Enter for FREE tier): ');
-  if (apiKey.trim()) {
-    config.setApiKey(apiKey.trim());
-    navada.init({ mcpApiKey: apiKey.trim(), dashboardApiKey: apiKey.trim() });
-    console.log(ui.success('API key saved'));
-  } else {
-    console.log(ui.dim('Continuing with FREE tier'));
-  }
+  console.log(ui.box('SETUP', ' Configure your NAVADA Edge CLI.'));
   console.log('');
 
-  // 2. Auto-detect network
-  console.log(ui.dim('Scanning for NAVADA Edge nodes...'));
-  // Ask for primary node IP to scan from
-  const scanIp = await ask(rl, '  Enter your primary node IP to scan (or press Enter to skip): ');
-  const defaultIps = {};
-  if (scanIp.trim()) {
-    defaultIps.asus = scanIp.trim();
-  }
+  // 1. API Key — the only required thing
+  console.log(ui.dim('  Your API key powers the AI agent. Accepts:'));
+  console.log(ui.dim('  - Anthropic key (sk-ant-...)'));
+  console.log(ui.dim('  - NAVADA Edge API key (nv_edge_...)'));
+  console.log(ui.dim('  - OpenAI key (sk-...)'));
+  console.log(ui.dim('  - Or press Enter to skip (limited mode)'));
+  console.log('');
 
-  let detected = {};
-  for (const [node, ip] of Object.entries(defaultIps)) {
-    try {
-      const port = node === 'oracle' ? 9000 : 3200;
-      await navada.request(`http://${ip}:${port}/`, { timeout: 3000 });
-      detected[node] = ip;
-      console.log(ui.online(node.toUpperCase(), true, ip));
-    } catch {
-      console.log(ui.online(node.toUpperCase(), false, 'not found'));
+  const apiKey = await ask(rl, '  API key: ');
+  if (apiKey.trim()) {
+    const key = apiKey.trim();
+    config.setApiKey(key);
+    // Auto-detect key type and save to right field
+    if (key.startsWith('sk-ant')) {
+      config.set('anthropicKey', key);
+      console.log(ui.success('Anthropic key saved — full agent mode enabled'));
+    } else if (key.startsWith('nv_edge')) {
+      console.log(ui.success('NAVADA Edge key saved — MCP access enabled'));
+    } else if (key.startsWith('sk-')) {
+      config.set('openaiKey', key);
+      navada.init({ openaiKey: key });
+      console.log(ui.success('OpenAI key saved'));
+    } else {
+      console.log(ui.success('Key saved'));
     }
+  } else {
+    console.log(ui.dim('Skipped — you can set this later with /login <key>'));
   }
   console.log('');
 
-  // 3. Confirm or enter manually
-  if (Object.keys(detected).length > 0) {
-    const useDetected = await ask(rl, '  Use detected nodes? (Y/n): ');
-    if (useDetected.toLowerCase() !== 'n') {
-      for (const [node, ip] of Object.entries(detected)) {
-        config.set(node, ip);
-      }
-      // Auto-derive service URLs from ASUS
-      if (detected.asus) {
-        config.set('mcp', `http://${detected.asus}:8811`);
-        config.set('dashboard', `http://${detected.asus}:7900`);
-        config.set('registry', `http://${detected.asus}:5000`);
-        navada.init({
-          asus: detected.asus, hp: detected.hp || '', ec2: detected.ec2 || '', oracle: detected.oracle || '',
-          mcp: `http://${detected.asus}:8811`, dashboard: `http://${detected.asus}:7900`, registry: `http://${detected.asus}:5000`,
-        });
-      }
-      if (detected.ec2) {
-        config.set('lucas', `http://${detected.ec2}:8820`);
-        navada.init({ lucas: `http://${detected.ec2}:8820` });
-      }
-      console.log(ui.success('Nodes configured'));
-    }
-  } else {
-    console.log(ui.dim('No nodes auto-detected. Enter manually:'));
+  // 2. Node IPs — optional
+  const configureNodes = await ask(rl, '  Configure network nodes? (y/N): ');
+  if (configureNodes.trim().toLowerCase() === 'y') {
+    console.log('');
+    console.log(ui.dim('  Enter Tailscale IPs for your NAVADA Edge nodes.'));
+    console.log(ui.dim('  Press Enter to skip any node.'));
+    console.log('');
+
     const asusIp = await ask(rl, '  ASUS IP (Production Engine): ');
     if (asusIp.trim()) {
       config.set('asus', asusIp.trim());
       config.set('mcp', `http://${asusIp.trim()}:8811`);
       config.set('dashboard', `http://${asusIp.trim()}:7900`);
       config.set('registry', `http://${asusIp.trim()}:5000`);
-      navada.init({ asus: asusIp.trim(), mcp: `http://${asusIp.trim()}:8811`, dashboard: `http://${asusIp.trim()}:7900`, registry: `http://${asusIp.trim()}:5000` });
+      navada.init({
+        asus: asusIp.trim(),
+        mcp: `http://${asusIp.trim()}:8811`,
+        dashboard: `http://${asusIp.trim()}:7900`,
+        registry: `http://${asusIp.trim()}:5000`,
+      });
     }
-    const hpIp = await ask(rl, '  HP IP (Database, press Enter to skip): ');
+    const hpIp = await ask(rl, '  HP IP (Database): ');
     if (hpIp.trim()) config.set('hp', hpIp.trim());
-    const ec2Ip = await ask(rl, '  EC2 IP (Monitoring, press Enter to skip): ');
+    const ec2Ip = await ask(rl, '  EC2 IP (Monitoring): ');
     if (ec2Ip.trim()) {
       config.set('ec2', ec2Ip.trim());
       config.set('lucas', `http://${ec2Ip.trim()}:8820`);
     }
-    const oracleIp = await ask(rl, '  Oracle IP (Docker Infra, press Enter to skip): ');
+    const oracleIp = await ask(rl, '  Oracle IP (Infrastructure): ');
     if (oracleIp.trim()) config.set('oracle', oracleIp.trim());
+    console.log(ui.success('Nodes configured'));
   }
   console.log('');
 
-  // 4. Choose theme
-  const theme = await ask(rl, '  Choose theme (dark/crow/matrix/light) [dark]: ');
+  // 3. Theme
+  const theme = await ask(rl, '  Theme (dark/crow/matrix/light) [dark]: ');
   config.setTheme(theme.trim() || 'dark');
-  console.log(ui.success(`Theme: ${config.getTheme()}`));
-  console.log('');
-
-  // 5. Test connections
-  console.log(ui.dim('Testing connections...'));
-  const tests = [
-    { name: 'MCP', url: navada.config.mcp ? navada.config.mcp + '/health' : '' },
-    { name: 'Dashboard', url: navada.config.dashboard || '' },
-    { name: 'Registry', url: navada.config.registry ? navada.config.registry + '/v2/_catalog' : '' },
-  ];
-  let pass = 0;
-  for (const t of tests) {
-    if (!t.url) { console.log(ui.online(t.name, false, 'not configured')); continue; }
-    try {
-      const r = await navada.request(t.url, { timeout: 5000 });
-      console.log(ui.online(t.name, r.status < 500));
-      pass++;
-    } catch {
-      console.log(ui.online(t.name, false, 'unreachable'));
-    }
-  }
   console.log('');
 
-  // 6. Summary
-  console.log(ui.box('SETUP COMPLETE', ` ${pass}/${tests.length} services connected\n Theme: ${config.getTheme()}\n Tier: ${config.getTier()}\n Config: ${config.CONFIG_FILE}`));
+  // 4. Done
+  console.log(ui.box('READY', ` Config saved: ${config.CONFIG_FILE}\n Type naturally to chat, or /help for commands.`));
   console.log('');
-  console.log(ui.dim('Run `navada` to start, or `navada doctor` to test all connections.'));
 
   rl.close();
 }
 
 module.exports = function(reg) {
-  reg('setup', 'Run onboarding wizard', async () => {
-    await runSetup();
+  reg('setup', 'Run setup wizard', async () => {
+    await runSetup(true);
   }, { category: 'SYSTEM' });
 };
 

package/lib/commands/system.js

@@ -65,11 +65,32 @@ module.exports = function(reg) {
   }, { category: 'SYSTEM' });
 
   // --- /login ---
-  reg('login', 'Set API key', (args) => {
-    if (!args[0]) { console.log(ui.dim('Usage: /login <api-key>')); return; }
-    config.setApiKey(args[0]);
-    navada.init({ mcpApiKey: args[0], dashboardApiKey: args[0] });
-    console.log(ui.success(`API key saved to ${config.CONFIG_FILE}`));
+  reg('login', 'Set API key (Anthropic, OpenAI, NAVADA Edge, or HuggingFace)', (args) => {
+    if (!args[0]) {
+      console.log(ui.dim('Usage: /login <api-key>'));
+      console.log(ui.dim('Accepts: sk-ant-... (Anthropic) | sk-... (OpenAI) | nv_edge_... (NAVADA) | hf_... (HuggingFace)'));
+      return;
+    }
+    const key = args[0].trim();
+    config.setApiKey(key);
+
+    if (key.startsWith('sk-ant')) {
+      config.set('anthropicKey', key);
+      console.log(ui.success('Anthropic key saved — full agent mode with tool use enabled'));
+    } else if (key.startsWith('hf_')) {
+      config.set('hfToken', key);
+      navada.init({ hfToken: key });
+      console.log(ui.success('HuggingFace key saved — Qwen Coder (FREE) enabled'));
+    } else if (key.startsWith('nv_edge')) {
+      navada.init({ mcpApiKey: key, dashboardApiKey: key });
+      console.log(ui.success('NAVADA Edge key saved — MCP + Dashboard access enabled'));
+    } else if (key.startsWith('sk-')) {
+      config.set('openaiKey', key);
+      navada.init({ openaiKey: key });
+      console.log(ui.success('OpenAI key saved — GPT-4o enabled'));
+    } else {
+      console.log(ui.success('Key saved'));
+    }
   }, { category: 'SYSTEM' });
 
   // --- /init ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "navada-edge-cli",
-  "version": "2.1.0",
+  "version": "2.1.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": {