clarity-ai 1.2.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-ai",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "AI agent CLI for Termux and terminal — chat, code, automate",
   "type": "module",
   "main": "src/index.js",

package/src/commands/index.js

@@ -33,6 +33,7 @@ const commandRegistry = {
 
         case '/keys': return this.keys(args);
         case '/model': return this.model(args);
+        case '/provider': return this.provider(args);
         case '/config': return this.config(args);
         case '/theme': return this.theme(args);
 
@@ -147,7 +148,7 @@ const commandRegistry = {
 
     const categories = {
       'CHAT & AI': ['/chat', '/ask <q>', '/clear', '/history show|clear|export', '/memory show|add|clear'],
-      'CONFIGURATION': ['/init', '/keys set|list|remove|test', '/model set|list', '/config show|reset', '/theme set|list'],
+      'CONFIGURATION': ['/init', '/keys set|list|remove|test', '/provider', '/model', '/config show|reset', '/theme set|list'],
       'FILES': ['/file create|read|delete|list|edit', '/bash <command>', '/code run|write|explain|fix|review|refactor|test|docs'],
       'WEB & SEARCH': ['/web <url>', '/search <query>', '/translate <text>', '/summarize <file|url>'],
       'AGENTS & TOOLS': ['/agent start|stop|list|logs', '/tools list|run'],
@@ -232,27 +233,75 @@ const commandRegistry = {
 
   async model(args) {
     const sub = args[0];
-    if (!sub) { blocks.warn('Usage', '/model list|set <provider/model>'); return; }
+    if (sub === 'set') {
+      if (args.length < 2) { blocks.warn('Usage', '/model set <provider/model>'); return; }
+      settings.set('defaultModel', args[1]);
+      blocks.success('Model Set', `Default model: ${args[1]}`);
+      return;
+    }
 
-    switch (sub) {
-      case 'list': {
-        const configured = Object.keys(listKeys());
-        if (configured.length === 0) { blocks.info('No Keys', 'Configure keys first with /init'); return; }
-        for (const p of configured) {
-          const models = listModels(p);
-          blocks.info(p, models.map(m => `${p}/${m}`).join('\n'));
-        }
-        break;
-      }
-      case 'set': {
-        if (args.length < 2) { blocks.warn('Usage', '/model set <provider/model>'); return; }
-        settings.set('defaultModel', args[1]);
-        blocks.success('Model Set', `Default model: ${args[1]}`);
-        break;
-      }
-      default:
-        blocks.warn('Usage', '/model list|set <provider/model>');
+    const configured = Object.keys(listKeys());
+    if (configured.length === 0) { blocks.info('No Keys', 'Configure keys first with /init'); return; }
+
+    const { default: inquirer } = await import('inquirer');
+    const choices = [];
+    for (const p of configured) {
+      const models = listModels(p);
+      models.forEach(m => {
+        choices.push({ name: `${p}/${m}`, value: `${p}/${m}` });
+      });
+    }
+
+    if (choices.length === 0) { blocks.warn('No Models', 'No models available for configured providers.'); return; }
+
+    const current = settings.get('defaultModel') || 'groq/llama-3.3-70b-versatile';
+    const { model } = await inquirer.prompt([{
+      type: 'list',
+      name: 'model',
+      message: 'Select AI model:',
+      pageSize: 15,
+      choices: choices.map(c => ({
+        ...c,
+        checked: c.value === current,
+      })),
+    }]);
+    settings.set('defaultModel', model);
+    blocks.success('Model Set', `Default model: ${model}`);
+    return { resetRL: true };
+  },
+
+  async provider(args) {
+    const configured = Object.keys(listKeys());
+    if (configured.length === 0) { blocks.info('No Keys', 'Configure keys first with /init'); return; }
+
+    const { default: inquirer } = await import('inquirer');
+    const { provider } = await inquirer.prompt([{
+      type: 'list',
+      name: 'provider',
+      message: 'Select AI provider:',
+      choices: configured.map(p => ({
+        name: PROVIDER_NAMES[p] || p,
+        value: p,
+      })),
+    }]);
+
+    const models = listModels(provider);
+    if (models.length > 0) {
+      const { model } = await inquirer.prompt([{
+        type: 'list',
+        name: 'model',
+        message: `Select ${PROVIDER_NAMES[provider]} model:`,
+        choices: models.map(m => ({
+          name: `${provider}/${m}`,
+          value: `${provider}/${m}`,
+        })),
+      }]);
+      settings.set('defaultModel', model);
+      blocks.success('Provider & Model Set', `${PROVIDER_NAMES[provider]} → ${model}`);
+    } else {
+      blocks.warn('No Models', `No models listed for ${PROVIDER_NAMES[provider]}`);
     }
+    return { resetRL: true };
   },
 
   config(args) {

package/src/config/settings.js

@@ -3,7 +3,7 @@ import paths from './paths.js';
 
 const schema = {
   theme: { type: 'string', default: 'dark' },
-  defaultModel: { type: 'string', default: 'groq/llama3-70b-8192' },
+    defaultModel: { type: 'string', default: 'groq/llama-3.3-70b-versatile' },
   stream: { type: 'boolean', default: true },
   showTokens: { type: 'boolean', default: true },
   saveHistory: { type: 'boolean', default: true },
@@ -17,7 +17,7 @@ const settings = new Conf({
   cwd: paths.config,
   defaults: {
     theme: 'dark',
-    defaultModel: 'groq/llama3-70b-8192',
+    defaultModel: 'groq/llama-3.3-70b-versatile',
     stream: true,
     showTokens: true,
     saveHistory: true,

package/src/providers/index.js

@@ -10,12 +10,12 @@ const providers = { groq, gemini, deepseek, openrouter, openai, anthropic: claud
 const PRIORITY = ['groq', 'gemini', 'deepseek', 'openrouter', 'openai', 'anthropic'];
 
 const capabilities = {
-  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' },
-  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' },
-  deepseek: { free: false, cheap: true, streaming: true, models: ['deepseek-chat', 'deepseek-coder'], baseURL: 'https://api.deepseek.com/v1' },
-  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' },
-  anthropic: { free: false, streaming: true, models: ['claude-3-5-haiku-20241022', 'claude-3-5-sonnet-20241022'], baseURL: 'https://api.anthropic.com/v1' },
-  openai: { free: false, streaming: true, models: ['gpt-4o-mini', 'gpt-4o', 'gpt-3.5-turbo'], baseURL: 'https://api.openai.com/v1' },
+  groq: { free: true, streaming: true, models: ['llama-3.3-70b-versatile', 'llama-3.1-8b-instant', 'meta-llama/llama-4-scout-17b-16e-instruct', 'meta-llama/llama-4-maverick-17b-128e-instruct', 'mixtral-8x7b-32768', 'gemma2-9b-it', 'qwen/qwen3-32b', 'deepseek-r1-distill-llama-70b', 'moonshotai/kimi-k2-instruct'], baseURL: 'https://api.groq.com/openai/v1' },
+  gemini: { free: true, streaming: true, models: ['gemini-2.0-flash', 'gemini-2.5-pro-exp-03-25', 'gemini-1.5-flash', 'gemini-1.5-pro'], baseURL: 'https://generativelanguage.googleapis.com/v1beta' },
+  deepseek: { free: false, cheap: true, streaming: true, models: ['deepseek-chat', 'deepseek-coder', 'deepseek-reasoner'], baseURL: 'https://api.deepseek.com/v1' },
+  openrouter: { free: true, streaming: true, models: ['meta-llama/llama-3.3-70b-instruct:free', 'google/gemma-2-9b-it:free', 'mistralai/mistral-7b-instruct:free', 'deepseek/deepseek-chat:free', 'qwen/qwen-2.5-72b-instruct:free'], baseURL: 'https://openrouter.ai/api/v1' },
+  anthropic: { free: false, streaming: true, models: ['claude-3-5-haiku-latest', 'claude-3-5-sonnet-latest', 'claude-3-haiku'], baseURL: 'https://api.anthropic.com/v1' },
+  openai: { free: false, streaming: true, models: ['gpt-4o-mini', 'gpt-4o', 'gpt-4.1', 'o3-mini'], baseURL: 'https://api.openai.com/v1' },
 };
 
 function sendMessage(apiKey, messages, model, stream = true) {

package/src/ui/chatbox.js

@@ -4,17 +4,26 @@ import settings from '../config/settings.js';
 import { hasAnyKeys } from '../config/keys.js';
 import { getKey, PROVIDER_NAMES } from '../config/keys.js';
 import { sendMessage } from '../providers/index.js';
-import { createPrompt, showPrompt, addToHistory, loadHistory, showSuggestions, ALL_COMMANDS } from './prompt.js';
+import { createPrompt, addToHistory, loadHistory, ALL_COMMANDS } from './prompt.js';
 import blocks from './blocks.js';
 import spin from './spinner.js';
-import agentManager from '../agents/manager.js';
 import commandRegistry from '../commands/index.js';
 import memory from '../memory/store.js';
-import { runTool } from '../tools/index.js';
 import { isTermux } from '../utils/termux.js';
+import readline from 'readline';
+import { readFileSync } from 'fs';
+
+const PKG = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url)));
+const VERSION = PKG.version;
+
+const RESET = '\x1b[0m';
+const GREY_BG = '\x1b[48;5;236m';
+const PURPLE_BG = '\x1b[48;5;53m';
+const FILL = '░';
 
 let rl = null;
 let conversation = [];
+let cmdBuffer = '';
 
 const SYSTEM_PROMPT = `You are CLARITY, an autonomous AI agent running in the user's terminal (Termux on Android).
 
@@ -30,122 +39,188 @@ Current environment: ${process.platform} ${process.arch}, Node ${process.version
 Directory: ${process.cwd()}
 Termux: ${isTermux()}`;
 
-function renderHeader() {
-  const model = settings.get('defaultModel') || 'groq/llama3-70b-8192';
-  const w = process.stdout.columns || 80;
-  const left = c.accent('◈');
-  const mid = c.muted(` ${model} `);
-  const right = c.muted('/help');
-  const pad = '.'.repeat(Math.max(0, Math.floor((w - mid.length - right.length - 8) / 2)));
-  console.log(c.border(`  ${left}${c.dim(pad)}${mid}${c.dim(pad)}${right}`));
-  blocks.divider();
+function getW() {
+  return process.stdout.columns || 80;
 }
 
-function startChat() {
-  if (!hasAnyKeys()) {
-    blocks.warn('No API Keys', 'Run /init to configure API keys first.');
-    return;
-  }
-
-  loadHistory();
-  console.clear();
-  renderBanner();
-  renderHeader();
-  console.log();
+function fill(w) {
+  return FILL.repeat(w);
+}
 
-  rl = createPrompt();
-  showPrompt();
-  let cmdBuffer = '';
+function renderPromptBar() {
+  const model = settings.get('defaultModel') || 'groq/llama-3.3-70b-versatile';
+  const w = getW();
+  const line = '━'.repeat(w - 4);
+  const left = ` ${model} `;
+  const right = `v${VERSION}  /help `;
+  const gap = Math.max(0, w - 4 - left.length - right.length);
 
-  process.stdin.on('keypress', (char, key) => {
-    if (key && key.name === 'slash' && !cmdBuffer) {
-      cmdBuffer = '/';
-      suggestCommands('');
-    }
-    if (key && key.name === 'escape') {
-      if (cmdBuffer) { cmdBuffer = ''; }
-    }
-  });
+  console.log(c.accent(`  ┏${line}┓`));
+  console.log(c.accent(`  ┃${GREY_BG}${fill(w - 4)}${RESET}${c.accent('┃')}`));
+  console.log(c.accent(`  ┃${GREY_BG}${c.muted(left)}${fill(gap)}${c.muted(right)}${RESET}${c.accent('┃')}`));
+  console.log(c.accent(`  ┃${GREY_BG}${fill(w - 4)}${RESET}${c.accent('┃')}`));
+  console.log(c.accent(`  ┗${line}┛`));
+}
 
-  rl.on('line', async (line) => {
-    const input = line.trim();
-    if (!input) { showPrompt(); return; }
-    cmdBuffer = '';
-    addToHistory(input);
+function showPrompt() {
+  process.stdout.write(` ${c.accent('◆')} `);
+}
 
-    if (input.startsWith('/')) {
-      const result = await commandRegistry.execute(input, { rl, conversation, showPrompt });
-      if (result?.exit) { closeChat(); return; }
-    } else {
-      conversation.push({ role: 'user', content: input });
-      await handleAIResponse();
-    }
-    showPrompt();
-  });
+function attachReadlineHandlers() {
+  rl.removeAllListeners('line');
+  rl.removeAllListeners('close');
+  rl.removeAllListeners('SIGINT');
 
+  rl.on('line', onLine);
   rl.on('close', () => {
     console.log(c.muted('\nGoodbye!'));
     process.exit(0);
   });
-
   rl.on('SIGINT', () => {
     console.log(c.muted('\nUse /exit to quit'));
+    renderPromptBar();
     showPrompt();
   });
 }
 
-function suggestCommands(partial) {
-  const w = process.stdout.columns || 80;
-  const matches = ALL_COMMANDS.filter(([cmd]) => cmd.startsWith(partial));
-  const top = matches.slice(0, 6);
-  if (top.length === 0) return;
+async function onLine(line) {
+  const input = line.trim();
+  if (!input) { renderPromptBar(); showPrompt(); return; }
+  cmdBuffer = '';
+  addToHistory(input);
+
+  if (input.startsWith('/')) {
+    const result = await commandRegistry.execute(input, { rl, conversation, showPrompt });
+    if (result?.exit) { closeChat(); return; }
+    if (result?.resetRL) {
+      rl.close();
+      rl = createPrompt();
+      attachReadlineHandlers();
+    }
+  } else {
+    conversation.push({ role: 'user', content: input });
+    renderUserMsg(input);
+    await handleAIResponse();
+  }
+  renderPromptBar();
+  showPrompt();
+}
+
+function renderUserMsg(text) {
+  const w = getW();
+  const line = '─'.repeat(w - 4);
   console.log();
-  console.log(c.dim(`  ${'─'.repeat(w - 4)}`));
-  top.forEach(([cmd, desc], i) => {
-    const tag = c.badge('/' + cmd, i === 0 ? 'cyan' : 'purple');
-    console.log(`  ${tag} ${c.muted(desc)}`);
+  console.log(c.primary(`  ┌${line}┐`));
+  console.log(c.primary(`  │${GREY_BG}${fill(w - 4)}${RESET}${c.primary('│')}`));
+  text.split('\n').forEach(l => {
+    const clean = l.replace(/\x1b\[[0-9;]*m/g, '');
+    console.log(c.primary(`  │${GREY_BG}  ${c.user(l)}${fill(Math.max(0, w - 6 - clean.length))}${RESET}${c.primary('│')}`));
   });
-  console.log(c.dim(`  ${'─'.repeat(w - 4)}`));
+  console.log(c.primary(`  │${GREY_BG}${fill(w - 4)}${RESET}${c.primary('│')}`));
+  console.log(c.primary(`  └${line}┘`));
+  console.log();
+}
+
+function startChat() {
+  if (!hasAnyKeys()) {
+    blocks.warn('No API Keys', 'Run /init to configure API keys first.');
+    return;
+  }
+
+  loadHistory();
+  console.clear();
+  renderBanner();
   console.log();
+  renderPromptBar();
   showPrompt();
+  rl = createPrompt();
+  attachReadlineHandlers();
+
+  process.stdin.on('keypress', onKeypress);
+}
+
+function onKeypress(char, key) {
+  if (!key) return;
+
+  if (key.name === 'slash' && !cmdBuffer) {
+    cmdBuffer = '/';
+    showCmdList();
+    return;
+  }
+  if (key.name === 'escape') {
+    cmdBuffer = '';
+  }
+}
+
+function showCmdList() {
+  const w = getW();
+  readline.clearLine(process.stdout, 0);
+  readline.cursorTo(process.stdout, 0);
+  console.log(c.accent(`  ┌${'─'.repeat(w - 6)}┐`));
+  console.log(c.accent(`  │${GREY_BG}${fill(w - 6)}${RESET}${c.accent('│')}`));
+  const top = ALL_COMMANDS.slice(0, 8);
+  top.forEach(([cmd, desc], i) => {
+    const tag = i === 0 ? c.primary('/' + cmd) : c.accent('/' + cmd);
+    console.log(c.accent(`  │${GREY_BG}  ${tag}${fill(Math.max(0, w - 10 - cmd.length - desc.length))}${c.muted(desc)} ${RESET}${c.accent('│')}`));
+  });
+  if (ALL_COMMANDS.length > 8) {
+    console.log(c.accent(`  │${GREY_BG}  ${c.muted('... and ' + (ALL_COMMANDS.length - 8) + ' more — Tab to complete')}${fill(Math.max(0, w - 12 - 28))}${RESET}${c.accent('│')}`));
+  }
+  console.log(c.accent(`  │${GREY_BG}${fill(w - 6)}${RESET}${c.accent('│')}`));
+  console.log(c.accent(`  └${'─'.repeat(w - 6)}┘`));
 }
 
 async function handleAIResponse() {
-  const model = settings.get('defaultModel') || 'groq/llama3-70b-8192';
+  const model = settings.get('defaultModel') || 'groq/llama-3.3-70b-versatile';
   const [provider] = model.split('/');
   const apiKey = getKey(provider);
 
   if (!apiKey) {
-    blocks.error('Key Missing', `No API key for ${PROVIDER_NAMES[provider] || provider}`);
+    blocks.error('Key Missing', `No key for ${PROVIDER_NAMES[provider] || provider}`);
     return;
   }
 
-  const systemMsg = { role: 'system', content: SYSTEM_PROMPT + '\n\nUser memory: ' + (memory.show().filter(m => m.role === 'system').map(m => m.content).join('; ') || 'none') };
+  const systemMsg = {
+    role: 'system',
+    content: SYSTEM_PROMPT + '\n\nUser memory: ' + (memory.show().filter(m => m.role === 'system').map(m => m.content).join('; ') || 'none')
+  };
   const messages = [systemMsg, ...conversation];
 
-  spin.start('CLARITY is thinking...');
+  spin.start('thinking...');
 
   try {
     const stream = sendMessage(apiKey, messages, model, settings.get('stream'));
+    const streaming = settings.get('stream');
 
-    if (settings.get('stream')) {
+    if (streaming) {
       spin.stop();
-      const w = process.stdout.columns || 80;
-      console.log(c.accent(`  ╔${'═'.repeat(w - 4)}╗`));
-      process.stdout.write(c.accent('  ║ ') + c.ai('CLARITY ') + c.white(''));
+      const w = getW();
+      const line = '━'.repeat(w - 4);
+
+      console.log(c.accent(`  ┏${line}┓`));
+      console.log(c.accent(`  ┃${PURPLE_BG}${fill(w - 4)}${RESET}${c.accent('┃')}`));
+      process.stdout.write(c.accent(`  ┃${PURPLE_BG}  ${c.ai('CLARITY')} `));
       let full = '';
+
       try {
         for await (const chunk of stream) {
           full += chunk;
-          process.stdout.write(c.white(chunk));
+          process.stdout.write(chunk);
         }
       } catch (streamErr) {
-        if (full) process.stdout.write(c.warning('\n\n[stream interrupted]'));
+        if (full) process.stdout.write(c.warning('\n\n[interrupted]'));
         else throw streamErr;
       }
+
+      const clean = full.replace(/\x1b\[[0-9;]*m/g, '');
+      const lastLine = clean.includes('\n') ? clean.split('\n').pop() : clean;
+      const remain = Math.max(0, w - 8 - lastLine.length);
+      process.stdout.write(`${fill(remain)}${RESET}${c.accent('┃')}`);
       console.log();
-      console.log(c.accent(`  ╚${'═'.repeat(w - 4)}╝`));
+      console.log(c.accent(`  ┃${PURPLE_BG}${fill(w - 4)}${RESET}${c.accent('┃')}`));
+      console.log(c.accent(`  ┗${line}┛`));
       console.log();
+
       if (full.trim()) {
         conversation.push({ role: 'assistant', content: full });
         memory.add(conversation);
@@ -164,9 +239,9 @@ async function handleAIResponse() {
     }
 
     if (settings.get('showTokens')) {
-      const inTokens = Math.ceil(conversation.reduce((s, m) => s + m.content.length, 0) / 4);
-      const outTokens = Math.ceil(conversation.filter(m => m.role === 'assistant').reduce((s, m) => s + m.content.length, 0) / 4);
-      console.log(c.dim(`  tokens: ${inTokens} in / ${outTokens} out  •  free`));
+      const inTok = Math.ceil(conversation.reduce((s, m) => s + m.content.length, 0) / 4);
+      const outTok = Math.ceil(conversation.filter(m => m.role === 'assistant').reduce((s, m) => s + m.content.length, 0) / 4);
+      console.log(c.dim(`  tokens: ${inTok} in / ${outTok} out`));
     }
   } catch (err) {
     spin.fail('Error');
@@ -175,7 +250,9 @@ async function handleAIResponse() {
 }
 
 function closeChat() {
+  process.stdin.removeListener('keypress', onKeypress);
   if (rl) rl.close();
+  if (process.stdin.isTTY) process.stdin.setRawMode(false);
   console.log(c.muted('\nGoodbye!'));
   process.exit(0);
 }

package/src/ui/prompt.js

@@ -2,7 +2,6 @@ import readline from 'readline';
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { dirname } from 'path';
 import paths from '../config/paths.js';
-import c from './colors.js';
 
 const HISTORY_FILE = paths.history;
 const ALL_COMMANDS = [
@@ -16,6 +15,8 @@ const ALL_COMMANDS = [
   ['keys list', 'List API keys'],
   ['keys remove', 'Remove API key'],
   ['keys test', 'Test API key'],
+  ['provider', 'Switch AI provider'],
+  ['model', 'Select AI model'],
   ['model set', 'Set default model'],
   ['model list', 'List models'],
   ['config show', 'Show config'],
@@ -73,7 +74,6 @@ const ALL_COMMANDS = [
 
 const MAX_HISTORY = 500;
 let history = [];
-let showCmdSuggest = false;
 
 function loadHistory() {
   try {
@@ -99,17 +99,6 @@ function addToHistory(line) {
   }
 }
 
-function showSuggestions(rl, partial) {
-  const p = partial.replace('/', '');
-  if (!p) {
-    showCmdSuggest = true;
-    return ALL_COMMANDS.slice(0, 8);
-  }
-  const matches = ALL_COMMANDS.filter(([cmd]) => cmd.startsWith(p));
-  showCmdSuggest = matches.length > 0;
-  return matches.slice(0, 8);
-}
-
 function createPrompt() {
   loadHistory();
   const rl = readline.createInterface({
@@ -119,12 +108,19 @@ function createPrompt() {
     historySize: MAX_HISTORY,
     terminal: true,
     prompt: '',
+    completer: (line) => {
+      if (line.startsWith('/')) {
+        const hits = ALL_COMMANDS.filter(([cmd]) => {
+          const fullCmd = '/' + cmd;
+          return fullCmd.startsWith(line);
+        }).map(([cmd]) => '/' + cmd);
+        if (hits.length === 0) return [[], line];
+        return [hits, line];
+      }
+      return [[], line];
+    }
   });
   return rl;
 }
 
-function showPrompt() {
-  process.stdout.write(` ${c.primary('◆')} `);
-}
-
-export { createPrompt, showPrompt, addToHistory, loadHistory, history, showSuggestions, ALL_COMMANDS };
+export { createPrompt, addToHistory, loadHistory, history, ALL_COMMANDS };