clarity-ai 3.0.2 → 3.1.0

package/package.json

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

package/src/agents/loop.js

@@ -1,32 +1,157 @@
 import { callProvider } from '../providers/index.js';
 import { buildSystemPrompt } from '../core/context.js';
 import { addMessage } from '../core/history.js';
+import { renderEdit, renderWrite, renderTool } from '../ui/blocks.js';
+import { diffLines } from 'diff';
+import { execSync } from 'child_process';
+import { readFileSync, writeFileSync, existsSync } from 'fs';
 
-const TOOLS_DESC = `You are CLARITY, an autonomous AI agent. You have access to these tools:
-- bash <command>: Execute shell commands
-- read_file <path>: Read file contents
-- write_file <path> <content>: Create/overwrite files
-- edit_file <path> <old> <new>: Replace text in files
-- delete_file <path>: Delete files
-- list_dir <dir>: List directory contents
-- search_files <pattern>: Find files by glob
-- grep <pattern> <path>: Search file contents
-- web_search <query>: Search the web
-- web_fetch <url>: Fetch URL content
-- git <subcommand>: Git operations
-- memory <read/write/search/clear>: Persistent memory
-- pkg_manager <npm/pip> <install> <pkg>: Install packages
-- code_runner <lang> <code>: Execute code snippets
-
-Respond with JSON:
-{"tool": "tool_name", "args": {"arg1": "val1"}}
-or to respond to user:
-{"response": "your final answer here"}`;
+export const SYSTEM_PROMPT = 'You are CLARITY, an autonomous AI agent CLI running in Termux on Android.\n\n' +
+'## CRITICAL RULES — NEVER VIOLATE\n\n' +
+'1. NEVER fabricate file contents, directory structures, or command outputs.\n' +
+'   - If you have not read a file, say "I have not read that file yet."\n' +
+'   - If a command has not run, say "I will run that now."\n' +
+'   - NEVER invent results.\n\n' +
+'2. NEVER hallucinate tool calls — only call tools you actually have.\n' +
+'   Available tools: bash, read_file, write_file, edit_file, delete_file,\n' +
+'   list_directory, search_files, grep, web_search, web_fetch, git,\n' +
+'   run_tests, memory, task_planner, code_runner, pkg_manager, env,\n' +
+'   diff, compress, screenshot, clipboard, notify, version_check,\n' +
+'   context, agent_spawn.\n\n' +
+'3. NEVER confirm an action before doing it — just do it.\n' +
+'   Bad: "I will create the workspace folder now." [then waits]\n' +
+'   Good: [calls bash tool: mkdir workspace] then "Created workspace/."\n\n' +
+'4. ALWAYS ground responses in actual tool output.\n' +
+'   If a tool returns an error, report the actual error. Do not pretend it succeeded.\n\n' +
+'5. SHORT responses. No filler. No "Certainly!" No "Great question!"\n' +
+'   Just: action -> result -> next step if needed.\n\n' +
+'6. When editing files, ALWAYS read the file first, then make targeted edits.\n' +
+'   Never overwrite a file you have not read.\n\n' +
+'7. For multi-step tasks, plan first with task_planner, then execute step by step.\n' +
+'   Show each step as you complete it.\n\n' +
+'## RESPONSE FORMAT\n\n' +
+'- Plain text for explanations. No markdown headers in chat.\n' +
+'- File edits shown as diffs automatically by the UI — do not describe edits in text.\n' +
+'- Code in responses: just write it plainly, no fences needed unless showing a standalone snippet.\n' +
+'- Errors: state the actual error and what you will try next.\n\n' +
+'## IDENTITY\n\n' +
+'You are CLARITY v3.0. You are running on ' + process.platform + '.\n' +
+'Current working directory: ' + process.cwd() + '\n' +
+'Agent mode: ON — you can and should use tools without asking permission.\n' +
+'\nAvailable tools with JSON schema:\n' +
+'- bash { command: string }\n' +
+'- read_file { path: string }\n' +
+'- write_file { path: string, content: string }\n' +
+'- edit_file { path: string, old_str: string, new_str: string }\n' +
+'- delete_file { path: string }\n' +
+'- list_directory { dir: string }\n' +
+'- search_files { pattern: string }\n' +
+'- grep { pattern: string, path: string }\n' +
+'- web_search { query: string }\n' +
+'- web_fetch { url: string }\n' +
+'- git { subcommand: string }\n' +
+'- memory { action: string, key?: string, value?: string }\n' +
+'- code_runner { language: string, code: string }\n' +
+'- pkg_manager { manager: string, action: string, packages: string }\n\n' +
+'Respond with JSON:\n' +
+'{"tool": "tool_name", "args": {"arg1": "val1"}}\n' +
+'or to respond to user:\n' +
+'{"response": "your final answer here"}';
+
+function filterContextHunks(hunks, ctx) {
+  const changedIdx = hunks
+    .map((h, i) => (h.type !== 'context' ? i : -1))
+    .filter((i) => i >= 0);
+  return hunks.filter((_, i) => {
+    if (hunks[i].type !== 'context') return true;
+    for (const c of changedIdx) {
+      if (Math.abs(i - c) <= ctx) return true;
+    }
+    return false;
+  });
+}
+
+async function executeToolCall(toolName, toolInput) {
+  switch (toolName) {
+    case 'write_file': {
+      const { path, content } = toolInput;
+      const lines = content.split('\n').length;
+      writeFileSync(path, content, 'utf-8');
+      console.log(renderWrite(path, lines));
+      return 'Written ' + lines + ' lines to ' + path;
+    }
+
+    case 'edit_file': {
+      const { path, old_str, new_str } = toolInput;
+      if (!existsSync(path)) return 'Error: File not found: ' + path;
+      const original = readFileSync(path, 'utf-8');
+      const updated = original.replace(old_str, new_str);
+
+      const changes = diffLines(original, updated);
+      const hunks = [];
+      let lineNum = 1;
+      for (const part of changes) {
+        for (const line of part.value.split('\n').slice(0, -1)) {
+          if (part.added) {
+            hunks.push({ type: 'add', line, lineNum });
+          } else if (part.removed) {
+            hunks.push({ type: 'remove', line, lineNum });
+          } else {
+            hunks.push({ type: 'context', line, lineNum });
+          }
+          lineNum++;
+        }
+      }
+
+      const filtered = filterContextHunks(hunks, 2);
+      writeFileSync(path, updated, 'utf-8');
+      console.log(renderEdit(path, filtered));
+      return 'Edited ' + path;
+    }
+
+    case 'bash': {
+      const { command } = toolInput;
+      try {
+        const result = execSync(command, { encoding: 'utf-8', timeout: 30000 });
+        const out = result || '(no output)';
+        console.log(renderTool('bash', command, out));
+        return out;
+      } catch (err) {
+        const errMsg = err.stderr || err.message;
+        console.log(renderTool('bash', command, errMsg));
+        return 'Error: ' + errMsg;
+      }
+    }
+
+    case 'read_file': {
+      const { path } = toolInput;
+      if (!existsSync(path)) return 'Error: File not found: ' + path;
+      const content = readFileSync(path, 'utf-8');
+      console.log(renderTool('read_file', path, content.slice(0, 200)));
+      return content;
+    }
+
+    default: {
+      try {
+        const mod = await import('../tools/' + toolName + '.js');
+        const toolFn = Object.values(mod)[0];
+        const result = await toolFn(toolInput);
+        console.log(renderTool(toolName, JSON.stringify(toolInput).slice(0, 60), result));
+        return result;
+      } catch (e) {
+        return 'Tool error: ' + e.message;
+      }
+    }
+  }
+}
 
 export async function agentLoop(userMessage, config, history) {
   const messages = [
-    { role: 'system', content: buildSystemPrompt(TOOLS_DESC) },
-    ...history.slice(-20).map(m => ({ role: m.role === 'assistant' ? 'assistant' : 'user', content: m.content })),
+    { role: 'system', content: buildSystemPrompt(SYSTEM_PROMPT) },
+    ...history.slice(-20).map((m) => ({
+      role: m.role === 'assistant' ? 'assistant' : 'user',
+      content: m.content,
+    })),
     { role: 'user', content: userMessage },
   ];
 
@@ -41,40 +166,35 @@ export async function agentLoop(userMessage, config, history) {
       fullResponse += chunk;
     }
 
-    try {
-      const jsonMatch = fullResponse.match(/\{[^]*\}/);
-      if (!jsonMatch) {
-        finalResponse = fullResponse;
-        break;
-      }
-      const parsed = JSON.parse(jsonMatch[0]);
-
-      if (parsed.response) {
-        finalResponse = parsed.response;
-        break;
-      }
-
-      if (parsed.tool) {
-        toolCalls++;
-        const toolName = parsed.tool;
-        const args = parsed.args || {};
-
-        let result;
-        try {
-          const mod = await import(`../tools/${toolName}.js`);
-          const toolFn = Object.values(mod)[0];
-          result = await toolFn(args);
-        } catch (e) {
-          result = `Tool error: ${e.message}`;
-        }
+    const jsonMatch = fullResponse.match(/\{[^]*\}/);
+    if (!jsonMatch) {
+      finalResponse = fullResponse;
+      break;
+    }
 
-        messages.push({ role: 'assistant', content: fullResponse });
-        messages.push({ role: 'user', content: `Tool result: ${result}` });
-      }
+    let parsed;
+    try {
+      parsed = JSON.parse(jsonMatch[0]);
     } catch {
       finalResponse = fullResponse;
       break;
     }
+
+    if (parsed.response) {
+      finalResponse = parsed.response;
+      break;
+    }
+
+    if (parsed.tool) {
+      toolCalls++;
+      const toolName = parsed.tool;
+      const args = parsed.args || {};
+
+      const result = await executeToolCall(toolName, args);
+
+      messages.push({ role: 'assistant', content: fullResponse });
+      messages.push({ role: 'user', content: 'Tool result: ' + result });
+    }
   }
 
   if (toolCalls >= maxToolCalls) {

package/src/main.js

@@ -1,6 +1,6 @@
 import readline from 'readline';
-import { clr } from './ui/colors.js';
-import { blocks } from './ui/blocks.js';
+import chalk from 'chalk';
+import { renderAI, renderUser, renderInfo, renderError, renderSuccess, renderWarning, divider } from './ui/blocks.js';
 import { dispatchCommand } from './commands/index.js';
 import { callProvider } from './providers/index.js';
 import { loadHistory, saveHistory, addMessage } from './core/history.js';
@@ -9,23 +9,25 @@ import { agentLoop } from './agents/loop.js';
 export async function startChat(config) {
   const history = loadHistory();
 
-  console.log(blocks.info(
-    'CLARITY-AI v' + config.version + ' interactive session started.\n' +
-    'Type /help for commands. Ctrl+C to exit.\n' +
-    'Provider: ' + config.provider + ' | Model: ' + config.model,
-    '◆ Ready ── ' + new Date().toLocaleTimeString()
+  console.log(renderSuccess(
+    'CLARITY-AI v' + config.version + ' interactive session started.  ' +
+    'Type /help for commands. Ctrl+C to exit.'
   ));
+  console.log(divider());
   console.log();
 
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
     terminal: true,
-    historySize: 100,
+    historySize: 200,
   });
 
   function showPrompt() {
-    const pre = clr.primary('❯ ') + clr.dim(config.provider + '/' + config.model) + clr.primary(' ❯ ');
+    const pre =
+      chalk.hex('#00FFFF')('\u276f ') +
+      chalk.dim(config.provider + '/' + config.model) +
+      chalk.hex('#00FFFF')(' \u276f ');
     rl.setPrompt(pre);
     rl.prompt();
   }
@@ -50,31 +52,36 @@ export async function startChat(config) {
       return;
     }
 
-    console.log('\n' + blocks.user(input) + '\n');
+    console.log();
+    console.log(renderUser(input));
+    console.log();
 
     if (config.agentMode !== false) {
       const result = await agentLoop(input, config, history);
       addMessage(history, 'user', input);
       addMessage(history, 'assistant', result);
       saveHistory(history);
-      console.log('\n' + blocks.ai(result) + '\n');
+      console.log();
+      console.log(renderAI(result));
+      console.log();
     } else {
       addMessage(history, 'user', input);
-      console.log(clr.dim('◆ Thinking...'));
+      console.log(chalk.hex('#555555')('\u25c6 Thinking...'));
 
       let fullResponse = '';
       const stream = callProvider(config, [
-        { role: 'system', content: 'You are CLARITY-AI, a helpful AI assistant.' },
+        { role: 'system', content: 'You are CLARITY-AI, a helpful AI assistant. Keep responses short and direct.' },
         ...history.slice(-10).map(m => ({ role: m.role === 'assistant' ? 'assistant' : 'user', content: m.content })),
         { role: 'user', content: input },
       ]);
 
-      process.stdout.write(clr.ai('') + ' ');
       for await (const chunk of stream) {
         fullResponse += chunk;
-        process.stdout.write(chunk);
       }
-      console.log('\n');
+
+      console.log();
+      console.log(renderAI(fullResponse));
+      console.log();
 
       addMessage(history, 'assistant', fullResponse);
       saveHistory(history);
@@ -84,7 +91,7 @@ export async function startChat(config) {
   });
 
   rl.on('SIGINT', () => {
-    console.log('\n' + blocks.info('Session ended. Goodbye.', '◆ EXIT'));
+    console.log('\n' + renderInfo('Session ended. Goodbye.'));
     process.exit(0);
   });
 }

package/src/ui/blocks.js

@@ -1,65 +1,132 @@
-// src/ui/blocks.js
 import chalk from 'chalk';
 import { clr } from './colors.js';
 import stripAnsi from 'strip-ansi';
 
-const W = process.stdout.columns || 80;
+const W = () => process.stdout.columns || 80;
 
-const BORDERS = {
-  round:  { tl:'╭', tr:'╮', bl:'╰', br:'╯', h:'─', v:'│' },
-  sharp:  { tl:'┌', tr:'┐', bl:'└', br:'┘', h:'─', v:'│' },
-  double: { tl:'╔', tr:'╗', bl:'╚', br:'╝', h:'═', v:'║' },
-  thick:  { tl:'▛', tr:'▜', bl:'▙', br:'▟', h:'▀', v:'█' },
-};
+export function renderUser(text) {
+  const w = Math.min(W(), 80);
+  const lines = String(text).split('\n');
+  const out = [];
+  out.push(chalk.hex('#9B59FF').bold('\u276f YOU ') + chalk.hex('#9B59FF')('\u2500'.repeat(Math.max(0, w - 7))));
+  for (const line of lines) {
+    const vis = stripAnsi(line).length;
+    const pad = Math.max(0, w - vis - 1);
+    out.push(chalk.hex('#C39BD3').bgHex('#2D1B4E')(line + ' '.repeat(pad)));
+  }
+  return out.join('\n');
+}
+
+export function renderAI(text) {
+  const w = Math.min(W(), 80);
+  const lines = String(text).split('\n');
+  const out = [];
+  out.push(chalk.hex('#9B59FF')('\u25c6 CLARITY ') + chalk.hex('#555555')('\u2500'.repeat(Math.max(0, w - 11))));
+  for (const line of lines) {
+    out.push(chalk.hex('#7B2FFF')('\u2502') + ' ' + chalk.white(line));
+  }
+  return out.join('\n');
+}
 
-function box(content, opts = {}) {
-  const {
-    title = '',
-    style = 'round',
-    color = '#00FFFF',
-    width = Math.min(W - 2, 78),
-    padding = 1,
-  } = opts;
+export function renderEdit(filepath, hunks) {
+  const out = [];
+  const fname = filepath.split('/').pop();
+  out.push(
+    chalk.bgHex('#1A1A2E').hex('#74B9FF').bold(' \u270e ' + fname + ' ') +
+    chalk.dim(' ' + filepath)
+  );
+  out.push(chalk.hex('#333333')('\u2500'.repeat(Math.min(W(), 80))));
+  for (const h of hunks) {
+    if (h.type === 'add') {
+      out.push(
+        chalk.hex('#00FF9F')('+') +
+        chalk.dim(String(h.lineNum).padStart(4)) +
+        ' ' +
+        chalk.hex('#00FF9F')(h.line)
+      );
+    } else if (h.type === 'remove') {
+      out.push(
+        chalk.hex('#FF4757')('-') +
+        chalk.dim(String(h.lineNum).padStart(4)) +
+        ' ' +
+        chalk.hex('#FF4757').strikethrough(h.line)
+      );
+    } else {
+      out.push(
+        chalk.dim(' ') +
+        chalk.dim(String(h.lineNum).padStart(4)) +
+        ' ' +
+        chalk.hex('#888888')(h.line)
+      );
+    }
+  }
+  return out.join('\n');
+}
 
-  const b = BORDERS[style] || BORDERS.round;
-  const colorFn = (t) => chalk.hex(color)(t);
-  const inner = width - 2;
+export function renderWrite(filepath, lineCount) {
+  const fname = filepath.split('/').pop();
+  return [
+    chalk.bgHex('#1A1A2E').hex('#00FF9F').bold(' + ' + fname + ' ') +
+    chalk.dim(' ' + filepath),
+    chalk.hex('#00FF9F')('  ' + lineCount + ' lines written'),
+  ].join('\n');
+}
 
-  const lines = String(content).split('\n');
-  const padded = lines.map(l => {
-    const vis = stripAnsi(l).length;
-    const pad = Math.max(0, inner - padding * 2 - vis);
-    return colorFn(b.v) + ' '.repeat(padding) + l + ' '.repeat(pad) + colorFn(b.v);
-  });
+export function renderTool(toolName, input, output) {
+  const out = [];
+  out.push(chalk.hex('#FFD700')('\u2699 ') + chalk.hex('#FFD700').bold(toolName) + chalk.dim(' \u00b7 ' + String(input).slice(0, 60)));
+  if (output) {
+    const lines = String(output).split('\n').slice(0, 8);
+    for (const l of lines) {
+      out.push(chalk.dim('  \u2502 ') + chalk.hex('#AAAAAA')(l));
+    }
+    if (String(output).split('\n').length > 8) {
+      out.push(chalk.dim('  \u2502 ...'));
+    }
+  }
+  return out.join('\n');
+}
 
-  const titleStr = title
-    ? colorFn(b.h).repeat(2) + ' ' + chalk.bold(title) + ' ' + colorFn(b.h).repeat(Math.max(0, inner - title.length - 4))
-    : colorFn(b.h).repeat(inner);
+export function renderInfo(msg) {
+  return chalk.hex('#54A0FF')('\u2139 ') + chalk.hex('#54A0FF')(msg);
+}
 
-  const top    = colorFn(b.tl) + titleStr + colorFn(b.tr);
-  const bottom = colorFn(b.bl) + colorFn(b.h).repeat(inner) + colorFn(b.br);
+export function renderError(msg) {
+  return chalk.hex('#FF4757')('\u2716 ') + chalk.hex('#FF4757')(msg);
+}
+
+export function renderSuccess(msg) {
+  return chalk.hex('#00FF9F')('\u2714 ') + chalk.hex('#00FF9F')(msg);
+}
+
+export function renderWarning(msg) {
+  return chalk.hex('#FFB800')('\u26a0 ') + chalk.hex('#FFB800')(msg);
+}
+
+export function divider() {
+  return chalk.hex('#333333')('\u2500'.repeat(Math.min(process.stdout.columns || 80, 80)));
+}
 
-  return [top, ...padded, bottom].join('\n');
+export function renderPromptPrefix(provider, model) {
+  return (
+    chalk.hex('#00FFFF')('\u276f ') +
+    chalk.dim(provider + '/' + model) +
+    chalk.hex('#00FFFF')(' \u276f ')
+  );
 }
 
-// 12 named block types
 export const blocks = {
-  info:     (msg, title) => box(clr.info(msg),    { title: title || 'ℹ INFO',    color: '#54A0FF', style: 'round'  }),
-  success:  (msg, title) => box(clr.success(msg), { title: title || '✔ SUCCESS', color: '#00FF9F', style: 'round'  }),
-  warning:  (msg, title) => box(clr.warning(msg), { title: title || '⚠ WARNING', color: '#FFB800', style: 'sharp'  }),
-  error:    (msg, title) => box(clr.error(msg),   { title: title || '✖ ERROR',   color: '#FF4757', style: 'sharp'  }),
-  code:     (msg, title) => box(chalk.hex('#E8E8E8')(msg), { title: title || '◆ CODE', color: '#9B59FF', style: 'sharp' }),
-  file:     (msg, title) => box(clr.filepath(msg),{ title: title || '📄 FILE',   color: '#74B9FF', style: 'round'  }),
-  ai:       (msg, title) => box(clr.ai(msg),      { title: title || '◆ CLARITY', color: '#9B59FF', style: 'round'  }),
-  user:     (msg, title) => box(clr.user(msg),    { title: title || '❯ YOU',     color: '#00FFFF', style: 'round'  }),
-  tool:     (msg, title) => box(clr.tool(msg),    { title: title || '⚙ TOOL',    color: '#00FF9F', style: 'double' }),
-  task:     (msg, title) => box(clr.gold(msg),    { title: title || '▶ TASK',    color: '#FFD700', style: 'double' }),
-  divider:  ()           => clr.muted('─'.repeat(Math.min(W, 80))),
-  progress: (pct, label) => {
-    const filled = Math.round(pct / 100 * 30);
-    const bar = chalk.hex('#00FFFF')('█'.repeat(filled)) + chalk.gray('░'.repeat(30 - filled));
-    return `[${bar}] ${chalk.bold(pct + '%')} ${label || ''}`;
-  },
+  ai:       renderAI,
+  user:     renderUser,
+  info:     (msg) => renderInfo(msg),
+  error:    (msg) => renderError(msg),
+  success:  (msg) => renderSuccess(msg),
+  warning:  (msg) => renderWarning(msg),
+  divider,
+  edit:     renderEdit,
+  write:    renderWrite,
+  tool:     renderTool,
+  task:     (msg) => chalk.hex('#FFD700')('\u25b6 ') + chalk.hex('#FFD700')(msg),
 };
 
 export default blocks;

package/src/ui/input.js

@@ -1,60 +1,29 @@
 import readline from 'readline';
 import chalk from 'chalk';
-import { clr } from './colors.js';
 
-export function createPrompt(config) {
+export function createInput(config) {
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
     terminal: true,
-    historySize: 100,
-  });
-
-  const promptStr = clr.primary('❯ ') + clr.dim(config.provider + '/' + config.model) + clr.primary(' ❯ ');
-
-  rl.on('SIGINT', () => {
-    process.stdout.write('\n');
-    process.exit(0);
+    historySize: 200,
   });
 
   process.stdin.on('keypress', (str, key) => {
-    if (key.ctrl && key.name === 'd') {
-      process.stdout.write('\n');
-      process.exit(0);
-    }
-    if (key.ctrl && key.name === 'l') {
-      console.clear();
-      return rl._refreshLine();
-    }
-    if (key.ctrl && key.name === 'u') {
-      const pos = rl.cursor;
-      rl.line = rl.line.slice(pos);
-      rl.cursor = 0;
-      return rl._refreshLine();
-    }
-    if (key.ctrl && key.name === 'a') {
-      rl.cursor = 0;
-      return rl._refreshLine();
-    }
-    if (key.ctrl && key.name === 'e') {
-      rl.cursor = rl.line.length;
-      return rl._refreshLine();
-    }
-    if (key.ctrl && key.name === 'k') {
-      rl.line = rl.line.slice(0, rl.cursor);
-      return rl._refreshLine();
-    }
-    if (key.ctrl && key.name === 'w') {
-      const before = rl.line.slice(0, rl.cursor);
-      const after = rl.line.slice(rl.cursor);
-      const trimmed = before.replace(/\S+\s*$/, '');
-      rl.line = trimmed + after;
-      rl.cursor = trimmed.length;
-      return rl._refreshLine();
+    if (key && key.ctrl && key.name === 'l') {
+      process.stdout.write('\x1Bc');
+      process.stdout.write(chalk.hex('#00FFFF').bold('\n  CLARITY v3.0\n\n'));
+      rl.prompt();
     }
   });
 
-  rl.setPrompt(promptStr);
-
   return rl;
 }
+
+export function getPromptString(provider, model) {
+  return (
+    chalk.hex('#00FFFF')('\u276f ') +
+    chalk.dim(provider + '/' + model) +
+    chalk.hex('#00FFFF')(' \u276f ')
+  );
+}