openaxies 0.6.0 → 0.7.0

package/package.json

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

package/src/App.js

@@ -1,16 +1,22 @@
 import React from 'react';
 import { Box, Text, useInput, useStdout } from 'ink';
 import { hex } from './config/theme.js';
-
 import { getModels, getModelById, DEFAULT_MODEL_ID } from './config/models.js';
 import { callModel } from './providers/index.js';
-import { createBrandHeader, BRAND_HEIGHT } from './components/BrandHeader.js';
+import { createHeaderBar, HEADER_HEIGHT } from './components/BrandHeader.js';
 import TextInput from 'ink-text-input';
 
 const h = React.createElement;
-
 export default AppRoot;
 
+const STARTUP_LOGO = [
+  '  \u2588\u2588\u2588\u2588\u2588\u2588\u2557',
+  ' \u2588\u2588\u2594\u2594\u2594\u2594\u2588\u2588\u2557',
+  ' \u2588\u2588\u2591   \u2588\u2588\u2591',
+  ' \u2588\u2588\u2591   \u2588\u2588\u2591',
+  ' \u255a\u2588\u2588\u2588\u2588\u2588\u2588\u2594\u259d',
+];
+
 function buildHistory(messages, newText) {
   const h = [];
   for (let i = 0; i < messages.length; i++) {
@@ -67,11 +73,14 @@ function AppRoot() {
   const [overlayIndex, setOverlayIndex] = React.useState(0);
   const [toolInfo, setToolInfo] = React.useState(null);
   const [showThoughts, setShowThoughts] = React.useState(true);
+  const [startupDone, setStartupDone] = React.useState(false);
 
-  const STATUS_H = 3;
+  const SEP_H = 1;
+  const FIXED_H = startupDone ? (HEADER_HEIGHT + SEP_H + 1 + 1) : 0;
   const DOCK_H = 1;
-  const fixedH = BRAND_HEIGHT + STATUS_H + DOCK_H;
-  const availLines = Math.max(10, rows - fixedH);
+  const STATUS_H = 1;
+  const totalFixed = startupDone ? (HEADER_HEIGHT + SEP_H + DOCK_H + STATUS_H) : 11;
+  const availLines = Math.max(10, rows - totalFixed);
 
   const abortRef = React.useRef(null);
   const connRef = React.useRef(null);
@@ -89,9 +98,7 @@ function AppRoot() {
     }, 100);
     spinnerRef.current = si;
     timerRef.current = ti;
-    return function () {
-      clearInterval(si); clearInterval(ti);
-    };
+    return function () { clearInterval(si); clearInterval(ti); };
   }, [isThinking]);
 
   function cycleModel() {
@@ -113,9 +120,15 @@ function AppRoot() {
     return o > c;
   }
 
+  function filterText(t) {
+    if (showThoughts === true) return t;
+    return t.split('<think>').join('').split('</think>').join('');
+  }
+
   async function handleSubmit(text) {
     const safe = typeof text === 'string' ? text : '';
     if (safe.length === 0 || streamingActive === true) return;
+    if (startupDone === false) setStartupDone(true);
     lastQueryRef.current = safe;
     setStreamingActive(true);
     setToolInfo(null);
@@ -239,55 +252,44 @@ function AppRoot() {
     }
   });
 
-  function filterText(t) {
-    if (showThoughts === true) return t;
-    return t.split('<think>').join('').split('</think>').join('');
-  }
-
-  const activeInfo = getModelById(activeModel);
-  const activeLabel = activeInfo !== null ? activeInfo.label : 'OpenAxies';
+  const modelInfo = getModelById(activeModel);
+  const modelLabel = modelInfo !== null ? modelInfo.label : 'OpenAxies Llama';
 
-  // Build sections
+  // Build viewport sections
   const sections = [];
 
-  // Show overlay items
+  // Overlay items
   if (showOverlay === true) {
     sections.push({ t: 'sep' });
-    sections.push({ t: 'header_bright', text: 'Commands' });
+    sections.push({ t: 'overlay_header' });
     for (let i = 0; i < COMMANDS.length; i++) {
       const c = COMMANDS[i];
-      const sel = i === overlayIndex;
-      sections.push({ t: 'cmd', trigger: c.trigger, desc: c.desc, selected: sel });
+      sections.push({ t: 'cmd', trigger: c.trigger, desc: c.desc, sel: i === overlayIndex });
     }
     sections.push({ t: 'sep' });
   }
 
-  // Conversation history
+  // Messages
   for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
     if (msg === null || typeof msg !== 'object') continue;
     const content = typeof msg.content === 'string' ? msg.content : '';
     if (content.length === 0) continue;
-
     if (msg.role === 'user') {
       sections.push({ t: 'sep' });
       sections.push({ t: 'user', text: content });
     } else {
       if (sections.length > 0 && sections[sections.length - 1].t !== 'sep') sections.push({ t: 'sep' });
-      const display = filterText(content);
-      sections.push({ t: 'text', text: display });
+      sections.push({ t: 'assistant', text: filterText(content) });
     }
   }
 
-  // Streaming section
-  const hasStream = typeof streamText === 'string' && streamText.length > 0;
-  if (hasStream === true) {
+  // Streaming
+  if (typeof streamText === 'string' && streamText.length > 0) {
     const clean = filterText(streamText);
-
     if (toolInfo !== null && toolInfo.used === true && toolInfo.query.length > 0) {
       sections.push({ t: 'tool', tool: toolInfo.tool, query: toolInfo.query, sites: toolInfo.sites });
     }
-
     if (isThinking === true) {
       sections.push({ t: 'thinking', spin: SPINNER[spinnerIdx], elapsed: fmtTime(thinkingElapsed), content: clean });
     } else {
@@ -295,24 +297,28 @@ function AppRoot() {
     }
   }
 
-  // Idle ready state
+  // Startup screen
+  if (startupDone === false && messages.length === 0) {
+    sections.push({ t: 'startup' });
+  }
+
+  // Ready state
   if (sections.length === 0) {
     sections.push({ t: 'sep' });
-    sections.push({ t: 'ready', text: 'Ready' });
+    sections.push({ t: 'ready' });
     sections.push({ t: 'sep' });
   }
 
-  // Estimate line count per section
+  // Estimate and limit sections
   function estLines(s) {
-    if (s.t === 'sep' || s.t === 'ready' || s.t === 'stream' || s.t === 'text' || s.t === 'tool') return 1;
+    if (s.t === 'sep' || s.t === 'assistant' || s.t === 'stream' || s.t === 'tool' || s.t === 'ready' || s.t === 'overlay_header') return 1;
     if (s.t === 'cmd') return 1;
-    if (s.t === 'header_bright') return 1;
     if (s.t === 'user') return 2;
     if (s.t === 'thinking') return 2;
+    if (s.t === 'startup') return 11;
     return 1;
   }
 
-  // Limit to available lines - show the LAST (newest) sections
   let totalEst = 0;
   let lastN = 0;
   for (let i = sections.length - 1; i >= 0; i--) {
@@ -323,7 +329,7 @@ function AppRoot() {
   }
   const visible = sections.slice(sections.length - lastN);
 
-  // Render
+  // Render sections
   const sectionEls = [];
   for (let i = 0; i < visible.length; i++) {
     const s = visible[i];
@@ -342,7 +348,7 @@ function AppRoot() {
           h(Text, { color: hex.neonBlue, wrap: 'wrap' }, s.text)
         )
       );
-    } else if (s.t === 'text' || s.t === 'stream') {
+    } else if (s.t === 'assistant' || s.t === 'stream') {
       sectionEls.push(
         h(Box, { key: ki, height: 1, paddingLeft: 1 },
           h(Text, { color: hex.primary, wrap: 'wrap' }, s.text)
@@ -351,7 +357,7 @@ function AppRoot() {
     } else if (s.t === 'thinking') {
       sectionEls.push(
         h(Box, { key: ki + '-h', height: 1, paddingLeft: 1 },
-          h(Text, { color: '#FF9F43', bold: true }, ' ' + s.spin + ' Thinking \u2022 ' + s.elapsed)
+          h(Text, { color: '#FF9F43', bold: true }, s.spin + ' Thinking \u2022 ' + s.elapsed)
         )
       );
       sectionEls.push(
@@ -365,15 +371,15 @@ function AppRoot() {
           h(Text, { color: '#5B5B8A' }, '\u2500\u2500 ' + s.tool + ' \u2014 ' + (s.query || '') + ' (' + (s.sites || 0) + ' sites)')
         )
       );
-    } else if (s.t === 'header_bright') {
+    } else if (s.t === 'overlay_header') {
       sectionEls.push(
         h(Box, { key: ki, height: 1, paddingLeft: 1 },
-          h(Text, { color: '#888899', bold: true }, s.text || '')
+          h(Text, { color: '#888899', bold: true }, 'Commands')
         )
       );
     } else if (s.t === 'cmd') {
-      const prefix = s.selected === true ? '\u276F ' : '  ';
-      const col = s.selected === true ? hex.neonBlue : '#666688';
+      const prefix = s.sel === true ? '\u276F ' : '  ';
+      const col = s.sel === true ? hex.neonBlue : '#666688';
       sectionEls.push(
         h(Box, { key: ki, height: 1, paddingLeft: 2 },
           h(Text, { color: col }, prefix + s.trigger),
@@ -383,13 +389,38 @@ function AppRoot() {
     } else if (s.t === 'ready') {
       sectionEls.push(
         h(Box, { key: ki, height: 1, paddingLeft: 1 },
-          h(Text, { color: '#00FF88', bold: true }, s.text)
+          h(Text, { color: '#00FF88', bold: true }, 'Ready')
+        )
+      );
+    } else if (s.t === 'startup') {
+      for (let li = 0; li < STARTUP_LOGO.length; li++) {
+        sectionEls.push(
+          h(Box, { key: ki + '-l' + li, height: 1, paddingLeft: 1 },
+            h(Text, { color: '#00BBFF', bold: true }, STARTUP_LOGO[li])
+          )
+        );
+      }
+      sectionEls.push(h(Box, { key: ki + '-e1', height: 1 }, null));
+      sectionEls.push(
+        h(Box, { key: ki + '-t1', height: 1, paddingLeft: 1 },
+          h(Text, { color: '#FFFFFF', bold: true }, 'OpenAxies')
+        )
+      );
+      sectionEls.push(
+        h(Box, { key: ki + '-t2', height: 1, paddingLeft: 1 },
+          h(Text, { color: '#777788' }, 'local agent runtime')
+        )
+      );
+      sectionEls.push(h(Box, { key: ki + '-e2', height: 1 }, null));
+      sectionEls.push(
+        h(Box, { key: ki + '-t3', height: 1, paddingLeft: 1 },
+          h(Text, { color: '#555577' }, 'Press Enter to begin')
         )
       );
     }
   }
 
-  // Fill remaining lines
+  // Fill remaining
   while (sectionEls.length < availLines) {
     sectionEls.push(h(Box, { key: 'fl-' + sectionEls.length, height: 1 }, h(Text, {}, '')));
   }
@@ -401,20 +432,14 @@ function AppRoot() {
     overflow: 'hidden',
   }, ...sectionEls);
 
-  // Status bar
-  const statusBar = h(Box, { flexDirection: 'column', height: STATUS_H, flexShrink: 0 },
-    h(Box, { height: 1 }, hr(cols)),
-    h(Box, { height: 1, paddingLeft: 2 },
-      h(Text, { color: '#444466' }, 'esc interrupt     ctrl+t thoughts     ctrl+p models'),
-    ),
-    h(Box, { height: 1, paddingLeft: 2 },
-      h(Text, { color: '#444466' }, 'ctrl+l clear      ctrl+r resume       ctrl+k commands'),
-    )
-  );
+  // Main layout
+  const headerBar = startupDone === true ? createHeaderBar(modelLabel) : null;
+  const headerSep = startupDone === true ? h(Box, { height: 1 }, hr(cols)) : null;
 
-  // Prompt
-  const promptLine = h(Box, { height: DOCK_H, flexShrink: 0, paddingLeft: 2, paddingRight: 2 },
+  // Input line
+  const inputLine = h(Box, { height: DOCK_H, flexShrink: 0, paddingLeft: 2, paddingRight: 2 },
     h(Text, { color: hex.greenOnline }, '\u258C'),
+    h(Text, { color: '#555577' }, ' Ask OpenAxies'),
     h(TextInput, {
       value: inputBuffer,
       onChange: handleChange,
@@ -425,10 +450,22 @@ function AppRoot() {
     })
   );
 
+  // Shortcuts footer
+  const modelShort = modelLabel.replace('OpenAxies ', '');
+  const footerLine = h(Box, { height: STATUS_H, flexShrink: 0, paddingLeft: 2, paddingRight: 2 },
+    h(Text, { color: '#444466' }, 'esc \u2248 '),
+    h(Text, { color: '#444466' }, 'ctrl+t '),
+    h(Text, { color: '#444466' }, 'ctrl+p '),
+    h(Text, { color: '#444466' }, 'ctrl+k'),
+    h(Box, { flexGrow: 1 }),
+    h(Text, { color: '#555577' }, modelShort.toLowerCase() + ' \u2022 local'),
+  );
+
   return h(Box, { flexDirection: 'column', width: '100%', height: rows, overflow: 'hidden' },
-    createBrandHeader(),
+    headerBar,
+    headerSep,
     viewport,
-    statusBar,
-    promptLine
+    inputLine,
+    footerLine,
   );
 }

package/src/components/BrandHeader.js

@@ -1,36 +1,17 @@
 import React from 'react';
 import { Box, Text } from 'ink';
-import { hex } from '../config/theme.js';
 
 const h = React.createElement;
 
-const LOGO = [
-  '██████╗ ██████╗ ███████╗███╗   ██╗ █████╗ ██╗  ██╗██╗███████╗███████╗',
-  '██╔═══██╗██╔══██╗██╔════╝████╗  ██║██╔══██╗╚██╗██╔╝██║██╔════╝██╔════╝',
-  '██║   ██║██████╔╝█████╗  ██╔██╗ ██║███████║ ╚███╔╝ ██║█████╗  ███████╗',
-  '██║   ██║██╔═══╝ ██╔══╝  ██║╚██╗██║██╔══██║ ██╔██╗ ██║██╔══╝  ╚════██║',
-  '╚██████╔╝██║     ███████╗██║ ╚████║██║  ██║██╔╝ ██╗██║███████╗███████║',
-  ' ╚═════╝ ╚═╝     ╚══════╝╚═╝  ╚═══╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝╚══════╝╚══════╝',
-];
-
-export function createBrandHeader() {
-  const els = [];
-  for (let r = 0; r < LOGO.length; r++) {
-    els.push(
-      h(Text, { key: 'l' + r, color: '#00BBFF', bold: true }, LOGO[r])
-    );
-  }
-  els.push(
-    h(Text, { key: 'sub', color: '#666688' }, 'OpenAxies Agent Runtime')
+export function createHeaderBar(modelLabel) {
+  const label = typeof modelLabel === 'string' && modelLabel.length > 0 ? modelLabel : 'OpenAxies Llama';
+  return h(Box, { height: 1, paddingLeft: 1, paddingTop: 0, paddingBottom: 0 },
+    h(Text, { color: '#00BBFF', bold: true }, 'OpenAxies'),
+    h(Text, { color: '#555577' }, ' \u2022 '),
+    h(Text, { color: '#FFFFFF' }, label),
+    h(Text, { color: '#555577' }, ' \u2022 '),
+    h(Text, { color: '#777788' }, 'local'),
   );
-  return h(Box, {
-    flexDirection: 'column',
-    width: '100%',
-    flexShrink: 0,
-    paddingLeft: 0,
-    paddingTop: 0,
-    paddingBottom: 0,
-  }, ...els);
 }
 
-export const BRAND_HEIGHT = 7;
+export const HEADER_HEIGHT = 1;

package/src/providers/index.js

@@ -4,15 +4,12 @@ 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 = 120000;
-const READ_TIMEOUT = 60000;
+const CONNECT_TIMEOUT = 10000;
+const READ_TIMEOUT = 30000;
 
 function checkEndpoint(endpoint) {
   if (typeof endpoint !== 'string') {