ethagent 2.2.0 → 2.4.0

package/src/chat/MessageList.tsx

@@ -3,11 +3,16 @@ import { Box, Text } from 'ink'
 import { theme } from '../ui/theme.js'
 import { ProgressBar } from '../ui/ProgressBar.js'
 import { Spinner } from '../ui/Spinner.js'
+import { DiffView } from './display/DiffView.js'
+import { SyntaxLine } from './display/SyntaxText.js'
+import { formatToolCall } from './display/toolCallDisplay.js'
+import { BrandSplash } from '../ui/BrandSplash.js'
 
 export type ToolCallResult = {
   content: string
   summary: string
   isError: boolean
+  diff?: string
 }
 
 export type MessageRow =
@@ -19,7 +24,7 @@ export type MessageRow =
       id: string
       name: string
       summary: string
-      input?: string
+      input?: Record<string, unknown>
       result?: ToolCallResult
     }
   | { role: 'note'; id: string; kind: 'info' | 'error' | 'dim'; content: string }
@@ -34,6 +39,13 @@ export type MessageRow =
       indeterminate?: boolean
       startedAt?: number
     }
+  | {
+      role: 'splash'
+      id: string
+      contextLine?: string
+      tipLine?: string
+      updateNotice?: string | null
+    }
 
 type MessageListProps = {
   rows: MessageRow[]
@@ -55,11 +67,18 @@ type InlineToken =
 const MAX_RENDERED_MESSAGE_CHARS = 12_000
 const MAX_RENDERED_REASONING_CHARS = 10_000
 const ASSISTANT_ACCENT = theme.accentPeriwinkle
+const ASSISTANT_MARKER = '• '
 const UNREADABLE_REASONING_TEXT = 'reasoning output was not readable text'
 
 const MessageListInner: React.FC<MessageListProps> = ({ rows }) => (
   <Box flexDirection="column">
-    {rows.map(row => <RowView key={row.id} row={row} />)}
+    {rows.map((row, index) => (
+      <RowView
+        key={row.id}
+        row={row}
+        tightTop={row.role === 'tool_call' && rows[index - 1]?.role === 'tool_call'}
+      />
+    ))}
   </Box>
 )
 
@@ -102,7 +121,7 @@ export function toggleInspectableRow(rows: MessageRow[], rowId?: string): Messag
   return rows
 }
 
-const RowViewInner: React.FC<{ row: MessageRow }> = ({ row }) => {
+const RowViewInner: React.FC<{ row: MessageRow; tightTop?: boolean }> = ({ row, tightTop }) => {
   if (row.role === 'user') {
     const display = clipTextForDisplay(row.content, MAX_RENDERED_MESSAGE_CHARS)
     const lines = display.text.length === 0 ? [''] : display.text.split('\n')
@@ -132,48 +151,65 @@ const RowViewInner: React.FC<{ row: MessageRow }> = ({ row }) => {
   if (row.role === 'thinking') {
     const text = sanitizeReasoningForDisplay(reasoningText(row))
     const preview = summarizeThinking(text)
-    const borderColor = reasoningBorderColor(row)
+    const active = Boolean(row.streaming)
     const showCursor = reasoningCursorVisible(row)
     if (row.expanded) {
       return (
-        <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={borderColor} paddingX={1}>
-          <Text>
-            <Text color={theme.accentPeriwinkle} bold>reasoning</Text>
-            <Text color={theme.dim}> · expanded · alt+t collapse</Text>
-          </Text>
-          <ReasoningBody content={text} showCursor={showCursor} />
-        </Box>
+        <ReasoningBlock
+          content={text}
+          detail="alt+t collapse"
+          expanded
+          active={active}
+          showCursor={showCursor}
+        />
       )
     }
     return (
-      <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={borderColor} paddingX={1}>
-        <Text>
-          <Text color={theme.accentPeriwinkle} bold>reasoning</Text>
-          <Text color={theme.dim}> · collapsed · alt+t inspect</Text>
-        </Text>
-        <Text color={theme.textSubtle}>
-          {preview || 'thinking...'}
-          {showCursor ? <ThinkingCursor active hasPreview={Boolean(preview)} /> : null}
-        </Text>
-      </Box>
+      <ReasoningBlock
+        content={preview || 'thinking...'}
+        detail="alt+t inspect"
+        active={active}
+        showCursor={showCursor}
+      />
     )
   }
 
   if (row.role === 'tool_call') {
+    const { displayName, argSummary } = formatToolCall(row.name, row.input)
     const result = row.result
-    const inputPreview = row.input ? truncateToolInputForLine(row.input, 60) : ''
+    const showResultLine = !result || result.isError
     return (
-      <Box marginTop={1}>
+      <Box flexDirection="column" marginTop={tightTop ? 0 : 1}>
         <Text>
-          <Text color={theme.dim}>{'· '}</Text>
-          <Text color={theme.accentPeriwinkle} bold>{row.name}</Text>
-          {inputPreview ? <Text color={theme.textSubtle}>{`  ${inputPreview}`}</Text> : null}
-          {result ? (
-            <Text color={result.isError ? theme.accentError : theme.dim}>{`  ${result.summary}`}</Text>
-          ) : (
-            <Text color={theme.dim}>{'  running…'}</Text>
-          )}
+          <Text color={theme.dim}>{'● '}</Text>
+          <Text color={theme.accentPeriwinkle} bold>{displayName}</Text>
+          {row.name !== 'run_bash' && argSummary ? <Text color={theme.textSubtle}>{` ${argSummary}`}</Text> : null}
+          {result && !result.isError ? <Text color={theme.dim}>{' done'}</Text> : null}
         </Text>
+        {row.name === 'run_bash' && argSummary ? (
+          <Box marginLeft={2}>
+            <Text>
+              <Text color={theme.dim}>{'$ '}</Text>
+              <Text color={theme.text}>{argSummary}</Text>
+            </Text>
+          </Box>
+        ) : null}
+        {showResultLine ? (
+          result ? (
+            <Box marginLeft={2}>
+              <Text color={result.isError ? theme.accentError : theme.dim}>{result.summary}</Text>
+            </Box>
+          ) : (
+            <Box marginLeft={2}>
+              <Text color={theme.dim}>running…</Text>
+            </Box>
+          )
+        ) : null}
+        {result?.diff && !result.isError ? (
+          <Box flexDirection="column" marginLeft={2}>
+            <DiffView diff={result.diff} />
+          </Box>
+        ) : null}
       </Box>
     )
   }
@@ -187,6 +223,16 @@ const RowViewInner: React.FC<{ row: MessageRow }> = ({ row }) => {
     )
   }
 
+  if (row.role === 'splash') {
+    return (
+      <BrandSplash
+        contextLine={row.contextLine}
+        tipLine={row.tipLine}
+        updateNotice={row.updateNotice ?? null}
+      />
+    )
+  }
+
   return (
     <Box flexDirection="column" marginTop={1}>
       <Text color={theme.accentPeriwinkle} bold>{row.title}</Text>
@@ -208,21 +254,60 @@ const ProgressSpinner: React.FC<{ row: Extract<MessageRow, { role: 'progress' }>
   return <Spinner active label={row.status} hint={row.suffix} startedAt={row.startedAt} />
 }
 
-export function reasoningBorderColor(row: Extract<MessageRow, { role: 'thinking' }>): string {
-  return row.streaming ? theme.accentPeriwinkle : theme.border
+const ShimmerText: React.FC<{
+  text: string
+  color: string
+  active?: boolean
+  bold?: boolean
+  italic?: boolean
+}> = ({ text, color, active = false, bold, italic }) => {
+  const [position, setPosition] = useState(0)
+
+  useEffect(() => {
+    if (!active) return
+    const period = text.length + 8
+    const timer = setInterval(() => {
+      setPosition(prev => (prev + 1) % period)
+    }, 90)
+    return () => clearInterval(timer)
+  }, [active, text.length])
+
+  if (!active) {
+    return <Text color={color} bold={bold} italic={italic}>{text}</Text>
+  }
+
+  const shimmerStart = position - 1
+  const shimmerEnd = position + 1
+  const visibleStart = Math.max(0, shimmerStart)
+  const visibleEnd = Math.min(text.length, shimmerEnd + 1)
+  const before = text.slice(0, visibleStart)
+  const shimmer = shimmerStart < text.length && shimmerEnd >= 0 ? text.slice(visibleStart, visibleEnd) : ''
+  const after = text.slice(visibleEnd)
+
+  return (
+    <>
+      {before ? <Text color={color} bold={bold} italic={italic}>{before}</Text> : null}
+      {shimmer ? <Text color={theme.accentWhite} bold italic={italic}>{shimmer}</Text> : null}
+      {after ? <Text color={color} bold={bold} italic={italic}>{after}</Text> : null}
+    </>
+  )
 }
 
-function truncateToolInputForLine(input: string, max: number): string {
-  const flat = input.replace(/\s+/g, ' ').trim()
-  if (flat.length <= max) return flat
-  return `${flat.slice(0, Math.max(1, max - 1))}…`
+export function reasoningBorderColor(row: Extract<MessageRow, { role: 'thinking' }>): string {
+  return row.streaming ? theme.accentPeriwinkle : theme.border
 }
 
 export function reasoningCursorVisible(row: Extract<MessageRow, { role: 'thinking' }>): boolean {
   return Boolean(row.streaming && row.showCursor)
 }
 
-const ReasoningBody: React.FC<{ content: string; showCursor?: boolean }> = ({ content, showCursor }) => {
+const ReasoningBlock: React.FC<{
+  content: string
+  detail: string
+  active?: boolean
+  expanded?: boolean
+  showCursor?: boolean
+}> = ({ content, detail, active = false, expanded = false, showCursor }) => {
   const display = useMemo(
     () => clipTextForDisplay(content, MAX_RENDERED_REASONING_CHARS),
     [content],
@@ -233,16 +318,35 @@ const ReasoningBody: React.FC<{ content: string; showCursor?: boolean }> = ({ co
   }, [display.text])
 
   return (
-    <Box flexDirection="column">
+    <Box flexDirection="column" marginTop={1}>
       {display.omittedChars > 0 ? (
         <Text color={theme.dim}>{`${display.omittedChars} earlier reasoning characters omitted`}</Text>
       ) : null}
-      {lines.map((line, index) => (
-        <Text key={index} color={theme.textSubtle}>
-          {line || ' '}
-          {showCursor && index === lines.length - 1 ? <ThinkingCursor active hasPreview={line.length > 0} /> : null}
-        </Text>
-      ))}
+      <Text>
+        <AssistantMarker />
+        <ShimmerText
+          text={expanded ? 'Thinking…' : 'Thinking'}
+          color={theme.accentPeriwinkle}
+          active={active}
+          bold
+          italic
+        />
+        <Text color={theme.dim}>{` · ${detail}`}</Text>
+        {!expanded && showCursor ? <ThinkingCursor active hasPreview /> : null}
+      </Text>
+      {expanded ? (
+        <Box flexDirection="column" marginLeft={2}>
+          {lines.map((line, index) => (
+            <Box key={index}>
+              <Text color={theme.textSubtle}>
+                <Text color={theme.dim}>{'  '}</Text>
+                {line || ' '}
+                {showCursor && index === lines.length - 1 ? <ThinkingCursor active hasPreview={line.length > 0} /> : null}
+              </Text>
+            </Box>
+          ))}
+        </Box>
+      ) : null}
     </Box>
   )
 }
@@ -269,22 +373,33 @@ const AssistantBody: React.FC<{ content: string; liveTail?: string; streaming?:
           key={index}
           block={block}
           streaming={streaming && index === blocks.length - 1}
+          prefix={index === 0 || block.kind === 'code' ? <AssistantMarker /> : null}
         />
       ))}
       {streaming && blocks.length === 0 ? (
-        <Text color={ASSISTANT_ACCENT}>
-          <StreamCursor active />
+        <Text>
+          <AssistantMarker />
+          <Text color={ASSISTANT_ACCENT}><StreamCursor active /></Text>
         </Text>
       ) : null}
     </Box>
   )
 }
 
-const MarkdownBlockView: React.FC<{ block: MarkdownBlock; streaming?: boolean }> = ({ block, streaming = false }) => {
+const AssistantMarker: React.FC = () => (
+  <Text color={theme.dim}>{ASSISTANT_MARKER}</Text>
+)
+
+const MarkdownBlockView: React.FC<{ block: MarkdownBlock; streaming?: boolean; prefix?: React.ReactNode }> = ({
+  block,
+  streaming = false,
+  prefix = null,
+}) => {
   if (block.kind === 'heading') {
     return (
       <Box flexDirection="column" marginTop={1}>
         <Text>
+          {prefix}
           <InlineText text={block.text} color={ASSISTANT_ACCENT} bold />
         </Text>
       </Box>
@@ -296,6 +411,7 @@ const MarkdownBlockView: React.FC<{ block: MarkdownBlock; streaming?: boolean }>
       <Box flexDirection="column" marginTop={1}>
         {block.lines.map((line, index) => (
           <Text key={index}>
+            {index === 0 ? prefix : null}
             <Text color={ASSISTANT_ACCENT}>| </Text>
             <InlineText text={line} color={theme.dim} />
           </Text>
@@ -309,6 +425,7 @@ const MarkdownBlockView: React.FC<{ block: MarkdownBlock; streaming?: boolean }>
       <Box flexDirection="column" marginTop={1}>
         {block.items.map((item, index) => (
           <Text key={index}>
+            {index === 0 ? prefix : null}
             <Text color={ASSISTANT_ACCENT}>{block.ordered ? `${index + 1}. ` : '- '}</Text>
             <InlineText text={item} color={theme.text} />
           </Text>
@@ -319,18 +436,20 @@ const MarkdownBlockView: React.FC<{ block: MarkdownBlock; streaming?: boolean }>
 
   if (block.kind === 'code') {
     const lines = block.code.length === 0 ? [''] : block.code.split('\n')
-    const accent = codeAccent(block.lang)
+    const isShell = block.lang === 'bash' || block.lang === 'sh'
     return (
-      <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={accent}>
-        <Box paddingX={1}>
-          <Text color={accent} bold>{block.lang ? block.lang : 'code'}</Text>
-          <Text color={theme.dim}>{block.open ? '  · streaming' : '  · block'}</Text>
-        </Box>
-        <Box flexDirection="column" paddingX={1}>
+      <Box flexDirection="column" marginTop={1}>
+        <Text>
+          {prefix}
+          <Text color={theme.accentPeriwinkle} bold>{block.lang ?? 'code'}</Text>
+          {block.open ? <Text color={theme.dim}> streaming</Text> : null}
+        </Text>
+        <Box flexDirection="column" marginLeft={2}>
           {lines.map((line, index) => (
             <Text key={index}>
-              <Text color={theme.dim}>{`${String(index + 1).padStart(2, '0')} `}</Text>
-              <Text color={codeLineColor(block.lang, line)}>{line || ' '}</Text>
+              <Text color={theme.dim}>{isShell ? '$ ' : '  '}</Text>
+              <SyntaxLine line={line} lang={block.lang} fallbackColor={theme.textSubtle} />
+              {block.open && index === lines.length - 1 ? <Text color={ASSISTANT_ACCENT}> <StreamCursor active /></Text> : null}
             </Text>
           ))}
         </Box>
@@ -341,6 +460,7 @@ const MarkdownBlockView: React.FC<{ block: MarkdownBlock; streaming?: boolean }>
   return (
     <Box flexDirection="column" marginTop={1}>
       <Text>
+        {prefix}
         <InlineText text={block.text} color={theme.text} />
         {streaming ? <Text color={ASSISTANT_ACCENT}> <StreamCursor active /></Text> : null}
       </Text>
@@ -408,6 +528,14 @@ const StreamCursor: React.FC<{ active: boolean }> = ({ active }) => {
   return <>{visible ? '|' : ' '}</>
 }
 
+function blockContentWidth(lines: string[]): number {
+  return Math.max(1, ...lines.map(displayWidth))
+}
+
+function displayWidth(line: string): number {
+  return (line || ' ').replace(/\t/g, '  ').length
+}
+
 function parseMarkdownBlocks(markdown: string): MarkdownBlock[] {
   const text = markdown.replace(/\r\n/g, '\n').replace(/\r/g, '\n')
   if (!text.trim()) return []
@@ -505,21 +633,6 @@ function parseMarkdownBlocks(markdown: string): MarkdownBlock[] {
   return blocks
 }
 
-function codeAccent(_lang: string | null): string {
-  return ASSISTANT_ACCENT
-}
-
-function codeLineColor(lang: string | null, line: string): string {
-  const trimmed = line.trim()
-  if (!trimmed) return theme.textSubtle
-  if ((lang === 'json' || lang === 'jsonc') && /^["[{]/.test(trimmed)) return ASSISTANT_ACCENT
-  if (/^(\/\/|#|\/\*|\*)/.test(trimmed)) return theme.dim
-  if (/\b(function|const|let|return|if|else|class|export|import)\b/.test(trimmed)) return theme.text
-  if (/<\/?[A-Za-z]/.test(trimmed)) return ASSISTANT_ACCENT
-  if (/^[.#@]/.test(trimmed)) return ASSISTANT_ACCENT
-  return theme.textSubtle
-}
-
 function parseInlineTokens(text: string): InlineToken[] {
   const tokens: InlineToken[] = []
   const source = normalizeInlineDisplayText(text)

package/src/chat/SessionStatus.tsx

@@ -3,6 +3,8 @@ import { Box, Text } from 'ink'
 import type { ContextUsage } from '../runtime/compaction.js'
 import { theme } from '../ui/theme.js'
 import { formatModelDisplayName } from '../models/modelDisplay.js'
+import { providerDisplayName } from '../models/providerDisplay.js'
+import type { ProviderId } from '../storage/config.js'
 
 type StatusBarProps = {
   provider: string
@@ -25,7 +27,7 @@ const SessionStatusInner: React.FC<StatusBarProps> = ({
   return (
     <Box flexDirection="row">
       <Text color={theme.dim}>
-        {provider} · {displayModel} · {turns} {turns === 1 ? 'turn' : 'turns'} · ~{formatTokens(approxTokens)} tokens · Context {contextUsage.percent}% (~{formatTokens(contextUsage.usedTokens)} / {formatTokens(contextUsage.windowTokens)}) · {formatElapsed(Date.now() - startedAt)}
+        {providerDisplayName(provider as ProviderId)} · {displayModel} · {turns} {turns === 1 ? 'turn' : 'turns'} · ~{formatTokens(approxTokens)} tokens · Context {contextUsage.percent}% (~{formatTokens(contextUsage.usedTokens)} / {formatTokens(contextUsage.windowTokens)}) · {formatElapsed(Date.now() - startedAt)}
       </Text>
     </Box>
   )

package/src/chat/chatScreenUtils.ts

@@ -11,7 +11,7 @@ import {
   type SessionMessage,
 } from '../storage/sessions.js'
 import type { MessageRow } from './MessageList.js'
-import { hidesSuccessfulToolResultContent } from './toolResultDisplay.js'
+import { hidesSuccessfulToolResultContent, toolResultDiffContent, toolResultTextContent } from './display/toolResultDisplay.js'
 
 export type TurnCheckpoint = {
   sessionId: string
@@ -62,7 +62,7 @@ export function sessionMessagesToRows(messages: SessionMessage[], nextRowId: ()
         id: nextRowId(),
         name: msg.name,
         summary: msg.name,
-        input: summarizeToolInput(msg.input),
+        input: msg.input,
       }
       restored.push(row)
       toolCallByUseId.set(msg.toolUseId, row)
@@ -70,9 +70,10 @@ export function sessionMessagesToRows(messages: SessionMessage[], nextRowId: ()
       const isError = Boolean(msg.isError)
       const summary = isError ? `${msg.name} failed` : `${msg.name} completed`
       const content = toolResultContentForRow(msg.name, msg.content, msg.isError)
+      const diff = toolResultDiffForRow(msg.content, msg.isError)
       const existing = toolCallByUseId.get(msg.toolUseId)
       if (existing) {
-        existing.result = { content, summary, isError }
+        existing.result = diff ? { content, summary, isError, diff } : { content, summary, isError }
         existing.name = msg.name
       } else {
         restored.push({
@@ -80,7 +81,7 @@ export function sessionMessagesToRows(messages: SessionMessage[], nextRowId: ()
           id: nextRowId(),
           name: msg.name,
           summary: msg.name,
-          result: { content, summary, isError },
+          result: diff ? { content, summary, isError, diff } : { content, summary, isError },
         })
       }
     }
@@ -88,23 +89,18 @@ export function sessionMessagesToRows(messages: SessionMessage[], nextRowId: ()
   return restored
 }
 
-export function summarizeToolInput(input: Record<string, unknown>): string {
-  try {
-    const text = JSON.stringify(input)
-    if (text.length <= 160) return text
-    return `${text.slice(0, 157)}...`
-  } catch {
-    return '[unserializable input]'
-  }
-}
-
 export function truncateForRow(text: string, max = 1200): string {
   if (text.length <= max) return text
   return `${text.slice(0, max - 3)}...`
 }
 
 export function toolResultContentForRow(name: string, content: string, isError?: boolean): string {
-  return hidesSuccessfulToolResultContent(name, isError) ? '' : truncateForRow(content)
+  const textContent = toolResultTextContent(content)
+  return hidesSuccessfulToolResultContent(name, isError) ? '' : truncateForRow(textContent)
+}
+
+export function toolResultDiffForRow(content: string, isError?: boolean): string | undefined {
+  return toolResultDiffContent(content, isError)
 }
 
 export function splitStreamingContent(text: string): { committed: string; liveTail: string } {

package/src/chat/chatSessionState.ts

@@ -39,6 +39,7 @@ export function resolveModelSelection(
       selection.model === currentConfig.model
       && currentConfig.provider === 'llamacpp'
       && currentConfig.baseUrl === baseUrl
+      && currentConfig.localMmprojPath === selection.mmprojPath
     ) {
       return { kind: 'noop' }
     }
@@ -49,8 +50,9 @@ export function resolveModelSelection(
         provider: 'llamacpp',
         model: selection.model,
         baseUrl,
+        localMmprojPath: selection.mmprojPath,
       },
-      notice: `Local Hugging Face model ready. Now using ${formatModelDisplayName('llamacpp', selection.model, { maxLength: 64 })}.`,
+      notice: `Local Hugging Face model ready. Now using ${formatModelDisplayName('llamacpp', selection.model, { maxLength: 64 })}${selection.mmprojPath ? ' with vision encoder' : ''}.`,
       tone: 'info',
     }
   }
@@ -65,6 +67,7 @@ export function resolveModelSelection(
     provider: nextProvider,
     model: selection.model,
     baseUrl: nextBaseUrl,
+    localMmprojPath: undefined,
   }
 
   return {
@@ -102,7 +105,7 @@ export function buildResumedSessionState(args: {
 function formatResumeNote(metadata: SessionMetadata | null): string {
   const id = metadata?.id?.slice(0, 8) ?? ''
   const source = metadata?.compactedFromSessionId ? ` summarized from ${metadata.compactedFromSessionId.slice(0, 8)}` : ''
-  return `resumed from session ${id}.${source}`.trim()
+  return `Resumed from session ${id}.${source}`.trim()
 }
 
 export function restoreConversationState(

package/src/chat/chatTurnOrchestrator.ts

@@ -15,6 +15,7 @@ import {
   createTurnCheckpoint,
   type TurnCheckpoint,
 } from './chatScreenUtils.js'
+import { collapseImagePathsToRefs, userTextToContentBlocks } from '../utils/images.js'
 
 type MutableRef<T> = { current: T }
 
@@ -101,10 +102,13 @@ export async function runStreamingTurn(
   const activeCheckpoint = createTurnCheckpoint(sessionId, userText)
   setActiveCheckpoint(activeCheckpoint)
 
-  updateRows(prev => [...prev, { role: 'user', id: nextRowId(), content: userText }])
+  const userContent = userTextToContentBlocks(userText)
+  const displayText = collapseImagePathsToRefs(userText)
+  updateRows(prev => [...prev, { role: 'user', id: nextRowId(), content: displayText }])
   await persistTurnMessage({
     role: 'user',
-    content: userText,
+    content: displayText,
+    providerContent: typeof userContent === 'string' ? undefined : userContent,
     createdAt: nowIso(),
     turnId: activeCheckpoint.turnId,
   })
@@ -127,7 +131,6 @@ export async function runStreamingTurn(
   let thinkingRowId: string | null = null
   let thinkingCursorActive = false
   let assistantId: string | null = null
-  let hasPendingToolUse = false
 
   const resetIteration = () => {
     accumulated = ''
@@ -135,7 +138,6 @@ export async function runStreamingTurn(
     thinkingRowId = null
     thinkingCursorActive = false
     assistantId = null
-    hasPendingToolUse = false
   }
 
   const stopThinkingCursor = () => {
@@ -192,7 +194,7 @@ export async function runStreamingTurn(
     flushStreamRows(true)
     updateRows(prev => {
       let next = finalizeStreamingRowsById(prev, assistantId, thinkingRowId, accumulated, thinkingContent)
-      if (assistantId && (hasPendingToolUse || accumulated.length === 0)) {
+      if (assistantId && accumulated.length === 0) {
         next = next.filter(r => r.id !== assistantId)
       }
       return next
@@ -294,7 +296,6 @@ export async function runStreamingTurn(
         setThinkingRowId: id => { thinkingRowId = id },
         markThinkingCursorActive: () => { thinkingCursorActive = true },
         getThinkingRowId: () => thinkingRowId,
-        markPendingToolUse: () => { hasPendingToolUse = true },
         updateRows,
         pushNote,
         nextRowId,
@@ -340,7 +341,6 @@ type EventHandlerContext = {
   setThinkingRowId: (id: string | null) => void
   getThinkingRowId: () => string | null
   markThinkingCursorActive: () => void
-  markPendingToolUse: () => void
   updateRows: (updater: (prev: MessageRow[]) => MessageRow[]) => void
   pushNote: (text: string, kind?: 'info' | 'error' | 'dim') => void
   nextRowId: () => string
@@ -403,7 +403,6 @@ async function handleEvent(ev: TurnEvent, ctx: EventHandlerContext): Promise<voi
       return
     }
     case 'tool_use_stop': {
-      ctx.markPendingToolUse()
       ctx.finalizeStreamingRows()
       return
     }
@@ -426,7 +425,6 @@ async function handleEvent(ev: TurnEvent, ctx: EventHandlerContext): Promise<voi
     }
     case 'local_tool_recovery': {
       ctx.discardStreamingRows()
-      ctx.markPendingToolUse()
       return
     }
     case 'continuation_nudge': {