From ef51bb00911266996a03da6c4237d8e08ff5f9ee Mon Sep 17 00:00:00 2001
From: Brooklyn Nicholson <brooklyn.bb.nicholson@gmail.com>
Date: Sun, 12 Apr 2026 16:06:39 -0500
Subject: [PATCH] fix: tool drafting stuff

---
 ui-tui/src/app.tsx     | 48 ++++++++++++++++++++++++------------------
 ui-tui/src/lib/text.ts |  4 ++++
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/ui-tui/src/app.tsx b/ui-tui/src/app.tsx
index ee317662aff..6280041ca3e 100644
--- a/ui-tui/src/app.tsx
+++ b/ui-tui/src/app.tsx
@@ -26,6 +26,7 @@ import {
   fmtK,
   hasInterpolation,
   isToolTrailResultLine,
+  isTransientTrailLine,
   pick,
   sameToolTrailGroup
 } from './lib/text.js'
@@ -453,13 +454,27 @@ export function App({ gw }: { gw: GatewayClient }) {
     })
   }, [])
 
+  const pruneTransient = useCallback(() => {
+    setTurnTrail(prev => {
+      const next = prev.filter(l => !isTransientTrailLine(l))
+
+      if (next.length === prev.length) {
+        return prev
+      }
+
+      turnToolsRef.current = next
+
+      return next
+    })
+  }, [])
+
   const pushTrail = useCallback((line: string) => {
     setTurnTrail(prev => {
       if (prev.at(-1) === line) {
         return prev
       }
 
-      const next = [...prev, line].slice(-8)
+      const next = [...prev.filter(l => !isTransientTrailLine(l)), line].slice(-8)
       turnToolsRef.current = next
 
       return next
@@ -1037,13 +1052,9 @@ export function App({ gw }: { gw: GatewayClient }) {
       return
     }
 
-    if (completions.length && input && (key.upArrow || key.downArrow)) {
+    if (completions.length && input && historyIdx === null && (key.upArrow || key.downArrow)) {
       setCompIdx(i => (key.upArrow ? (i - 1 + completions.length) % completions.length : (i + 1) % completions.length))
 
-      if (historyIdx !== null) {
-        setHistoryIdx(null)
-      }
-
       return
     }
 
@@ -1332,6 +1343,7 @@ export function App({ gw }: { gw: GatewayClient }) {
           break
 
         case 'tool.start':
+          pruneTransient()
           setTools(prev => [
             ...prev,
             { id: p.tool_id, name: p.name, context: (p.context as string) || '', startedAt: Date.now() }
@@ -1416,6 +1428,8 @@ export function App({ gw }: { gw: GatewayClient }) {
           break
 
         case 'message.delta':
+          pruneTransient()
+
           if (p?.text && !interruptedRef.current) {
             buf.current = p.rendered ?? buf.current + p.text
             setStreaming(buf.current.trimStart())
@@ -1843,16 +1857,13 @@ export function App({ gw }: { gw: GatewayClient }) {
 
         case 'personality':
           if (arg) {
-            rpc('config.set', { session_id: sid, key: 'personality', value: arg }).then((r: any) => {
-              if (r?.cleared) {
-                setMessages([])
-                setHistoryItems([])
-              }
-
-              sys(`personality → ${r?.value}`)
-            })
+            rpc('config.set', { key: 'personality', value: arg }).then((r: any) =>
+              sys(`personality: ${r.value || 'default'}`)
+            )
           } else {
-            rpc('config.get', { key: 'personality' }).then((r: any) => sys(`personality: ${r?.value || 'default'}`))
+            gw.request('slash.exec', { command: 'personality', session_id: sid })
+              .then((r: any) => panel('Personality', [{ text: r?.output || '(no output)' }]))
+              .catch(() => sys('personality command failed'))
           }
 
           return true
@@ -2280,11 +2291,6 @@ export function App({ gw }: { gw: GatewayClient }) {
 
   const submit = useCallback(
     (value: string) => {
-      if (completions.length && completions[compIdx]) {
-        value = value.slice(0, compReplace) + completions[compIdx].text
-        setInput(value)
-      }
-
       if (!value.trim() && !inputBuf.length) {
         const now = Date.now()
         const dbl = now - lastEmptyAt.current < 450
@@ -2342,7 +2348,7 @@ export function App({ gw }: { gw: GatewayClient }) {
 
       dispatchSubmission([...inputBuf, value].join('\n'))
     },
-    [compIdx, compReplace, completions, dequeue, dispatchSubmission, inputBuf, sid]
+    [dequeue, dispatchSubmission, inputBuf, sid]
   )
 
   // ── Derived ──────────────────────────────────────────────────────
diff --git a/ui-tui/src/lib/text.ts b/ui-tui/src/lib/text.ts
index 461fbc8b00a..3c5ccbcc7d4 100644
--- a/ui-tui/src/lib/text.ts
+++ b/ui-tui/src/lib/text.ts
@@ -53,6 +53,10 @@ export const buildToolTrailLine = (name: string, context: string, error?: boolea
 /** Tool completed / failed row in the inline trail (not CoT prose). */
 export const isToolTrailResultLine = (line: string) => line.endsWith(' ✓') || line.endsWith(' ✗')
 
+/** Ephemeral status lines that should vanish once the next phase starts. */
+export const isTransientTrailLine = (line: string) =>
+  line.startsWith('drafting ') || line === 'analyzing tool output…'
+
 /** Whether a persisted/activity tool line belongs to the same tool label as a newer line. */
 export const sameToolTrailGroup = (label: string, entry: string) =>
   entry === `${label} ✓` || entry === `${label} ✗` || entry.startsWith(`${label}:`)