@emblemvault/agentwallet 1.1.0 → 1.2.0

package/{hustle-chat.js → emblemai.js}

@@ -1,51 +1,82 @@
 #!/usr/bin/env node
 
 /**
- * Hustle Incognito CLI with Headless Password Authentication
+ * EmblemAI - Unified CLI for Agent Hustle
  *
- * This CLI demonstrates using the SDK with password-based authentication,
- * ideal for servers, CLI tools, and AI agents without browser access.
+ * Agent Mode (for AI agents):
+ *   emblemai --agent -p "password" -m "What are my balances?"
  *
- * Usage:
- *   node simple-cli-auth.js --password "your-password-min-16-chars"
- *   node simple-cli-auth.js  # Will prompt for password interactively
+ * Interactive Mode (for humans):
+ *   emblemai -p "password"
+ *   emblemai  # Will prompt for password
  *
- * Environment variables:
- *   AGENT_PASSWORD  - Password for authentication (min 16 chars)
- *   APP_ID          - App ID (default: emblem-agent-wallet)
- *   AUTH_API_URL    - Auth API URL (optional, uses SDK default)
- *   HUSTLE_API_URL  - Hustle API URL (optional, uses SDK default)
- *   DEBUG           - Enable debug logging (set to 'true')
+ * Reset conversation:
+ *   emblemai --reset
+ *   (or /reset in interactive mode)
  */
 
 async function main() {
   try {
-    // Import dependencies
     const { HustleIncognitoClient } = await import('hustle-incognito');
     const { EmblemAuthSDK } = await import('@emblemvault/auth-sdk');
-    const dotenv = await import('dotenv');
     const readline = await import('readline');
-
-    // Load environment variables
-    dotenv.config();
+    const fs = await import('fs');
+    const path = await import('path');
+    const os = await import('os');
 
     // Parse command line arguments
     const args = process.argv.slice(2);
-    const getArg = (flag) => {
-      const index = args.indexOf(flag);
-      return index !== -1 && args[index + 1] ? args[index + 1] : null;
+    const getArg = (flags) => {
+      for (const flag of flags) {
+        const index = args.indexOf(flag);
+        if (index !== -1 && args[index + 1]) return args[index + 1];
+      }
+      return null;
     };
+    const hasFlag = (flags) => flags.some(f => args.includes(f));
+
+    const isAgentMode = hasFlag(['--agent', '-a']);
+    const isReset = hasFlag(['--reset']);
+    const initialDebug = hasFlag(['--debug']);
+    const initialStream = hasFlag(['--stream']);
+    const passwordArg = getArg(['--password', '-p']);
+    const messageArg = getArg(['--message', '-m']);
+
+    // Conversation history file
+    const historyFile = path.join(os.homedir(), '.emblemai-history.json');
+
+    // Load conversation history
+    function loadHistory() {
+      try {
+        if (fs.existsSync(historyFile)) {
+          const data = fs.readFileSync(historyFile, 'utf8');
+          return JSON.parse(data);
+        }
+      } catch (e) {
+        // Ignore errors, start fresh
+      }
+      return { messages: [], created: new Date().toISOString() };
+    }
+
+    // Save conversation history
+    function saveHistory(history) {
+      history.lastUpdated = new Date().toISOString();
+      fs.writeFileSync(historyFile, JSON.stringify(history, null, 2));
+    }
 
-    const initialDebugMode = args.includes('--debug');
-    const initialStreamMode = args.includes('--stream');
-    const passwordArg = getArg('--password');
+    // Reset conversation history
+    function resetHistory() {
+      if (fs.existsSync(historyFile)) {
+        fs.unlinkSync(historyFile);
+      }
+      console.log('Conversation history cleared.');
+    }
 
-    // Environment configuration
-    const ENV_PASSWORD = passwordArg || process.env.AGENT_PASSWORD;
-    const ENV_APP_ID = process.env.APP_ID || 'emblem-agent-wallet';
-    const ENV_AUTH_API_URL = process.env.AUTH_API_URL;  // Uses SDK default if not set
-    const ENV_HUSTLE_API_URL = process.env.HUSTLE_API_URL;  // Uses SDK default if not set
-    const ENV_DEBUG = process.env.DEBUG === 'true';
+    // Handle --reset flag
+    if (isReset) {
+      resetHistory();
+      process.exit(0);
+    }
 
     // Create readline interface
     const rl = readline.createInterface({
@@ -53,22 +84,18 @@ async function main() {
       output: process.stdout
     });
 
-    // Helper to prompt for input
     const prompt = (question) => new Promise((resolve) => {
       rl.question(question, resolve);
     });
 
-    // Helper to prompt for password (hidden input)
+    // Hidden password input
     const promptPassword = async (question) => {
       if (process.stdin.isTTY) {
         process.stdout.write(question);
-
         return new Promise((resolve) => {
           let password = '';
-
           const onData = (char) => {
             char = char.toString();
-
             switch (char) {
               case '\n':
               case '\r':
@@ -92,7 +119,6 @@ async function main() {
                 process.stdout.write('*');
             }
           };
-
           process.stdin.setRawMode(true);
           process.stdin.resume();
           process.stdin.on('data', onData);
@@ -102,105 +128,122 @@ async function main() {
       }
     };
 
-    console.log('========================================');
-    console.log('  Hustle Incognito CLI (Auth Edition)');
-    console.log('========================================');
-    console.log('');
-    console.log('This CLI uses headless password authentication.');
-    console.log('No API key required - authentication is via password.');
-    console.log('');
+    // Get password from args, env, file, or prompt
+    let password = passwordArg || process.env.EMBLEM_PASSWORD || process.env.AGENT_PASSWORD;
 
-    // Get password
-    let password = ENV_PASSWORD;
+    // Try credential file
+    if (!password) {
+      const credFile = path.join(os.homedir(), '.emblem-vault');
+      if (fs.existsSync(credFile)) {
+        password = fs.readFileSync(credFile, 'utf8').trim();
+      }
+    }
 
+    // Prompt if still no password
     if (!password) {
-      console.log('No password provided via --password flag or AGENT_PASSWORD env var.');
+      if (isAgentMode) {
+        console.error('Error: Password required in agent mode. Use -p or set EMBLEM_PASSWORD');
+        process.exit(1);
+      }
       console.log('');
-      password = await promptPassword('Enter your password (min 16 chars): ');
+      password = await promptPassword('Enter your EmblemVault password (min 16 chars): ');
     }
 
-    // Validate password
     if (!password || password.length < 16) {
-      console.error('\nError: Password must be at least 16 characters.');
-      console.error('Use a long, random string like an API key for security.');
+      console.error('Error: Password must be at least 16 characters.');
       process.exit(1);
     }
 
-    console.log('');
-    console.log('Authenticating...');
+    // Authenticate
+    if (!isAgentMode) {
+      console.log('');
+      console.log('Authenticating with Agent Hustle...');
+    }
+
+    const authSdk = new EmblemAuthSDK({
+      appId: 'emblem-agent-wallet',
+      persistSession: false,
+    });
 
-    // Create auth SDK instance directly (so we can access all its methods)
-    let authSdk;
-    let client;
+    const session = await authSdk.authenticatePassword({ password });
+    if (!session) {
+      throw new Error('Authentication failed');
+    }
 
-    try {
-      const sdkConfig = {
-        appId: ENV_APP_ID,
-        persistSession: false, // No localStorage in Node.js
-      };
+    // Settings (runtime state)
+    const settings = {
+      debug: initialDebug,
+      stream: !initialStream ? true : initialStream, // Default ON
+      retainHistory: true,
+      selectedTools: [],
+      model: null,
+    };
 
-      if (ENV_AUTH_API_URL) {
-        sdkConfig.apiUrl = ENV_AUTH_API_URL;
-      }
+    const client = new HustleIncognitoClient({
+      sdk: authSdk,
+      debug: settings.debug,
+    });
 
-      authSdk = new EmblemAuthSDK(sdkConfig);
+    // Intent context for auto-tools mode
+    let lastIntentContext = null;
 
-      // Authenticate with password
-      const session = await authSdk.authenticatePassword({ password });
+    // Load existing history (resume by default)
+    let history = loadHistory();
 
-      if (!session) {
-        throw new Error('Authentication failed - no session returned');
+    // ==================== AGENT MODE ====================
+    if (isAgentMode) {
+      if (!messageArg) {
+        console.error('Error: Message required in agent mode. Use -m "your message"');
+        process.exit(1);
       }
 
-      // Create Hustle client with the authenticated SDK
-      const clientConfig = {
-        sdk: authSdk,
-        debug: initialDebugMode || ENV_DEBUG,
-      };
+      console.log('Agent Hustle is thinking.');
 
-      if (ENV_HUSTLE_API_URL) {
-        clientConfig.hustleApiUrl = ENV_HUSTLE_API_URL;
-      }
+      // Add user message to history
+      history.messages.push({ role: 'user', content: messageArg });
 
-      client = new HustleIncognitoClient(clientConfig);
+      // Progress indicator - output a dot every 5 seconds to show it's not hung
+      const progressInterval = setInterval(() => {
+        process.stdout.write('.');
+      }, 5000);
 
-    } catch (error) {
-      console.error('\nAuthentication failed:', error.message);
-      if (error.message.includes('@emblemvault/auth-sdk')) {
-        console.error('\nTo install the auth SDK:');
-        console.error('  npm install @emblemvault/auth-sdk');
-      }
-      process.exit(1);
-    }
+      try {
+        const response = await client.chat(history.messages);
 
-    console.log('Authentication successful!');
-    console.log('');
+        // Stop progress indicator
+        clearInterval(progressInterval);
 
-    // Settings
-    let settings = {
-      debug: initialDebugMode || ENV_DEBUG,
-      stream: initialStreamMode,
-      selectedTools: [],
-      retainHistory: true,
-      model: null,
-    };
+        // Add assistant response to history
+        history.messages.push({ role: 'assistant', content: response.content });
+        saveHistory(history);
+
+        // Output response (for agent to capture)
+        console.log(response.content);
+      } catch (error) {
+        clearInterval(progressInterval);
+        console.error('Error:', error.message);
+        process.exit(1);
+      }
 
-    // Store conversation history
-    const messages = [];
+      rl.close();
+      process.exit(0);
+    }
 
-    // Store intent context for auto-tools mode
-    let lastIntentContext = null;
+    // ==================== INTERACTIVE MODE ====================
+    console.log('');
+    console.log('========================================');
+    console.log('         Agent Hustle CLI');
+    console.log('========================================');
+    console.log('');
 
-    // Spinner for loading animation
+    // Spinner
     const spinnerFrames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
     let spinnerInterval = null;
     let spinnerIndex = 0;
-    const hideCursor = '\x1B[?25l';
-    const showCursor = '\x1B[?25h';
 
     function startSpinner() {
       spinnerIndex = 0;
-      process.stdout.write(hideCursor + spinnerFrames[0]);
+      process.stdout.write('\x1B[?25l' + spinnerFrames[0]);
       spinnerInterval = setInterval(() => {
         process.stdout.write('\b' + spinnerFrames[spinnerIndex]);
         spinnerIndex = (spinnerIndex + 1) % spinnerFrames.length;
@@ -211,133 +254,44 @@ async function main() {
       if (spinnerInterval) {
         clearInterval(spinnerInterval);
         spinnerInterval = null;
-        process.stdout.write('\b \b' + showCursor);
-      }
-    }
-
-    // Stream response
-    async function streamResponse(msgs) {
-      let fullText = '';
-      let toolCalls = [];
-      let firstChunkReceived = false;
-
-      process.stdout.write('\nAgent: ');
-      startSpinner();
-
-      try {
-        const streamOptions = {
-          messages: msgs,
-          processChunks: true
-        };
-
-        if (settings.model) {
-          streamOptions.model = settings.model;
-        }
-
-        if (settings.selectedTools.length > 0) {
-          streamOptions.selectedToolCategories = settings.selectedTools;
-        } else if (lastIntentContext) {
-          streamOptions.intentContext = lastIntentContext;
-        }
-
-        const stream = client.chatStream(streamOptions);
-
-        for await (const chunk of stream) {
-          if ('type' in chunk) {
-            switch (chunk.type) {
-              case 'text':
-                if (!firstChunkReceived) {
-                  stopSpinner();
-                  firstChunkReceived = true;
-                }
-                process.stdout.write(chunk.value);
-                fullText += chunk.value;
-                break;
-
-              case 'intent_context':
-                if (chunk.value?.intentContext) {
-                  lastIntentContext = chunk.value.intentContext;
-                  if (settings.debug) {
-                    console.log('[DEBUG] Captured intent context:',
-                      `activeIntent="${lastIntentContext.activeIntent || 'general'}", ` +
-                      `categories=[${lastIntentContext.categories?.join(', ') || 'none'}]`);
-                  }
-                }
-                break;
-
-              case 'tool_call':
-                if (!firstChunkReceived) {
-                  stopSpinner();
-                  firstChunkReceived = true;
-                }
-                toolCalls.push(chunk.value);
-                break;
-
-              case 'finish':
-                stopSpinner();
-                process.stdout.write('\n');
-                break;
-            }
-          }
-        }
-      } catch (error) {
-        stopSpinner();
-        console.error(`\nError during streaming: ${error.message}`);
-      }
-
-      if (toolCalls.length > 0) {
-        console.log('\nTools used:');
-        toolCalls.forEach((tool, i) => {
-          console.log(`${i+1}. ${tool.toolName || 'Unknown tool'} (ID: ${tool.toolCallId || 'unknown'})`);
-          if (tool.args) {
-            console.log(`   Args: ${JSON.stringify(tool.args)}`);
-          }
-        });
+        process.stdout.write('\b \b\x1B[?25h');
       }
-
-      return fullText;
     }
 
-    // Display help
+    // ==================== HELP ====================
     function showHelp() {
-      console.log('\nAvailable commands:');
-      console.log('  /help       - Show this help message');
-      console.log('  /settings   - Show current settings');
-      console.log('  /auth       - Open authentication menu (API key, vault info, etc.)');
+      console.log('\nCommands:');
+      console.log('  /help          - Show this help');
+      console.log('  /settings      - Show current settings');
+      console.log('  /auth          - Open auth menu (API key, addresses, etc.)');
       console.log('  /stream on|off - Toggle streaming mode');
       console.log('  /debug on|off  - Toggle debug mode');
-      console.log('  /history on|off - Toggle message history retention');
-      console.log('  /clear      - Clear conversation history');
-      console.log('  /models     - List available models');
-      console.log('  /model <id> - Set the model to use');
-      console.log('  /model clear - Clear model selection');
-      console.log('  /tools      - Manage tool categories');
-      console.log('  /tools add <id> - Add a tool category');
-      console.log('  /tools remove <id> - Remove a tool category');
-      console.log('  /tools clear - Enable auto-tools mode');
-      console.log('  /exit or /quit - Exit the application');
+      console.log('  /history on|off - Toggle history retention');
+      console.log('  /reset         - Clear conversation history');
+      console.log('  /models        - List available models');
+      console.log('  /model <id>    - Set model (or "clear" to reset)');
+      console.log('  /tools         - List tool categories');
+      console.log('  /tools add|remove <id> - Manage tools');
+      console.log('  /tools clear   - Enable auto-tools mode');
+      console.log('  /exit          - Exit the CLI');
     }
 
-    // Show settings
+    // ==================== SETTINGS ====================
     function showSettings() {
-      const session = authSdk.getSession();
+      const sess = authSdk.getSession();
       console.log('\nCurrent settings:');
-      console.log(`  App ID:     ${ENV_APP_ID}`);
-      console.log(`  Vault ID:   ${session?.user?.vaultId || 'N/A'}`);
+      console.log(`  App ID:     emblem-agent-wallet`);
+      console.log(`  Vault ID:   ${sess?.user?.vaultId || 'N/A'}`);
       console.log(`  Auth Mode:  Password (headless)`);
       console.log(`  Model:      ${settings.model || 'API default'}`);
       console.log(`  Streaming:  ${settings.stream ? 'ON' : 'OFF'}`);
       console.log(`  Debug:      ${settings.debug ? 'ON' : 'OFF'}`);
       console.log(`  History:    ${settings.retainHistory ? 'ON' : 'OFF'}`);
-      console.log(`  Messages:   ${messages.length}`);
-      console.log(`  Tools:      ${
-        settings.selectedTools.length > 0
-          ? settings.selectedTools.join(', ')
-          : 'Auto-tools mode'
-      }`);
+      console.log(`  Messages:   ${history.messages.length}`);
+      console.log(`  Tools:      ${settings.selectedTools.length > 0 ? settings.selectedTools.join(', ') : 'Auto-tools mode'}`);
     }
 
-    // Auth menu
+    // ==================== AUTH MENU ====================
     async function showAuthMenu() {
       console.log('\n========================================');
       console.log('         Authentication Menu');
@@ -357,50 +311,25 @@ async function main() {
       const choice = await prompt('Select option (1-9): ');
 
       switch (choice.trim()) {
-        case '1':
-          await getApiKey();
-          break;
-        case '2':
-          await getVaultInfo();
-          break;
-        case '3':
-          showSessionInfo();
-          break;
-        case '4':
-          await refreshSession();
-          break;
-        case '5':
-          await getEvmAddress();
-          break;
-        case '6':
-          await getSolanaAddress();
-          break;
-        case '7':
-          await getBtcAddresses();
-          break;
-        case '8':
-          await doLogout();
-          break;
-        case '9':
-          return;
-        default:
-          console.log('Invalid option');
+        case '1': await getApiKey(); break;
+        case '2': await getVaultInfo(); break;
+        case '3': showSessionInfo(); break;
+        case '4': await refreshSession(); break;
+        case '5': await getEvmAddress(); break;
+        case '6': await getSolanaAddress(); break;
+        case '7': await getBtcAddresses(); break;
+        case '8': await doLogout(); break;
+        case '9': return;
+        default: console.log('Invalid option');
       }
 
-      // Show menu again after action
       await showAuthMenu();
     }
 
     async function getApiKey() {
       console.log('\nFetching API key...');
-      if (settings.debug) {
-        console.log('[DEBUG] Calling authSdk.getVaultApiKey()...');
-      }
       try {
         const apiKey = await authSdk.getVaultApiKey();
-        if (settings.debug) {
-          console.log('[DEBUG] Raw response:', JSON.stringify(apiKey, null, 2));
-        }
         console.log('\n========================================');
         console.log('           YOUR API KEY');
         console.log('========================================');
@@ -410,27 +339,15 @@ async function main() {
         console.log('========================================');
         console.log('');
         console.log('IMPORTANT: Store this key securely!');
-        console.log('You can use this key with the regular CLI (simple-cli.js)');
-        console.log('Set it as HUSTLE_API_KEY in your environment.');
       } catch (error) {
         console.error('Error fetching API key:', error.message);
-        if (settings.debug && error.stack) {
-          console.error('[DEBUG] Stack:', error.stack);
-        }
       }
     }
 
     async function getVaultInfo() {
       console.log('\nFetching vault info...');
-      if (settings.debug) {
-        console.log('[DEBUG] Calling authSdk.getVaultInfo()...');
-      }
       try {
         const vaultInfo = await authSdk.getVaultInfo();
-        if (settings.debug) {
-          console.log('[DEBUG] Raw response:');
-          console.log(JSON.stringify(vaultInfo, null, 2));
-        }
         console.log('\n========================================');
         console.log('           VAULT INFO');
         console.log('========================================');
@@ -445,52 +362,31 @@ async function main() {
         }
         if (vaultInfo.btcAddresses) {
           console.log('  BTC Addresses:');
-          if (vaultInfo.btcAddresses.p2pkh) {
-            console.log(`    P2PKH:         ${vaultInfo.btcAddresses.p2pkh}`);
-          }
-          if (vaultInfo.btcAddresses.p2wpkh) {
-            console.log(`    P2WPKH:        ${vaultInfo.btcAddresses.p2wpkh}`);
-          }
-          if (vaultInfo.btcAddresses.p2tr) {
-            console.log(`    P2TR:          ${vaultInfo.btcAddresses.p2tr}`);
-          }
-        }
-        if (vaultInfo.createdAt) {
-          console.log(`  Created At:      ${vaultInfo.createdAt}`);
-        }
-        if (vaultInfo.created_by) {
-          console.log(`  Created By:      ${vaultInfo.created_by}`);
+          if (vaultInfo.btcAddresses.p2pkh) console.log(`    P2PKH:         ${vaultInfo.btcAddresses.p2pkh}`);
+          if (vaultInfo.btcAddresses.p2wpkh) console.log(`    P2WPKH:        ${vaultInfo.btcAddresses.p2wpkh}`);
+          if (vaultInfo.btcAddresses.p2tr) console.log(`    P2TR:          ${vaultInfo.btcAddresses.p2tr}`);
         }
+        if (vaultInfo.createdAt) console.log(`  Created At:      ${vaultInfo.createdAt}`);
         console.log('');
         console.log('========================================');
       } catch (error) {
         console.error('Error fetching vault info:', error.message);
-        if (settings.debug && error.stack) {
-          console.error('[DEBUG] Stack:', error.stack);
-        }
       }
     }
 
     function showSessionInfo() {
-      if (settings.debug) {
-        console.log('[DEBUG] Calling authSdk.getSession()...');
-      }
-      const session = authSdk.getSession();
-      if (settings.debug) {
-        console.log('[DEBUG] Raw response:');
-        console.log(JSON.stringify(session, null, 2));
-      }
+      const sess = authSdk.getSession();
       console.log('\n========================================');
       console.log('           SESSION INFO');
       console.log('========================================');
       console.log('');
-      if (session) {
-        console.log(`  Identifier:   ${session.user?.identifier || 'N/A'}`);
-        console.log(`  Vault ID:     ${session.user?.vaultId || 'N/A'}`);
-        console.log(`  App ID:       ${session.appId || 'N/A'}`);
-        console.log(`  Auth Type:    ${session.authType || 'N/A'}`);
-        console.log(`  Expires At:   ${session.expiresAt ? new Date(session.expiresAt).toISOString() : 'N/A'}`);
-        console.log(`  Auth Token:   ${session.authToken ? session.authToken.substring(0, 20) + '...' : 'N/A'}`);
+      if (sess) {
+        console.log(`  Identifier:   ${sess.user?.identifier || 'N/A'}`);
+        console.log(`  Vault ID:     ${sess.user?.vaultId || 'N/A'}`);
+        console.log(`  App ID:       ${sess.appId || 'N/A'}`);
+        console.log(`  Auth Type:    ${sess.authType || 'N/A'}`);
+        console.log(`  Expires At:   ${sess.expiresAt ? new Date(sess.expiresAt).toISOString() : 'N/A'}`);
+        console.log(`  Auth Token:   ${sess.authToken ? sess.authToken.substring(0, 20) + '...' : 'N/A'}`);
       } else {
         console.log('  No active session');
       }
@@ -500,15 +396,8 @@ async function main() {
 
     async function refreshSession() {
       console.log('\nRefreshing session...');
-      if (settings.debug) {
-        console.log('[DEBUG] Calling authSdk.refreshSession()...');
-      }
       try {
         const newSession = await authSdk.refreshSession();
-        if (settings.debug) {
-          console.log('[DEBUG] Raw response:');
-          console.log(JSON.stringify(newSession, null, 2));
-        }
         if (newSession) {
           console.log('Session refreshed successfully!');
           console.log(`New expiry: ${new Date(newSession.expiresAt).toISOString()}`);
@@ -517,23 +406,13 @@ async function main() {
         }
       } catch (error) {
         console.error('Error refreshing session:', error.message);
-        if (settings.debug && error.stack) {
-          console.error('[DEBUG] Stack:', error.stack);
-        }
       }
     }
 
     async function getEvmAddress() {
       console.log('\nFetching EVM address...');
-      if (settings.debug) {
-        console.log('[DEBUG] Calling authSdk.getVaultInfo() for EVM address...');
-      }
       try {
         const vaultInfo = await authSdk.getVaultInfo();
-        if (settings.debug) {
-          console.log('[DEBUG] Raw response:');
-          console.log(JSON.stringify(vaultInfo, null, 2));
-        }
         if (vaultInfo.evmAddress) {
           console.log('\n========================================');
           console.log('           EVM ADDRESS');
@@ -547,23 +426,13 @@ async function main() {
         }
       } catch (error) {
         console.error('Error fetching EVM address:', error.message);
-        if (settings.debug && error.stack) {
-          console.error('[DEBUG] Stack:', error.stack);
-        }
       }
     }
 
     async function getSolanaAddress() {
       console.log('\nFetching Solana address...');
-      if (settings.debug) {
-        console.log('[DEBUG] Calling authSdk.getVaultInfo() for Solana address...');
-      }
       try {
         const vaultInfo = await authSdk.getVaultInfo();
-        if (settings.debug) {
-          console.log('[DEBUG] Raw response:');
-          console.log(JSON.stringify(vaultInfo, null, 2));
-        }
         const solanaAddr = vaultInfo.solanaAddress || vaultInfo.address;
         if (solanaAddr) {
           console.log('\n========================================');
@@ -578,42 +447,13 @@ async function main() {
         }
       } catch (error) {
         console.error('Error fetching Solana address:', error.message);
-        if (settings.debug && error.stack) {
-          console.error('[DEBUG] Stack:', error.stack);
-        }
-      }
-    }
-
-    async function doLogout() {
-      console.log('\nLogging out...');
-      if (settings.debug) {
-        console.log('[DEBUG] Calling authSdk.logout()...');
-      }
-      try {
-        authSdk.logout();
-        console.log('Logged out successfully.');
-        console.log('Session cleared. Exiting CLI...');
-        rl.close();
-        process.exit(0);
-      } catch (error) {
-        console.error('Error during logout:', error.message);
-        if (settings.debug && error.stack) {
-          console.error('[DEBUG] Stack:', error.stack);
-        }
       }
     }
 
     async function getBtcAddresses() {
       console.log('\nFetching BTC addresses...');
-      if (settings.debug) {
-        console.log('[DEBUG] Calling authSdk.getVaultInfo() for BTC addresses...');
-      }
       try {
         const vaultInfo = await authSdk.getVaultInfo();
-        if (settings.debug) {
-          console.log('[DEBUG] Raw response:');
-          console.log(JSON.stringify(vaultInfo, null, 2));
-        }
         if (vaultInfo.btcAddresses || vaultInfo.btcPubkey) {
           console.log('\n========================================');
           console.log('         BTC ADDRESSES');
@@ -624,15 +464,9 @@ async function main() {
             console.log('');
           }
           if (vaultInfo.btcAddresses) {
-            if (vaultInfo.btcAddresses.p2pkh) {
-              console.log(`  P2PKH (Legacy):     ${vaultInfo.btcAddresses.p2pkh}`);
-            }
-            if (vaultInfo.btcAddresses.p2wpkh) {
-              console.log(`  P2WPKH (SegWit):    ${vaultInfo.btcAddresses.p2wpkh}`);
-            }
-            if (vaultInfo.btcAddresses.p2tr) {
-              console.log(`  P2TR (Taproot):     ${vaultInfo.btcAddresses.p2tr}`);
-            }
+            if (vaultInfo.btcAddresses.p2pkh) console.log(`  P2PKH (Legacy):     ${vaultInfo.btcAddresses.p2pkh}`);
+            if (vaultInfo.btcAddresses.p2wpkh) console.log(`  P2WPKH (SegWit):    ${vaultInfo.btcAddresses.p2wpkh}`);
+            if (vaultInfo.btcAddresses.p2tr) console.log(`  P2TR (Taproot):     ${vaultInfo.btcAddresses.p2tr}`);
           }
           console.log('');
           console.log('========================================');
@@ -641,13 +475,145 @@ async function main() {
         }
       } catch (error) {
         console.error('Error fetching BTC addresses:', error.message);
-        if (settings.debug && error.stack) {
-          console.error('[DEBUG] Stack:', error.stack);
+      }
+    }
+
+    async function doLogout() {
+      console.log('\nLogging out...');
+      try {
+        authSdk.logout();
+        console.log('Logged out successfully.');
+        console.log('Session cleared. Exiting CLI...');
+        rl.close();
+        process.exit(0);
+      } catch (error) {
+        console.error('Error during logout:', error.message);
+      }
+    }
+
+    // ==================== STREAM RESPONSE ====================
+    async function streamResponse(msgs) {
+      let fullText = '';
+      let toolCalls = [];
+      let firstChunk = false;
+
+      process.stdout.write('\nAgent Hustle: ');
+      startSpinner();
+
+      try {
+        const streamOptions = {
+          messages: msgs,
+          processChunks: true
+        };
+
+        if (settings.model) {
+          streamOptions.model = settings.model;
+        }
+
+        if (settings.selectedTools.length > 0) {
+          streamOptions.selectedToolCategories = settings.selectedTools;
+        } else if (lastIntentContext) {
+          streamOptions.intentContext = lastIntentContext;
         }
+
+        const stream = client.chatStream(streamOptions);
+
+        for await (const chunk of stream) {
+          if ('type' in chunk) {
+            switch (chunk.type) {
+              case 'text':
+                if (!firstChunk) {
+                  stopSpinner();
+                  firstChunk = true;
+                }
+                process.stdout.write(chunk.value);
+                fullText += chunk.value;
+                break;
+
+              case 'intent_context':
+                if (chunk.value?.intentContext) {
+                  lastIntentContext = chunk.value.intentContext;
+                  if (settings.debug) {
+                    console.log('[DEBUG] Captured intent context:',
+                      `activeIntent="${lastIntentContext.activeIntent || 'general'}", ` +
+                      `categories=[${lastIntentContext.categories?.join(', ') || 'none'}]`);
+                  }
+                }
+                break;
+
+              case 'tool_call':
+                if (!firstChunk) {
+                  stopSpinner();
+                  firstChunk = true;
+                }
+                toolCalls.push(chunk.value);
+                break;
+
+              case 'finish':
+                stopSpinner();
+                process.stdout.write('\n');
+                break;
+            }
+          }
+        }
+      } catch (error) {
+        stopSpinner();
+        console.error(`\nError: ${error.message}`);
+      }
+
+      if (toolCalls.length > 0) {
+        console.log('\nTools used:');
+        toolCalls.forEach((tool, i) => {
+          console.log(`${i+1}. ${tool.toolName || 'Unknown tool'} (ID: ${tool.toolCallId || 'unknown'})`);
+          if (settings.debug && tool.args) {
+            console.log(`   Args: ${JSON.stringify(tool.args)}`);
+          }
+        });
+      }
+
+      return fullText;
+    }
+
+    // ==================== NON-STREAMING RESPONSE ====================
+    async function nonStreamResponse(msgs) {
+      console.log('\nAgent Hustle is thinking...');
+
+      try {
+        const chatOptions = {};
+
+        if (settings.model) {
+          chatOptions.model = settings.model;
+        }
+
+        if (settings.selectedTools.length > 0) {
+          chatOptions.selectedToolCategories = settings.selectedTools;
+        } else if (lastIntentContext) {
+          chatOptions.intentContext = lastIntentContext;
+        }
+
+        const response = await client.chat(msgs, chatOptions);
+
+        if (response.intentContext?.intentContext) {
+          lastIntentContext = response.intentContext.intentContext;
+        }
+
+        console.log(`\nAgent Hustle: ${response.content}`);
+
+        if (response.toolCalls && response.toolCalls.length > 0) {
+          console.log('\nTools used:');
+          response.toolCalls.forEach((tool, i) => {
+            console.log(`${i+1}. ${tool.toolName || 'Unknown'}`);
+          });
+        }
+
+        return response.content;
+      } catch (error) {
+        console.error(`\nError: ${error.message}`);
+        return '';
       }
     }
 
-    // Process commands
+    // ==================== PROCESS COMMANDS ====================
     async function processCommand(command) {
       if (command === '/help') {
         showHelp();
@@ -664,10 +630,10 @@ async function main() {
         return true;
       }
 
-      if (command === '/clear') {
-        messages.length = 0;
+      if (command === '/reset' || command === '/clear') {
+        resetHistory();
+        history = { messages: [], created: new Date().toISOString() };
         lastIntentContext = null;
-        console.log('Conversation history cleared.');
         return true;
       }
 
@@ -675,7 +641,6 @@ async function main() {
         console.log('Goodbye!');
         rl.close();
         process.exit(0);
-        return true;
       }
 
       if (command.startsWith('/stream')) {
@@ -721,7 +686,15 @@ async function main() {
             console.log('History retention disabled');
           }
         } else {
-          console.log(`History is currently ${settings.retainHistory ? 'ON' : 'OFF'}`);
+          console.log(`\nHistory is ${settings.retainHistory ? 'ON' : 'OFF'}`);
+          console.log(`Conversation has ${history.messages.length} messages.`);
+          if (history.messages.length > 0) {
+            console.log('Recent:');
+            history.messages.slice(-4).forEach((m) => {
+              const preview = m.content.substring(0, 60) + (m.content.length > 60 ? '...' : '');
+              console.log(`  ${m.role}: ${preview}`);
+            });
+          }
         }
         return true;
       }
@@ -771,9 +744,9 @@ async function main() {
             console.log('\n=== Tool Categories ===\n');
             tools.forEach((tool) => {
               const isSelected = settings.selectedTools.includes(tool.id);
-              const status = isSelected ? '✅' : '⬜';
+              const status = isSelected ? '[x]' : '[ ]';
               console.log(`${status} ${tool.title} (${tool.id})`);
-              console.log(`   ${tool.description}`);
+              console.log(`    ${tool.description}`);
             });
             console.log('\nCurrently selected:',
               settings.selectedTools.length > 0
@@ -799,6 +772,8 @@ async function main() {
             settings.selectedTools.push(toolId);
             lastIntentContext = null;
             console.log(`Added: ${toolId}`);
+          } else {
+            console.log(`Already added: ${toolId}`);
           }
           return true;
         }
@@ -808,6 +783,8 @@ async function main() {
           if (index > -1) {
             settings.selectedTools.splice(index, 1);
             console.log(`Removed: ${toolId}`);
+          } else {
+            console.log(`Not found: ${toolId}`);
           }
           return true;
         }
@@ -818,9 +795,17 @@ async function main() {
       return false;
     }
 
-    // Main chat loop
+    // ==================== CHAT LOOP ====================
     async function chat() {
       rl.question('\nYou: ', async (input) => {
+        input = input.trim();
+
+        if (!input) {
+          chat();
+          return;
+        }
+
+        // Process commands
         if (input.startsWith('/')) {
           const isCommand = await processCommand(input);
           if (isCommand) {
@@ -829,75 +814,43 @@ async function main() {
           }
         }
 
+        // Handle exit/quit without slash
         if (input.toLowerCase() === 'exit' || input.toLowerCase() === 'quit') {
           console.log('Goodbye!');
           rl.close();
           return;
         }
 
-        const currentMessages = settings.retainHistory ? [...messages] : [];
+        // Build message list based on history retention setting
+        const currentMessages = settings.retainHistory ? [...history.messages] : [];
         currentMessages.push({ role: 'user', content: input });
 
-        if (!settings.stream) {
-          console.log('\nAgent is thinking...');
+        // Send message
+        let response;
+        if (settings.stream) {
+          response = await streamResponse(currentMessages);
+        } else {
+          response = await nonStreamResponse(currentMessages);
         }
 
-        try {
-          let assistantResponse = '';
-
-          if (settings.stream) {
-            assistantResponse = await streamResponse([...currentMessages]);
-          } else {
-            const chatOptions = {};
-
-            if (settings.model) {
-              chatOptions.model = settings.model;
-            }
-
-            if (settings.selectedTools.length > 0) {
-              chatOptions.selectedToolCategories = settings.selectedTools;
-            } else if (lastIntentContext) {
-              chatOptions.intentContext = lastIntentContext;
-            }
-
-            const response = await client.chat(currentMessages, chatOptions);
-
-            if (response.intentContext?.intentContext) {
-              lastIntentContext = response.intentContext.intentContext;
-            }
-
-            console.log(`\nAgent: ${response.content}`);
-
-            if (response.toolCalls && response.toolCalls.length > 0) {
-              console.log('\nTools used:');
-              response.toolCalls.forEach((tool, i) => {
-                console.log(`${i+1}. ${tool.toolName || 'Unknown'}`);
-              });
-            }
-
-            assistantResponse = response.content;
-          }
-
-          if (settings.retainHistory && assistantResponse) {
-            messages.push({ role: 'user', content: input });
-            messages.push({ role: 'assistant', content: assistantResponse });
-          }
-
-          chat();
-        } catch (error) {
-          console.error('Error:', error.message);
-          chat();
+        // Save to history
+        if (settings.retainHistory && response) {
+          history.messages.push({ role: 'user', content: input });
+          history.messages.push({ role: 'assistant', content: response });
+          saveHistory(history);
         }
+
+        chat();
       });
     }
 
-    // Start
+    // Show initial settings and start chat
     console.log('Type "/help" for commands, "/auth" for auth menu, or "/exit" to quit.\n');
     showSettings();
     chat();
 
   } catch (error) {
-    console.error('Error initializing CLI:', error);
+    console.error('Error:', error.message);
     process.exit(1);
   }
 }