clarity-ai 4.3.0 → 4.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-ai",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "Premium terminal AI agent for Termux — OpenCode-style UI, streaming, markdown, tools, agent mode",
   "type": "module",
   "bin": {

package/src/chat.js

@@ -3,6 +3,8 @@ import { setKey } from './config/keys.js';
 import { TOOLS, executeTool } from './tools.js';
 import { extractCommandFromText } from './intentDetect.js';
 
+const sleep = ms => new Promise(r => setTimeout(r, ms));
+
 export function createChatState() {
   return {
     messages: [],
@@ -26,10 +28,23 @@ export async function handleSend(state, setState, input, model, provider) {
   setState(s => ({ ...s, messages: [...s.messages, userMsg], thinking: true, streamBuffer: '' }));
 
   try {
-    const history = [...state.messages, userMsg].map(m => ({
-      role: m.role === 'error' ? 'assistant' : m.role,
-      content: m.content,
-    }));
+    const history = [...state.messages, userMsg].map(m => {
+      const base = {
+        role: m.role === 'error' ? 'assistant' : m.role,
+        content: m.content,
+      };
+      if (m.role === 'tool' && m.tool_call_id) {
+        base.tool_call_id = m.tool_call_id;
+      }
+      if (m.role === 'assistant' && m.toolCalls) {
+        base.tool_calls = m.toolCalls.map(tc => ({
+          id: tc.id,
+          type: 'function',
+          function: { name: tc.function.name, arguments: tc.function.arguments },
+        }));
+      }
+      return base;
+    });
 
     await processStream(provider, model, history, state.agentMode, setState);
   } catch (err) {
@@ -50,48 +65,62 @@ async function processStream(provider, model, history, agentMode, setState, dept
     return;
   }
 
-  const stream = callAI(provider, model, history, { tools: agentMode ? TOOLS : undefined });
+  let stream;
+  try {
+    stream = callAI(provider, model, history, { tools: agentMode ? TOOLS : undefined });
+  } catch (err) {
+    if (err.type === 'rate_limit') {
+      await sleep(2000);
+      return processStream(provider, model, history, agentMode, setState, depth);
+    }
+    throw err;
+  }
+
   let buffer = '';
   let toolCalls = null;
 
-  for await (const event of stream) {
-    if (event.type === 'token') {
-      buffer += event.content;
-      setState(s => ({
-        ...s,
-        streamBuffer: buffer,
-        messages: updateLastAssistant(s.messages, buffer),
-      }));
-    } else if (event.type === 'tool_calls') {
-      toolCalls = event.calls;
-    } else if (event.type === 'error') {
-      handleError(setState, event);
-      return;
+  try {
+    for await (const event of stream) {
+      if (event.type === 'token') {
+        buffer += event.content;
+        setState(s => ({
+          ...s,
+          streamBuffer: buffer,
+          messages: updateLastAssistant(s.messages, buffer),
+        }));
+      } else if (event.type === 'tool_calls') {
+        toolCalls = event.calls;
+      } else if (event.type === 'error') {
+        handleError(setState, event);
+        return;
+      }
+    }
+  } catch (err) {
+    if (err.type === 'rate_limit') {
+      await sleep(2000);
+      return processStream(provider, model, history, agentMode, setState, depth);
     }
+    throw err;
   }
 
   if (toolCalls && toolCalls.length > 0 && agentMode) {
-    const assistantMsg = { id: nextId(), role: 'assistant', content: buffer || '', toolCalls };
     const toolResults = [];
-
     for (const tc of toolCalls) {
       const { name, arguments: argsStr } = tc.function;
       let args;
-      try {
-        args = JSON.parse(argsStr);
-      } catch {
-        args = {};
-      }
-
-      setState(s => ({
-        ...s,
-        messages: [...s.messages, { id: nextId(), role: 'tool', content: '⚙ ' + name + '(' + JSON.stringify(args).slice(0, 100) + ')...', toolName: name }],
-      }));
-
+      try { args = JSON.parse(argsStr); } catch { args = {}; }
       const result = await executeTool(name, args);
-      toolResults.push({ tool_call_id: tc.id, role: 'tool', content: result });
+      toolResults.push({ tool_call_id: tc.id, role: 'tool', content: result, name });
     }
 
+    const newAssistantMsg = { id: nextId(), role: 'assistant', content: buffer || '', toolCalls };
+    const toolMsgs = toolResults.map(tr => ({
+      id: nextId(), role: 'tool', content: tr.content,
+      tool_call_id: tr.tool_call_id, toolName: tr.name,
+    }));
+
+    setState(s => ({ ...s, messages: [...s.messages, newAssistantMsg, ...toolMsgs] }));
+
     const newHistory = [
       ...history,
       { role: 'assistant', content: buffer || null, tool_calls: toolCalls.map(tc => ({