thincoder 0.8.11 → 0.8.13

package/src/tui/render-frame.mjs

@@ -2,8 +2,9 @@
  * render-frame.mjs — terminal frame renderer (pure computation, no side effects)
  * Produces an ANSI frame string from state + agent + layout, returns cursor position.
  *
- * Layout calculation lives in layout.mjs (computeLayout pure function).
- * Side effects (scroll clamping, ctxCache update) are performed by the caller before rendering.
+ * Panel render functions are exported individually for incremental rendering
+ * (only changed panels are written to the terminal, eliminating flicker on Windows).
+ * The legacy renderFrame() wrapper is kept for compatibility.
  */
 import { ansi, C, ESC } from "./ansi.mjs"
 import { computeLayout, MAX_SUB_LINES } from "./layout.mjs"
@@ -13,7 +14,7 @@ import {
 import { specForModel } from "../config.mjs"
 import { basename } from "node:path"
 
-// ---------- status bar slash-command hints (lookup table instead of if-else chain) ----------
+// ---------- status bar slash-command hints ----------
 const SLASH_HINTS = {
   "/config": "open config menu",
   "/model": "select model & manage providers",
@@ -24,9 +25,205 @@ const SLASH_HINTS = {
   "/restore": "select checkpoint to restore",
 }
 
+// ====================================================================
+// Panel render functions (exported for incremental rendering)
+// Each returns string[] — one element per screen row, ANSI-colored,
+// WITHOUT \x1b[K (clear-line) or cursor positioning (added by caller).
+// ====================================================================
+
+/** Header panel (always 1 line). */
+export function renderHeader(agent, cols) {
+  const model = agent.provider.model
+  const spec = specForModel(model)
+  const thinkOnValue = spec.thinkOnValue ?? "enabled"
+  const t = agent.provider.thinking
+  const effort = agent.provider.reasoningEffort
+  const thinkBadge = t?.type === "disabled" ? "│ think: off"
+    : effort ? `│ think: ${effort}`
+    : t?.type === thinkOnValue ? "│ think: on" : ""
+  return `${ansi.bold}${C.tool} ThinCoder ${ansi.reset}${ansi.dim}│ ${sliceByWidth(model, 30)}${thinkBadge ? " " + thinkBadge : ""} │ ${sliceByWidth(basename(agent.cwd), Math.max(10, cols - 60))}${ansi.reset}`
+}
+
+/**
+ * Compute a cheap cache key for the conversation panel.
+ * Structural hints that change ONLY when the conversation actually changes.
+ * Used by the incremental renderer to skip rebuilding convLines when nothing changed.
+ */
+export function convCacheKey(state) {
+  const lastLine = state.lines.length > 0 ? state.lines[state.lines.length - 1] : null
+  return `${state.lines.length}|${lastLine?.text.length ?? 0}|${state.streaming.length}|${state.reasoning.length}|${Object.keys(state.toolStreams).length}`
+}
+
+/** Conversation panel (scrollable, variable height). Returns exactly `visibleH` lines. */
+export function renderConversation(state, cols, visibleH, scroll) {
+  const convLines = buildConvLines(state, cols)
+  const maxScroll = Math.max(0, convLines.length - visibleH)
+  const clamped = Math.min(scroll, maxScroll)
+  const end = convLines.length - clamped
+  const visible = convLines.slice(Math.max(0, end - visibleH), end)
+  const pad = visibleH - visible.length
+  const out = []
+  for (let i = 0; i < pad; i++) out.push("")
+  for (const l of visible) out.push(`${l.color}${l.text}${ansi.reset}`)
+  return out
+}
+
+/** Todo/task panel. Returns empty array when no tasks visible. */
+export function renderTodo(visibleTasks, cols) {
+  return visibleTasks.map((t) => {
+    const mark = t.status === "done" ? "✓" : t.status === "in_progress" ? "▶" : "○"
+    const color = t.status === "done" ? `${C.dim}${ESC}[9m` : t.status === "in_progress" ? C.tool : C.text
+    return `${color} ${mark} ${sliceByWidth(t.title, cols - 4)}${ansi.reset}`
+  })
+}
+
+/** Subagent panel. Returns empty when no subagents. */
+export function renderSubagent(allSubs, W) {
+  const subs = allSubs
+  if (subs.length === 0) return []
+  const out = []
+  for (const s of subs.slice(0, MAX_SUB_LINES)) {
+    const icon = s.done ? "✓" : "…"
+    const color = s.done ? C.dim : C.tool
+    const label = `[${s.role}]`.padEnd(10)
+    let content
+    if (s.done) {
+      const elapsed = Math.floor((Date.now() - s.started) / 1000)
+      content = `done ${elapsed}s`
+    } else if (s.tool) {
+      content = s.tool
+    } else if (s.text) {
+      const textLines = s.text.split("\n").filter((l) => l.trim())
+      content = textLines.length > 0 ? textLines[textLines.length - 1] : "thinking..."
+    } else {
+      content = "thinking..."
+    }
+    out.push(`${color} ${icon} ${label} ${sliceByWidth(content, Math.max(10, W - 14))}${ansi.reset}`)
+  }
+  if (subs.length > MAX_SUB_LINES) {
+    out.push(`${C.dim}  ... +${subs.length - MAX_SUB_LINES} more subagents${ansi.reset}`)
+  }
+  return out
+}
+
+/** Tool output panels (streaming output like tail -f). Returns empty when no active output. */
+export function renderOutput(state, W, panelH) {
+  const active = Object.values(state.outputPanels).filter((p) => !p.done)
+  if (active.length === 0) return []
+  const out = []
+  const linesPerPanel = Math.max(1, Math.floor(panelH / active.length))
+  for (const p of active) {
+    const textLines = (p.text ?? "").split("\n").filter((l) => l.trim())
+    const tail = textLines.slice(-linesPerPanel)
+    for (const line of tail) {
+      out.push(`${C.dim}  │ ${sliceByWidth(sanitizeDisplay(line), W - 5)}${ansi.reset}`)
+    }
+  }
+  // Fill remaining rows to match panelH exactly
+  const used = active.reduce((s, p) => {
+    const tl = (p.text ?? "").split("\n").filter((l) => l.trim()).slice(-linesPerPanel)
+    return s + tl.length
+  }, 0)
+  for (let i = used; i < panelH; i++) out.push("")
+  return out
+}
+
+/** Permission preview panel. Returns empty when no permission request. */
+export function renderPermission(permPreviewLines) {
+  if (permPreviewLines.length === 0) return []
+  return [`${ansi.bold}${C.warn}❯ Permission Request${ansi.reset}`, ...permPreviewLines.map((w) => `${C.warn}${w}${ansi.reset}`)]
+}
+
+/** Queue preview (1 line when queue has items during processing). */
+export function renderQueue(state, W) {
+  if (state.queue.length === 0 || !state.processing) return ""
+  const preview = sliceByWidth(state.queue[0].text, W - 20)
+  return `${C.dim}❯ Queue: ${state.queue.length} pending${state.queue.length > 1 ? ` (next: ${preview}…)` : ` (next: ${preview})`} — Ctrl+D delete │ Ctrl+I inject${ansi.reset}`
+}
+
+/** Picker/wizard overlay panel. Returns empty when no overlay. */
+export function renderPicker(state, cols, panel, overlay) {
+  if (!panel || !overlay) return []
+  const out = []
+  const winH = panel.h - 1
+  const start = Math.max(0, Math.min(overlay.scroll, Math.max(0, overlay.lines.length - winH)))
+  const shown = overlay.lines.slice(start, start + winH)
+  const title = state.picker ? ` ❯ ${state.picker.title} ` : " ❯ Setup "
+  out.push(`${ansi.bold}${C.tool}${title}${ansi.reset}${ansi.dim}${state.picker ? "(↑↓ navigate, Enter confirm, Esc cancel)" : ""}${ansi.reset}`)
+  for (const l of shown) {
+    out.push(`${l.color}${sliceByWidth(l.text, cols - 1)}${ansi.reset}`)
+  }
+  for (let i = shown.length; i < winH; i++) out.push("")
+  return out
+}
+
+/** Input box (border-bounded text entry area). Always visible. */
+/**
+ * Render the input box. When inputLayout is provided, renders a visual cursor
+ * (SGR reverse video) so the hardware cursor can stay hidden at all times,
+ * matching pi-tui's approach.
+ */
+export function renderInputBox(state, W, boxLines, cols, inputLayout, inputOffset) {
+  const { borderColor, title } = inputBoxStyle(state)
+  let topBorder
+  if (title === " Input " || title === " Question " || title === " Inject Message " || title === " Processing... ") {
+    const parts = []
+    if (title === " Input " || title === " Processing... ") parts.push(" Ctrl+U clear ")
+    if (title === " Question ") parts.push(" Enter submit ")
+    if (title === " Inject Message ") parts.push(" Enter send, Esc cancel ")
+    parts.push(" Ctrl+V paste ")
+    parts.push(" Ctrl+I inject ")
+    const hint = parts.join("")
+    topBorder = `╭─${title}${"─".repeat(Math.max(0, W - 4 - stringWidth(title) - stringWidth(hint)))}${hint}─╮`
+  } else {
+    topBorder = `╭─${title}${"─".repeat(Math.max(0, W - 3 - stringWidth(title)))}╮`
+  }
+  const out = [`${borderColor}${topBorder}${ansi.reset}`]
+
+  // Visual cursor position in the input box (hardware cursor stays hidden)
+  const hasOverlay = state.permission || state.question || state.picker || state.wizard?.step === "provider"
+  const curLine = (!hasOverlay && inputLayout) ? inputLayout.cursorLine - (inputOffset ?? 0) : -1
+  const curCol = (!hasOverlay && inputLayout) ? inputLayout.cursorCol : -1
+
+  for (let li = 0; li < boxLines.length; li++) {
+    const l = boxLines[li]
+    let content = sliceByWidth(l, W - 4)
+    const fill = " ".repeat(Math.max(0, W - 4 - stringWidth(content)))
+
+    if (li === curLine && curCol >= 0) {
+      const beforeWidth = Math.min(curCol, stringWidth(content))
+      const before = sliceByWidth(content, beforeWidth)
+      const atIdx = beforeWidth
+      const at = content[atIdx] ?? " "
+      const after = content.slice(atIdx + 1)
+      content = before + `${ansi.reset}\x1b[7m${at}\x1b[27m${ansi.reset}` + after
+    }
+
+    out.push(`${borderColor}│${ansi.reset} ${content}${fill} ${borderColor}│${ansi.reset}`)
+  }
+  out.push(`${borderColor}╰${"─".repeat(Math.max(0, W - 2))}╯${ansi.reset}`)
+  return out
+}
+
+/** Status bar (always 1 line). */
+export function renderStatus(state, agent, cols, slashCommands) {
+  const statusLine = buildStatusLine(state, agent, { cols, slashCommands })
+  const autoBanner = agent.autoApprove ? `${C.warn} AUTO${ansi.reset}${ansi.dim}│` : ""
+  const planBanner = agent.planMode ? `${C.tool} PLAN${ansi.reset}${ansi.dim}│` : ""
+  const advisorBanner = agent.config?.advisor?.enabled ? `${C.advisor} ADVISOR${ansi.reset}${ansi.dim}│` : ""
+  const bannerPrefix = (agent.planMode ? " PLAN│ " : "") + (agent.autoApprove ? " AUTO│ " : "") + (agent.config?.advisor?.enabled ? " ADVISOR│ " : "")
+  const statusMax = cols - 1 - (bannerPrefix ? stringWidth(bannerPrefix) : 0)
+  return `${ansi.dim}${planBanner}${autoBanner}${advisorBanner}${sliceByWidth(statusLine, Math.max(10, statusMax))}${ansi.reset}`
+}
+
+// ====================================================================
+// Legacy: full-frame renderer (wraps individual panel functions)
+// ====================================================================
+
 /**
  * Render one frame, returns { frame, cursorRow, cursorCol }.
  * Pure function: does not modify state/agent.
+ * @deprecated Prefer individual panel functions for incremental rendering.
  */
 export function renderFrame(state, agent, opts) {
   const cols = opts.cols || 80
@@ -36,150 +233,58 @@ export function renderFrame(state, agent, opts) {
 
   const layout = computeLayout(state, { cols, rows })
   const { W, panels, inputLayout, inputOffset, boxLines, visibleTasks, allSubs, permPreviewLines, overlay } = layout
-  const model = agent.provider.model
-  const thinking = agent.provider.thinking
-  const effort = agent.provider.reasoningEffort
-  const isMultimodal = specForModel(model).multimodal
-  const thinkBadge = thinking?.type === "disabled" ? "│ think: off"
-    : effort ? `│ think: ${effort}` : thinking?.type === "enabled" ? "│ think: on" : ""
 
   const out = [ansi.home]
   let cursorRow = 0, cursorCol = 0
 
-  // ---- header ----
-  out.push(
-    `${ansi.bold}${C.tool} ThinCoder ${ansi.reset}${ansi.dim}│ ${sliceByWidth(model, 30)}${thinkBadge ? " " + thinkBadge : ""} │ ${sliceByWidth(basename(agent.cwd), Math.max(10, cols - 60))}${ansi.reset}${ansi.clearLine}`,
-  )
+  // header
+  out.push(`${renderHeader(agent, cols)}\x1b[K`)
 
-  // ---- conversation ----
-  const convLines = buildConvLines(state, cols)
-  const maxScroll = Math.max(0, convLines.length - panels.conversation.h)
-  const scroll = Math.min(state.scroll, maxScroll)
-  const end = convLines.length - scroll
-  const visible = convLines.slice(Math.max(0, end - panels.conversation.h), end)
-  const pad = panels.conversation.h - visible.length
-  for (let i = 0; i < pad; i++) out.push(ansi.clearLine)
-  for (const l of visible) {
-    out.push(`${l.color}${l.text}${ansi.reset}${ansi.clearLine}`)
+  // conversation
+  for (const l of renderConversation(state, cols, panels.conversation.h, state.scroll)) {
+    out.push(`${l}\x1b[K`)
   }
 
-  // ---- picker / wizard overlay ----
+  // picker
   if (panels.picker) {
-    const winH = panels.picker.h - 1
-    const start = Math.max(0, Math.min(overlay.scroll, Math.max(0, overlay.lines.length - winH)))
-    const shown = overlay.lines.slice(start, start + winH)
-    const overlayTitle = state.picker ? ` ❯ ${state.picker.title} ` : " ❯ Setup "
-    out.push(`${ansi.bold}${C.tool}${overlayTitle}${ansi.reset}${ansi.dim}${state.picker ? "(↑↓ navigate, Enter confirm, Esc cancel)" : ""}${ansi.reset}${ansi.clearLine}`)
-    for (const l of shown) {
-      out.push(`${l.color}${sliceByWidth(l.text, cols - 1)}${ansi.reset}${ansi.clearLine}`)
+    for (const l of renderPicker(state, cols, panels.picker, overlay)) {
+      out.push(`${l}\x1b[K`)
     }
-    for (let i = shown.length; i < winH; i++) out.push(ansi.clearLine)
   }
 
-  // ---- todo panel ----
-  for (const t of visibleTasks) {
-    const mark = t.status === "done" ? "✓" : t.status === "in_progress" ? "▶" : "○"
-    const color = t.status === "done" ? `${C.dim}${ESC}[9m` : t.status === "in_progress" ? C.tool : C.text
-    out.push(`${color} ${mark} ${sliceByWidth(t.title, cols - 4)}${ansi.reset}${ansi.clearLine}`)
-  }
+  // todo
+  for (const l of renderTodo(visibleTasks, cols)) out.push(`${l}\x1b[K`)
 
-  // ---- subagent panel ----
+  // subagent
   if (panels.subagent) {
-    const subs = allSubs
-    for (const s of subs.slice(0, MAX_SUB_LINES)) {
-      const icon = s.done ? "✓" : "…"
-      const color = s.done ? C.dim : C.tool
-      const label = `[${s.role}]`.padEnd(10)
-      let content
-      if (s.done) {
-        const elapsed = Math.floor((Date.now() - s.started) / 1000)
-        content = `done ${elapsed}s`
-      } else if (s.tool) {
-        const argSummary = s.toolArgs ? summarizeToolArg(s.tool, s.toolArgs) : ""
-        content = `${s.tool}${argSummary ? ` ${argSummary}` : ""}`
-      } else if (s.text) {
-        const textLines = s.text.split("\n").filter((l) => l.trim())
-        content = textLines.length > 0 ? textLines[textLines.length - 1] : "thinking..."
-      } else {
-        content = "thinking..."
-      }
-      const availWidth = W - 14
-      out.push(`${color} ${icon} ${label} ${sliceByWidth(content, Math.max(10, availWidth))}${ansi.reset}${ansi.clearLine}`)
-    }
-    if (subs.length > MAX_SUB_LINES) {
-      out.push(`${C.dim}  ... +${subs.length - MAX_SUB_LINES} more subagents${ansi.reset}${ansi.clearLine}`)
-    }
+    for (const l of renderSubagent(allSubs, W)) out.push(`${l}\x1b[K`)
   }
 
-  // ---- tool output panels (streaming output like tail -f, auto-clears when done) ----
+  // output panels
   if (panels.output) {
-    const active = Object.values(state.outputPanels).filter((p) => !p.done)
-    if (active.length > 0) {
-      const linesPerPanel = Math.max(1, Math.floor(panels.output.h / active.length))
-      for (const p of active) {
-        const textLines = (p.text ?? "").split("\n").filter((l) => l.trim())
-        const tail = textLines.slice(-linesPerPanel)
-        for (const line of tail) {
-          out.push(`${C.dim}  │ ${sliceByWidth(sanitizeDisplay(line), W - 5)}${ansi.reset}${ansi.clearLine}`)
-        }
-      }
-      // fill remaining rows
-      const used = active.reduce((s, p) => {
-        const tl = (p.text ?? "").split("\n").filter((l) => l.trim()).slice(-linesPerPanel)
-        return s + tl.length
-      }, 0)
-      for (let i = used; i < panels.output.h; i++) {
-        out.push(ansi.clearLine)
-      }
-    }
+    for (const l of renderOutput(state, W, panels.output.h)) out.push(`${l}\x1b[K`)
   }
 
-  // ---- permission preview ----
+  // permission preview
   if (panels.permission) {
-    out.push(`${ansi.bold}${C.warn}❯ Permission Request${ansi.reset}${ansi.clearLine}`)
-    for (const wrapped of permPreviewLines) {
-      out.push(`${C.warn}${wrapped}${ansi.reset}${ansi.clearLine}`)
-    }
+    for (const l of renderPermission(permPreviewLines)) out.push(`${l}\x1b[K`)
   }
 
-  // ---- queue preview ----
+  // queue preview
   if (panels.queue) {
-    const preview = sliceByWidth(state.queue[0].text, W - 20)
-    out.push(`${C.dim}❯ Queue: ${state.queue.length} pending${state.queue.length > 1 ? ` (next: ${preview}…)` : ` (next: ${preview})`} — Ctrl+D delete${ansi.reset}${ansi.clearLine}`)
+    const qLine = renderQueue(state, W)
+    if (qLine) out.push(`${qLine}\x1b[K`)
   }
 
-  // ---- input box ----
-  const { borderColor, title } = inputBoxStyle(state)
-  let topBorder
-  if (title === " Input " || title === " Question ") {
-    const parts = []
-    if (title === " Input ") parts.push(" Ctrl+U clear ")
-    if (title === " Question ") parts.push(" Enter submit ")
-    parts.push(" Ctrl+V paste ")
-    const hint = parts.join("")
-    topBorder = `╭─${title}${"─".repeat(Math.max(0, W - 4 - stringWidth(title) - stringWidth(hint)))}${hint}─╮`
-  } else {
-    topBorder = `╭─${title}${"─".repeat(Math.max(0, W - 3 - stringWidth(title)))}╮`
-  }
-  out.push(`${borderColor}${topBorder}${ansi.reset}${ansi.clearLine}`)
-  for (const l of boxLines) {
-    const content = sliceByWidth(l, W - 4)
-    const fill = " ".repeat(Math.max(0, W - 4 - stringWidth(content)))
-    out.push(`${borderColor}│${ansi.reset} ${content}${fill} ${borderColor}│${ansi.reset}${ansi.clearLine}`)
-  }
-  out.push(`${borderColor}╰${"─".repeat(Math.max(0, W - 2))}╯${ansi.reset}${ansi.clearLine}`)
+  // input box
+  for (const l of renderInputBox(state, W, boxLines, cols, inputLayout, inputOffset)) out.push(`${l}\x1b[K`)
 
-  // ---- status bar ----
-  const statusLine = buildStatusLine(state, agent, { cols, slashCommands })
-  const autoBanner = agent.autoApprove ? `${C.warn} AUTO${ansi.reset}${ansi.dim}│` : ""
-  const planBanner = agent.planMode ? `${C.tool} PLAN${ansi.reset}${ansi.dim}│` : ""
-  const bannerPrefix = (agent.planMode ? " PLAN│ " : "") + (agent.autoApprove ? " AUTO│ " : "")
-  const statusMax = cols - 1 - (bannerPrefix ? stringWidth(bannerPrefix) : 0)
-  out.push(`${ansi.dim}${planBanner}${autoBanner}${sliceByWidth(statusLine, Math.max(10, statusMax))}${ansi.reset}${ansi.clearLine}`)
+  // status bar
+  out.push(`${renderStatus(state, agent, cols, slashCommands)}\x1b[K`)
 
   const frame = out.join("\r\n")
 
-  // ---- cursor ----
+  // cursor position
   if (!state.permission && !state.question && !state.picker && state.wizard?.step !== "provider") {
     cursorRow = panels.inputBox.y + 1 + (inputLayout.cursorLine - inputOffset) + 1
     cursorCol = 3 + inputLayout.cursorCol
@@ -188,20 +293,18 @@ export function renderFrame(state, agent, opts) {
   return { frame, cursorRow, cursorCol }
 }
 
-// ---------------------------------------------------------- internal helpers
+// ====================================================================
+// Internal helpers (unchanged from original)
+// ====================================================================
 
-/** Count conversation lines after sanitize + wrap (for scroll clamping). Pure. */
 export function countConvLines(state, cols) {
   return buildConvLines(state, cols).length
 }
 
-/** Build conversation lines from state (sanitized + wrapped). Pure.
- *  Cached: avoids O(n) rebuild on cursor moves — only recomputes when conversation grows/changes. */
 let _convCache = { key: "", cols: 0, lines: [] }
 function buildConvLines(state, cols) {
-  // Cheap cache key: structural hints that change whenever the conversation changes
   const lastLine = state.lines.length > 0 ? state.lines[state.lines.length - 1] : null
-  const key = `${state.lines.length}|${lastLine?.text.length ?? 0}|${state.streaming.length}|${state.reasoning.length}|${Object.keys(state.toolStreams).length}`
+  const key = convCacheKey(state)
   if (_convCache.key === key && _convCache.cols === cols) return _convCache.lines
 
   const convLines = []
@@ -235,20 +338,16 @@ function buildConvLines(state, cols) {
   return convLines
 }
 
-/** Determine input box border color and title. Pure. */
 function inputBoxStyle(state) {
   let borderColor = C.tool
   let title
-  if (state.question) {
-    borderColor = C.tool
-    title = " Question "
+  if (state.interruptPrompt) {
+    borderColor = C.warn; title = " Inject Message "
+  } else if (state.question) {
+    borderColor = C.tool; title = " Question "
   } else if (state.permission) {
     borderColor = C.warn
-    if (state.permission.name === "continue") {
-      title = " Continue? (y/n) "
-    } else {
-      title = ` Allow ${state.permission.name}? (y/n/a) `
-    }
+    title = state.permission.name === "continue" ? " Continue? (y/n) " : ` Allow ${state.permission.name}? (y/n/a) `
   } else if (state.picker) {
     title = " Select "
   } else if (state.wizard) {
@@ -261,7 +360,6 @@ function inputBoxStyle(state) {
   return { borderColor, title }
 }
 
-/** Build status bar line. Pure. */
 function buildStatusLine(state, agent, { cols, slashCommands }) {
   const scrollHint = state.scroll > 0 ? ` │ scrolled ${state.scroll}` : ""
   const rawInput = state.input.join("")
@@ -277,9 +375,7 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
       ? " y: continue │ n: stop"
       : " y: approve │ n: deny │ a: approve all (AUTO)"
   }
-  if (state.picker) {
-    return " ↑↓: select │ Enter: confirm │ Esc: cancel"
-  }
+  if (state.picker) return " ↑↓: select │ Enter: confirm │ Esc: cancel"
   if (state.wizard) {
     return state.wizard.step === "provider"
       ? " ↑↓: select │ Enter: confirm │ Esc: skip"
@@ -289,51 +385,28 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
     const [cmd] = rawInput.split(/\s+/)
     const cmds = slashCommands.filter((c) => c.name.startsWith(cmd))
     const match = cmds.length === 1 ? cmds[0] : null
-    if (match && SLASH_HINTS[match.name]) {
-      return ` ${match.name} ${SLASH_HINTS[match.name]}`
-    }
+    if (match && SLASH_HINTS[match.name]) return ` ${match.name} ${SLASH_HINTS[match.name]}`
     if (cmds.length > 0) {
-      if (cmds.length <= 4) {
-        return ` ${cmds.map((c) => `${c.name} ${c.desc}`).join("  │  ")}`
-      }
+      if (cmds.length <= 4) return ` ${cmds.map((c) => `${c.name} ${c.desc}`).join("  │  ")}`
       return ` ${cmds.map((c) => c.name).join("  ")}  │  Tab complete`
     }
     return ` unknown command (/help for available commands)`
   }
 
   const taskHint = state.tasks.length > 0
-    ? ` │ ✓${state.tasks.filter((t) => t.status === "done").length}/${state.tasks.length}`
-    : ""
+    ? ` │ ✓${state.tasks.filter((t) => t.status === "done").length}/${state.tasks.length}` : ""
   const tk = state.tokens
   const fmtK = (n) => (n >= 10000 ? `${Math.round(n / 1000)}k` : n >= 1000 ? `${(n / 1000).toFixed(1)}k` : `${n}`)
   const cacheTotal = tk.cacheHit + tk.cacheMiss
   const tokenHint = tk.prompt > 0
-    ? ` │ ↑${fmtK(tk.prompt)} ↓${fmtK(tk.completion)}${cacheTotal > 0 ? ` hit${Math.round((tk.cacheHit / cacheTotal) * 100)}%` : ""}`
-    : ""
+    ? ` │ ↑${fmtK(tk.prompt)} ↓${fmtK(tk.completion)}${tk.reasoningTokens > 0 ? ` ✦${fmtK(tk.reasoningTokens)}` : ""}${cacheTotal > 0 ? ` hit${Math.round((tk.cacheHit / cacheTotal) * 100)}%` : ""}` : ""
   const elapsed = state.processing ? ` ${Math.floor((Date.now() - state.processingStarted) / 1000)}s` : ""
   const toolHint = state.currentTool ? ` ${state.currentTool}…` : ""
   const statusText = state.processing ? `${state.status}${toolHint}${elapsed}` : state.status
   const ctxThreshold = agent.config?.agent?.compactThreshold ?? 100_000
   const ctxPct = Math.round((state.ctxCache.tokens / ctxThreshold) * 100)
   const ctxHint = ctxPct > 0
-    ? ctxPct >= 80
-      ? ` │ ${ansi.reset}${C.warn}context ${ctxPct}%${ansi.reset}${ansi.dim}`
-      : ` │ context ${ctxPct}%`
-    : ""
+    ? ctxPct >= 80 ? ` │ ${ansi.reset}${C.warn}context ${ctxPct}%${ansi.reset}${ansi.dim}` : ` │ context ${ctxPct}%` : ""
   const queueHint = state.queue.length > 0 ? ` │ queue: ${state.queue.length}` : ""
-  return ` ${statusText}${taskHint}${tokenHint}${ctxHint}${queueHint}${scrollHint} │ Enter: send${state.processing ? " (queue)" : ""} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+C: exit`
-}
-
-/** Summarize tool args for subagent panel display (one line, short). Pure. */
-function summarizeToolArg(toolName, args) {
-  if (!args || typeof args !== "object") return ""
-  if (toolName === "bash" && args.command) {
-    const cmd = args.command.split("\n")[0]
-    return `"${sliceByWidth(cmd, 50)}"`
-  }
-  if (args.path) return sliceByWidth(args.path, 60)
-  if (args.pattern) return `"${sliceByWidth(args.pattern, 50)}"`
-  if (args.query) return `"${sliceByWidth(args.query, 50)}"`
-  if (args.task) return `"${sliceByWidth(args.task, 50)}"`
-  return ""
+  return ` ${statusText}${taskHint}${tokenHint}${ctxHint}${queueHint}${scrollHint} │ Enter: send${state.processing ? " (queue)" : ""} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+I: inject │ Ctrl+C: exit`
 }

package/src/tui/slash-commands.mjs

@@ -21,6 +21,7 @@ import { handleGoalCommand } from "./cmd-goal.mjs"
 import { handleSkillsCommand } from "./cmd-skills.mjs"
 import { handleMcpCommand } from "./cmd-mcp.mjs"
 import { handleAutoCommand } from "./cmd-auto.mjs"
+import { handleAdvisorCommand } from "./cmd-advisor.mjs"
 import { handleThinkCommand } from "./cmd-think.mjs"
 import { handleModelCommand } from "./cmd-model.mjs"
 import { handleConfigCommand } from "./cmd-config.mjs"
@@ -31,6 +32,7 @@ import { handleUpgradeCommand } from "./cmd-upgrade.mjs"
 export const SLASH_COMMANDS = [
   { name: "/plan", group: "Agent", desc: "toggle plan mode (design first, then implement)" },
   { name: "/auto", group: "Agent", desc: "toggle auto-approve" },
+  { name: "/advisor", group: "Agent", desc: "toggle advisor review & select model" },
   { name: "/model", group: "Agent", desc: "select model & manage providers" },
   { name: "/goal", group: "Agent", desc: "set/view/cancel long-term goal" },
   { name: "/think", group: "Agent", desc: "thinking mode & reasoning effort" },
@@ -63,6 +65,7 @@ const HANDLERS = {
   "/skills": handleSkillsCommand,
   "/mcp": handleMcpCommand,
   "/auto": handleAutoCommand,
+  "/advisor": handleAdvisorCommand,
   "/think": handleThinkCommand,
   "/model": handleModelCommand,
   "/config": handleConfigCommand,