miii-cli 0.1.8 → 0.2.1

package/src/tui/InputBar.tsx

@@ -3,7 +3,7 @@ import { Box, Text, useStdout } from 'ink'
 import { InputArea } from './components/InputArea.js'
 import { ModelPicker } from './components/ModelPicker.js'
 import { Divider } from './components/StatusBar.js'
-import { stream } from '../llm/stream.js'
+import { chat } from '../llm/stream.js'
 import { listModels, pullModel } from '../llm/ollama.js'
 import type { OllamaModel } from '../llm/ollama.js'
 import { StreamParser } from '../parser/stream-parser.js'
@@ -22,12 +22,20 @@ interface Props {
 }
 
 const MAX_TOOL_DEPTH = 6
-const THROTTLE_MS = 40
-const PREVIEW_LINES = 8
 
-function lastLines(text: string, n: number): string[] {
-  return text.split('\n').slice(-n)
-}
+const THINKING_PHRASES = [
+  'oh wow, a question. let me pretend to care…',
+  'consulting the void…',
+  'making something up, just a sec…',
+  'definitely not hallucinating right now…',
+  'running 47 mental tabs…',
+  'staring into the abyss (it blinked)…',
+  'calculating your fate, no pressure…',
+  'doing the thinking you pay me for…',
+  'processing your questionable life choices…',
+  'summoning coherent thoughts, rarely works…',
+]
+const SPARKLE = ['✦', '✧', '✶', '✷', '✸', '✹']
 
 function buildAtContext(text: string): string {
   const refs = [...text.matchAll(/@([\w./\-]+)/g)]
@@ -49,8 +57,8 @@ export function InputBar({ config, skills, cwd, session }: Props) {
   const [status, setStatus] = useState<Status>('idle')
   const [tick, setTick] = useState(0)
   const [currentModel, setCurrentModel] = useState(config.model)
-  const [streamPreview, setStreamPreview] = useState('')
   const [sessionName, setSessionName] = useState(session)
+  const [currentTool, setCurrentTool] = useState<string | undefined>()
   const [planningMode, setPlanningMode] = useState(false)
 
   // picker opens on mount — force model selection every launch
@@ -62,8 +70,6 @@ export function InputBar({ config, skills, cwd, session }: Props) {
 
   const abortRef = useRef<AbortController | null>(null)
   const pullAbortRef = useRef<AbortController | null>(null)
-  const tokenBufRef = useRef('')
-  const lastRenderRef = useRef(0)
   const systemPromptRef = useRef(getSystemPrompt(`\n- CWD: ${cwd}`))
   const currentModelRef = useRef(currentModel)
   const sessionNameRef = useRef(sessionName)
@@ -100,45 +106,25 @@ export function InputBar({ config, skills, cwd, session }: Props) {
 
   const runLoop = useCallback(async (contextMsgs: ChatMessage[], depth = 0) => {
     if (depth >= MAX_TOOL_DEPTH) { setStatus('idle'); return }
-    setStatus('streaming')
-    setStreamPreview('')
-
-    const parser = new StreamParser()
-    const pendingTools: Array<{ name: string; args: Record<string, unknown> }> = []
-    let fullText = ''
+    setStatus('thinking')
 
     abortRef.current = new AbortController()
 
-    await stream({
+    await chat({
       provider: config.provider,
       model: currentModelRef.current,
       baseUrl: config.baseUrl,
       messages: contextMsgs,
       signal: abortRef.current.signal,
 
-      onToken(token) {
-        fullText += token
-        tokenBufRef.current += token
-        const now = Date.now()
-        if (now - lastRenderRef.current >= THROTTLE_MS) {
-          setStreamPreview(fullText)
-          tokenBufRef.current = ''
-          lastRenderRef.current = now
-        }
-        for (const item of parser.feed(token)) {
-          if (item.type === 'tool_call') pendingTools.push({ name: item.toolName, args: item.toolArgs })
-        }
-      },
-
-      async onDone() {
-        setStreamPreview(fullText)
-        for (const item of parser.flush()) {
+      async onDone(fullText) {
+        const pendingTools: Array<{ name: string; args: Record<string, unknown> }> = []
+        const parser = new StreamParser()
+        for (const item of [...parser.feed(fullText), ...parser.flush()]) {
           if (item.type === 'tool_call') pendingTools.push({ name: item.toolName, args: item.toolArgs })
         }
 
         printer.assistantMsg(fullText)
-        setStreamPreview('')
-
         historyRef.current.push({ role: 'assistant', content: fullText })
         saveSession(sessionNameRef.current, historyRef.current)
 
@@ -149,6 +135,7 @@ export function InputBar({ config, skills, cwd, session }: Props) {
 
         for (const tc of pendingTools) {
           const tool = tools.find(t => t.name === tc.name)
+          setCurrentTool(tc.name)
           if (tool) {
             try {
               const result = await tool.execute(tc.args)
@@ -164,6 +151,7 @@ export function InputBar({ config, skills, cwd, session }: Props) {
             next.push({ role: 'user', content: `unknown tool: ${tc.name}` })
           }
         }
+        setCurrentTool(undefined)
 
         await runLoop(next, depth + 1)
       },
@@ -171,7 +159,6 @@ export function InputBar({ config, skills, cwd, session }: Props) {
       onError(err) {
         if (err.name !== 'AbortError') printer.errorMsg(err.message)
         setStatus('idle')
-        setStreamPreview('')
       },
     })
   }, [config])
@@ -344,8 +331,6 @@ export function InputBar({ config, skills, cwd, session }: Props) {
   const handleAbort = useCallback(() => {
     abortRef.current?.abort()
     setStatus('idle')
-    setStreamPreview('')
-    tokenBufRef.current = ''
   }, [])
 
   const skillList = skills.list()
@@ -368,13 +353,16 @@ export function InputBar({ config, skills, cwd, session }: Props) {
           />
           <Divider cols={cols} />
         </>
-      ) : streamPreview ? (
+      ) : (status === 'thinking' || status === 'tool') ? (
         <>
           <Box flexDirection="column" paddingX={1}>
             <Text bold color="green">miii</Text>
-            {lastLines(streamPreview, PREVIEW_LINES).map((line, i) => (
-              <Text key={i} color="gray" wrap="wrap">{line || ' '}</Text>
-            ))}
+            <Box paddingLeft={2}>
+              {status === 'thinking'
+                ? <><Text color="yellow">{SPARKLE[tick % SPARKLE.length]} </Text><Text color="gray" dimColor italic>{THINKING_PHRASES[Math.floor(tick / 62) % THINKING_PHRASES.length]}</Text></>
+                : <Text color="yellow" dimColor>⚙ running {currentTool ?? 'tool'}…</Text>
+              }
+            </Box>
           </Box>
           <Divider cols={cols} />
         </>

package/src/tui/components/MessageList.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { Box, Text } from 'ink'
 import type { Message } from '../../types.js'
 
@@ -8,6 +8,7 @@ interface Props {
   cols: number
   scrollOffset: number  // 0 = pinned at bottom; N = N msgs hidden from bottom
   streaming?: boolean
+  thinkingTick?: number
 }
 
 // ─── height estimation ───────────────────────────────────────────────────────
@@ -104,7 +105,33 @@ function UserMsg({ msg }: { msg: Message }) {
   )
 }
 
-function AssistantMsg({ msg }: { msg: Message }) {
+const THINKING_PHRASES = [
+  'oh wow, a question. let me pretend to care…',
+  'consulting the void…',
+  'making something up, just a sec…',
+  'definitely not hallucinating right now…',
+  'running 47 mental tabs…',
+  'staring into the abyss (it blinked)…',
+  'calculating your fate, no pressure…',
+  'doing the thinking you pay me for…',
+  'processing your questionable life choices…',
+  'summoning coherent thoughts, rarely works…',
+]
+const SPARKLE = ['✦', '✧', '✶', '✷', '✸', '✹']
+
+function AssistantMsg({ msg, thinkingTick }: { msg: Message; thinkingTick?: number }) {
+  if (!msg.content && thinkingTick !== undefined) {
+    const phrase = THINKING_PHRASES[Math.floor(thinkingTick / 62) % THINKING_PHRASES.length]
+    const icon = SPARKLE[thinkingTick % SPARKLE.length]
+    return (
+      <Box flexDirection="column" marginBottom={1}>
+        <Text bold color="green">miii</Text>
+        <Box paddingLeft={2}>
+          <Text color="yellow">{icon} </Text><Text color="gray" dimColor italic>{phrase}</Text>
+        </Box>
+      </Box>
+    )
+  }
   return (
     <Box flexDirection="column" marginBottom={1}>
       <Text bold color="green">miii</Text>
@@ -139,10 +166,10 @@ function SystemMsg({ msg }: { msg: Message }) {
   )
 }
 
-function MsgItem({ msg }: { msg: Message }) {
+function MsgItem({ msg, thinkingTick }: { msg: Message; thinkingTick?: number }) {
   switch (msg.role) {
     case 'user':      return <UserMsg msg={msg} />
-    case 'assistant': return <AssistantMsg msg={msg} />
+    case 'assistant': return <AssistantMsg msg={msg} thinkingTick={thinkingTick} />
     case 'tool':      return <ToolMsg msg={msg} />
     case 'system':    return <SystemMsg msg={msg} />
     default:          return null
@@ -165,7 +192,7 @@ function ScrollHint({ hiddenAbove, hiddenBelow }: { hiddenAbove: number; hiddenB
 
 // ─── main export ─────────────────────────────────────────────────────────────
 
-export function MessageList({ messages, rows, cols, scrollOffset, streaming }: Props) {
+export function MessageList({ messages, rows, cols, scrollOffset, streaming, thinkingTick }: Props) {
   const availRows = Math.max(rows - 2, 4)
   const { visible, hiddenAbove, hiddenBelow } = useMemo(
     () => computeSlice(messages, availRows, scrollOffset, cols),
@@ -182,7 +209,7 @@ export function MessageList({ messages, rows, cols, scrollOffset, streaming }: P
         </Box>
       )}
 
-      {visible.map(msg => <MsgItem key={msg.id} msg={msg} />)}
+      {visible.map(msg => <MsgItem key={msg.id} msg={msg} thinkingTick={thinkingTick} />)}
 
       {streaming && scrollOffset === 0 && (
         <Box paddingLeft={2}><Text color="gray" dimColor>▋</Text></Box>

package/src/tui/components/StatusBar.tsx

@@ -17,7 +17,7 @@ export function StatusBar({ model, provider, status, tick }: Props) {
 
   const statusNode =
     status === 'idle' ? <Text color="green">● <Text color="gray">ready</Text></Text>
-    : status === 'streaming' ? <Text color="yellow">{spinner} <Text color="gray">streaming</Text></Text>
+    : status === 'thinking' ? <Text color="yellow">{spinner} <Text color="gray">thinking</Text></Text>
     : <Text color="yellow">{spinner} <Text color="gray">tool</Text></Text>
 
   return (

package/src/tui/printer.ts

@@ -90,7 +90,7 @@ export function welcome(provider: string, model: string, cwd: string): void {
     row('',                                            rcmd('/session',  'manage sessions')),
     blank(),
     row(`  ${gray(provider + '/' + model)}`,          `  ${bold(yellow('Tips'))}`),
-    row(`  ${gray(shortCwd)}`,                         rcmd('ctrl+c',   'stop streaming')),
+    row(`  ${gray(shortCwd)}`,                         rcmd('ctrl+c',   'stop thinking')),
     row('',                                            rcmd('ctrl+c x2','exit')),
     blank(),
     bottom,

package/src/types.ts

@@ -1,5 +1,5 @@
 export type Role = 'user' | 'assistant' | 'system' | 'tool'
-export type Status = 'idle' | 'streaming' | 'tool'
+export type Status = 'idle' | 'thinking' | 'tool'
 
 export interface Message {
   id: string