openaxies 1.0.3 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openaxies",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "private": false,
   "type": "module",
   "bin": {

package/src/App.js

@@ -7,7 +7,7 @@ import { callModel } from './providers/index.js';
 
 const h = React.createElement;
 
-const LOGO = [
+const STARTUP = [
   '  \u2588\u2588\u2588\u2588\u2588\u2588\u2557',
   ' \u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557',
   ' \u2588\u2588\u2551   \u2588\u2588\u2551',
@@ -15,13 +15,13 @@ const LOGO = [
   ' \u255a\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255d',
 ];
 
-const COMMANDS = [
-  { id: 'model', trigger: '/model', desc: 'Switch model' },
-  { id: 'thoughts', trigger: '/thoughts', desc: 'Toggle thinking' },
-  { id: 'resume', trigger: '/resume', desc: 'Re-run last query' },
-  { id: 'clear', trigger: '/clear', desc: 'Clear conversation' },
-  { id: 'help', trigger: '/help', desc: 'Show commands' },
-  { id: 'exit', trigger: '/exit', desc: 'Quit' },
+const CMDS = [
+  { id: 'model', t: '/model', d: 'Switch model' },
+  { id: 'thoughts', t: '/thoughts', d: 'Toggle thinking' },
+  { id: 'resume', t: '/resume', d: 'Re-run last query' },
+  { id: 'clear', t: '/clear', d: 'Clear conversation' },
+  { id: 'help', t: '/help', d: 'Show commands' },
+  { id: 'exit', t: '/exit', d: 'Quit' },
 ];
 
 export default function AppRoot() {
@@ -29,304 +29,306 @@ export default function AppRoot() {
   const { exit } = useApp();
   const cols = stdout.columns || 80;
   const rows = stdout.rows || 24;
-
-  const [messages, setMessages] = React.useState([]);
-  const [activeModel, setActiveModel] = React.useState(DEFAULT_MODEL_ID);
-  const [input, setInput] = React.useState('');
-  const [streaming, setStreaming] = React.useState(false);
-  const [streamText, setStreamText] = React.useState('');
-  const [thinkingActive, setThinkingActive] = React.useState(false);
-  const [thinkingText, setThinkingText] = React.useState('');
-  const [thinkTime, setThinkTime] = React.useState(0);
-  const [startupDone, setStartupDone] = React.useState(false);
-  const [showOverlay, setShowOverlay] = React.useState(false);
-  const [overlayIdx, setOverlayIdx] = React.useState(0);
-  const [showThought, setShowThought] = React.useState(true);
-  const [toolEv, setToolEv] = React.useState(null);
-
-  const abortRef = React.useRef(null);
-  const accumRef = React.useRef('');
-  const lastQRef = React.useRef('');
+  const WID = Math.min(cols - 4, 56);
+
+  const [msgs, setMsgs] = React.useState([]);
+  const [model, setModel] = React.useState(DEFAULT_MODEL_ID);
+  const [inp, setInp] = React.useState('');
+  const [busy, setBusy] = React.useState(false);
+  const [stream, setStream] = React.useState('');
+  const [think, setThink] = React.useState(false);
+  const [thinkTxt, setThinkTxt] = React.useState('');
+  const [thinkSec, setThinkSec] = React.useState(0);
+  const [ready, setReady] = React.useState(false);
+  const [overlay, setOverlay] = React.useState(false);
+  const [ovIdx, setOvIdx] = React.useState(0);
+  const [showT, setShowT] = React.useState(true);
+  const [tool, setTool] = React.useState(null);
+  const [pendingQ, setPendingQ] = React.useState(false);
+  const [qText, setQText] = React.useState('');
+  const [todos, setTodos] = React.useState([]);
+  const [toolCalls, setToolCalls] = React.useState([]);
+
+  const acRef = React.useRef(null);
+  const accRef = React.useRef('');
+  const lastRef = React.useRef('');
+  const qResolveRef = React.useRef(null);
+  const genRef = React.useRef(null);
 
   React.useEffect(() => {
-    if (!thinkingActive) return;
-    const t = setInterval(() => setThinkTime(p => p + 0.1), 100);
+    if (!think) return;
+    const t = setInterval(() => setThinkSec(p => p + 0.1), 100);
     return () => clearInterval(t);
-  }, [thinkingActive]);
-
-  const model = getModelById(activeModel);
-  const label = model ? model.label.replace('OpenAxies ', '') : 'llama';
-  const W = Math.min(cols - 4, 56);
-
-  function strip(t) {
-    return showThought ? t : t.split('<think>').join('').split('</think>').join('');
+  }, [think]);
+
+  const mi = getModelById(model);
+  const label = mi ? mi.label.replace('OpenAxies ', '') : 'llama';
+
+  function strip(s) { return showT ? s : s.split('<think>').join('').split('</think>').join(''); }
+
+  function headBox() {
+    const R = '\u2502';
+    const D = '\u2500';
+    const W = WID;
+    const hd = function (s) { return R + ' ' + s + ' '.repeat(Math.max(0, W - s.length)) + ' ' + R; };
+    return h(Box, { flexShrink: 0, flexDirection: 'column', paddingLeft: 1, paddingRight: 1 },
+      h(Text, { color: '#555577' }, '\u250C' + D.repeat(W + 2) + '\u2510'),
+      h(Text, { color: '#555577' }, hd('\u203A_ OpenAxies (v1.1.0)')),
+      h(Text, { color: '#555577' }, hd('')),
+      h(Text, { color: '#555577' }, hd('model:     ' + label + '   /model to change')),
+      h(Text, { color: '#555577' }, hd('directory: ~')),
+      h(Text, { color: '#555577' }, '\u2514' + D.repeat(W + 2) + '\u2518'),
+    );
   }
 
-  async function handleSubmit(text) {
-    const s = typeof text === 'string' ? text.trim() : '';
-    if (!s || streaming) return;
-    setStartupDone(true);
-    lastQRef.current = s;
-    accumRef.current = '';
-    setStreaming(true);
-    setStreamText('');
-    setThinkingText('');
-    setThinkTime(0);
-    setToolEv(null);
-    setMessages(p => [...p, { role: 'user', content: s }]);
-    setInput('');
-
-    const m = getModelById(activeModel);
-    if (!m) { setMessages(p => [...p, { role: 'assistant', content: 'No model loaded.' }]); setStreaming(false); return; }
-
+  async function submit(s) {
+    const t = typeof s === 'string' ? s.trim() : '';
+    if (!t || busy) return;
+    setReady(true); lastRef.current = t; accRef.current = '';
+    setBusy(true); setStream(''); setThinkTxt(''); setThinkSec(0); setTool(null);
+    setToolCalls([]);
+    setMsgs(p => [...p, { role: 'user', c: t }]);
+    setInp('');
+
+    const m = getModelById(model);
+    if (!m) { setMsgs(p => [...p, { role: 'asst', c: 'No model loaded.' }]); setBusy(false); return; }
     const ac = new AbortController();
-    abortRef.current = ac;
-    let thinkOpen = false;
+    acRef.current = ac;
+    let op = false;
 
     try {
-      const history = messages.map(msg => ({
-        role: msg.role === 'user' ? 'user' : 'assistant',
-        content: msg.content || '',
-      }));
-      history.push({ role: 'user', content: s });
-
-      for await (const ev of callModel({ id: activeModel }, history, ac.signal)) {
-        if (ac.signal.aborted) break;
-
-        if (ev.type === 'tool') {
-          setToolEv({ tool: ev.tool, query: ev.query, sites: ev.sites });
+      const hist = msgs.map(x => ({ role: x.role === 'user' ? 'user' : 'assistant', content: x.c || '' }));
+      hist.push({ role: 'user', content: t });
+
+      const gen = callModel({ id: model }, hist, ac.signal);
+      genRef.current = gen;
+      let result = await gen.next();
+
+      while (!result.done && !ac.signal.aborted) {
+        const ev = result.value;
+        if (ev.type === 'question') {
+          setPendingQ(true); setQText(ev.text);
+          const answer = await new Promise(resolve => { qResolveRef.current = resolve; });
+          setPendingQ(false); setQText('');
+          result = await gen.next(answer);
           continue;
         }
-
-        if (ev.type === 'token' || ev.type === 'thinking') {
+        if (ev.type === 'tool_call') {
+          setToolCalls(p => [...p, { tool: ev.tool, args: ev.args }]);
+          setTool({ tool: ev.tool, query: ev.args?.query || '', sites: 0 });
+          result = await gen.next();
+          continue;
+        }
+        if (ev.type === 'tool_result') {
+          setToolCalls(p => [...p, { tool: ev.tool, result: ev.result, done: true }]);
+          result = await gen.next();
+          continue;
+        }
+        if (ev.type === 'todo_add') {
+          setTodos(p => [...p, { text: ev.text, status: 'pending' }]);
+          result = await gen.next();
+          continue;
+        }
+        if (ev.type === 'todo_done') {
+          setTodos(p => p.map((td, i) => i === ev.id ? { ...td, status: 'done' } : td));
+          result = await gen.next();
+          continue;
+        }
+        if (ev.type === 'token') {
           const c = typeof ev.content === 'string' ? ev.content : '';
-          if (!c) continue;
-          if (c.includes('<think>')) thinkOpen = true;
-          accumRef.current += c;
-          const clean = strip(accumRef.current);
-          if (thinkOpen || accumRef.current.includes('<think>')) {
-            const still = thinkOpen || !accumRef.current.includes('</think>');
-            if (still) {
-              setThinkingActive(true);
-              setThinkingText(clean);
-              setStreamText('');
-            } else {
-              thinkOpen = false;
-              setThinkingActive(false);
-              setStreamText(clean);
-              setThinkingText('');
-            }
-          } else {
-            setStreamText(clean);
-          }
+          if (!c) { result = await gen.next(); continue; }
+          if (c.includes('<think>')) op = true;
+          accRef.current += c;
+          const cl = strip(accRef.current);
+          if (op || accRef.current.includes('<think>')) {
+            const st = op || !accRef.current.includes('</think>');
+            if (st) { setThink(true); setThinkTxt(cl); setStream(''); }
+            else { op = false; setThink(false); setStream(cl); setThinkTxt(''); }
+          } else setStream(cl);
+          result = await gen.next();
+          continue;
         }
         if (ev.type === 'done' || ev.type === 'timeout') {
-          if (ev.type === 'timeout' && accumRef.current) accumRef.current += '\n\u2014timed out\u2014';
+          if (ev.type === 'timeout' && accRef.current) accRef.current += '\n\u2014timed out\u2014';
           break;
         }
+        result = await gen.next();
       }
-    } catch (err) {
-      if (!ac.signal.aborted) setMessages(p => [...p, { role: 'assistant', content: 'Error: ' + (err.message || 'connection failed') }]);
+    } catch (e) {
+      if (!ac.signal.aborted) setMsgs(p => [...p, { role: 'asst', c: 'Error: ' + (e.message || 'connection') }]);
     } finally {
-      setStreaming(false);
-      setThinkingActive(false);
-      abortRef.current = null;
-      const final = accumRef.current;
-      if (final) setMessages(p => [...p, { role: 'assistant', content: strip(final) }]);
-      setStreamText('');
-      setThinkingText('');
+      setBusy(false); setThink(false); setPendingQ(false);
+      acRef.current = null; genRef.current = null;
+      const f = accRef.current;
+      if (f) setMsgs(p => [...p, { role: 'asst', c: strip(f) }]);
+      setStream(''); setThinkTxt('');
     }
   }
 
-  function cycleModel() {
-    const models = getModels();
-    setActiveModel(p => {
-      let f = false;
-      for (const m of models) { if (f) return m.id; if (m.id === p) f = true; }
-      return models[0].id;
-    });
+  function cycle() {
+    const ms = getModels();
+    setModel(p => { let f = false; for (const m of ms) { if (f) return m.id; if (m.id === p) f = true; } return ms[0].id; });
   }
 
-  function execCmd(item) {
+  function cmd(item) {
     if (!item) return;
-    const t = item.trigger;
-    if (t === '/exit') { exit(); return; }
-    if (t === '/clear') setMessages([]);
-    if (t === '/model') cycleModel();
-    if (t === '/thoughts') setShowThought(p => !p);
-    if (t === '/resume') { const q = lastQRef.current; if (q && !streaming) handleSubmit(q); return; }
-    if (t === '/help') setMessages(p => [...p, { role: 'assistant', content: 'Commands: /help /clear /model /thoughts /resume /exit' }]);
-    setInput(''); setShowOverlay(false); setOverlayIdx(0);
+    if (item.t === '/exit') { exit(); return; }
+    if (item.t === '/clear') { setMsgs([]); setTodos([]); }
+    if (item.t === '/model') cycle();
+    if (item.t === '/thoughts') setShowT(p => !p);
+    if (item.t === '/resume') { const q = lastRef.current; if (q && !busy) submit(q); return; }
+    if (item.t === '/help') setMsgs(p => [...p, { role: 'asst', c: 'Commands: /help /clear /model /thoughts /resume /exit' }]);
+    setInp(''); setOverlay(false); setOvIdx(0);
   }
 
-  useInput((inp, key) => {
-    if (showOverlay) {
-      if (key.escape) { setShowOverlay(false); setInput(''); setOverlayIdx(0); return; }
-      if (key.upArrow) { setOverlayIdx(p => p > 0 ? p - 1 : COMMANDS.length - 1); return; }
-      if (key.downArrow) { setOverlayIdx(p => p < COMMANDS.length - 1 ? p + 1 : 0); return; }
-      if (key.return) { execCmd(COMMANDS[overlayIdx]); return; }
-      return;
-    }
-    if (!startupDone && !streaming) {
-      if (key.return) { setStartupDone(true); setInput(''); return; }
+  useInput((i, k) => {
+    if (k.ctrl && (i === 'c' || i === 'C')) { exit(); return; }
+    if (k.escape && pendingQ) {
+      if (acRef.current) acRef.current.abort();
+      setPendingQ(false); setQText(''); setBusy(false); setStream(''); setThink(false);
       return;
     }
-    if (key.escape && streaming) {
-      if (abortRef.current) abortRef.current.abort();
-      setStreaming(false); setStreamText(''); setThinkingActive(false);
+    if (pendingQ) return;
+    if (overlay) {
+      if (k.escape) { setOverlay(false); setInp(''); setOvIdx(0); return; }
+      if (k.upArrow) setOvIdx(p => p > 0 ? p - 1 : CMDS.length - 1);
+      if (k.downArrow) setOvIdx(p => p < CMDS.length - 1 ? p + 1 : 0);
+      if (k.return) cmd(CMDS[ovIdx]);
       return;
     }
-    if (key.ctrl) {
-      if (inp === 'c' || inp === 'C') { exit(); return; }
-      if (inp === 't' || inp === 'T') { setShowThought(p => !p); return; }
-      if (inp === 'p' || inp === 'P') { cycleModel(); return; }
-      if (inp === 'r' || inp === 'R') { const q = lastQRef.current; if (q && !streaming) handleSubmit(q); return; }
-      if (inp === 'l' || inp === 'L') { setMessages([]); return; }
-      if (inp === 'k' || inp === 'K') { setInput('/'); setShowOverlay(true); setOverlayIdx(0); return; }
+    if (!ready && !busy) { if (k.return) { setReady(true); setInp(''); } return; }
+    if (k.escape && busy) { if (acRef.current) acRef.current.abort(); setBusy(false); setStream(''); setThink(false); setPendingQ(false); return; }
+    if (k.ctrl) {
+      if (i === 'c' || i === 'C') { exit(); return; }
+      if (i === 't' || i === 'T') { setShowT(p => !p); return; }
+      if (i === 'p' || i === 'P') { cycle(); return; }
+      if (i === 'r' || i === 'R') { const q = lastRef.current; if (q && !busy) submit(q); return; }
+      if (i === 'l' || i === 'L') { setMsgs([]); setTodos([]); return; }
+      if (i === 'k' || i === 'K') { setInp('/'); setOverlay(true); setOvIdx(0); return; }
     }
   });
 
-  // Build entries
-  const entries = [];
-  for (const msg of messages) {
-    if (msg.role === 'user' || msg.role === 'assistant') entries.push(msg);
-  }
-
-  if (toolEv && streaming) entries.push({ role: 'tool', tool: toolEv.tool, query: toolEv.query, sites: toolEv.sites });
-  if (thinkingActive && thinkingText) entries.push({ role: 'thought', content: thinkingText, time: thinkTime.toFixed(1) + 's' });
-  if (streaming && streamText && !thinkingActive) entries.push({ role: 'ongoing', content: streamText });
-
-  const MAX_CHAT = Math.max(3, rows - 10);
-  const vis = entries.slice(-MAX_CHAT);
-
-  // Startup screen
-  if (!startupDone && messages.length === 0) {
+  // Startup
+  if (!ready && msgs.length === 0) {
     return h(Box, { flexDirection: 'column', width: '100%', height: rows, overflow: 'hidden' },
-      h(Box, { height: 2 }),
-      ...LOGO.map((l, i) => h(Box, { key: 'l' + i, height: 1, paddingLeft: 2 },
-        h(Text, { color: '#00BBFF', bold: true }, l)
-      )),
+      h(Box, { height: 3 }),
+      ...STARTUP.map((l, i) => h(Box, { key: 'l' + i, height: 1, paddingLeft: 2 }, h(Text, { color: '#00BBFF', bold: true }, l))),
       h(Box, { height: 1 }),
       h(Box, { height: 1, paddingLeft: 2 }, h(Text, { color: '#FFFFFF', bold: true }, 'OpenAxies')),
-      h(Box, { height: 1, paddingLeft: 2 }, h(Text, { color: '#777788' }, 'local agent')),
+      h(Box, { height: 1, paddingLeft: 2 }, h(Text, { color: '#777788' }, 'autonomous agent')),
       h(Box, { height: 2 }),
       h(Box, { height: 1, paddingLeft: 2 }, h(Text, { color: '#555577' }, 'Press Enter to begin')),
       h(Box, { flexGrow: 1 }),
-      h(Box, { height: 1, paddingLeft: 2 }, h(Text, { color: '#333344' }, 'esc interrupt     ctrl+p models     /help')),
+      h(Box, { height: 1, paddingLeft: 2 }, h(Text, { color: '#333344' }, 'esc quit    ctrl+p models    /help')),
     );
   }
 
-  // Bordered header
-  const borderT = '\u250C' + '\u2500'.repeat(W + 2) + '\u2510';
-  const borderB = '\u2514' + '\u2500'.repeat(W + 2) + '\u2518';
-  const pad = '\u2502' + ' '.repeat(W + 2) + '\u2502';
-
-  function brdr(line) {
-    return '\u2502 ' + line + ' '.repeat(Math.max(0, W + 1 - line.length)) + '\u2502';
+  // Build entries
+  const entries = [];
+  for (const m of msgs) {
+    if (m.role === 'user') entries.push({ t: 'user', c: m.c });
+    else if (m.role === 'asst') entries.push({ t: 'asst', c: m.c });
   }
-
-  // Logo combined with info text
-  const line1 = brdr('  ' + LOGO[0] + '   OpenAxies');
-  const line2 = brdr(' ' + LOGO[1] + '  model: ' + label);
-  const line3 = brdr(' ' + LOGO[2] + '  dir:   ~');
-  const line4 = brdr(' ' + LOGO[3] + '  cmds:  /model /help /exit');
-  const line5 = brdr(' ' + LOGO[4]);
-
-  const header = h(Box, { flexShrink: 0, flexDirection: 'column', paddingLeft: 1, paddingRight: 1 },
-    h(Text, { color: '#555577' }, borderT),
-    h(Text, { color: '#555577' }, pad),
-    h(Text, { color: '#555577' }, line1),
-    h(Text, { color: '#555577' }, line2),
-    h(Text, { color: '#555577' }, line3),
-    h(Text, { color: '#555577' }, line4),
-    h(Text, { color: '#555577' }, line5),
-    h(Text, { color: '#555577' }, pad),
-    h(Text, { color: '#555577' }, borderB),
-  );
-
-  // Overlay
-  if (showOverlay) {
-    vis.unshift({ role: '_ocmd', idx: overlayIdx });
+  for (const tc of toolCalls) {
+    if (tc.done) entries.push({ t: 'tool', tool: tc.tool, result: tc.result });
   }
-
-  // Empty state
-  if (vis.length === 0) {
-    vis.push({ role: '_sep' });
-    vis.push({ role: '_idle' });
+  if (tool && busy) entries.push({ t: 'tool', tool: tool.tool, q: tool.query, sites: tool.sites });
+  for (const td of todos) {
+    entries.push({ t: 'todo', text: td.text, status: td.status });
   }
+  if (think && thinkTxt) entries.push({ t: 'thought', c: thinkTxt, sec: thinkSec.toFixed(1) + 's' });
+  if (busy && stream && !think) entries.push({ t: 'asst', c: stream });
+  if (pendingQ) entries.push({ t: 'question', c: qText });
+  if (overlay) entries.push({ t: '_ov', idx: ovIdx });
+
+  const maxChat = Math.max(3, rows - 7);
+  const vis = entries.slice(-maxChat);
 
-  // Render entries
-  const els = [];
+  // Render chat
+  const chEls = [];
   for (let i = 0; i < vis.length; i++) {
     const e = vis[i];
     const k = 'e' + i;
-
-    if (e.role === '_idle') {
-      els.push(h(Box, { key: k, height: 1, paddingLeft: 2 }, h(Text, { color: '#00FF88', bold: true }, '\u25CB Ready')));
-    } else if (e.role === '_ocmd') {
-      els.push(h(Box, { key: k + 'h', height: 1, paddingLeft: 2 }, h(Text, { color: '#888899', bold: true }, 'Commands:')));
-      for (let ci = 0; ci < COMMANDS.length; ci++) {
-        const c = COMMANDS[ci];
-        const sel = ci === e.idx;
-        els.push(h(Box, { key: k + 'c' + ci, height: 1, paddingLeft: 3 },
-          h(Text, { color: sel ? hex.neonBlue : '#666688' }, (sel ? '\u276F ' : '  ') + c.trigger),
-          h(Text, { color: '#444466' }, '  ' + (c.desc || ''))
+    if (e.t === '_ov') {
+      chEls.push(h(Box, { key: k + 'h', height: 1, paddingLeft: 2 }, h(Text, { color: '#888899', bold: true }, 'Commands:')));
+      for (let ci = 0; ci < CMDS.length; ci++) {
+        const c = CMDS[ci]; const sel = ci === e.idx;
+        chEls.push(h(Box, { key: k + 'c' + ci, height: 1, paddingLeft: 3 },
+          h(Text, { color: sel ? hex.neonBlue : '#666688' }, (sel ? '\u276F ' : '  ') + c.t),
+          h(Text, { color: '#444466' }, '  ' + (c.d || ''))
         ));
       }
-    } else if (e.role === 'user') {
-      els.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
+    } else if (e.t === 'user') {
+      chEls.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
         h(Text, { color: '#888899' }, '\u203A '),
-        h(Text, { color: hex.neonBlue, wrap: 'wrap' }, e.content),
+        h(Text, { color: hex.neonBlue, wrap: 'wrap' }, e.c),
       ));
-    } else if (e.role === 'assistant' || e.role === 'ongoing') {
-      els.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
+    } else if (e.t === 'asst') {
+      chEls.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
         h(Text, { color: '#88FF88' }, '\u2022 '),
-        h(Text, { color: '#FFFFFF', wrap: 'wrap' }, e.content),
+        h(Text, { color: '#FFFFFF', wrap: 'wrap' }, e.c),
       ));
-    } else if (e.role === 'thought') {
-      els.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
-        h(Text, { color: '#FF9F43', bold: true }, '\u2022 Thinking \u2022 ' + e.time),
+    } else if (e.t === 'todo') {
+      const mark = e.status === 'done' ? '\u2713' : '\u25A1';
+      const color = e.status === 'done' ? '#44AA44' : '#888899';
+      chEls.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
+        h(Text, { color: color }, '\u2022 ' + mark + ' ' + e.text),
       ));
-      if (e.content) {
-        els.push(h(Box, { key: k + 'c', height: 1, paddingLeft: 4 },
-          h(Text, { color: '#FF9F43', wrap: 'wrap' }, e.content),
-        ));
-      }
-    } else if (e.role === 'tool') {
-      els.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
-        h(Text, { color: '#5B5B8A' }, '\u2022 ' + (e.tool || 'tool') + (e.query ? ' "' + e.query + '"' : '') + (e.sites ? ' (' + e.sites + ' sites)' : '')),
+    } else if (e.t === 'thought') {
+      chEls.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
+        h(Text, { color: '#FF9F43', bold: true }, '\u2022 Thinking \u2022 ' + e.sec),
+      ));
+      if (e.c) chEls.push(h(Box, { key: k + 'c', height: 1, paddingLeft: 4 }, h(Text, { color: '#FF9F43', wrap: 'wrap' }, e.c)));
+    } else if (e.t === 'tool') {
+      chEls.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
+        h(Text, { color: '#5B5B8A' }, '\u2022 ' + (e.tool || 'tool') + (e.q ? ' ' + e.q : '') + (e.sites ? ' (' + e.sites + ' sites)' : '') + (e.result ? ' \u2713' : ' \u2026')),
+      ));
+    } else if (e.t === 'question') {
+      chEls.push(h(Box, { key: k, height: 1, paddingLeft: 2 },
+        h(Text, { color: '#FFD700' }, '\u2753 '),
+        h(Text, { color: '#FFD700', wrap: 'wrap' }, e.c),
       ));
     }
   }
 
-  const chat = h(Box, { flexGrow: 1, flexDirection: 'column', overflow: 'hidden' }, ...els);
+  if (chEls.length === 0) {
+    chEls.push(h(Box, { key: 'idle', height: 1, paddingLeft: 2 }, h(Text, { color: '#666688' }, '\u203A Ask me anything')));
+  }
 
-  // Input
-  const inputLine = h(Box, { height: 1, flexShrink: 0, paddingLeft: 2, paddingRight: 2 },
-    h(Text, { color: '#888899' }, '\u203A '),
-    h(Text, { color: hex.greenOnline }, '\u258C'),
+  const chatArea = h(Box, { flexGrow: 1, flexDirection: 'column', overflow: 'hidden' }, ...chEls);
+
+  // Input line
+  const inputBar = h(Box, { height: 1, flexShrink: 0, paddingLeft: 2, paddingRight: 2 },
+    h(Text, { color: pendingQ ? '#FFD700' : '#888899' }, pendingQ ? '\u2753 ' : '\u203A '),
+    pendingQ ? h(Text, { color: '#FFFFFF' }, '\u258C') : h(Text, { color: hex.greenOnline }, '\u258C'),
     h(Box, { width: 1 }),
     h(TextInput, {
-      value: input,
-      onChange: setInput,
-      onSubmit: v => { if (typeof v === 'string' && v.trim() && !streaming) handleSubmit(v); },
-      placeholder: '',
-      focus: !showOverlay,
-      showCursor: true,
-    })
+      value: inp,
+      onChange: setInp,
+      onSubmit: v => {
+        if (pendingQ && qResolveRef.current) {
+          qResolveRef.current(v);
+          setInp('');
+          return;
+        }
+        if (typeof v === 'string' && v.trim() && !busy) submit(v);
+      },
+      placeholder: pendingQ ? '' : '',
+      focus: !overlay,
+    }),
   );
 
-  // Footer bar
+  // Footer
   const footer = h(Box, { height: 1, flexShrink: 0, paddingLeft: 2, paddingRight: 2 },
     h(Text, { color: '#444466' }, 'esc \u2248  ctrl+t  ctrl+p  ctrl+k'),
     h(Box, { flexGrow: 1 }),
-    h(Text, { color: '#555577' }, label.toLowerCase() + ' \u2022 local'),
+    h(Text, { color: '#555577' }, label.toLowerCase() + ' \u2022 ~'),
   );
 
   return h(Box, { flexDirection: 'column', width: '100%', height: rows, overflow: 'hidden' },
-    header,
-    chat,
-    inputLine,
+    headBox(),
+    inputBar,
+    chatArea,
     footer,
   );
 }

package/src/agent/prompt.js

@@ -0,0 +1,46 @@
+import { TOOL_DEFS } from './tools.js';
+
+export function buildSystemPrompt(cwd) {
+  const toolLines = TOOL_DEFS.map(t => {
+    const args = Object.entries(t.args).map(([k, v]) => `${k}: ${v}`).join(', ');
+    return `- ${t.name}(${args}): ${t.desc}`;
+  }).join('\n');
+
+  return `You are OpenAxies, an autonomous AI coding agent running in the terminal.
+
+You have access to tools. When you need to gather information, modify files, or interact with the system, call a tool.
+
+TOOLS:
+${toolLines}
+
+IMPORTANT RULES:
+1. When you need to use a tool, respond with EXACTLY this format (no extra text before/after):
+   Action: tool_name
+   Action Input: {"arg1": "value1", "arg2": "value2"}
+
+2. After each tool result (Observation), decide what to do next.
+
+3. When you have enough information to respond to the user, use:
+   Final Answer: your complete response here
+
+4. You can call multiple tools sequentially. Each tool call is followed by an Observation.
+
+5. Current working directory: ${cwd}
+
+6. For coding tasks:
+   - Read files before editing them
+   - Use glob/grep to find relevant files
+   - Write clear, correct code
+   - Run bash commands to verify your work (tests, lint, etc.)
+   - Edit files with edit_file (search/replace) when possible
+
+7. For web searches, use web_search to get current information.
+
+8. If you need user input, use ask_question.
+
+9. Track your progress with todo_add and todo_done.
+
+10. Keep your Final Answer concise and helpful. Show the user what you did.
+
+Remember: only call ONE tool at a time. Wait for the Observation before deciding next step.`;
+}

package/src/agent/tools.js

@@ -0,0 +1,129 @@
+import fs from 'fs';
+import path from 'path';
+import { execSync } from 'child_process';
+import { searchWeb } from '../providers/websearch.js';
+
+function r(s) { return typeof s === 'string' ? s : ''; }
+
+function simpleGlob(pattern) {
+  const parts = pattern.split('/');
+  const hasStar = parts.some(p => p.includes('*'));
+  if (!hasStar) return fs.existsSync(pattern) ? [pattern] : [];
+  const root = pattern.startsWith('/') ? '/' : '.';
+  const results = [];
+  function walk(dir, idx) {
+    if (idx >= parts.length) { results.push(dir); return; }
+    const part = parts[idx];
+    if (part.includes('**')) {
+      walk(dir, idx + 1);
+      try { for (const e of fs.readdirSync(dir)) { const p = dir + '/' + e; if (fs.statSync(p).isDirectory()) walk(p, idx); } } catch {}
+    } else if (part.includes('*')) {
+      const re = new RegExp('^' + part.replace(/\*/g, '.*') + '$');
+      try { for (const e of fs.readdirSync(dir)) { if (re.test(e)) walk(dir + '/' + e, idx + 1); } } catch {}
+    } else {
+      const p = dir + '/' + part;
+      if (fs.existsSync(p)) walk(p, idx + 1);
+    }
+  }
+  walk(root, 0);
+  return results;
+}
+
+export const TOOL_DEFS = [
+  { name: 'read_file', args: { path: 'string' }, desc: 'Read a file from the filesystem' },
+  { name: 'write_file', args: { path: 'string', content: 'string' }, desc: 'Write content to a file (overwrites)' },
+  { name: 'edit_file', args: { path: 'string', old_string: 'string', new_string: 'string' }, desc: 'Edit a file by replacing old_string with new_string' },
+  { name: 'glob', args: { pattern: 'string' }, desc: 'Find files matching a glob pattern (e.g. "src/**/*.js")' },
+  { name: 'grep', args: { pattern: 'string', path: 'string' }, desc: 'Search file contents with a regex pattern' },
+  { name: 'bash', args: { command: 'string' }, desc: 'Execute a shell command and get output' },
+  { name: 'web_search', args: { query: 'string' }, desc: 'Search the web for current information' },
+  { name: 'ask_question', args: { question: 'string' }, desc: 'Ask the user a question when you need clarification' },
+  { name: 'todo_add', args: { text: 'string' }, desc: 'Add a task to the todo list' },
+  { name: 'todo_done', args: { id: 'number' }, desc: 'Mark a todo item as complete by its index (0-based)' },
+];
+
+export function parseToolCall(text) {
+  const s = r(text);
+  const m = s.match(/Action:\s*(\w+)\s*\nAction Input:\s*(\{[\s\S]*?\}|"[^"]*"|`[^`]*`|\S+)/);
+  if (!m) return null;
+  const name = m[1];
+  let raw = m[2].trim();
+  let args = {};
+  try {
+    if (raw.startsWith('{')) args = JSON.parse(raw);
+    else if (raw.startsWith('"')) args = { query: JSON.parse(raw) };
+    else if (raw.startsWith('`')) args = { command: raw.slice(1, -1) };
+    else args = { path: raw };
+  } catch { return null; }
+  return { name, args };
+}
+
+export async function execTool(toolCall, signal, questionCb) {
+  const { name, args } = toolCall;
+  try {
+    switch (name) {
+      case 'read_file': {
+        const p = r(args.path);
+        if (!fs.existsSync(p)) return 'Error: file not found: ' + p;
+        const c = fs.readFileSync(p, 'utf8');
+        return 'File ' + p + ':\n' + c.slice(0, 8000) + (c.length > 8000 ? '\n... [truncated]' : '');
+      }
+      case 'write_file': {
+        const p = r(args.path);
+        const d = path.dirname(p);
+        if (d && !fs.existsSync(d)) fs.mkdirSync(d, { recursive: true });
+        fs.writeFileSync(p, r(args.content));
+        const lines = r(args.content).split('\n').length;
+        return 'Wrote ' + p + ' (' + lines + ' lines)';
+      }
+      case 'edit_file': {
+        const p = r(args.path);
+        if (!fs.existsSync(p)) return 'Error: file not found: ' + p;
+        let c = fs.readFileSync(p, 'utf8');
+        const old = r(args.old_string);
+        const nw = r(args.new_string);
+        if (!c.includes(old)) return 'Error: old_string not found in ' + p;
+        c = c.replace(old, nw);
+        fs.writeFileSync(p, c);
+        return 'Edited ' + p;
+      }
+      case 'glob': {
+        const results = simpleGlob(r(args.pattern));
+        return results.length > 0 ? results.join('\n') : 'No files matched: ' + r(args.pattern);
+      }
+      case 'grep': {
+        const pat = r(args.pattern).replace(/"/g, '\\"');
+        const pth = r(args.path) || '.';
+        try {
+          const out = execSync('rg -l "' + pat + '" ' + pth + ' 2>/dev/null || true', { encoding: 'utf8', maxBuffer: 1024 * 1024 });
+          return out.trim() || 'No matches for: ' + r(args.pattern);
+        } catch { return 'No matches for: ' + r(args.pattern); }
+      }
+      case 'bash': {
+        const out = execSync(r(args.command), { encoding: 'utf8', maxBuffer: 1024 * 1024, timeout: 30000 });
+        return out.slice(0, 4000) || '(no output)';
+      }
+      case 'web_search': {
+        const res = await searchWeb(r(args.query), signal);
+        return res.sites > 0 ? 'Search results for "' + r(args.query) + '":\n' + res.summary : 'No search results';
+      }
+      case 'ask_question': {
+        if (typeof questionCb === 'function') {
+          const answer = await questionCb(r(args.question));
+          return 'User answered: ' + answer;
+        }
+        return 'Error: no question handler';
+      }
+      case 'todo_add': {
+        return 'Todo added: ' + r(args.text);
+      }
+      case 'todo_done': {
+        return 'Todo ' + args.id + ' marked done';
+      }
+      default:
+        return 'Error: unknown tool "' + name + '"';
+    }
+  } catch (e) {
+    return 'Error: ' + (e.message || String(e));
+  }
+}

package/src/providers/index.js

@@ -1,104 +1,142 @@
+import { StateGraph, START, END } from '@langchain/langgraph';
 import { streamResponse } from './streaming.js';
-import { runWebSearchGraph, shouldUseWebSearch } from './websearch.js';
+import { buildSystemPrompt } from '../agent/prompt.js';
+import { parseToolCall, execTool } from '../agent/tools.js';
 
 const MODEL_ROUTES = Object.freeze({
   'openaxis/openaxis-llama': Object.freeze([
     'https://universal-618-clarity-main.hf.space/v1/chat/completions',
+    'https://universal-618-clarity-4.hf.space/v1/chat/completions',
   ]),
   'openaxis/openaxis-gpt': Object.freeze([
     'https://universal-618-clarity-2.hf.space/v1/chat/completions',
+    'https://universal-618-clarity-5.hf.space/v1/chat/completions',
   ]),
   'openaxis/openaxis-deepseek': Object.freeze([
     'https://universal-618-clarity-3.hf.space/v1/chat/completions',
+    'https://universal-618-clarity-6.hf.space/v1/chat/completions',
   ]),
 });
 
 function checkMessages(messages) {
-  if (Array.isArray(messages) === false) {
-    throw new Error('messages must be an array');
-  }
+  if (!Array.isArray(messages)) throw new Error('messages must be an array');
   for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i];
-    if (msg === null || msg === undefined || typeof msg !== 'object') {
-      throw new Error('message at index ' + i + ' must be an object');
-    }
-    if (typeof msg.role !== 'string' || msg.role.length === 0) {
-      throw new Error('message at index ' + i + ' must have a non-empty role');
-    }
-    if (typeof msg.content !== 'string') {
-      throw new Error('message at index ' + i + ' content must be a string');
-    }
+    const m = messages[i];
+    if (!m || typeof m !== 'object') throw new Error('message at ' + i + ' must be an object');
+    if (typeof m.role !== 'string' || !m.role) throw new Error('message at ' + i + ' must have non-empty role');
+    if (typeof m.content !== 'string') throw new Error('message at ' + i + ' content must be string');
   }
   return messages;
 }
 
-export async function* callModel(modelConfig, messages, signal) {
-  if (modelConfig === null || modelConfig === undefined || typeof modelConfig !== 'object') {
-    throw new Error('modelConfig must be an object');
-  }
-  if (typeof modelConfig.id !== 'string') {
-    throw new Error('modelConfig.id must be a string');
-  }
-
-  checkMessages(messages);
-
-  const endpoints = MODEL_ROUTES[modelConfig.id];
-  if (endpoints === null || endpoints === undefined) {
-    throw new Error('No endpoints configured for model: ' + modelConfig.id);
-  }
-
-  const modelShort = modelConfig.id.replace(/^[^/]+\//, '');
-  let modelMessages = messages;
-  let webUsed = false;
-  let webSites = 0;
-  let webQuery = '';
+function buildRouterGraph() {
+  const graph = new StateGraph({
+    channels: {
+      lastResponse: { reducer: (a, b) => b ?? a, default: () => '' },
+      iteration: { reducer: (a, b) => b ?? a, default: () => 0 },
+      decision: { reducer: (a, b) => b ?? a, default: () => 'final' },
+      toolName: { reducer: (a, b) => b ?? a, default: () => null },
+      toolArgs: { reducer: (a, b) => b ?? a, default: () => null },
+    }
+  });
 
-  if (shouldUseWebSearch(messages) === true) {
-    try {
-      const webResult = await runWebSearchGraph(messages, signal);
-      if (webResult.used === true && webResult.sites > 0) {
-        webUsed = true;
-        webSites = webResult.sites;
-        webQuery = webResult.query || '';
-        modelMessages = [{
-          role: 'system',
-          content:
-            'Current web search results (use when relevant, cite URLs inline):\n\n' +
-            webResult.summary +
-            '\n\nNow respond to the user using these results as needed.',
-        }].concat(messages);
-      }
-    } catch (_) {
+  graph.addNode('router', async (state) => {
+    const tc = parseToolCall(state.lastResponse);
+    if (tc) {
+      return { decision: 'tool', toolName: tc.name, toolArgs: tc.args };
     }
-  }
+    return { decision: 'final' };
+  });
+
+  graph.addEdge(START, 'router');
+  graph.addEdge('router', END);
 
-  yield { type: 'tool', tool: 'websearch', used: webUsed, sites: webSites, query: webQuery };
+  return graph.compile();
+}
 
+async function* callLLMStream(endpoints, modelShort, messages, signal) {
   const body = {
     model: modelShort,
-    messages: modelMessages,
+    messages,
     max_tokens: 4096,
     temperature: 0.7,
     stream: true,
   };
 
   let lastError = null;
-
-  for (let i = 0; i < endpoints.length; i++) {
-    const endpoint = endpoints[i];
+  for (const ep of endpoints) {
     try {
-      const stream = streamResponse(endpoint, body, signal);
-      for await (const event of stream) {
-        yield event;
+      const stream = streamResponse(ep, body, signal);
+      for await (const ev of stream) {
+        yield ev;
       }
       return;
     } catch (err) {
       lastError = err;
-      if (signal !== null && signal !== undefined && signal.aborted === true) {
+      if (signal?.aborted) return;
+    }
+  }
+  throw lastError || new Error('All endpoints failed');
+}
+
+const routerGraph = buildRouterGraph();
+
+export async function* callModel(modelConfig, messages, signal) {
+  if (!modelConfig || typeof modelConfig !== 'object') throw new Error('modelConfig must be object');
+  if (typeof modelConfig.id !== 'string') throw new Error('modelConfig.id must be string');
+  checkMessages(messages);
+
+  const endpoints = MODEL_ROUTES[modelConfig.id];
+  if (!endpoints) throw new Error('No endpoints for ' + modelConfig.id);
+  const modelShort = modelConfig.id.replace(/^[^/]+\//, '');
+  const systemPrompt = buildSystemPrompt(process.cwd());
+
+  let msgs = [{ role: 'system', content: systemPrompt }].concat(messages);
+  let fullResponse = '';
+
+  for (let iter = 0; iter < 15 && !signal?.aborted; iter++) {
+    fullResponse = '';
+
+    const llmStream = callLLMStream(endpoints, modelShort, msgs, signal);
+    for await (const ev of llmStream) {
+      if (ev.type === 'token') {
+        fullResponse += ev.content || '';
+        yield ev;
+      } else if (ev.type === 'done') {
+        break;
+      } else if (ev.type === 'timeout') {
+        yield ev;
         return;
       }
     }
-  }
 
-  throw lastError !== null ? lastError : new Error('All endpoints failed for ' + modelConfig.id);
+    if (signal?.aborted) return;
+
+    const state = await routerGraph.invoke({ lastResponse: fullResponse, iteration: iter });
+
+    if (state.decision === 'final') {
+      yield { type: 'done' };
+      return;
+    }
+
+    yield { type: 'tool_call', tool: state.toolName, args: state.toolArgs };
+
+    let result;
+    if (state.toolName === 'ask_question') {
+      const answer = yield { type: 'question', text: state.toolArgs.question };
+      result = 'User answered: ' + (answer || '');
+    } else if (state.toolName === 'todo_add') {
+      result = await execTool({ name: state.toolName, args: state.toolArgs }, signal);
+      yield { type: 'todo_add', text: state.toolArgs.text, result };
+    } else if (state.toolName === 'todo_done') {
+      result = await execTool({ name: state.toolName, args: state.toolArgs }, signal);
+      yield { type: 'todo_done', id: state.toolArgs.id, result };
+    } else {
+      result = await execTool({ name: state.toolName, args: state.toolArgs }, signal);
+      yield { type: 'tool_result', tool: state.toolName, result: result.substring(0, 300) };
+    }
+
+    msgs.push({ role: 'assistant', content: fullResponse });
+    msgs.push({ role: 'user', content: 'Observation: ' + result });
+  }
 }

package/src/providers/streaming.js

@@ -1,5 +1,5 @@
-const CONNECT_TIMEOUT = 10000;
-const READ_TIMEOUT = 30000;
+const CONNECT_TIMEOUT = 120000;
+const READ_TIMEOUT = 60000;
 
 function checkEndpoint(endpoint) {
   if (typeof endpoint !== 'string') {

package/src/providers/websearch.js

@@ -46,7 +46,7 @@ export function shouldUseWebSearch(messages) {
   return asksExternalFact === true && hasNamedThing === true;
 }
 
-async function searchWeb(query, signal) {
+export async function searchWeb(query, signal) {
   const key = getWebSearchKey();
   if (key.length === 0) {
     return {