clarity-ai 1.3.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-ai",
-  "version": "1.3.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

@@ -267,6 +267,7 @@ const commandRegistry = {
     }]);
     settings.set('defaultModel', model);
     blocks.success('Model Set', `Default model: ${model}`);
+    return { resetRL: true };
   },
 
   async provider(args) {
@@ -300,6 +301,7 @@ const commandRegistry = {
     } else {
       blocks.warn('No Models', `No models listed for ${PROVIDER_NAMES[provider]}`);
     }
+    return { resetRL: true };
   },
 
   config(args) {

package/src/ui/chatbox.js

@@ -15,10 +15,15 @@ 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).
 
@@ -34,20 +39,26 @@ Current environment: ${process.platform} ${process.arch}, Node ${process.version
 Directory: ${process.cwd()}
 Termux: ${isTermux()}`;
 
-const GREY_BG = '\x1b[48;5;236m';
+function getW() {
+  return process.stdout.columns || 80;
+}
+
+function fill(w) {
+  return FILL.repeat(w);
+}
 
 function renderPromptBar() {
   const model = settings.get('defaultModel') || 'groq/llama-3.3-70b-versatile';
-  const w = process.stdout.columns || 80;
+  const w = getW();
   const line = '━'.repeat(w - 4);
-  const leftText = ` ${model} `;
-  const rightText = `v${VERSION}  /help `;
-  const fill = Math.max(0, w - leftText.length - rightText.length - 8);
+  const left = ` ${model} `;
+  const right = `v${VERSION}  /help `;
+  const gap = Math.max(0, w - 4 - left.length - right.length);
 
   console.log(c.accent(`  ┏${line}┓`));
-  console.log(c.accent(`  ┃${GREY_BG}${' '.repeat(w - 4)}${RESET}${c.accent('┃')}`));
-  console.log(c.accent(`  ┃${GREY_BG}  ${c.muted(leftText)}${' '.repeat(fill)}${c.muted(rightText)}${RESET}${c.accent('┃')}`));
-  console.log(c.accent(`  ┃${GREY_BG}${' '.repeat(w - 4)}${RESET}${c.accent('┃')}`));
+  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}┛`));
 }
 
@@ -55,6 +66,61 @@ function showPrompt() {
   process.stdout.write(` ${c.accent('◆')} `);
 }
 
+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();
+  });
+}
+
+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.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.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.');
@@ -68,64 +134,40 @@ function startChat() {
   renderPromptBar();
   showPrompt();
   rl = createPrompt();
+  attachReadlineHandlers();
 
-  let cmdBuffer = '';
+  process.stdin.on('keypress', onKeypress);
+}
 
-  process.stdin.on('keypress', (char, key) => {
-    if (key && key.name === 'slash' && !cmdBuffer) {
-      cmdBuffer = '/';
-      const input = rl.line || '';
-      readline.clearLine(process.stdout, 0);
-      readline.cursorTo(process.stdout, 0);
-      suggestCommands(input);
-      rl._refreshLine();
-    }
-    if (key && key.name === 'escape') {
-      if (cmdBuffer) { cmdBuffer = ''; }
-    }
-  });
+function onKeypress(char, key) {
+  if (!key) return;
 
-  rl.on('line', async (line) => {
-    const input = line.trim();
-    if (!input) { renderPromptBar(); showPrompt(); return; }
+  if (key.name === 'slash' && !cmdBuffer) {
+    cmdBuffer = '/';
+    showCmdList();
+    return;
+  }
+  if (key.name === 'escape') {
     cmdBuffer = '';
-    addToHistory(input);
-
-    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();
-    }
-    renderPromptBar();
-    showPrompt();
-  });
-
-  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 p = partial.replace('/', '');
-  const matches = p ? ALL_COMMANDS.filter(([cmd]) => cmd.startsWith(p)) : ALL_COMMANDS;
-  const top = matches.slice(0, 8);
-  if (top.length === 0) return;
-  console.log(c.dim(`  ${'─'.repeat(w - 4)}`));
+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 = blocks.badge('/' + cmd, i === 0 ? 'cyan' : 'purple');
-    console.log(`  ${tag} ${c.muted(desc)}`);
+    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('│')}`));
   });
-  console.log(c.dim(`  ${'─'.repeat(w - 4)}`));
+  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() {
@@ -134,40 +176,51 @@ async function handleAIResponse() {
   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;
+      const w = getW();
       const line = '━'.repeat(w - 4);
-      const PURPLE_BG = '\x1b[48;5;53m';
+
       console.log(c.accent(`  ┏${line}┓`));
-      console.log(c.accent(`  ┃${PURPLE_BG}${' '.repeat(w - 4)}${RESET}${c.accent('┃')}`));
-      process.stdout.write(c.accent(`  ┃${PURPLE_BG}  ${c.ai('CLARITY')} ${RESET}${c.white('')}`));
+      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(`  ┃${PURPLE_BG}${' '.repeat(w - 4)}${RESET}${c.accent('┃')}`));
+      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);
@@ -186,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');
@@ -197,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

@@ -108,6 +108,17 @@ 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;
 }