clarity-ai 3.2.0 → 3.3.0

package/bin/clarity.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-// bin/clarity.js
 import { showBanner } from '../src/ui/banner.js';
 import { isFirstRun, loadConfig } from '../src/config/settings.js';
 import { runSetupWizard } from '../src/core/setup.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-ai",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Autonomous AI Agent CLI for Termux",
   "type": "module",
   "bin": {

package/src/agents/loop.js

@@ -2,16 +2,16 @@ import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
 import { execSync } from 'child_process';
 import { dirname } from 'path';
 import chalk from 'chalk';
-import { Spinner, CollapsibleStep } from '../ui/spinner.js';
-import { renderAI, renderWrite, renderEdit, renderTool } from '../ui/blocks.js';
-import { callProvider, streamProvider } from '../providers/index.js';
+import { Spinner } from '../ui/spinner.js';
+import { renderAI, renderWrite, renderEdit } from '../ui/blocks.js';
+import { callProvider } from '../providers/index.js';
 import { addMessage, saveHistory } from '../core/history.js';
 import { diffLines } from 'diff';
 
 const SYSTEM_PROMPT = 'You are CLARITY, an autonomous AI agent CLI running in Termux on Android.\n\n' +
 '## CRITICAL RULES\n' +
 '1. NEVER fabricate file contents or command outputs.\n' +
-'2. NEVER confirm before acting — just do it.\n' +
+'2. NEVER confirm before acting \u2014 just do it.\n' +
 '3. ALWAYS ground responses in actual tool output.\n' +
 '4. SHORT responses. No filler.\n' +
 '5. When editing files, read first then edit.\n\n' +
@@ -34,16 +34,16 @@ function detectIntent(message) {
     if (p.test(lower)) return 'chat';
   }
   const toolPatterns = [
-    { re: /(create|make|mkdir|new)\s+(a\s+)?(dir|directory|folder)/, intent: 'bash' },
-    { re: /(create|make|write|generate)\s+(a\s+)?(file|script|code|program)/, intent: 'write_file' },
-    { re: /(run|execute|launch|start)\s+/, intent: 'bash' },
-    { re: /(edit|modify|change|update|fix)\s+(the\s+)?file/, intent: 'edit_file' },
-    { re: /(read|show|display|cat|open)\s+(the\s+)?file/, intent: 'read_file' },
-    { re: /(list|ls|show)\s+(files|dir|directory|folders)/, intent: 'list_directory' },
-    { re: /(search|find|grep|look for)/, intent: 'search' },
-    { re: /(install|npm|pip|pkg)\s+/, intent: 'bash' },
-    { re: /(git\s+)/, intent: 'git' },
-    { re: /(cd\s+|navigate to|go to)/, intent: 'bash' },
+    { re: /(create|make|mkdir|new)\s+(a\s+)?(dir|directory|folder)/ },
+    { re: /(create|make|write|generate)\s+(a\s+)?(file|script|code|program)/ },
+    { re: /(run|execute|launch|start)\s+/ },
+    { re: /(edit|modify|change|update|fix)\s+(the\s+)?file/ },
+    { re: /(read|show|display|cat|open)\s+(the\s+)?file/ },
+    { re: /(list|ls|show)\s+(files|dir|directory|folders)/ },
+    { re: /(search|find|grep|look for)/ },
+    { re: /(install|npm|pip|pkg)\s+/ },
+    { re: /(git\s+)/ },
+    { re: /(cd\s+|navigate to|go to)/ },
   ];
   for (const { re } of toolPatterns) {
     if (re.test(lower)) return 'agent';
@@ -185,112 +185,119 @@ function renderToolStep(name, args, result, elapsed) {
 }
 
 export async function agentLoop(userMessage, config, history) {
-  const intent = detectIntent(userMessage);
-  const spinner = new Spinner();
-  const msgHistory = Array.isArray(history) ? history : (history.messages || []);
+  try {
+    const intent = detectIntent(userMessage);
+    const spinner = new Spinner();
+    const msgHistory = Array.isArray(history) ? history : (history.messages || []);
 
-  if (intent === 'chat') {
-    spinner.start('Thinking', 'think');
-    const t0 = Date.now();
+    if (intent === 'chat') {
+      spinner.start('Thinking', 'think');
+      const t0 = Date.now();
 
-    const messages = [
-      { role: 'system', content: 'You are CLARITY-AI, a helpful assistant. Keep responses short.' },
-      ...msgHistory.slice(-10).map(m => ({ role: m.role === 'assistant' ? 'assistant' : 'user', content: m.content })),
-      { role: 'user', content: userMessage },
-    ];
+      const messages = [
+        { role: 'system', content: 'You are CLARITY-AI, a helpful assistant. Keep responses short.' },
+        ...msgHistory.slice(-10).map(m => ({ role: m.role === 'assistant' ? 'assistant' : 'user', content: m.content })),
+        { role: 'user', content: userMessage },
+      ];
 
-    const response = await callProvider(config, messages);
-    const elapsed = Date.now() - t0;
-    spinner.stop('Thought ' + (elapsed < 1000 ? elapsed + 'ms' : (elapsed/1000).toFixed(1) + 's'), 'done');
+      const result = await callProvider(config, messages);
+      const elapsed = Date.now() - t0;
+      spinner.stop('Thought ' + (elapsed < 1000 ? elapsed + 'ms' : (elapsed/1000).toFixed(1) + 's'), 'done');
 
-    addMessage(msgHistory, 'user', userMessage);
-    addMessage(msgHistory, 'assistant', response);
-    saveHistory(msgHistory);
+      addMessage(msgHistory, 'user', userMessage);
+      addMessage(msgHistory, 'assistant', result.content);
+      saveHistory(msgHistory);
 
-    console.log();
-    console.log(renderAI(response));
-    console.log();
-    return;
-  }
+      console.log();
+      console.log(renderAI(result.content));
+      console.log();
+      return;
+    }
 
-  let messages = [
-    { role: 'system', content: SYSTEM_PROMPT },
-    ...msgHistory.slice(-20).map(m => ({ role: m.role === 'assistant' ? 'assistant' : 'user', content: m.content })),
-    { role: 'user', content: userMessage },
-  ];
+    let messages = [
+      { role: 'system', content: SYSTEM_PROMPT },
+      ...msgHistory.slice(-20).map(m => ({ role: m.role === 'assistant' ? 'assistant' : 'user', content: m.content })),
+      { role: 'user', content: userMessage },
+    ];
 
-  let loopCount = 0;
-  const MAX_LOOPS = 15;
+    let loopCount = 0;
+    const MAX_LOOPS = 15;
 
-  while (loopCount < MAX_LOOPS) {
-    loopCount++;
+    while (loopCount < MAX_LOOPS) {
+      loopCount++;
 
-    spinner.start('Thinking', 'think');
-    const t0 = Date.now();
+      spinner.start('Thinking', 'think');
+      const t0 = Date.now();
 
-    let fullResponse = '';
-    const stream = streamProvider(config, messages);
-    for await (const chunk of stream) {
-      fullResponse += chunk;
-    }
+      const result = await callProvider(config, messages);
+      const fullResponse = result.content;
 
-    const thinkMs = Date.now() - t0;
-    spinner.stop('Thought ' + (thinkMs < 1000 ? thinkMs + 'ms' : (thinkMs/1000).toFixed(1) + 's'), 'done');
+      const thinkMs = Date.now() - t0;
+      spinner.stop('Thought ' + (thinkMs < 1000 ? thinkMs + 'ms' : (thinkMs/1000).toFixed(1) + 's'), 'done');
 
-    const jsonMatch = fullResponse.match(/\{[^]*\}/);
-    if (!jsonMatch) {
-      console.log();
-      console.log(renderAI(fullResponse));
-      console.log();
-      addMessage(msgHistory, 'user', userMessage);
-      addMessage(msgHistory, 'assistant', fullResponse);
-      saveHistory(msgHistory);
-      return;
-    }
+      const jsonMatch = fullResponse.match(/\{[^]*\}/);
+      if (!jsonMatch) {
+        console.log();
+        console.log(renderAI(fullResponse));
+        console.log();
+        addMessage(msgHistory, 'user', userMessage);
+        addMessage(msgHistory, 'assistant', fullResponse);
+        saveHistory(msgHistory);
+        return;
+      }
 
-    let parsed;
-    try {
-      parsed = JSON.parse(jsonMatch[0]);
-    } catch {
-      console.log();
-      console.log(renderAI(fullResponse));
-      console.log();
-      addMessage(msgHistory, 'user', userMessage);
-      addMessage(msgHistory, 'assistant', fullResponse);
-      saveHistory(msgHistory);
-      return;
-    }
+      let parsed;
+      try {
+        parsed = JSON.parse(jsonMatch[0]);
+      } catch {
+        console.log();
+        console.log(renderAI(fullResponse));
+        console.log();
+        addMessage(msgHistory, 'user', userMessage);
+        addMessage(msgHistory, 'assistant', fullResponse);
+        saveHistory(msgHistory);
+        return;
+      }
 
-    if (parsed.response) {
-      const finalText = parsed.response;
-      console.log();
-      console.log(renderAI(finalText));
-      console.log();
-      addMessage(msgHistory, 'user', userMessage);
-      addMessage(msgHistory, 'assistant', finalText);
-      saveHistory(msgHistory);
-      return;
-    }
+      if (parsed.response) {
+        const finalText = parsed.response;
+        console.log();
+        console.log(renderAI(finalText));
+        console.log();
+        addMessage(msgHistory, 'user', userMessage);
+        addMessage(msgHistory, 'assistant', finalText);
+        saveHistory(msgHistory);
+        return;
+      }
 
-    if (parsed.tool) {
-      const name = parsed.tool;
-      const args = parsed.args || {};
-      const argPreview = args.command || args.path || args.pattern || '';
+      if (parsed.tool) {
+        const name = parsed.tool;
+        const args = parsed.args || {};
+        const argPreview = args.command || args.path || args.pattern || '';
 
-      spinner.start('Running ' + name, 'tool');
-      spinner.update('Running ' + name, argPreview.slice(0, 40));
+        spinner.start('Running ' + name, 'tool');
+        spinner.update('Running ' + name, argPreview.slice(0, 40));
 
-      const ts = Date.now();
-      const result = await executeTool(name, args);
-      const te = Date.now() - ts;
+        const ts = Date.now();
+        const toolResult = await executeTool(name, args);
+        const te = Date.now() - ts;
 
-      spinner.stop(name + ' \u00b7 ' + argPreview.slice(0, 30), 'done');
-      renderToolStep(name, args, result, te);
+        spinner.stop(name + ' \u00b7 ' + argPreview.slice(0, 30), 'done');
+        renderToolStep(name, args, toolResult, te);
 
-      messages.push({ role: 'assistant', content: fullResponse });
-      messages.push({ role: 'user', content: 'Tool result: ' + result });
+        messages.push({ role: 'assistant', content: fullResponse });
+        messages.push({ role: 'user', content: 'Tool result: ' + toolResult });
+      }
     }
-  }
 
-  console.log(chalk.hex('#FFB800')('\u26a0 Max tool calls reached. Stopping.'));
+    console.log(chalk.hex('#FFB800')('\u26a0 Max tool calls reached. Stopping.'));
+  } catch (err) {
+    console.log();
+    console.log(chalk.hex('#FF4757')('\u2716 Error: ') + chalk.white(err.message.split('\n')[0]));
+    const extra = err.message.split('\n').slice(1);
+    for (const line of extra) {
+      console.log(chalk.dim('  ' + line));
+    }
+    console.log();
+  }
 }

package/src/commands/model.js

@@ -1,26 +1,100 @@
-import { saveConfig } from '../config/settings.js';
-import { PROVIDERS, getProvider } from '../providers/index.js';
 import chalk from 'chalk';
+import { saveConfig } from '../config/settings.js';
+import { getProvider } from '../providers/index.js';
+
+const PROVIDER_MODELS = {
+  groq: [
+    'llama-3.3-70b-versatile',
+    'llama-3.1-8b-instant',
+    'llama-4-scout-17b-16e-instruct',
+    'deepseek-r1-distill-llama-70b',
+    'gemma2-9b-it',
+    'mixtral-8x7b-32768',
+    'kimi-k2-instruct',
+    'compound-beta',
+  ],
+  gemini: [
+    'gemini-1.5-flash',
+    'gemini-1.5-pro',
+    'gemini-2.0-flash',
+    'gemini-2.5-flash',
+  ],
+  openrouter: [
+    'mistralai/mistral-7b-instruct:free',
+    'meta-llama/llama-3.3-70b-instruct:free',
+    'deepseek/deepseek-chat',
+    'anthropic/claude-3.5-sonnet',
+    'openai/gpt-4o',
+  ],
+  openai: [
+    'gpt-4o',
+    'gpt-4o-mini',
+    'gpt-4-turbo',
+    'o1',
+    'o1-mini',
+  ],
+  anthropic: [
+    'claude-opus-4-5',
+    'claude-sonnet-4-5',
+    'claude-3-5-haiku-20241022',
+  ],
+  deepseek: [
+    'deepseek-chat',
+    'deepseek-reasoner',
+  ],
+};
 
 export async function modelCommand(args, config) {
-  if (args.length === 0) {
-    console.log(chalk.hex('#54A0FF')('Current model: ') + chalk.white(config.provider + '/' + config.model));
+  const provider = config.provider || 'groq';
+  const knownModels = PROVIDER_MODELS[provider] || [];
+
+  if (!args || args.length === 0) {
+    console.log(chalk.hex('#00FFFF')('Current model: ') + chalk.white(config.model));
+    console.log(chalk.dim('\nAvailable models for ' + provider + ':'));
+    for (const m of knownModels) {
+      const isCurrent = m === config.model;
+      console.log(
+        (isCurrent ? chalk.hex('#00FF9F')('  \u276f ') : chalk.dim('    ')) +
+        chalk.white(m) +
+        (isCurrent ? chalk.hex('#00FF9F')(' \u2190 current') : '')
+      );
+    }
+    console.log(chalk.dim('\nUsage: /model <model-name>'));
     return;
   }
 
-  const modelName = args[0];
+  const requested = args.join(' ').trim();
 
-  const prov = getProvider(modelName);
+  const prov = getProvider(requested);
   if (prov) {
     config.provider = prov.value;
     config.model = prov.freeModel;
     saveConfig(config);
-    console.log(chalk.hex('#00FF9F')('Switched to provider: ') + chalk.white(prov.name) + chalk.dim(' (' + prov.freeModel + ')'));
-    return config;
+    console.log(chalk.hex('#00FF9F')('\u2714 Switched to provider: ') + chalk.white(prov.name) + chalk.dim(' (' + prov.freeModel + ')'));
+    return;
+  }
+
+  const isKnown = knownModels.some(m => m.toLowerCase() === requested.toLowerCase());
+
+  if (!isKnown && knownModels.length > 0) {
+    const suggestion = knownModels.find(m =>
+      m.toLowerCase().includes(requested.toLowerCase())
+    ) || knownModels.find(m =>
+      requested.toLowerCase().includes(m.split('-')[0].toLowerCase())
+    );
+
+    if (suggestion) {
+      console.log(chalk.hex('#FFB800')('\u26a0 Unknown model: ') + chalk.white(requested));
+      console.log(chalk.dim('  Did you mean: ') + chalk.hex('#00FFFF')(suggestion));
+      console.log(chalk.dim('  Run: /model ' + suggestion));
+    } else {
+      console.log(chalk.hex('#FFB800')('\u26a0 Unknown model for ' + provider + ': ') + chalk.white(requested));
+      console.log(chalk.dim('  Run /model with no args to see valid models'));
+    }
+    console.log(chalk.dim('  Saving anyway. If it fails, the provider will tell you.'));
   }
 
-  config.model = modelName;
+  config.model = requested;
   saveConfig(config);
-  console.log(chalk.hex('#00FF9F')('Model set to: ') + chalk.white(modelName));
-  return config;
+  console.log(chalk.hex('#00FF9F')('\u2714 Model set to: ') + chalk.white(requested));
 }

package/src/config/settings.js

@@ -8,7 +8,7 @@ const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
 const MEMORY_FILE = join(CONFIG_DIR, 'memory.json');
 
 const DEFAULTS = {
-  version: '3.0.0',
+  version: '3.3.0',
   provider: 'groq',
   model: 'llama-3.3-70b-versatile',
   apiKeys: {},

package/src/main.js

@@ -1,168 +1,88 @@
+import readline from 'readline';
 import chalk from 'chalk';
-import { renderUser, renderAI, divider } from './ui/blocks.js';
-import { getPrompt, drawPromptBox, SlashPalette } from './ui/prompt.js';
-import { dispatchCommand } from './commands/index.js';
+import { renderUser, renderAI, renderInfo, renderError, divider } from './ui/blocks.js';
+import { dispatchCommand, ALL_COMMANDS } from './commands/index.js';
 import { agentLoop } from './agents/loop.js';
 import { showBanner } from './ui/banner.js';
 
 export async function startChat(config) {
   const history = [];
-  const palette = new SlashPalette();
-  let slashMode = false;
-  let slashBuffer = '';
 
-  const { top } = drawPromptBox(config.provider, config.model, config.agentMode);
-  console.log(chalk.hex('#00FF9F')('\u2714 ') + chalk.white('CLARITY-AI v' + config.version + ' interactive session started.') +
-              chalk.dim('  Type /help for commands. Ctrl+C to exit.'));
+  console.log(
+    chalk.hex('#00FF9F')('\u2714 ') +
+    chalk.white('CLARITY-AI v' + config.version + ' interactive session started.') +
+    chalk.dim('  Type /help for commands. Ctrl+C to exit.')
+  );
   console.log(divider());
   console.log();
 
-  const { emitKeypressEvents } = await import('readline');
-  emitKeypressEvents(process.stdin);
-  if (process.stdin.isTTY) process.stdin.setRawMode(true);
-
-  let currentInput = '';
-
-  function drawPromptLine() {
-    process.stdout.write('\r\x1b[2K');
-    process.stdout.write(getPrompt(config.provider, config.model));
-    if (currentInput) process.stdout.write(currentInput);
+  function makePrompt() {
+    const W = process.stdout.columns || 80;
+    const label = config.provider + '/' + config.model;
+    const agentTag = config.agentMode ? chalk.hex('#00FF9F')('agent:ON') : chalk.dim('agent:OFF');
+    const leftPart = chalk.hex('#333333')('\u2502 ') + chalk.hex('#00FFFF')('\u276f ');
+    const rightPart = chalk.dim(' ' + label + ' ') + agentTag + chalk.hex('#333333')(' \u2502');
+    return leftPart + rightPart + '\n' + chalk.hex('#333333')('\u2514' + '\u2500'.repeat(Math.max(0, W - 2)) + '\u2518') + '\n' + chalk.hex('#00FFFF')('  \u276f ');
   }
 
-  function clearAndPrompt() {
-    console.log();
-    drawPromptLine();
-  }
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    terminal: true,
+    historySize: 200,
+    prompt: makePrompt(),
+  });
 
-  process.stdin.on('keypress', async (str, key) => {
-    if (!key) return;
+  rl.setPrompt(makePrompt());
+  rl.prompt();
 
-    if (key.ctrl && key.name === 'c') {
-      if (slashMode) {
-        palette.hide();
-        slashMode = false;
-        slashBuffer = '';
-        currentInput = '';
-        drawPromptLine();
-        return;
-      }
-      console.log('\n' + chalk.hex('#00FF9F')('\u2714 ') + chalk.dim('Session ended. Goodbye.'));
-      process.exit(0);
-    }
+  rl.on('line', async (rawInput) => {
+    const input = rawInput.trim();
 
-    if (key.ctrl && key.name === 'l') {
-      process.stdout.write('\x1Bc');
-      await showBanner(config.version, config.provider, config.model);
-      drawPromptLine();
+    if (!input) {
+      rl.setPrompt(makePrompt());
+      rl.prompt();
       return;
     }
 
-    if (key.ctrl && key.name === 'u') {
-      currentInput = '';
-      slashMode = false;
-      slashBuffer = '';
-      drawPromptLine();
-      return;
-    }
+    console.log();
+    console.log(renderUser(input));
+    console.log();
 
-    if (key.name === 'escape') {
-      if (slashMode) {
-        palette.hide();
-        slashMode = false;
-        slashBuffer = '';
-        currentInput = '';
-        drawPromptLine();
+    if (input === '/') {
+      console.log(chalk.hex('#00FFFF').bold('  Commands:'));
+      console.log(chalk.hex('#333333')('  ' + '\u2500'.repeat(50)));
+      for (const cmd of ALL_COMMANDS) {
+        console.log(
+          chalk.hex('#9B59FF')('  ' + cmd.name.padEnd(16)) +
+          chalk.dim(cmd.description)
+        );
       }
+      console.log(chalk.hex('#333333')('  ' + '\u2500'.repeat(50)));
+      rl.setPrompt(makePrompt());
+      rl.prompt();
       return;
     }
 
-    if (slashMode) {
-      if (key.name === 'up') {
-        palette.selectPrev();
-        return;
-      }
-      if (key.name === 'down') {
-        palette.selectNext();
-        return;
-      }
-      if (key.name === 'return') {
-        const selected = palette.getSelected();
-        palette.hide();
-        slashMode = false;
-        currentInput = '';
-        drawPromptLine();
-        if (selected) {
-          console.log();
-          await dispatchCommand(selected.name, config, history);
-        }
-        clearAndPrompt();
-        return;
-      }
-      if (key.name === 'backspace') {
-        slashBuffer = slashBuffer.slice(0, -1);
-        currentInput = '/' + slashBuffer;
-        palette.filter(slashBuffer);
-        drawPromptLine();
-        return;
-      }
-      if (str && !key.ctrl && !key.meta) {
-        slashBuffer += str;
-        currentInput = '/' + slashBuffer;
-        palette.filter(slashBuffer);
-        drawPromptLine();
-        return;
-      }
+    if (input.startsWith('/')) {
+      await dispatchCommand(input, config, history);
+      rl.setPrompt(makePrompt());
+      rl.prompt();
       return;
     }
 
-    if (key.name === 'backspace') {
-      currentInput = currentInput.slice(0, -1);
-      drawPromptLine();
-      return;
-    }
-
-    if (key.name === 'return') {
-      const input = currentInput.trim();
-      currentInput = '';
-
-      if (!input) {
-        console.log();
-        drawPromptLine();
-        return;
-      }
-
-      process.stdout.write('\r\x1b[2K');
-      console.log();
-      console.log(renderUser(input));
-      console.log();
-
-      if (input.startsWith('/')) {
-        await dispatchCommand(input, config, history);
-        clearAndPrompt();
-        return;
-      }
-
+    try {
       await agentLoop(input, config, history);
-      clearAndPrompt();
-      return;
+    } catch (err) {
+      console.log(chalk.hex('#FF4757')('\u2716 ') + chalk.hex('#FF4757')(err.message));
     }
 
-    if (str === '/' && currentInput === '') {
-      slashMode = true;
-      slashBuffer = '';
-      currentInput = '/';
-      console.log();
-      palette.show();
-      drawPromptLine();
-      return;
-    }
-
-    if (str && !key.ctrl && !key.meta) {
-      currentInput += str;
-      drawPromptLine();
-    }
+    rl.setPrompt(makePrompt());
+    rl.prompt();
   });
 
-  console.log(top);
-  drawPromptLine();
+  rl.on('SIGINT', () => {
+    console.log('\n' + chalk.hex('#00FF9F')('\u2714 ') + chalk.dim('Goodbye.'));
+    process.exit(0);
+  });
 }

package/src/providers/claude.js

@@ -1,61 +1,35 @@
-const PROVIDER = {
-  name: 'anthropic',
-  free: false,
-  streaming: true,
-  models: ['claude-3-5-haiku-20241022', 'claude-3-5-sonnet-20241022'],
-  baseURL: 'https://api.anthropic.com/v1',
-};
+export async function callAnthropic(config, messages, tools = null) {
+  const apiKey = config.apiKeys?.anthropic;
+  if (!apiKey) throw new Error('No Anthropic API key set. Run: /keys anthropic <your-key>');
+
+  const model = config.model || 'claude-3-5-haiku-20241022';
 
-async function* sendMessage(apiKey, messages, model = 'claude-3-5-haiku-20241022', stream = true) {
-  const url = `${PROVIDER.baseURL}/messages`;
-  
   const systemMsg = messages.filter(m => m.role === 'system');
   const chatMessages = messages.filter(m => m.role !== 'system');
-  
+
   const body = {
     model,
-    max_tokens: 4096,
+    max_tokens: config.maxTokens || 4096,
     messages: chatMessages.map(m => ({ role: m.role, content: m.content })),
-    stream,
   };
   if (systemMsg.length > 0) body.system = systemMsg.map(m => m.content).join('\n');
 
-  const res = await fetch(url, {
+  const res = await fetch('https://api.anthropic.com/v1/messages', {
     method: 'POST',
-    headers: { 'x-api-key': apiKey, 'anthropic-version': '2023-06-01', 'Content-Type': 'application/json' },
+    headers: {
+      'x-api-key': apiKey,
+      'anthropic-version': '2023-06-01',
+      'Content-Type': 'application/json',
+    },
     body: JSON.stringify(body),
   });
 
-  if (!res.ok) throw new Error(`Anthropic API error: ${res.status} ${res.statusText}`);
-
-  if (!stream) {
-    const data = await res.json();
-    yield data.content[0].text;
-    return;
+  if (!res.ok) {
+    const detail = await res.text();
+    throw new Error('Anthropic API error: ' + res.status + ' \u2014 ' + (detail.slice(0, 200)));
   }
 
-  const reader = res.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = '';
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-    const lines = buffer.split('\n');
-    buffer = lines.pop() || '';
-    
-    for (const line of lines) {
-      if (line.startsWith('data: ')) {
-        try {
-          const json = JSON.parse(line.slice(6));
-          if (json.type === 'content_block_delta' && json.delta?.text) {
-            yield json.delta.text;
-          }
-        } catch {}
-      }
-    }
-  }
+  const data = await res.json();
+  const text = data.content?.[0]?.text || '';
+  return { content: text, tool_calls: null };
 }
-
-export { PROVIDER, sendMessage };

package/src/providers/deepseek.js

@@ -1,53 +1,47 @@
-const PROVIDER = {
-  name: 'deepseek',
-  free: false,
-  cheap: true,
-  streaming: true,
-  models: ['deepseek-chat', 'deepseek-coder'],
-  baseURL: 'https://api.deepseek.com/v1',
-};
+export async function callDeepSeek(config, messages, tools = null) {
+  const apiKey = config.apiKeys?.deepseek;
+  if (!apiKey) throw new Error('No DeepSeek API key set. Run: /keys deepseek <your-key>');
 
-async function* sendMessage(apiKey, messages, model = 'deepseek-chat', stream = true) {
-  const url = `${PROVIDER.baseURL}/chat/completions`;
-  const body = { model, messages, stream };
+  const model = config.model || 'deepseek-chat';
+  const body = {
+    model,
+    messages,
+    max_tokens: config.maxTokens || 4096,
+    temperature: config.temperature || 0.7,
+  };
 
-  const res = await fetch(url, {
+  if (tools && tools.length > 0) {
+    body.tools = tools.map(t => ({
+      type: 'function',
+      function: {
+        name: t.name,
+        description: t.description,
+        parameters: t.parameters,
+      },
+    }));
+    body.tool_choice = 'auto';
+  }
+
+  const res = await fetch('https://api.deepseek.com/v1/chat/completions', {
     method: 'POST',
-    headers: { 'Authorization': `Bearer ${apiKey}`, 'Content-Type': 'application/json' },
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': 'Bearer ' + apiKey,
+    },
     body: JSON.stringify(body),
   });
 
-  if (!res.ok) throw new Error(`DeepSeek API error: ${res.status} ${res.statusText}`);
-
-  if (!stream) {
-    const data = await res.json();
-    yield data.choices[0].message.content;
-    return;
+  if (!res.ok) {
+    const detail = await res.text();
+    throw new Error('DeepSeek API error: ' + res.status + ' \u2014 ' + (detail.slice(0, 200)));
   }
 
-  const reader = res.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = '';
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-    const lines = buffer.split('\n');
-    buffer = lines.pop() || '';
-    
-    for (const line of lines) {
-      if (line.startsWith('data: ')) {
-        const data = line.slice(6).trim();
-        if (data === '[DONE]') return;
-        try {
-          const json = JSON.parse(data);
-          const delta = json.choices?.[0]?.delta?.content;
-          if (delta) yield delta;
-        } catch {}
-      }
-    }
-  }
+  const data = await res.json();
+  const choice = data.choices?.[0];
+  if (!choice) throw new Error('Empty response from DeepSeek');
+  const message = choice.message;
+  return {
+    content: message.content || '',
+    tool_calls: message.tool_calls || null,
+  };
 }
-
-export { PROVIDER, sendMessage };

package/src/providers/gemini.js

@@ -1,48 +1,35 @@
-const PROVIDER = {
-  name: 'gemini',
-  free: true,
-  streaming: true,
-  models: ['gemini-1.5-flash', 'gemini-1.5-pro', 'gemini-2.0-flash-exp'],
-  baseURL: 'https://generativelanguage.googleapis.com/v1beta',
-};
+export async function callGemini(config, messages, tools = null) {
+  const apiKey = config.apiKeys?.gemini;
+  if (!apiKey) throw new Error('No Gemini API key set. Run: /keys gemini <your-key>');
+
+  const model = config.model || 'gemini-1.5-flash';
+  const url = 'https://generativelanguage.googleapis.com/v1beta/models/' + model + ':generateContent?key=' + apiKey;
 
-async function* sendMessage(apiKey, messages, model = 'gemini-1.5-flash', stream = true) {
-  const url = `${PROVIDER.baseURL}/models/${model}:streamGenerateContent?key=${apiKey}&alt=sse`;
-  
   const contents = messages.map(m => ({
     role: m.role === 'assistant' ? 'model' : m.role,
-    parts: [{ text: m.content }]
+    parts: [{ text: m.content }],
   }));
 
+  const body = {
+    contents,
+    generationConfig: {
+      maxOutputTokens: config.maxTokens || 4096,
+      temperature: config.temperature || 0.7,
+    },
+  };
+
   const res = await fetch(url, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ contents }),
+    body: JSON.stringify(body),
   });
 
-  if (!res.ok) throw new Error(`Gemini API error: ${res.status} ${res.statusText}`);
-
-  const reader = res.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = '';
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-    const lines = buffer.split('\n');
-    buffer = lines.pop() || '';
-    
-    for (const line of lines) {
-      if (line.startsWith('data: ')) {
-        try {
-          const json = JSON.parse(line.slice(6));
-          const text = json.candidates?.[0]?.content?.parts?.[0]?.text;
-          if (text) yield text;
-        } catch {}
-      }
-    }
+  if (!res.ok) {
+    const detail = await res.text();
+    throw new Error('Gemini API error: ' + res.status + ' \u2014 ' + (detail.slice(0, 200)));
   }
-}
 
-export { PROVIDER, sendMessage };
+  const data = await res.json();
+  const text = data.candidates?.[0]?.content?.parts?.[0]?.text || '';
+  return { content: text, tool_calls: null };
+}

package/src/providers/groq.js

@@ -1,56 +1,99 @@
-const PROVIDER = {
-  name: 'groq',
-  free: true,
-  streaming: true,
-  models: ['llama3-70b-8192', 'llama3-8b-8192', 'mixtral-8x7b-32768', 'gemma2-9b-it'],
-  baseURL: 'https://api.groq.com/openai/v1',
-};
-
-async function* sendMessage(apiKey, messages, model = 'llama3-70b-8192', stream = true) {
-  const url = `${PROVIDER.baseURL}/chat/completions`;
-  const body = { model, messages, stream, max_tokens: 4096 };
-
-  const res = await fetch(url, {
+import chalk from 'chalk';
+
+const GROQ_MODELS = [
+  'llama-3.3-70b-versatile',
+  'llama-3.1-8b-instant',
+  'llama-3.1-70b-versatile',
+  'llama-4-scout-17b-16e-instruct',
+  'llama-4-maverick-17b-128e-instruct',
+  'gemma2-9b-it',
+  'mixtral-8x7b-32768',
+  'deepseek-r1-distill-llama-70b',
+  'deepseek-r1-distill-qwen-32b',
+  'compound-beta',
+  'compound-beta-mini',
+  'allam-2-7b',
+  'kimi-k2-instruct',
+  'moonshotai/kimi-k2-instruct',
+];
+
+function fuzzyMatch(input, list) {
+  const lower = input.toLowerCase();
+  const exact = list.find(m => m.toLowerCase() === lower);
+  if (exact) return exact;
+  const contains = list.find(m => m.toLowerCase().includes(lower) || lower.includes(m.split('-')[0]));
+  return contains || null;
+}
+
+export async function callGroq(config, messages, tools = null) {
+  const apiKey = config.apiKeys?.groq;
+  if (!apiKey) throw new Error('No Groq API key set. Run: /keys groq <your-key>');
+
+  let model = config.model;
+  const matched = fuzzyMatch(model, GROQ_MODELS);
+
+  if (!matched) {
+    console.log(
+      chalk.hex('#FFB800')('\u26a0 Unknown Groq model: ') + chalk.white(model) + '\n' +
+      chalk.dim('  Valid models: ') + chalk.dim(GROQ_MODELS.slice(0, 5).join(', ') + '...')
+    );
+    console.log(chalk.dim('  Falling back to: llama-3.3-70b-versatile'));
+    model = 'llama-3.3-70b-versatile';
+  } else if (matched !== model) {
+    console.log(chalk.dim('  Auto-corrected model: ' + model + ' \u2192 ' + matched));
+    model = matched;
+  }
+
+  const body = {
+    model,
+    messages,
+    max_tokens: config.maxTokens || 4096,
+    temperature: config.temperature || 0.7,
+  };
+
+  if (tools && tools.length > 0) {
+    body.tools = tools.map(t => ({
+      type: 'function',
+      function: {
+        name: t.name,
+        description: t.description,
+        parameters: t.parameters,
+      },
+    }));
+    body.tool_choice = 'auto';
+  }
+
+  const res = await fetch('https://api.groq.com/openai/v1/chat/completions', {
     method: 'POST',
-    headers: { 'Authorization': `Bearer ${apiKey}`, 'Content-Type': 'application/json' },
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': 'Bearer ' + apiKey,
+    },
     body: JSON.stringify(body),
   });
 
   if (!res.ok) {
-    let detail = '';
-    try { const e = await res.json(); detail = e.error?.message || JSON.stringify(e); } catch { detail = res.statusText; }
-    throw new Error(`Groq API error: ${res.status} — ${detail}`);
+    const detail = await res.text();
+    let msg = 'Groq API error: ' + res.status;
+    try {
+      const parsed = JSON.parse(detail);
+      msg = parsed.error?.message || msg;
+      if (res.status === 404 || msg.includes('does not exist')) {
+        msg += '\n  Valid Groq models include:\n  ' + GROQ_MODELS.slice(0, 6).map(m => '  \u2022 ' + m).join('\n');
+        msg += '\n  Use /model <name> to switch.';
+      }
+    } catch {}
+    throw new Error(msg);
   }
 
-  if (!stream) {
-    const data = await res.json();
-    yield data.choices[0].message.content;
-    return;
-  }
+  const data = await res.json();
+  const choice = data.choices?.[0];
+  if (!choice) throw new Error('Empty response from Groq');
 
-  const reader = res.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = '';
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-    const lines = buffer.split('\n');
-    buffer = lines.pop() || '';
-
-    for (const line of lines) {
-      if (line.startsWith('data: ')) {
-        const data = line.slice(6).trim();
-        if (data === '[DONE]') return;
-        try {
-          const json = JSON.parse(data);
-          const delta = json.choices?.[0]?.delta?.content;
-          if (delta) yield delta;
-        } catch {}
-      }
-    }
-  }
-}
+  const message = choice.message;
 
-export { PROVIDER, sendMessage };
+  return {
+    content: message.content || '',
+    tool_calls: message.tool_calls || null,
+  };
+}

package/src/providers/index.js

@@ -1,36 +1,53 @@
-import { sendMessage as groqSend } from './groq.js';
-import { sendMessage as geminiSend } from './gemini.js';
-import { sendMessage as openrouterSend } from './openrouter.js';
-import { sendMessage as openaiSend } from './openai.js';
-import { sendMessage as anthropicSend } from './claude.js';
-import { sendMessage as deepseekSend } from './deepseek.js';
+import { callGroq } from './groq.js';
+import { callGemini } from './gemini.js';
+import { callOpenRouter } from './openrouter.js';
+import { callOpenAI } from './openai.js';
+import { callAnthropic } from './claude.js';
+import { callDeepSeek } from './deepseek.js';
 
 export const PROVIDERS = [
   { name: 'Groq', value: 'groq', freeModel: 'llama-3.3-70b-versatile', keyUrl: 'https://console.groq.com/keys' },
   { name: 'Gemini', value: 'gemini', freeModel: 'gemini-1.5-flash', keyUrl: 'https://aistudio.google.com/app/apikey' },
   { name: 'OpenRouter', value: 'openrouter', freeModel: 'mistralai/mistral-7b-instruct:free', keyUrl: 'https://openrouter.ai/keys' },
   { name: 'OpenAI', value: 'openai', freeModel: 'gpt-4o', keyUrl: 'https://platform.openai.com/api-keys' },
-  { name: 'Anthropic', value: 'anthropic', freeModel: 'claude-3-5-sonnet-20241022', keyUrl: 'https://console.anthropic.com/settings/keys' },
+  { name: 'Anthropic', value: 'anthropic', freeModel: 'claude-3-5-haiku-20241022', keyUrl: 'https://console.anthropic.com/settings/keys' },
   { name: 'DeepSeek', value: 'deepseek', freeModel: 'deepseek-chat', keyUrl: 'https://platform.deepseek.com/api_keys' },
 ];
 
-const senders = { groq: groqSend, gemini: geminiSend, openrouter: openrouterSend, openai: openaiSend, anthropic: anthropicSend, deepseek: deepseekSend };
+const callers = {
+  groq: callGroq,
+  gemini: callGemini,
+  openrouter: callOpenRouter,
+  openai: callOpenAI,
+  anthropic: callAnthropic,
+  deepseek: callDeepSeek,
+};
 
-export function streamProvider(config, messages) {
-  const provider = config.provider || 'groq';
-  const model = config.model || 'llama-3.3-70b-versatile';
-  const apiKey = config.apiKeys?.[provider] || process.env[provider.toUpperCase() + '_API_KEY'] || '';
-  const sender = senders[provider];
-  if (!sender) throw new Error('Unknown provider: ' + provider);
-  return sender(apiKey, messages, model, true);
-}
+const SYSTEM_PROMPT = `You are CLARITY, an autonomous AI agent CLI for Termux.
+
+RULES:
+- Never fabricate file contents, directory listings, or command output
+- Only call tools when the user asks for a real action (file, bash, search)
+- For greetings or questions, just reply in plain text \u2014 no tools
+- Keep replies concise. No filler words. No "Certainly!"
+- If a tool fails, report the actual error. Never pretend it succeeded.
+- You are running on Android/Termux. Use Termux-compatible commands.`;
+
+export async function callProvider(config, messagesOrHistory, tools = null) {
+  let messages = Array.isArray(messagesOrHistory)
+    ? messagesOrHistory
+    : (messagesOrHistory?.messages || []);
+
+  const withSystem = [
+    { role: 'system', content: SYSTEM_PROMPT },
+    ...messages.filter(m => m.role !== 'system'),
+  ];
+
+  const payload = { ...config, model: config.model };
+  const caller = callers[config.provider];
+  if (!caller) throw new Error('Unknown provider: ' + config.provider + '. Use /provider to switch.');
 
-export async function callProvider(config, messages) {
-  let full = '';
-  for await (const chunk of streamProvider(config, messages)) {
-    full += chunk;
-  }
-  return full;
+  return caller(payload, withSystem, tools);
 }
 
 export function getProvider(name) {

package/src/providers/openai.js

@@ -1,52 +1,47 @@
-const PROVIDER = {
-  name: 'openai',
-  free: false,
-  streaming: true,
-  models: ['gpt-4o-mini', 'gpt-4o', 'gpt-3.5-turbo'],
-  baseURL: 'https://api.openai.com/v1',
-};
+export async function callOpenAI(config, messages, tools = null) {
+  const apiKey = config.apiKeys?.openai;
+  if (!apiKey) throw new Error('No OpenAI API key set. Run: /keys openai <your-key>');
 
-async function* sendMessage(apiKey, messages, model = 'gpt-4o-mini', stream = true) {
-  const url = `${PROVIDER.baseURL}/chat/completions`;
-  const body = { model, messages, stream };
+  const model = config.model || 'gpt-4o-mini';
+  const body = {
+    model,
+    messages,
+    max_tokens: config.maxTokens || 4096,
+    temperature: config.temperature || 0.7,
+  };
 
-  const res = await fetch(url, {
+  if (tools && tools.length > 0) {
+    body.tools = tools.map(t => ({
+      type: 'function',
+      function: {
+        name: t.name,
+        description: t.description,
+        parameters: t.parameters,
+      },
+    }));
+    body.tool_choice = 'auto';
+  }
+
+  const res = await fetch('https://api.openai.com/v1/chat/completions', {
     method: 'POST',
-    headers: { 'Authorization': `Bearer ${apiKey}`, 'Content-Type': 'application/json' },
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': 'Bearer ' + apiKey,
+    },
     body: JSON.stringify(body),
   });
 
-  if (!res.ok) throw new Error(`OpenAI API error: ${res.status} ${res.statusText}`);
-
-  if (!stream) {
-    const data = await res.json();
-    yield data.choices[0].message.content;
-    return;
+  if (!res.ok) {
+    const detail = await res.text();
+    throw new Error('OpenAI API error: ' + res.status + ' \u2014 ' + (detail.slice(0, 200)));
   }
 
-  const reader = res.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = '';
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-    const lines = buffer.split('\n');
-    buffer = lines.pop() || '';
-    
-    for (const line of lines) {
-      if (line.startsWith('data: ')) {
-        const data = line.slice(6).trim();
-        if (data === '[DONE]') return;
-        try {
-          const json = JSON.parse(data);
-          const delta = json.choices?.[0]?.delta?.content;
-          if (delta) yield delta;
-        } catch {}
-      }
-    }
-  }
+  const data = await res.json();
+  const choice = data.choices?.[0];
+  if (!choice) throw new Error('Empty response from OpenAI');
+  const message = choice.message;
+  return {
+    content: message.content || '',
+    tool_calls: message.tool_calls || null,
+  };
 }
-
-export { PROVIDER, sendMessage };

package/src/providers/openrouter.js

@@ -1,52 +1,49 @@
-const PROVIDER = {
-  name: 'openrouter',
-  free: true,
-  streaming: true,
-  models: ['meta-llama/llama-3.1-8b-instruct:free', 'google/gemma-2-9b-it:free', 'mistralai/mistral-7b-instruct:free'],
-  baseURL: 'https://openrouter.ai/api/v1',
-};
+export async function callOpenRouter(config, messages, tools = null) {
+  const apiKey = config.apiKeys?.openrouter;
+  if (!apiKey) throw new Error('No OpenRouter API key set. Run: /keys openrouter <your-key>');
 
-async function* sendMessage(apiKey, messages, model = 'meta-llama/llama-3.1-8b-instruct:free', stream = true) {
-  const url = `${PROVIDER.baseURL}/chat/completions`;
-  const body = { model, messages, stream };
+  const model = config.model || 'mistralai/mistral-7b-instruct:free';
+  const body = {
+    model,
+    messages,
+    max_tokens: config.maxTokens || 4096,
+    temperature: config.temperature || 0.7,
+  };
 
-  const res = await fetch(url, {
+  if (tools && tools.length > 0) {
+    body.tools = tools.map(t => ({
+      type: 'function',
+      function: {
+        name: t.name,
+        description: t.description,
+        parameters: t.parameters,
+      },
+    }));
+    body.tool_choice = 'auto';
+  }
+
+  const res = await fetch('https://openrouter.ai/api/v1/chat/completions', {
     method: 'POST',
-    headers: { 'Authorization': `Bearer ${apiKey}`, 'Content-Type': 'application/json', 'HTTP-Referer': 'https://clarity-ai.local', 'X-Title': 'CLARITY AI' },
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': 'Bearer ' + apiKey,
+      'HTTP-Referer': 'https://clarity-ai.local',
+      'X-Title': 'CLARITY AI',
+    },
     body: JSON.stringify(body),
   });
 
-  if (!res.ok) throw new Error(`OpenRouter API error: ${res.status} ${res.statusText}`);
-
-  if (!stream) {
-    const data = await res.json();
-    yield data.choices[0].message.content;
-    return;
+  if (!res.ok) {
+    const detail = await res.text();
+    throw new Error('OpenRouter API error: ' + res.status + ' \u2014 ' + (detail.slice(0, 200)));
   }
 
-  const reader = res.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = '';
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-    const lines = buffer.split('\n');
-    buffer = lines.pop() || '';
-    
-    for (const line of lines) {
-      if (line.startsWith('data: ')) {
-        const data = line.slice(6).trim();
-        if (data === '[DONE]') return;
-        try {
-          const json = JSON.parse(data);
-          const delta = json.choices?.[0]?.delta?.content;
-          if (delta) yield delta;
-        } catch {}
-      }
-    }
-  }
+  const data = await res.json();
+  const choice = data.choices?.[0];
+  if (!choice) throw new Error('Empty response from OpenRouter');
+  const message = choice.message;
+  return {
+    content: message.content || '',
+    tool_calls: message.tool_calls || null,
+  };
 }
-
-export { PROVIDER, sendMessage };

package/src/ui/banner.js

@@ -6,7 +6,7 @@ import { clr } from './colors.js';
 
 const clarityGradient = gradient(['#00FFFF', '#7B2FFF', '#FF6B6B']);
 
-export async function showBanner(version = '3.0.0', provider = 'groq', model = 'llama-3.3-70b') {
+export async function showBanner(version = '3.3.0', provider = 'groq', model = 'llama-3.3-70b') {
   // Clear terminal
   process.stdout.write('\x1Bc');
   await new Promise(r => setTimeout(r, 50));