openaxies 1.0.2 → 1.0.4

package/bin/openaxis.js

@@ -1,58 +1,9 @@
 #!/usr/bin/env node
 import React from 'react';
 import { render } from 'ink';
-import fs from 'fs';
-import path from 'path';
 import App from '../src/App.js';
 
 const h = React.createElement;
 
-const debugBuffer = [];
-
-function sandboxWrite(chunk) {
-  const str = typeof chunk === 'string' ? chunk : String(chunk);
-  const trimmed = str.trim();
-  if (trimmed.length > 0) {
-    debugBuffer.push(trimmed);
-  }
-  return true;
-}
-
-const consoleKeys = ['log', 'error', 'warn'];
-for (let i = 0; i < consoleKeys.length; i++) {
-  const key = consoleKeys[i];
-  const original = console[key];
-  console[key] = function sandboxedConsole() {
-    const args = [];
-    for (let j = 0; j < arguments.length; j++) {
-      args.push(arguments[j]);
-    }
-    sandboxWrite(args.join(' '));
-    return original.apply(console, args);
-  };
-}
-
-const { waitUntilExit } = render(h(App, {}));
-// Keep the process alive until the Ink UI signals exit (e.g., via SIGINT).
+const { waitUntilExit } = render(h(App, {}), { exitOnCtrlC: false });
 waitUntilExit();
-
-function cleanup() {
-  if (debugBuffer.length > 0) {
-    const logPath = path.join(process.cwd(), 'openaxies-debug.log');
-    try {
-      fs.writeFileSync(logPath, debugBuffer.join('\n') + '\n');
-    } catch (_) {}
-  }
-  process.exit(0);
-}
-
-process.on('SIGINT', cleanup);
-process.on('SIGTERM', cleanup);
-process.on('exit', function () {
-  if (debugBuffer.length > 0) {
-    const logPath = path.join(process.cwd(), 'openaxies-debug.log');
-    try {
-      fs.writeFileSync(logPath, debugBuffer.join('\n') + '\n');
-    } catch (_) {}
-  }
-});

package/package.json

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

package/src/App.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Box, Text, useInput, useStdout } from 'ink';
+import { Box, Text, useInput, useStdout, useApp } from 'ink';
 import TextInput from 'ink-text-input';
 import { hex } from './config/theme.js';
 import { getModels, getModelById, DEFAULT_MODEL_ID } from './config/models.js';
@@ -7,7 +7,7 @@ import { callModel } from './providers/index.js';
 
 const h = React.createElement;
 
-const STARTUP_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,352 +15,248 @@ const STARTUP_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() {
   const { stdout } = useStdout();
-  const rows = stdout.rows || 24;
+  const { exit } = useApp();
   const cols = stdout.columns || 80;
-
-  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 [thinkElapsed, setThinkElapsed] = 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 [toolEvent, setToolEvent] = React.useState(null);
-
-  const abortRef = React.useRef(null);
-  const accumulatedRef = React.useRef('');
-  const lastQueryRef = React.useRef('');
+  const rows = stdout.rows || 24;
+  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 acRef = React.useRef(null);
+  const accRef = React.useRef('');
+  const lastRef = React.useRef('');
 
   React.useEffect(() => {
-    if (!thinkingActive) return;
-    const t = setInterval(() => setThinkElapsed(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 modelLabel = model ? model.label : 'Unknown';
-
-  function stripThink(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.0.3)')),
+      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);
-    lastQueryRef.current = s;
-    accumulatedRef.current = '';
-    setStreaming(true);
-    setStreamText('');
-    setThinkingText('');
-    setThinkElapsed(0);
-    setToolEvent(null);
-    setMessages(p => [...p, { type: 'user', content: s }]);
-    setInput('');
-
-    const m = getModelById(activeModel);
-    if (!m) { setMessages(p => [...p, { type: '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);
+    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;
+    acRef.current = ac;
+    let op = false;
 
     try {
-      const history = [];
-      for (const msg of messages) {
-        if (msg.type === 'user') history.push({ role: 'user', content: msg.content });
-        else if (msg.type === 'assistant' || msg.type === 'thought') history.push({ role: 'assistant', content: msg.content });
-      }
-      history.push({ role: 'user', content: s });
+      const hist = msgs.map(x => ({ role: x.role === 'user' ? 'user' : 'assistant', content: x.c || '' }));
+      hist.push({ role: 'user', content: t });
 
-      let thinkOpen = false;
-
-      for await (const ev of callModel({ id: activeModel }, history, ac.signal)) {
+      for await (const ev of callModel({ id: model }, hist, ac.signal)) {
         if (ac.signal.aborted) break;
-
-        if (ev.type === 'tool') {
-          setToolEvent({ tool: ev.tool, query: ev.query, sites: ev.sites });
-          continue;
-        }
-
+        if (ev.type === 'tool') { setTool({ tool: ev.tool, q: ev.query, sites: ev.sites }); continue; }
         if (ev.type === 'token' || ev.type === 'thinking') {
           const c = typeof ev.content === 'string' ? ev.content : '';
           if (!c) continue;
-
-          // Track think state
-          if (c.includes('<think>')) thinkOpen = true;
-          accumulatedRef.current += c;
-
-          const clean = stripThink(accumulatedRef.current);
-          if (thinkOpen || accumulatedRef.current.includes('<think>')) {
-            const stillOpen = thinkOpen || !accumulatedRef.current.includes('</think>');
-            if (stillOpen) {
-              setThinkingActive(true);
-              setThinkingText(clean);
-              setStreamText('');
-            } else {
-              thinkOpen = false;
-              setThinkingActive(false);
-              setStreamText(clean);
-              setThinkingText('');
-            }
-          } else {
-            setStreamText(clean);
-          }
+          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);
         }
-
         if (ev.type === 'done' || ev.type === 'timeout') {
-          if (ev.type === 'timeout' && accumulatedRef.current) {
-            accumulatedRef.current += '\n\u2014 timed out \u2014';
-          }
+          if (ev.type === 'timeout' && accRef.current) accRef.current += '\n\u2014timed out\u2014';
           break;
         }
       }
-    } catch (err) {
-      if (!ac.signal.aborted) {
-        setMessages(p => [...p, { type: '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 = accumulatedRef.current;
-      if (final) {
-        setMessages(p => [...p, { type: 'assistant', content: stripThink(final) }]);
-      }
-      setStreamText('');
-      setThinkingText('');
+      setBusy(false); setThink(false); acRef.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 found = false;
-      for (const m of models) {
-        if (found) return m.id;
-        if (m.id === p) found = 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 handleCmd(item) {
+  function cmd(item) {
     if (!item) return;
-    const t = item.trigger;
-    if (t === '/exit') process.exit(0);
-    if (t === '/clear') setMessages([]);
-    if (t === '/model') cycleModel();
-    if (t === '/thoughts') setShowThought(p => !p);
-    if (t === '/resume') { const q = lastQueryRef.current; if (q && !streaming) handleSubmit(q); }
-    if (t === '/help') setMessages(p => [...p, { type: '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([]);
+    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) { handleCmd(COMMANDS[overlayIdx]); return; }
-      return;
-    }
-    if (!startupDone && !streaming) {
-      if (key.return) { setStartupDone(true); setInput(''); return; }
-      return;
-    }
-    if (key.escape) {
-      if (streaming && abortRef.current) { abortRef.current.abort(); setStreaming(false); setStreamText(''); setThinkingActive(false); }
+  useInput((i, k) => {
+    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') { if (abortRef.current) abortRef.current.abort(); process.exit(0); }
-      if (inp === 't' || inp === 'T') { setShowThought(p => !p); return; }
-      if (inp === 'p' || inp === 'P') { cycleModel(); return; }
-      if (inp === 'r' || inp === 'R') { const q = lastQueryRef.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); 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([]); return; }
+      if (i === 'k' || i === 'K') { setInp('/'); setOverlay(true); setOvIdx(0); return; }
     }
   });
 
-  // Build timeline
-  const events = [];
-  for (const msg of messages) {
-    if (msg.type === 'user' || msg.type === 'assistant' || msg.type === 'thought') {
-      events.push(msg);
-    }
-  }
-
-  // Tool event
-  if (toolEvent && streaming) {
-    events.push({ type: 'tool', tool: toolEvent.tool, query: toolEvent.query });
-  }
-
-  // Live thinking
-  if (thinkingActive && thinkingText) {
-    events.push({ type: 'thought', content: thinkingText, elapsed: thinkElapsed.toFixed(1) + 's' });
-  }
-
-  // Live stream
-  if (streaming && streamText && !thinkingActive) {
-    events.push({ type: 'assistant', content: streamText });
-  }
-
-  const visible = events.slice(-20);
-
-  // Startup screen
-  if (!startupDone && messages.length === 0) {
+  // Startup
+  if (!ready && msgs.length === 0) {
     return h(Box, { flexDirection: 'column', width: '100%', height: rows, overflow: 'hidden' },
-      ...STARTUP_LOGO.map((l, i) => h(Box, { key: 'sl' + i, height: 1, paddingLeft: 1 },
-        h(Text, { color: '#00BBFF', bold: true }, l)
-      )),
-      h(Box, { key: 'sp1', height: 1 }),
-      h(Box, { key: 'st1', height: 1, paddingLeft: 1 }, h(Text, { color: '#FFFFFF', bold: true }, 'OpenAxies')),
-      h(Box, { key: 'st2', height: 1, paddingLeft: 1 }, h(Text, { color: '#777788' }, 'local ai agent runtime')),
-      h(Box, { key: 'sp2', height: 1 }),
-      h(Box, { key: 'st3', height: 1, paddingLeft: 1 }, h(Text, { color: '#555577' }, 'Press Enter to begin')),
+      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: 2 }),
+      h(Box, { height: 1, paddingLeft: 2 }, h(Text, { color: '#555577' }, 'Press Enter to begin')),
       h(Box, { flexGrow: 1 }),
-      h(Box, { key: 'foot', height: 1, paddingLeft: 1 }, h(Text, { color: '#333344' }, 'esc quit     enter begin')),
+      h(Box, { height: 1, paddingLeft: 2 }, h(Text, { color: '#333344' }, 'esc quit    ctrl+p models    /help')),
     );
   }
 
-  // Overlay
-  if (showOverlay) {
-    visible.unshift({ type: '_sep' });
-    visible.unshift({ type: '_overlay', idx: overlayIdx });
+  // 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 });
   }
+  if (tool && busy) entries.push({ t: 'tool', tool: tool.tool, q: tool.q, sites: tool.sites });
+  if (think && thinkTxt) entries.push({ t: 'thought', c: thinkTxt, sec: thinkSec.toFixed(1) + 's' });
+  if (busy && stream && !think) entries.push({ t: 'asst', c: stream });
 
-  // No content yet after startup
-  if (visible.length === 0) {
-    visible.push({ type: '_sep' });
-    visible.push({ type: '_ready' });
-    visible.push({ type: '_sep' });
-  }
-
-  // Estimate lines
-  const HEADER_H = 1;
-  const SEP_H = 1;
-  const INPUT_H = 1;
-  const FOOTER_H = 1;
-  const fixed = HEADER_H + SEP_H + INPUT_H + FOOTER_H;
-  const maxLines = Math.max(5, rows - fixed);
-
-  function estLines(ev) {
-    if (ev.type === '_sep' || ev.type === '_ready' || ev.type === '_overlay') return 1;
-    if (ev.type === 'tool') return 1;
-    if (ev.type === 'user') return 2;
-    if (ev.type === 'thought') return 2;
-    return 1;
-  }
+  if (overlay) entries.push({ t: '_ov', idx: ovIdx });
 
-  let totalEst = 0;
-  let showN = 0;
-  for (let i = visible.length - 1; i >= 0; i--) {
-    const l = estLines(visible[i]);
-    if (totalEst + l > maxLines) break;
-    totalEst += l;
-    showN = visible.length - i;
-  }
-  const show = visible.slice(visible.length - showN);
+  const maxChat = Math.max(3, rows - 7);
+  const vis = entries.slice(-maxChat);
 
-  const els = [];
-  for (let i = 0; i < show.length; i++) {
-    const ev = show[i];
+  // Render chat
+  const chEls = [];
+  for (let i = 0; i < vis.length; i++) {
+    const e = vis[i];
     const k = 'e' + i;
-
-    if (ev.type === '_sep') {
-      els.push(h(Box, { key: k, height: 1 }, h(Text, { color: '#1A1A28' }, '\u2500'.repeat(cols))));
-    } else if (ev.type === '_ready') {
-      els.push(h(Box, { key: k, height: 1, paddingLeft: 1 }, h(Text, { color: '#00FF88', bold: true }, 'Ready')));
-    } else if (ev.type === '_overlay') {
-      els.push(h(Box, { key: k + 'h', height: 1, paddingLeft: 1 }, h(Text, { color: '#888899', bold: true }, 'Commands')));
-      for (let ci = 0; ci < COMMANDS.length; ci++) {
-        const c = COMMANDS[ci];
-        const sel = ci === ev.idx;
-        const prefix = sel ? '\u276F ' : '  ';
-        const col = sel ? hex.neonBlue : '#666688';
-        els.push(h(Box, { key: k + 'c' + ci, height: 1, paddingLeft: 2 },
-          h(Text, { color: col }, prefix + 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 (ev.type === 'user') {
-      els.push(h(Box, { key: k + 'h', height: 1, paddingLeft: 1 }, h(Text, { color: '#888899', bold: true }, 'You')));
-      els.push(h(Box, { key: k + 'c', height: 1, paddingLeft: 2 }, h(Text, { color: hex.neonBlue, wrap: 'wrap' }, ev.content)));
-    } else if (ev.type === 'assistant') {
-      els.push(h(Box, { key: k, height: 1, paddingLeft: 1 }, h(Text, { color: '#FFFFFF', wrap: 'wrap' }, ev.content)));
-    } else if (ev.type === 'thought') {
-      els.push(h(Box, { key: k + 'h', height: 1, paddingLeft: 1 },
-        h(Text, { color: '#FF9F43', bold: true }, '\u25CB Thinking \u2022 ' + (ev.elapsed || '0.0s'))
+    } 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.c),
       ));
-      els.push(h(Box, { key: k + 'c', height: 1, paddingLeft: 2 }, h(Text, { color: '#FF9F43', wrap: 'wrap' }, ev.content)));
-    } else if (ev.type === 'tool') {
-      els.push(h(Box, { key: k, height: 1, paddingLeft: 1 },
-        h(Text, { color: '#5B5B8A' }, '\u2500\u2500 ' + (ev.tool || 'tool') + (ev.query ? ' \u2014 ' + ev.query : ''))
+    } 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.c),
+      ));
+    } 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)' : '')),
       ));
     }
   }
 
-  // Fill
-  while (els.length < maxLines) {
-    els.push(h(Box, { key: 'f' + els.length, height: 1 }));
+  if (chEls.length === 0) {
+    chEls.push(h(Box, { key: 'idle', height: 1, paddingLeft: 2 }, h(Text, { color: '#666688' }, '\u203A Ask me anything')));
   }
 
-  // Header
-  const header = h(Box, { height: HEADER_H, flexShrink: 0, paddingLeft: 1, paddingRight: 1 },
-    h(Text, { color: '#00BBFF', bold: true }, 'OpenAxies'),
-    h(Text, { color: '#555577' }, ' \u2022 '),
-    h(Text, { color: '#FFFFFF' }, modelLabel),
-    h(Box, { flexGrow: 1 }),
-    h(Text, { color: '#666688' }, 'local'),
-  );
-
-  // Separator
-  const sepLine = h(Box, { height: SEP_H, flexShrink: 0 }, h(Text, { color: '#1A1A28' }, '\u2500'.repeat(cols)));
+  const chatArea = h(Box, { flexGrow: 1, flexDirection: 'column', overflow: 'hidden' }, ...chEls);
 
-  // Input
-  const inputLine = h(Box, { height: INPUT_H, flexShrink: 0, paddingLeft: 1, paddingRight: 1 },
+  // Input line
+  const inputBar = h(Box, { height: 1, flexShrink: 0, paddingLeft: 2, paddingRight: 2 },
+    h(Text, { color: '#888899' }, '\u203A '),
     h(Text, { color: hex.greenOnline }, '\u258C'),
     h(Box, { width: 1 }),
     h(TextInput, {
-      value: input,
-      onChange: setInput,
-      onSubmit: function (v) { if (typeof v === 'string' && v.trim() && !streaming) handleSubmit(v); },
+      value: inp,
+      onChange: setInp,
+      onSubmit: v => { if (typeof v === 'string' && v.trim() && !busy) submit(v); },
       placeholder: '',
-      focus: !showOverlay,
+      focus: !overlay,
       showCursor: true,
-    })
+    }),
   );
 
   // Footer
-  const footer = h(Box, { height: FOOTER_H, flexShrink: 0, paddingLeft: 1, paddingRight: 1 },
+  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' }, (modelLabel.replace('OpenAxies ', '') || 'model').toLowerCase() + ' \u2022 local'),
+    h(Text, { color: '#555577' }, label.toLowerCase() + ' \u2022 ~'),
   );
 
   return h(Box, { flexDirection: 'column', width: '100%', height: rows, overflow: 'hidden' },
-    header,
-    sepLine,
-    h(Box, { flexGrow: 1, flexDirection: 'column', overflow: 'hidden' }, ...els),
-    inputLine,
+    headBox(),
+    inputBar,
+    chatArea,
     footer,
   );
 }

package/src/providers/index.js

@@ -4,12 +4,15 @@ import { runWebSearchGraph, shouldUseWebSearch } from './websearch.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',
   ]),
 });
 

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') {