@darksol/terminal 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darksol/terminal",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "DARKSOL Terminal — unified CLI for all DARKSOL services. Market intel, trading, oracle, casino, and more.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -294,6 +294,16 @@ export function cli(argv) {
     .description('Settle payment on-chain')
     .action((payment) => facilitatorSettle(payment));
 
+  // ═══════════════════════════════════════
+  // CHAT SHORTCUT (darksol chat = darksol ai chat)
+  // ═══════════════════════════════════════
+  program
+    .command('chat')
+    .description('Start AI trading chat (shortcut for: darksol ai chat)')
+    .option('-p, --provider <name>', 'LLM provider')
+    .option('-m, --model <model>', 'Model name')
+    .action((opts) => startChat(opts));
+
   // ═══════════════════════════════════════
   // SETUP COMMAND
   // ═══════════════════════════════════════
@@ -591,58 +601,41 @@ export function cli(argv) {
     });
 
   // ═══════════════════════════════════════
-  // DASHBOARD (default) — CHAT-FIRST
+  // DASHBOARD (default) — commands + optional AI
   // ═══════════════════════════════════════
   program
     .command('dashboard', { isDefault: true })
-    .description('Show DARKSOL Terminal — chat-first interface')
+    .description('Show DARKSOL Terminal dashboard')
     .action(async () => {
       showBanner();
 
-      // First-run detection — force setup
-      const ranSetup = await checkFirstRun();
-      if (ranSetup) return;
-
       const cfg = getAllConfig();
       const wallet = cfg.activeWallet;
-      const { hasKey } = await import('./config/keys.js');
-      const hasLLM = ['openai', 'anthropic', 'openrouter', 'ollama'].some(s => hasKey(s));
+      const { hasAnyLLM } = await import('./config/keys.js');
+      const hasLLM = hasAnyLLM();
 
-      // ── Status bar (compact) ──
+      // ── Status bar ──
       const statusParts = [
         wallet ? theme.success(`● ${wallet}`) : theme.dim('○ no wallet'),
         theme.dim(`${cfg.chain}`),
         theme.dim(`${cfg.slippage}% slip`),
-        hasLLM ? theme.success('● AI ready') : theme.accent('○ no AI'),
+        hasLLM ? theme.success('● AI ready') : theme.dim('○ no AI'),
       ];
       console.log(`  ${statusParts.join(theme.dim('  │  '))}`);
       console.log('');
 
-      // ── CHAT INTERFACE (primary) ──
+      // ── Commands (always shown) ──
+      showCommandList();
+
+      // ── AI nudge or chat prompt ──
       if (hasLLM) {
-        // AI is connected — drop straight into chat
-        console.log(theme.gold('  ╔══════════════════════════════════════════════════════════╗'));
-        console.log(theme.gold('  ║') + theme.label('  DARKSOL AI — ready. Ask anything.                      ') + theme.gold('║'));
-        console.log(theme.gold('  ║') + theme.dim('  "swap 0.1 ETH for USDC" • "what\'s AERO at?" • "help"   ') + theme.gold('║'));
-        console.log(theme.gold('  ║') + theme.dim('  Type "commands" to see all tools. Type "exit" to quit.   ') + theme.gold('║'));
-        console.log(theme.gold('  ╚══════════════════════════════════════════════════════════╝'));
+        console.log(theme.gold('  💬 AI is ready — run ') + theme.label('darksol ai chat') + theme.gold(' or just ') + theme.label('darksol chat'));
+        console.log(theme.dim('     "swap 0.1 ETH for USDC" • "what\'s AERO at?" • any question'));
         console.log('');
-
-        // Start interactive chat loop
-        await startChatLoop(cfg);
       } else {
-        // No AI — show connect prompt
-        console.log(theme.gold('  ╔══════════════════════════════════════════════════════════╗'));
-        console.log(theme.gold('  ║') + theme.accent('  ⚠  No AI provider connected                            ') + theme.gold('║'));
-        console.log(theme.gold('  ║') + theme.dim('  The DARKSOL AI needs an LLM to work.                    ') + theme.gold('║'));
-        console.log(theme.gold('  ║') + theme.dim('                                                          ') + theme.gold('║'));
-        console.log(theme.gold('  ║') + theme.dim('  Run: ') + theme.label('darksol setup') + theme.dim('          to connect OpenAI/Anthropic  ') + theme.gold('║'));
-        console.log(theme.gold('  ║') + theme.dim('  Run: ') + theme.label('darksol keys add openai') + theme.dim(' to add an API key       ') + theme.gold('║'));
-        console.log(theme.gold('  ║') + theme.dim('                                                          ') + theme.gold('║'));
-        console.log(theme.gold('  ║') + theme.dim('  Or use Ollama for free local AI — no key needed.        ') + theme.gold('║'));
-        console.log(theme.gold('  ╚══════════════════════════════════════════════════════════╝'));
+        console.log(theme.dim('  💡 Want AI-powered trading? Run ') + theme.label('darksol setup') + theme.dim(' to connect an LLM'));
+        console.log(theme.dim('     Supports OpenAI, Anthropic, OpenRouter, or Ollama (free/local)'));
         console.log('');
-        showCommandList();
       }
     });
 

package/src/config/keys.js

@@ -351,13 +351,54 @@ export function getKeyAuto(service) {
 }
 
 /**
- * Check if any key exists for a service (stored or env)
+ * Check if a VALID key exists for a service (stored or env)
+ * Actually validates format, not just existence
  */
 export function hasKey(service) {
-  const vault = loadVault();
-  if (vault.keys[service]) return true;
   const svc = SERVICES[service];
-  if (svc?.envVar && process.env[svc.envVar]) return true;
+  const vault = loadVault();
+
+  // Check vault (auto-stored keys)
+  if (vault.keys[service]) {
+    // If auto-stored, try to decrypt and validate
+    if (vault.keys[service].autoStored) {
+      try {
+        const key = decrypt(vault.keys[service].encrypted, getMachineVaultPass());
+        if (svc?.validate && !svc.validate(key)) return false;
+        return true;
+      } catch { return false; }
+    }
+    return true;  // manually stored keys are assumed valid
+  }
+
+  // Check environment variable
+  if (svc?.envVar && process.env[svc.envVar]) {
+    const envVal = process.env[svc.envVar];
+    // For Ollama, just having OLLAMA_HOST doesn't mean AI is ready
+    // — we need actual LLM providers with API keys
+    if (service === 'ollama') {
+      // Ollama is "ready" if host is set and looks like a URL
+      return envVal.startsWith('http') && envVal.length > 10;
+    }
+    // For API key services, validate the key format
+    if (svc.validate) {
+      return svc.validate(envVal);
+    }
+    return envVal.length > 0;
+  }
+
+  return false;
+}
+
+/**
+ * Quick check: is any LLM provider properly configured?
+ * Only returns true if a real API key is validated
+ */
+export function hasAnyLLM() {
+  // Cloud providers — need real validated API keys
+  if (['openai', 'anthropic', 'openrouter'].some(s => hasKey(s))) return true;
+  // Ollama — check if explicitly configured via hasKey (validates URL format)
+  if (hasKey('ollama')) return true;
   return false;
 }
 

package/src/setup/wizard.js

@@ -3,7 +3,7 @@ import { theme } from '../ui/theme.js';
 import { showSection, showDivider } from '../ui/banner.js';
 import { success, error, warn, info, kvDisplay } from '../ui/components.js';
 import { getConfig, setConfig } from '../config/store.js';
-import { addKeyDirect, hasKey, SERVICES } from '../config/keys.js';
+import { addKeyDirect, hasKey, hasAnyLLM, SERVICES } from '../config/keys.js';
 import { createServer } from 'http';
 import open from 'open';
 import crypto from 'crypto';
@@ -16,9 +16,9 @@ import crypto from 'crypto';
  * Check if this is a first run (no LLM keys configured)
  */
 export function isFirstRun() {
-  const hasAnyLLM = ['openai', 'anthropic', 'openrouter', 'ollama'].some(s => hasKey(s));
+  const llmReady = hasAnyLLM();
   const setupDone = getConfig('setupComplete');
-  return !hasAnyLLM && !setupDone;
+  return !llmReady && !setupDone;
 }
 
 /**
@@ -494,12 +494,10 @@ function showPostSetup() {
 }
 
 /**
- * Quick check on startup — if first run, FORCE setup (no prompt)
+ * Quick check on startup — nudge about AI, never block
+ * Returns false always so dashboard continues to render
  */
 export async function checkFirstRun() {
-  if (isFirstRun()) {
-    await runSetupWizard();
-    return true;
-  }
+  // Never block — just return false and let dashboard handle the nudge
   return false;
 }

package/src/ui/banner.js

@@ -26,7 +26,7 @@ export function showBanner(opts = {}) {
   );
   console.log(
     theme.dim('  ║ ') +
-    theme.subtle(' v0.3.1') +
+    theme.subtle(' v0.3.3') +
     theme.dim('                                                ') +
     theme.gold('🌑') +
     theme.dim(' ║')
@@ -44,7 +44,7 @@ export function showBanner(opts = {}) {
 
 export function showMiniBanner() {
   console.log('');
-  console.log(theme.gold.bold('  🌑 DARKSOL TERMINAL') + theme.dim(' v0.3.1'));
+  console.log(theme.gold.bold('  🌑 DARKSOL TERMINAL') + theme.dim(' v0.3.3'));
   console.log(theme.dim('  ─────────────────────────────'));
   console.log('');
 }
@@ -64,3 +64,5 @@ export function showDivider() {
 
 
 
+
+