thincoder 0.12.58 → 0.12.59

package/src/tui/key-modes.mjs

@@ -0,0 +1,215 @@
+/**
+ * key-modes.mjs — 按键模态层（2026-09-03 D-S4 自 key-handler.mjs 拆出）：
+ * permission / question / interruptPrompt 三种独占模态分支。每个 handler 在模态激活时
+ * 消费全部按键（返回 true——含未匹配键，与拆出前无条件 return 语义一致），未激活返回 false。
+ * ctx: { state, agent, pushLine, render }（各 handler 按需取用）。
+ * 搜索模态另居 key-handler-search.mjs（既有拆分，本批不动）。
+ */
+import { C } from "./ansi.mjs"
+import { readClipboardText, insertPastedText } from "./clipboard.mjs"
+import { QUESTION_CUSTOM } from "./interaction.mjs"
+
+/** permission 确认模态：y/n/a（a = approve + AUTO ON）；batch（§16 D-B1）：a/o/n（Esc = deny）。
+ *  consume：valid 键或 Esc 走 resolve 分支；其余键静默吞掉（模态独占）。 */
+export function handlePermissionMode(str, key, ctx) {
+  const { state, agent, pushLine, render } = ctx
+  if (!state.permission) return false
+  const answer = (str || "").toLowerCase()
+  const isContinue = state.permission.name === "continue"
+  const isBatch = Boolean(state.permission.batch)
+  const validKeys = isContinue ? ["y", "n"] : isBatch ? ["a", "o", "n"] : ["y", "n", "a"]
+  if (validKeys.includes(answer) || key.name === "escape") {
+    const { resolve, name } = state.permission
+    state.permission = null
+    state.permissionPreview = []
+    state.status = "Processing..."
+    if (isBatch) {
+      // Merged batch ask: resolve the verdict string; dispatch applies it
+      // (approveAll = batch-scope allowance only, NOT the persistent AUTO flag).
+      const verdict = answer === "a" ? "approveAll" : answer === "o" ? "oneByOne" : "deny"
+      const tone = verdict === "approveAll" ? C.dim : C.error
+      pushLine(`  [${verdict === "approveAll" ? "approved" : verdict === "deny" ? "denied" : "one by one"}] ${name}`, tone)
+      resolve(verdict)
+      render()
+      return true
+    }
+    if (answer === "a" && !isContinue) {
+      agent.autoApprove = true
+      agent._pendingReminders = agent._pendingReminders ?? []
+      agent._pendingReminders.push("[System reminder: AUTO mode is now ON. All tool calls are automatically approved. Use /auto to disable.]")
+      pushLine(`  [auto] AUTO ON: tool calls no longer prompt for approval (/auto to disable)`, C.warn)
+    }
+    const approved = answer === "y" || (answer === "a" && !isContinue)
+    // leave trail: record approval/denial in conversation (continue prompt has its own output, don't duplicate)
+    if (!isContinue) {
+      pushLine(`  [${approved ? "approved" : "denied"}] ${name}`, approved ? C.dim : C.error)
+    }
+    resolve(approved)
+    render()
+  }
+  return true
+}
+
+/** question 工具回调模态：自由文本（type answer, Enter submit, Esc cancel）或选项
+ *  （↑↓ select, Enter confirm, Esc cancel——QUESTION_CUSTOM 项切自由文本模式）。
+ *  自由文本态编辑键契约见 TUI-INPUT-BOX.md §7.2（←→/Home/End/Ctrl+U/Backspace/中段插入/
+ *  Ctrl+V 落 cursor/\n→空格/Ctrl+J no-op/未列键吞——无 fall-through）；Esc 语义 round2 #5：
+ *  有 options（Custom 进入）→ 回 options 态；无 options → 中止 question。
+ *  consume：模态激活时全部按键独占（含未匹配键——拆出前 onKeypress 尾 return）。 */
+export function handleQuestionMode(str, key, ctx) {
+  const { state, pushLine, render } = ctx
+  if (!state.question) return false
+  const q = state.question
+  if (q.options.length > 0) {
+    // options mode: ↑↓ select, Enter confirm, Esc cancel
+    if (key.name === "escape") {
+      q.resolve("")
+      state.question = null
+      state.status = "Processing..."
+      render()
+    } else if (key.name === "up") {
+      q.selected = Math.max(0, (q.selected ?? 0) - 1)
+      render()
+    } else if (key.name === "down") {
+      q.selected = Math.min(q.options.length - 1, (q.selected ?? 0) + 1)
+      render()
+    } else if (key.name === "return") {
+      const answer = q.options[q.selected ?? 0]
+      if (answer === QUESTION_CUSTOM) {
+        // Switch to free-text mode — the user wants to type their own answer.
+        // options 列表备份（_backOptions）——自由文本态 Esc 可回 options 态（round2 #5 逃生口）；
+        // answer/cursor 按 §7.2 初始化（codepoint 数组 + cursor = answer.length）。
+        q._backOptions = { options: q.options, selected: q.selected }
+        q.options = []
+        q.selected = undefined
+        q.answer = []
+        q.cursor = 0
+        state.status = "Waiting for answer..."
+        render()
+        return true
+      }
+      q.resolve(answer)
+      state.question = null
+      state.status = "Processing..."
+      pushLine(`  → ${answer}`, C.tool)
+      render()
+    }
+  } else {
+    // free text: codepoint-array answer + cursor editing (TUI-INPUT-BOX.md §7.2)
+    if (!Array.isArray(q.answer)) q.answer = q.answer ? [...q.answer] : []
+    q.cursor = Math.max(0, Math.min(q.cursor ?? q.answer.length, q.answer.length))
+    const len = q.answer.length
+    if (key.name === "escape") {
+      // round2 #5：有 options（Custom 进入）→ 回 options 态（误触 Custom 有逃生口——
+      // 选择列表与选中位恢复）；无 options → 中止 question（原语义）。
+      if (q._backOptions) {
+        q.options = q._backOptions.options
+        q.selected = q._backOptions.selected
+        delete q._backOptions
+        delete q.answer
+        delete q.cursor
+        state.status = "Waiting for choice..."
+        render()
+      } else {
+        q.resolve("")
+        state.question = null
+        state.status = "Processing..."
+        render()
+      }
+    } else if (key.name === "return") {
+      if (q._pasting) return true // block Enter while paste is in flight
+      const answer = q.answer.join("").trim()
+      q.resolve(answer || "")
+      state.question = null
+      state.status = "Processing..."
+      pushLine(`  → ${answer || "(empty)"}`, C.tool)
+      render()
+    } else if (key.name === "enter") {
+      // Ctrl+J（\n → name "enter"）= no-op 吞——不插换行无 fall-through（round2 #2）
+    } else if (key.name === "left") {
+      q.cursor = Math.max(0, q.cursor - 1)
+      render()
+    } else if (key.name === "right") {
+      q.cursor = Math.min(len, q.cursor + 1)
+      render()
+    } else if (key.name === "home") {
+      q.cursor = 0
+      render()
+    } else if (key.name === "end") {
+      q.cursor = len
+      render()
+    } else if (key.ctrl && !key.alt && key.name === "u") {
+      q.answer = []
+      q.cursor = 0
+      render()
+    } else if (key.name === "backspace") {
+      if (q.cursor > 0) {
+        q.answer.splice(q.cursor - 1, 1) // codepoint 元素删除——emoji 不劈半（round2 #1）
+        q.cursor--
+        render()
+      }
+    } else if (key.ctrl && !key.alt && !key.meta && key.name === "v") {
+      // Ctrl+V paste: read clipboard text (fires when the terminal passes Ctrl+V through
+      // as a key event; bracketed-paste terminals are handled upstream in the stdin handler).
+      // 两路径同归 insertPastedText——落 cursor 位置、\n→空格（clipboard.mjs 单行守卫）。
+      if (q._pasting) return true
+      q._pasting = true
+      readClipboardText().then((text) => {
+        q._pasting = false
+        if (text) {
+          // activeQuestion 守卫：粘贴在途用户 Esc 中止/Enter 提交后，本回调不得把
+          // 剪贴板内容落进主输入框（审计 F1——insertPastedText 见 stale 即丢）。
+          insertPastedText(state, text, q)
+          render()
+        }
+      }).catch((e) => {
+        q._pasting = false
+        console.error(`[tui] clipboard paste failed: ${e.message}`)
+      })
+    } else if (str && !key.ctrl && !key.meta && key.name !== "tab" && key.name !== "enter") {
+      // 可打印字符插入光标位置（codepoint 拆字）；\r\n 剥离 + \t→2 空格（单行不变式同主输入清洗口径）
+      const chars = [...str.replace(/[\r\n]+/g, "").replace(/\t/g, "  ")]
+      if (chars.length) {
+        q.answer.splice(q.cursor, 0, ...chars)
+        q.cursor += chars.length
+        render()
+      }
+    }
+    // 未列键（↑↓/PgUp/PgDn/Delete/F1/…）一律消费 return——无 fall-through 到正常编辑
+    // （search 穿透教训——TUI-INPUT-BOX.md §3.2 BUG-2）
+  }
+  return true
+}
+
+/** interruptPrompt 模态（Ctrl+I 后输入注入消息）：Enter 提交 → controller.abort
+ *  { interrupt: true, message }；Esc 取消；字符进 prompt；其余键静默吞（模态独占）。
+ *  返回 false 当模态未激活（key-handler 先检 state.interruptPrompt 入口再调）。 */
+export function handleInterruptMode(str, key, ctx) {
+  const { state, pushLine, render } = ctx
+  if (!state.interruptPrompt) return false
+  if (key.name === "escape") {
+    state.interruptPrompt = null
+    render()
+  } else if (key.name === "return") {
+    const msg = (state.interruptPrompt.text ?? "").trim()
+    state.interruptPrompt = null
+    if (msg) {
+      // Guard: if the turn already finished while the user was typing, the controller
+      // may have been replaced or already aborted — don't abort a live turn by mistake.
+      if (state.processing && state.controller && !state.controller.signal.aborted) {
+        pushLine(`  [inject] ${msg}`, C.warn)
+        state.controller.abort({ interrupt: true, message: msg })
+      } else {
+        pushLine(`  [inject — turn ended, message queued] ${msg}`, C.dim)
+      }
+      render()
+    }
+  } else if (key.name === "backspace") {
+    state.interruptPrompt.text = state.interruptPrompt.text.slice(0, -1)
+    render()
+  } else if (str && !key.ctrl && !key.meta) {
+    state.interruptPrompt.text += str.replace(/[\r\n]+/g, "")
+    render()
+  }
+  return true
+}

package/src/tui/layout.mjs

@@ -26,6 +26,14 @@ const MAX_INPUT_LINES = 5
 const MAX_TASK_LINES = 5
 const QWIN = 5
 
+/** question 自由文本态渲染布局：与主输入框同实现（TUI-INPUT-BOX.md §7.2 round2 #1/#6）——
+ *  折行展开（`▸ ` 首行 + 续行 2 空格缩进）+ 光标行列；answer 单行不变式（无 \n 字符）由
+ *  输入侧硬守卫（Ctrl+J no-op / 粘贴 \n→空格），此处只复用 layoutInput 的折行/光标语义，
+ *  cap/滚动由 computeLayout 以 MAX_INPUT_LINES + questionOffset 承担（同主输入 inputOffset）。 */
+export function layoutAnswer(chars, cursor, width) {
+  return layoutInput(chars, cursor, width)
+}
+
 /**
  * Computes layout. Returns panel coordinates + precomputed content (height-affecting parts).
  * Pure function: does not modify state.
@@ -43,6 +51,11 @@ export function computeLayout(state, { cols, rows }) {
   }
   const inputLines = inputLayout.lines.slice(inputOffset, inputOffset + MAX_INPUT_LINES)
   let boxLines = inputLines
+  // question 自由文本态（无 options）：boxLines = layoutAnswer 行（同主输入 cap + offset 滚动——
+  // 光标随行；长答案不挤压会话面板到零行——TUI-INPUT-BOX.md §7.2 round2 #6）。questionLayout/
+  // questionOffset 供 render-frame 反显光标与硬件定位（hasOverlay 例外细化同 §7.2）。
+  let questionLayout = null
+  let questionOffset = 0
   if (state.question) {
     const q = state.question
     if (q.options.length > 0) {
@@ -51,7 +64,13 @@ export function computeLayout(state, { cols, rows }) {
       boxLines = q.options.slice(start, start + QWIN).map((opt, i) =>
         (start + i === sel ? "▸ " : "  ") + (opt === QUESTION_CUSTOM ? "✍ Custom answer…" : optText(opt)))
     } else {
-      boxLines = ["▸ " + (q.answer ?? "")]
+      const answerChars = Array.isArray(q.answer) ? q.answer : q.answer ? [...q.answer] : []
+      const qCursor = Math.max(0, Math.min(q.cursor ?? answerChars.length, answerChars.length))
+      questionLayout = layoutAnswer(answerChars, qCursor, W - 4)
+      if (questionLayout.lines.length > MAX_INPUT_LINES) {
+        questionOffset = Math.min(questionLayout.cursorLine, questionLayout.lines.length - MAX_INPUT_LINES)
+      }
+      boxLines = questionLayout.lines.slice(questionOffset, questionOffset + MAX_INPUT_LINES)
     }
   }
   const inputBoxH = boxLines.length + 2
@@ -174,6 +193,8 @@ export function computeLayout(state, { cols, rows }) {
     // precomputed content (affects height, reused during render)
     inputLayout,
     inputOffset,
+    questionLayout,
+    questionOffset,
     boxLines,
     visibleTasks,
     permPreviewLines,

package/src/tui/mouse.mjs

@@ -17,6 +17,8 @@
 import { computeLayout, subagentLineIndex } from "./layout.mjs"
 import { buildConvLines, convViewport } from "./render-conversation.mjs"
 import { toggleFoldBlock, scrollFoldBlock, foldScrollOffset } from "./fold-block.mjs"
+import { cancelAsyncSubagent } from "../agent-tools/subagent-async.mjs"
+import { C } from "./ansi.mjs"
 
 /** 2026-08-31 滚轮事件分派（用户需求"展开块能滚动阅读全文"）：坐标命中展开块内容行 →
  *  块内逐行滚动（scrollFoldBlock ±3）；未命中 → 会话滚动（调用方继续处理）。
@@ -125,6 +127,15 @@ export function handleMouseClick(ctx, col, row) {
     // 评审 #4：保底截断后可见行 ≠ 前 h 行——命中映射与 render-frame 同一几何契约
     // （subagentLineIndex：分隔线 + 末尾区块行优先）。
     const lineEl = layout.subagentLines[subagentLineIndex(layout.subagentLines, P.subagent.h, r - P.subagent.y)]
+    // §19.5 D-M7/D-M7b ⏹ 停止标记（round1 #6 + 用户裁定 B 形态）：列级命中——⏹ 列
+    // 点击 = cancel（定向该子代理——ctx.cancelSubagent 直连池 abort 路径，不经模型
+    // 回合），不触发折叠翻转；**仅 async 区块带 _stopSub 元数据**（sync 无 ⏹——
+    // 其右缘点击照常走折叠翻转——D-M7b ③）；⏹ 区外点击照常走折叠/翻窗。
+    if (lineEl?._stopSub && col >= (lineEl._stopCol ?? Infinity)) {
+      ctx.cancelSubagent?.(lineEl._stopSub)
+      render()
+      return true
+    }
     if (lineEl?._foldScrollUp || lineEl?._foldScrollDown) {
       // ▲/▼ 控制行点击翻窗（60% 封顶保留、窗口随翻滚动，全文可达）
       scrollFoldBlock(state, lineEl._foldScrollUp ?? lineEl._foldScrollDown,
@@ -164,3 +175,32 @@ export function handleMouseClick(ctx, col, row) {
 
   return false
 }
+
+/** 鼠标装配簇（2026-09-03 D-S1a 自 index.mjs 迁入）：index.mjs 只留装配调用。
+ *  ctx: { agent, state, pushLine, render, popPicker }；返回 { onMouseClick, mouseCtx }。
+ *  cancelSubagent（⏹ 停止标记，§19.5 D-M7）：UI 停止不经模型回合，直连池 abort——
+ *  与 action:"cancel" 同实现路径。block key "role#id" → 池条目 id。 */
+export function createMouseDispatch({ agent, state, pushLine, render, popPicker }) {
+  const cancelSubagent = (key) => {
+    try {
+      const id = key.slice(key.lastIndexOf("#") + 1)
+      const r = cancelAsyncSubagent(agent, id)
+      if (r?.status === "error") {
+        // 池内无此条目但区块仍 live（!done）→ 阻塞型（sync）spawn 中——无池条目可定向
+        // 中止（§19.5 cancel 只针对 async 后台子代理）；给出可操作指引而非神秘 unknown id
+        const liveBlock = state.subTasks?.[key] && !state.subTasks[key].done
+        pushLine(liveBlock
+          ? `[subagent stop] ${key} is a blocking (sync) child mid-call — targeted stop is not available; use Ctrl+C to interrupt the turn`
+          : `[subagent stop] ${r.error}`, C.error)
+      } else {
+        pushLine(`[subagent ${key} stop requested]`, C.warn)
+      }
+    } catch (e) {
+      pushLine(`[subagent stop] ${e?.message ?? String(e)}`, C.error)
+    }
+    render()
+  }
+  const onMouseClick = (col, row) => handleMouseClick({ state, render, popPicker, cancelSubagent }, col, row)
+  const mouseCtx = () => ({ state, render })
+  return { onMouseClick, mouseCtx }
+}

package/src/tui/pickers.mjs

@@ -342,10 +342,18 @@ export function createPickers(ctx) {
       if (!baseURL) return
       const model = await askQuestion("Enter model name:")
       if (!model) return
-      const format = (await askQuestion("API format [openai/anthropic/google] (default: openai):")).trim().toLowerCase()
+      // D-C1（TUI.md §10.6D）：API format 改 picker 选择（openai/anthropic/google——默认 index=0
+      // openai）——固定枚举不再手输；Esc/取消 = 中止整个 Add Provider 流程（cfg 尚未落盘——
+      // 无半配置，与旧手输非法 abort 同语义）。与 preset 选择器同形态——零新机制。
+      const format = await showPicker("API format", [
+        { type: "item", text: "openai", name: "openai" },
+        { type: "item", text: "anthropic", name: "anthropic" },
+        { type: "item", text: "google", name: "google" },
+      ])
+      if (!format) return // Esc/取消 → 中止流程
       const cfg = { name, baseURL, model }
-      if (format === "anthropic" || format === "google") cfg.format = format
-      else if (format && format !== "openai") return // unknown format → abort
+      if (format.name === "anthropic" || format.name === "google") cfg.format = format.name
+      else if (format.name !== "openai") return // 防御：未知格式（理论不可达——picker 枚举）
       agent.providers.push(cfg)
       await persistRaw((raw) => { raw.providers = agent.providers })
       const key = await askQuestion(`Enter API key for ${name} (skip if none):`)

package/src/tui/render-conversation.mjs

@@ -16,6 +16,7 @@ import {
   renderMathAndMarkdown, foldCapRows, renderFoldedHead, foldTailLines,
 } from "./fold-block.mjs"
 import { ADVISOR_THINKING_PLACEHOLDER } from "../advisor/run.mjs"
+import { frozenSubSeg, toolSeg, frozenAdvSeg } from "./render-segments.mjs"
 
 
 // Test seam (mirrors the _-prefixed seams in run.mjs) — moved to fold-block.mjs.
@@ -27,7 +28,9 @@ let _convCache = { key: "", cols: 0, lines: [] }
 /** 2026-08-31 懒加载卡顿优化②：段级行体缓存（行对象→conv 行数组）。
  *  与行级 wrapRowsCached 分层：wrap 缓存只省 markdown/换行重算（streaming 行 text 变失效），
  *  段缓存省**整个行体的折叠/展开/窗口化组装**——loadOlder unshift 后尾部 987 行段全命中，
- *  rebuild 从 25.7ms → ~8ms 量级。签名由 lineSegSig 集中计算（该段输出的所有决定因素）。 */
+ *  rebuild 从 25.7ms → ~8ms 量级。签名由 lineSegSig 集中计算（该段输出的所有决定因素）。
+ *  2026-09-03 D-S2：tool/frozenSub/frozenAdvisor 三段缓存随段实现迁至 render-segments.mjs
+ *  （各段独立 WeakMap——行对象载体系互斥——此处只剩普通源行段缓存）。 */
 const _lineSegCache = new WeakMap()
 
 /** 段签名：段输出的所有决定因素（漏一项 → 缓存失效不全 → 显示 stale）。
@@ -94,61 +97,6 @@ function buildLineSeg(state, l, i, cols, maxRows) {
   return out
 }
 
-/** 工具块段（2026-08-31 段缓存抽出——真实会话 106 个工具块每帧全量 wrap 32ms 的根治）。
- *  返回 conv 行数组（工具块的折叠头+尾/展开窗口+控制行），逻辑与原 L221-258 逐字同构。 */
-function buildToolBlockSeg(state, l, i, cols, maxRows) {
-  const b = l._toolBlock
-  const foldKey = `tool-${l._lineId ?? i}`
-  const out = []
-  const status = !b.done
-    ? "running"
-    : `${b.elapsed !== null ? b.elapsed + "ms" : ""}${b.summary ? (b.elapsed !== null ? " · " : "") + sliceByWidth(b.summary, 50) : ""}`.trim() || "done"
-  if (isExpanded(state, foldKey)) {
-    const body = []
-    const pushWrapped = (raw, color) => {
-      for (const w of wrapText(raw, cols - 4)) body.push({ text: "  " + w, color, _skipDimFold: true })
-    }
-    for (const jl of b.argsJson) pushWrapped(jl, C.dim)
-    for (const ol of b.output) pushWrapped(ol, C.tool)
-    if (b.result) for (const rl of b.result) pushWrapped(rl, C.dim)
-    out.push(...renderExpandedBlock({ body, foldKey, state, maxRows, cols, label: `${b.name}${b.roundTag || ""} ${b.argsSummary}`.trim() }))
-  } else {
-    const headText = sliceByWidth(
-      `❯ ${b.name}${b.roundTag || ""}${b.argsSummary ? " " + b.argsSummary : ""}  · ${status}`,
-      Math.max(20, cols - 2),
-    )
-    const body = []
-    for (const jl of b.argsJson) for (const w of wrapText(jl, cols - 4)) body.push({ text: w, color: C.dim, _skipDimFold: true })
-    for (const ol of b.output.slice(-3)) for (const w of wrapText(ol, cols - 4)) body.push({ text: w, color: C.dim, _skipDimFold: true })
-    if (b.result) for (const rl of b.result) for (const w of wrapText(rl, cols - 4)) body.push({ text: w, color: C.dim, _skipDimFold: true })
-    out.push(...renderFoldedHead({ header: { text: headText, color: C.tool, _foldToggle: foldKey }, body, cols }))
-  }
-  return out
-}
-
-/** frozenAdvisor 段（2026-08-31 段缓存抽出）——foldKey 升级为 _lineId 派生（同 long-N 判例）。 */
-function buildFrozenAdvSeg(state, l, i, cols, maxRows) {
-  const frozenAdvKey = `advisor-done-${l._lineId ?? i}`
-  const out = []
-  if (isExpanded(state, frozenAdvKey)) {
-    const body = []
-    const rendered = renderMathAndMarkdown(sanitizeDisplay(l._frozenAdvisor))
-    for (const line of formatTables(rendered, cols - 1)) {
-      for (const wrapped of wrapText(line, cols - 1)) {
-        body.push({ text: wrapped, color: C.reason, _skipDimFold: true })
-      }
-    }
-    out.push(...renderExpandedBlock({ body, foldKey: frozenAdvKey, state, maxRows, cols, label: "[advisor · review done]" }))
-  } else {
-    out.push({
-      text: `▶ [advisor · review done] … click to expand`,
-      color: C.fold,
-      _foldToggle: frozenAdvKey,
-    })
-  }
-  return out
-}
-
 
 /** 2026-08-31 懒加载卡顿根因修复：行级 wrap/markdown 渲染缓存。
  *  buildConvLines 全量重建 O(总行数)——真实 200 条历史 → 987 conv 行 94ms、loadOlder 后
@@ -219,9 +167,6 @@ export function convCacheKey(state, maxRows) {
   return `${state.lines.length}|${lastLine?.text.length ?? 0}|${state.streaming.length}|${state.reasoning.length}|${blocksSig}|${frozenSig}|${toolSig}|${colorSig}|${state.foldEnabled !== false ? "f" : "u"}|${exp}|${capPart}|${searchPart}|${foldScrollSig}`
 }
 
-/** Fold marker line: bold-cyan icon + "click to …" phrase underlined (clickable affordance).
- *  No indent — flush with the content below it; the caller adds a blank line BEFORE it
- *  so the control line stands apart from unrelated content (reported UX). */
 
 function highlightSearchMatches(text, query, matchesInLine, globalCurrentIndex, allMatches, lineIndex) {
   if (!matchesInLine || matchesInLine.length === 0 || !query) return text
@@ -247,45 +192,6 @@ function highlightSearchMatches(text, query, matchesInLine, globalCurrentIndex,
   return result
 }
 
-/** Render a FROZEN child activity block carried on a state.lines entry
- *  (subagent-blocks.mjs freezeSubTaskLines pushes {_frozenSubTask: sub}). The
- *  running form renders in the fixed bottom panel (§7.2.1 subagent-panel.mjs);
- *  the frozen form stays in the stream with the same interaction: folded =
- *  `[✓ coder#1 · glm-5.3 · done 45s · turn 12/100] … click to expand` header +
- *  tail 3 block lines; expanded = blank + ▼ control + full timeline (60% screen
- *  cap via the shared component — capped view ends in a reachable collapse
- *  control). Toggle key `sub-${key}` — the SAME key the panel section uses, so
- *  fold state carries across the freeze boundary seamlessly (user ruled
- *  2026-08-30: frozen stays clickable — full design interaction, not a
- *  dim-lines fallback). */
-function frozenSubTaskLines(state, sub, cols, maxRows) {
-  const foldKey = `sub-${sub.key}`
-  const elapsed = Math.floor(((sub.doneAt ?? Date.now()) - sub.started) / 1000)
-  const modelPart = sub.model ? ` · ${sub.model}` : ""
-  const turnPart = sub.maxTurns > 0 ? ` · turn ${sub.turn}/${sub.maxTurns}` : ""
-  const errPart = sub.lastError ? ` — ${sub.lastError}` : ""
-  const icon = sub.approval ? "⏸" : "✓"
-  const header = `[${icon} ${sub.key}${modelPart} · done ${elapsed}s${turnPart}${errPart}]`
-  const out = []
-  if (isExpanded(state, foldKey)) {
-    // Expanded: shared component renders blank + ▼ control + full timeline,
-    // capped at 60% of the screen with a bottom collapse control.
-    const body = renderBlockTimeline(sub.blocks, cols)
-    out.push(...renderExpandedBlock({ body, foldKey, state, maxRows, cols, label: "subagent activity" }))
-  } else {
-    // Folded: the header line itself is the control (▶ affordance), then tail 3.
-    out.push({
-      text: `▶ ${header} … subagent activity — click to expand`,
-      color: C.dim,
-      _foldToggle: foldKey,
-    })
-    for (const line of foldTailLines(sub.blocks)) {
-      out.push({ text: `│ ${sliceByWidth(line, cols - 4)}`, color: C.dim, _skipDimFold: true })
-    }
-  }
-  return out
-}
-
 /**
  * Build the conversation lines for the given state.
  * maxRows: terminal rows for the 60% expansion cap (undefined → uncapped —
@@ -329,77 +235,23 @@ function buildConvLines(state, cols, maxRows) {
       if (!prevMain) pushBlank()
       blankAfter = !nextMain
     }
-    // Frozen subagent activity block (§7.2 D4, 2026-08-30): rendered as its own
-    // collapsible section in the stream (running blocks live in the fixed panel,
-    // §7.2.1 — the frozen form keeps the same clickable interaction).
+    // Frozen subagent activity block (§7.2 D4, 2026-08-30): frozen form keeps the
+    // same clickable interaction as the running panel (impl in render-segments.mjs).
     if (l._frozenSubTask) {
-      // 2026-08-31 段缓存：frozenSubTask 冻结后内容不变——签名含 sub.key + blocks 计数
-      const fKey = `sub-${l._frozenSubTask.key}`
-      const fSig = [
-        cols, maxRows ?? 0, l._frozenSubTask.key, l._frozenSubTask.blocks?.length ?? 0,
-        l._frozenSubTask.done ? 1 : 0, state.foldEnabled === false ? 0 : 1,
-        state.expandedBlocks?.has(fKey) ? 1 : 0, state._foldScroll?.get(fKey) ?? 0,
-      ].join("|")
-      const fHit = _lineSegCache.get(l)
-      if (fHit && fHit.textRef === l._frozenSubTask && fHit.sig === fSig) {
-        convLines.push(...fHit.rows)
-      } else {
-        const rows = frozenSubTaskLines(state, l._frozenSubTask, cols, maxRows)
-        _lineSegCache.set(l, { textRef: l._frozenSubTask, sig: fSig, rows })
-        convLines.push(...rows)
-      }
+      convLines.push(...frozenSubSeg(state, l, i, cols, maxRows))
       continue
     }
-    // ONE BLOCK PER TOOL CALL (2026-08-30 user ruling): header = name+args+
-    // live status, body = args JSON + streaming output + result. Folded =
-    // ▶ name args · status/summary; expanded = 60%-capped body (shared component).
+    // ONE BLOCK PER TOOL CALL (2026-08-30 user ruling) — impl in render-segments.mjs.
     if (l._toolBlock) {
-      // 2026-08-31 段缓存：工具块签名含三缓冲长度+done/elapsed/summary+该块展开态——
-      // 流式 append 使 output.length 变 → 失效；real 会话 106 个工具块每帧全量 wrap 实测
-      // 32ms（rebuild 40ms 的大头），入缓存后命中只算签名拼接。
-      const b = l._toolBlock
-      const toolFoldKey = `tool-${l._lineId ?? i}`
-      const tSig = [
-        cols, maxRows ?? 0, b.argsJson?.length ?? 0, b.output?.length ?? 0, b.result?.length ?? 0,
-        b.done ? 1 : 0, b.elapsed ?? "", b.summary ?? "", b.name ?? "", b.roundTag ?? "",
-        l._lineId ?? "", state.foldEnabled === false ? 0 : 1,
-        state.expandedBlocks?.has(toolFoldKey) ? 1 : 0, state._foldScroll?.get(toolFoldKey) ?? 0,
-      ].join("|")
-      const tHit = _lineSegCache.get(l)
-      if (tHit && tHit.textRef === b && tHit.sig === tSig) {
-        convLines.push(...tHit.rows)
-      } else {
-        const rows = buildToolBlockSeg(state, l, i, cols, maxRows)
-        _lineSegCache.set(l, { textRef: b, sig: tSig, rows })
-        convLines.push(...rows)
-      }
+      convLines.push(...toolSeg(state, l, i, cols, maxRows))
       continue
     }
-    // Frozen advisor review (2026-08-30): same collapsible-box treatment —
-    // folded = one control line; expanded = the full review text (markdown
-    // rendered, no gutter — review history convention kept from the flat era),
-    // 60% cap via the shared component.
+    // Frozen advisor review (2026-08-30): same collapsible-box treatment — impl
+    // in render-segments.mjs.
     if (l._frozenAdvisor) {
-      // 2026-08-31 段缓存：frozenAdvisor 文本冻结不变——签名含文本长度 + 展开态
-      // 注：foldKey 由 advisor-done-${i}（位置键）升级为 advisor-done-${_lineId ?? i}
-      // （同 long-N 判例——loadOlder unshift 后不重绑）
-      const frozenAdvKey = `advisor-done-${l._lineId ?? i}`
-      const aSig = [
-        cols, maxRows ?? 0, (l._frozenAdvisor ?? "").length,
-        state.foldEnabled === false ? 0 : 1,
-        state.expandedBlocks?.has(frozenAdvKey) ? 1 : 0, state._foldScroll?.get(frozenAdvKey) ?? 0,
-      ].join("|")
-      const aHit = _lineSegCache.get(l)
-      if (aHit && aHit.textRef === l._frozenAdvisor && aHit.sig === aSig) {
-        convLines.push(...aHit.rows)
-      } else {
-        const rows = buildFrozenAdvSeg(state, l, i, cols, maxRows)
-        _lineSegCache.set(l, { textRef: l._frozenAdvisor, sig: aSig, rows })
-        convLines.push(...rows)
-      }
+      convLines.push(...frozenAdvSeg(state, l, i, cols, maxRows))
       continue
     }
-
     // ── 普通源行段（2026-08-31 懒加载卡顿优化②：段级缓存——行体 WeakMap 按行对象
     // 缓存，签名含该段所有决定因素；unshift/loadOlder 后尾部段全命中，只算新增行。
     // toggle/翻窗/收起只失效该块段，其它段照样命中。行为不变性是硬约束。
@@ -425,7 +277,7 @@ function buildConvLines(state, cols, maxRows) {
   // buildConvLines no longer renders running children: on completion
   // onToolResult freezes the block into state.lines (subagent-blocks.mjs
   // freezeSubTaskLines) and it scrolls away with the conversation (D4 现状).
-  // Frozen blocks render above via the _frozenSubTask branch (frozenSubTaskLines).
+  // Frozen blocks render above via the _frozenSubTask branch (render-segments.mjs).
 
   if (state.reasoning) {
     // Live thinking streams INSIDE the unified box (user ruling 2026-08-30:

package/src/tui/render-frame.mjs

@@ -132,11 +132,19 @@ export function renderInputBox(state, W, boxLines, cols, inputLayout, inputOffse
   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 === " Question ") {
+      // question 两形态各自真实按键提示（TUI-INPUT-BOX.md §7.2——自由文本态单行不变式：
+      // 无换行键——Shift+Enter/Ctrl+J 不插行，提示不沿用主输入框那组）。
+      parts.push((state.question?.options?.length ?? 0) > 0
+        ? " ↑↓ select │ Enter confirm │ Esc: cancel "
+        : " Enter submit │ Esc: cancel │ Ctrl+U clear │ Ctrl+V paste ")
+    }
     if (title === " Inject Message ") parts.push(" Enter send, Esc cancel ")
-    parts.push(" Shift+Enter / Ctrl+J newline ")
-    parts.push(" Ctrl+V paste ")
-    parts.push(" Ctrl+I inject ")
+    if (title !== " Question ") {
+      parts.push(" Shift+Enter / Ctrl+J newline ")
+      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 {
@@ -144,8 +152,11 @@ export function renderInputBox(state, W, boxLines, cols, inputLayout, inputOffse
   }
   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"
+  // Visual cursor position in the input box (hardware cursor stays hidden).
+  // hasOverlay 例外细化（TUI-INPUT-BOX.md §7.2）：question 自由文本态（无 options）保留
+  // 反显光标（与主输入框同路径）；options/permission/picker/wizard-provider 态无光标。
+  const qOptionsOnly = Boolean(state.question && state.question.options.length > 0)
+  const hasOverlay = state.permission || qOptionsOnly || state.picker || state.wizard?.step === "provider"
   const curLine = (!hasOverlay && inputLayout) ? inputLayout.cursorLine - (inputOffset ?? 0) : -1
   const curCol = (!hasOverlay && inputLayout) ? inputLayout.cursorCol : -1
 
@@ -256,13 +267,19 @@ export function renderRows(state, agent, opts) {
   if (panels.picker) put(panels.picker.y, renderPicker(state, cols, panels.picker, overlay))
   if (panels.permission) put(panels.permission.y, renderPermission(permPreviewLines))
   if (panels.queue) put(panels.queue.y, [renderQueue(state, W)])
-  put(panels.inputBox.y, renderInputBox(state, W, boxLines, cols, inputLayout, inputOffset))
+  // question 自由文本态：box 内容是 layoutAnswer 行——光标布局/滚动随 box 内容走
+  // （questionLayout/questionOffset）；主输入 inputLayout 此时无意义（被 question 行替换）。
+  const qFree = Boolean(state.question && state.question.options.length === 0)
+  const qOptionsOnly = Boolean(state.question && state.question.options.length > 0)
+  const boxLayout = qFree ? (layout.questionLayout ?? layout.inputLayout) : layout.inputLayout
+  const boxOffset = qFree ? (layout.questionOffset ?? 0) : layout.inputOffset
+  put(panels.inputBox.y, renderInputBox(state, W, boxLines, cols, boxLayout, boxOffset))
   put(panels.status.y, [renderStatus(state, agent, cols, slashCommands)])
 
   let cursorRow = 0, cursorCol = 0
-  if (!state.permission && !state.question && !state.picker && state.wizard?.step !== "provider") {
-    cursorRow = panels.inputBox.y + 1 + (inputLayout.cursorLine - inputOffset) + 1
-    cursorCol = 3 + inputLayout.cursorCol
+  if (!state.permission && !state.picker && state.wizard?.step !== "provider" && !qOptionsOnly) {
+    cursorRow = panels.inputBox.y + 1 + (boxLayout.cursorLine - boxOffset) + 1
+    cursorCol = 3 + boxLayout.cursorCol
   }
 
   return { rows: screen, cursorRow, cursorCol, layout }

package/src/tui/render-loop.mjs

@@ -111,7 +111,10 @@ export function createRenderLoop(state, agent, ctx, pushLine, write = (s) => pro
       }
       prevRows = rows
 
-      const hasOverlay = state.permission || state.question || state.picker || state.wizard?.step === "provider"
+      // hasOverlay 例外细化（TUI-INPUT-BOX.md §7.2）：question 自由文本态（无 options）
+      // 保留硬件定位（cursorSuffix 正常发——与主输入框同路径）；options 态无光标。
+      const qOptionsOnly = Boolean(state.question && state.question.options.length > 0)
+      const hasOverlay = state.permission || qOptionsOnly || state.picker || state.wizard?.step === "provider"
       const cursorSuffix = hasOverlay ? "" : `\x1b[${cursorRow};${cursorCol}H${ansi.hideCursor}`
 
       if (out.length || cursorSuffix) write(ansi.wrapOff + ansi.syncUpdateStart + out.join("") + ansi.syncUpdateEnd + cursorSuffix + ansi.wrapOn)