thincoder 0.12.51 → 0.12.53

package/src/tui/render-conversation.mjs

@@ -12,7 +12,7 @@
 import { ansi, C } from "./ansi.mjs"
 import { formatTables, sanitizeDisplay, sliceByWidth, wrapText } from "./render.mjs"
 import {
-  isExpanded, foldHintLine, blankLine, renderExpandedBlock, renderBlockTimeline,
+  isExpanded, foldHintLine, renderExpandedBlock, renderBlockTimeline,
   renderMathAndMarkdown, foldCapRows, renderFoldedHead, foldTailLines,
 } from "./fold-block.mjs"
 import { ADVISOR_THINKING_PLACEHOLDER } from "../advisor/run.mjs"
@@ -24,10 +24,160 @@ export { _rmpw as _renderMarkdownPreservingWidth }
 
 let _convCache = { key: "", cols: 0, lines: [] }
 
+/** 2026-08-31 懒加载卡顿优化②：段级行体缓存（行对象→conv 行数组）。
+ *  与行级 wrapRowsCached 分层：wrap 缓存只省 markdown/换行重算（streaming 行 text 变失效），
+ *  段缓存省**整个行体的折叠/展开/窗口化组装**——loadOlder unshift 后尾部 987 行段全命中，
+ *  rebuild 从 25.7ms → ~8ms 量级。签名由 lineSegSig 集中计算（该段输出的所有决定因素）。 */
+const _lineSegCache = new WeakMap()
+
+/** 段签名：段输出的所有决定因素（漏一项 → 缓存失效不全 → 显示 stale）。
+ *  返回 { textRef, sig }——text 用**引用比较**（O(1)；streaming 同对象 text 变 → 新引用
+ *  ≠ 旧引用 → 失效），其余短字段（列宽/行数上限/颜色/种类/折行 id/lineId/foldEnabled/
+ *  该段折叠展开态+offset/search）拼接——**不**把 l.text 全量拼进 sig（987 行 × KB 级
+ *  字符串拼接实测 20ms，等于没优化）。 */
+function lineSegSig(state, l, i, cols, maxRows) {
+  const longKey = `long-${l._lineId ?? i}`
+  const expanded = state.expandedBlocks?.has(longKey) ? 1 : 0
+  const offset = state._foldScroll?.get(longKey) ?? 0
+  const searchSig = state.search?.query
+    ? `${state.search.query}:${state.search.index ?? 0}:${l._searchMatches?.length ?? 0}`
+    : ""
+  return {
+    textRef: l.text,
+    sig: [
+      cols, maxRows ?? 0, l.color ?? "", l._kind ?? "", l._foldId ?? "",
+      l._lineId ?? "", state.foldEnabled === false ? 0 : 1, expanded, offset, searchSig,
+    ].join("|"),
+  }
+}
+
+/** 普通源行 → conv 行数组（行体；不含前后空行——空行由 buildConvLines 外层逻辑补）。
+ *  从 buildConvLines 循环抽出（2026-08-31 段缓存）；逻辑与原位置逐字同构。 */
+function buildLineSeg(state, l, i, cols, maxRows) {
+  const LONG_FOLD_LINES = 12
+  const out = []
+  let text = l.text
+
+  // Apply search highlighting
+  if (state.search && state.search.query && l._searchMatches) {
+    text = highlightSearchMatches(text, state.search.query, l._searchMatches, state.search.index, state.search.matches, i)
+  }
+
+  const longKey = `long-${l._lineId ?? i}`
+  const isReasoning = l._kind === "thinking" || (l._kind === undefined && l.color === C.reason)
+  const foldable = isReasoning || (l._kind === "tool" || (l._kind === undefined && l.color === C.dim) || (l._kind === undefined && l.color !== C.text && l.color !== C.reason))
+  const threshold = isReasoning ? 0 : LONG_FOLD_LINES
+  const folded = foldable && state.foldEnabled !== false && !state.expandedBlocks?.has(longKey)
+  const block = []
+  const renderedRows = wrapRowsCached(state, l, text, cols)
+  for (const wrapped of renderedRows) {
+    block.push({ text: wrapped, color: l.color, _foldId: l._foldId, _src: i })
+  }
+  if (folded && block.length > threshold) {
+    const kind = l.color === C.reason ? "thinking" : l.color === C.dim ? "tool output" : "message"
+    out.push(...renderFoldedHead({
+      header: foldHintLine(`▶ ${kind} · ${block.length} lines — click to expand`, longKey, i),
+      body: block, cols,
+    }))
+  } else if (foldable && block.length > threshold) {
+    if (state.foldEnabled === false) {
+      out.push(...block)
+    } else {
+      if (l.color === C.dim) {
+        for (const line of block) line._skipDimFold = true
+      }
+      out.push(...renderExpandedBlock({ body: block, foldKey: longKey, state, maxRows, cols, label: `${block.length} lines` }))
+    }
+  } else {
+    out.push(...block)
+  }
+  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 后
+ *  111ms（主线程阻塞卡顿）。行对象 + cols + 加工后 text（含 search 高亮注入）为键，
+ *  已有行直接复用——loadOlder/prepend 只算新增行；streaming 行 text 变自动失效；
+ *  行对象在 unshift 间引用稳定（行级隔离，无跨 state 串扰）。 */
+const _wrapCache = new WeakMap()
+
+function wrapRowsCached(state, line, text, cols) {
+  const hit = _wrapCache.get(line)
+  if (hit && hit.cols === cols && hit.text === text && hit.color === line.color) return hit.rows
+  const renderedText = renderMathAndMarkdown(sanitizeDisplay(text))
+  const rows = []
+  for (const l of formatTables(renderedText, cols - 1)) {
+    for (const wrapped of wrapText(l, cols - 1)) rows.push(wrapped)
+  }
+  _wrapCache.set(line, { cols, text, color: line.color, rows })
+  return rows
+}
+
+
 export function convCacheKey(state, maxRows) {
   const lastLine = state.lines.length > 0 ? state.lines[state.lines.length - 1] : null
   // expandedBlocks participates: expanding/folding a block must invalidate the cache
   const exp = state.expandedBlocks ? [...state.expandedBlocks].sort().join(",") : ""
+  // 2026-08-31 块内滚动：_foldScroll（foldKey→offset）参与签名——翻窗必须重新渲染
+  const foldScrollSig = state._foldScroll
+    ? [...state._foldScroll.entries()].sort((a, b) => a[0] < b[0] ? -1 : 1).map(([k, v]) => `${k}:${v}`).join(",")
+    : ""
   // Content prefix in the signature: same kind+length with different content
   // would otherwise collide (stale render); 8 chars disambiguate in practice.
   const blocksSig = (state._advisorBlocks ?? []).map((b) => `${b.kind}:${b.text?.length ?? 0}:${String(b.text ?? "").slice(0, 8)}`).join(",")
@@ -75,13 +225,12 @@ export function convCacheKey(state, maxRows) {
   // this the cache would serve the pre-search rows and highlight would never
   // appear (P0-1, 2026-08-30 consult). query+index covers match navigation.
   const searchPart = state.search?.query ? `${state.search.query}:${state.search.index ?? 0}` : ""
-  return `${state.lines.length}|${lastLine?.text.length ?? 0}|${state.streaming.length}|${state.reasoning.length}|${blocksSig}|${subSig}|${frozenSig}|${toolSig}|${colorSig}|${state.foldEnabled !== false ? "f" : "u"}|${exp}|${capPart}|${searchPart}`
+  return `${state.lines.length}|${lastLine?.text.length ?? 0}|${state.streaming.length}|${state.reasoning.length}|${blocksSig}|${subSig}|${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). */
-// foldHintLine/blankLine moved to fold-block.mjs (shared with the component).
 
 function highlightSearchMatches(text, query, matchesInLine, globalCurrentIndex, allMatches, lineIndex) {
   if (!matchesInLine || matchesInLine.length === 0 || !query) return text
@@ -190,47 +339,45 @@ function buildConvLines(state, cols, maxRows) {
     // Frozen subagent activity block (§7.2 D4, 2026-08-30): rendered as its own
     // collapsible section — clickable expand/collapse like the running block.
     if (l._frozenSubTask) {
-      convLines.push(...frozenSubTaskLines(state, l._frozenSubTask, cols, maxRows))
+      // 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)
+      }
       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).
     if (l._toolBlock) {
+      // 2026-08-31 段缓存：工具块签名含三缓冲长度+done/elapsed/summary+该块展开态——
+      // 流式 append 使 output.length 变 → 失效；real 会话 106 个工具块每帧全量 wrap 实测
+      // 32ms（rebuild 40ms 的大头），入缓存后命中只算签名拼接。
       const b = l._toolBlock
-      // Stable key from the line's own id (P1 2026-08-30): the line may shift
-      // index when loadOlder unshifts older pages — positional tool-${i} would
-      // re-bind the expand state to a different tool block.
-      const foldKey = `tool-${l._lineId ?? i}`
-      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)
-        convLines.push(...renderExpandedBlock({ body, foldKey, state, maxRows, cols, label: `${b.name}${b.roundTag || ""} ${b.argsSummary}`.trim() }))
+      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 {
-        // Head MUST be width-bounded: argsSummary for unknown/MCP tools is a
-      // JSON.stringify dump that can be thousands of chars — an overwide header
-      // row makes the terminal soft-wrap mid-frame, shifting every panel below
-      // (the "code breaks the input box border" report, 2026-08-30).
-      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 })
-        // Result lines join the tail pool too — restore carrier has no output
-        // rows, so without this its folded tail showed only args JSON and the
-        // result vanished from the folded view (parity bug, 2026-08-30).
-        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 })
-        convLines.push(...renderFoldedHead({ header: { text: headText, color: C.tool, _foldToggle: foldKey }, body, cols }))
+        const rows = buildToolBlockSeg(state, l, i, cols, maxRows)
+        _lineSegCache.set(l, { textRef: b, sig: tSig, rows })
+        convLines.push(...rows)
       }
       continue
     }
@@ -239,93 +386,37 @@ function buildConvLines(state, cols, maxRows) {
     // rendered, no gutter — review history convention kept from the flat era),
     // 60% cap via the shared component.
     if (l._frozenAdvisor) {
-      const frozenAdvKey = `advisor-done-${i}`
-      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 })
-          }
-        }
-        convLines.push(...renderExpandedBlock({ body, foldKey: frozenAdvKey, state, maxRows, cols, label: "[advisor · review done]" }))
+      // 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 {
-        convLines.push({
-          text: `▶ [advisor · review done] … click to expand`,
-          color: C.fold,
-          _foldToggle: frozenAdvKey,
-        })
+        const rows = buildFrozenAdvSeg(state, l, i, cols, maxRows)
+        _lineSegCache.set(l, { textRef: l._frozenAdvisor, sig: aSig, rows })
+        convLines.push(...rows)
       }
       continue
     }
-    let text = l.text
-
-    // Apply search highlighting
-    if (state.search && state.search.query && l._searchMatches) {
-      text = highlightSearchMatches(text, state.search.query, l._searchMatches, state.search.index, state.search.matches, i)
-    }
 
-    // Long-message folding (2026-08-30 user ruling): MAIN OUTPUT / user messages
-    // (C.text) NEVER fold — primary conversation content is read by scrolling,
-    // not by expanding; a folded core answer hid the actual result behind a
-    // click. Foldable subjects narrow to THINKING (C.reason) and dim tool
-    // summaries — the auxiliary streams. (This re-enacts the pre-0.12.7 rule
-    // for main output only; the 0.12.7 "revert" had reopened folding for it.)
-    // Keyed by the source-line index (`long-${i}`) so the toggle survives
-    // re-renders.
-    const longKey = `long-${i}`
-    // Single source of truth: the producer stamps _kind ("thinking" / "text" /
-    // "tool") — buildConvLines READS the stamp instead of GUESSING from color.
-    // Three producers (live flushStream / restored historyToLines / injected
-    // lines) now emit the identical grammar; the renderer is one place.
-    // Fallback: unstamped lines keep the legacy color-based inference (defensive
-    // for any path this refactor missed — empty until proven otherwise).
-    const isReasoning = l._kind === "thinking" || (l._kind === undefined && l.color === C.reason)
-    // Foldable classes: thinking (ALWAYS — threshold 0) and dim auxiliaries.
-    // "text" (main output / user messages) NEVER folds.
-    const foldable = isReasoning || (l._kind === "tool" || (l._kind === undefined && l.color === C.dim) || (l._kind === undefined && l.color !== C.text && l.color !== C.reason))
-    const threshold = isReasoning ? 0 : LONG_FOLD_LINES
-    const folded = foldable && state.foldEnabled !== false && !state.expandedBlocks?.has(longKey)
-    const block = []
-    // Lightweight markdown display (IK5VW3): render BEFORE measuring — the
-    // table column math (formatTables) and wrapping must see the RENDERED
-    // text (ANSI consumes zero display width; the width functions are
-    // ANSI-aware). Rendering after wrapping measured raw markdown
-    // (`**bold**` = 8) against displayed text (4) and sliced markers
-    // mid-sequence — the table misalignment the user kept reporting.
-    const renderedText = renderMathAndMarkdown(sanitizeDisplay(text))
-    for (const line of formatTables(renderedText, cols - 1)) {
-      for (const wrapped of wrapText(line, cols - 1)) {
-        block.push({ text: wrapped, color: l.color, _foldId: l._foldId, _src: i })
-      }
-    }
-    if (folded && block.length > threshold) {
-      // FOLDED — unified form (fold-block.mjs renderFoldedHead, 2026-08-30 user
-      // ruling): named identity header + last 3 lines. Replaces the legacy
-      // [first 4, anonymous ▶ at the ellipsis, last] whose orphaned-looking
-      // "… N more lines" segment confused the scrollback.
-      const kind = l.color === C.reason ? "thinking" : l.color === C.dim ? "tool output" : "message"
-      convLines.push(...renderFoldedHead({
-        header: foldHintLine(`▶ ${kind} · ${block.length} lines — click to expand`, longKey, i),
-        body: block, cols,
-      }))
-    } else if (foldable && block.length > threshold) {
-      if (state.foldEnabled === false) {
-        // Folding fully off — content already fully visible; a "click to
-        // collapse" hint would be misleading (toggling has no effect).
-        convLines.push(...block)
-      } else {
-        // EXPANDED thinking/dim long block via the shared component: blank + ▼
-        // control at the HEAD, content, 60% cap with a bottom collapse control.
-        // DIM blocks must not re-trigger the consecutive-dim folding below
-        // (folding stacked on folding — reported regression).
-        if (l.color === C.dim) {
-          for (const line of block) line._skipDimFold = true
-        }
-        convLines.push(...renderExpandedBlock({ body: block, foldKey: longKey, state, maxRows, cols, label: `${block.length} lines` }))
-      }
+    // ── 普通源行段（2026-08-31 懒加载卡顿优化②：段级缓存——行体 WeakMap 按行对象
+    // 缓存，签名含该段所有决定因素；unshift/loadOlder 后尾部段全命中，只算新增行。
+    // toggle/翻窗/收起只失效该块段，其它段照样命中。行为不变性是硬约束。
+    const seg = lineSegSig(state, l, i, cols, maxRows)
+    const hit = _lineSegCache.get(l)
+    if (hit && hit.textRef === seg.textRef && hit.sig === seg.sig) {
+      convLines.push(...hit.rows)
     } else {
-      convLines.push(...block)
+      const rows = buildLineSeg(state, l, i, cols, maxRows)
+      _lineSegCache.set(l, { textRef: seg.textRef, sig: seg.sig, rows })
+      convLines.push(...rows)
     }
     // Trailing blank after a main-output segment (user request 2026-08-30) —
     // landed after the segment's rendered content.
@@ -464,7 +555,6 @@ function buildConvLines(state, cols, maxRows) {
   }
   // Fold long blocks (> 8 consecutive dim lines)
   const FOLD_LINES = 8
-  let foldCounter = 0
   const folded = []
   let i = 0
   while (i < convLines.length) {
@@ -476,7 +566,10 @@ function buildConvLines(state, cols, maxRows) {
       // Expanded long-fold blocks are exempt — otherwise folding stacks on folding
       const hasExpandedLong = convLines.slice(i, j).some((l) => l._skipDimFold)
       if (blockLen > FOLD_LINES && !hasExpandedLong) {
-        const foldKey = `fold-${foldCounter++}`
+        // 2026-08-31 会诊三家共识：fold-N 计数器键在 loadOlder/上游 dim 块增减时重绑——
+        // 用首行 _lineId 身份化（连续 dim 块首行即稳定锚）；无 _lineId 时退 fold-i（防御）
+        const keySource = convLines[i]._lineId ?? i
+        const foldKey = `fold-${keySource}`
         if (state.foldEnabled !== false && !state.expandedBlocks?.has(foldKey)) {
           // FOLDED — unified named-header + last-3 form (same ruling as the
           // long-message fold above).
@@ -515,13 +608,22 @@ export { buildConvLines }
 
 export function renderConversation(state, cols, visibleH, scroll, maxRows) {
   const convLines = buildConvLines(state, cols, maxRows)
-  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 { start, end, pad } = convViewport(convLines.length, visibleH, scroll)
+  const visible = convLines.slice(start, end)
   const out = []
   for (let p = 0; p < pad; p++) out.push("")
   for (const l of visible) out.push(`${l.color ?? ""}${l.text}${ansi.reset}`)
   return out
 }
+
+/** 视口数学单源（2026-08-31 会诊 kimi 缺陷 1——convGlobalIndex 未减 pad：
+ *  短会话顶部补 pad 空行后命中整体偏移，点击/滚轮落空或错行）。
+ *  返回 { start, end, pad }——renderConversation 与鼠标命中测试共用。 */
+export function convViewport(convLen, convH, scroll) {
+  const maxScroll = Math.max(0, convLen - convH)
+  const clamped = Math.min(scroll, maxScroll)
+  const end = Math.max(0, convLen - clamped)
+  const start = Math.max(0, end - convH)
+  const pad = Math.max(0, convH - (end - start))
+  return { start, end, pad }
+}

package/src/tui/render-frame.mjs

@@ -8,13 +8,18 @@
  */
 import { ansi, C, ESC } from "./ansi.mjs"
 import { convCacheKey, renderConversation, countConvLines } from "./render-conversation.mjs"
-import { sliceByWidth, stringWidth, sanitizeDisplay } from "./render.mjs"
+import { sliceByWidth, stringWidth } from "./render.mjs"
 import { specForModel } from "../config.mjs"
 import { computeLayout } from "./layout.mjs"
 import { basename } from "node:path"
+import { readFileSync } from "node:fs"
 
 export { convCacheKey, renderConversation, countConvLines } from "./render-conversation.mjs"
 
+// Module-load read, once per process (same pattern as cmd-upgrade.mjs): the
+// header shows the installed version next to the logo (user request 2026-08-31).
+const THINCODER_VERSION = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url), "utf8")).version
+
 // ---------- status bar slash-command hints ----------
 const SLASH_HINTS = {
   "/config": "open config menu",
@@ -42,7 +47,7 @@ export function renderHeader(agent, cols) {
   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}`
+  return `${ansi.bold}${C.tool} ThinCoder ${ansi.reset}${ansi.dim}${THINCODER_VERSION} │ ${sliceByWidth(model, 30)}${thinkBadge ? " " + thinkBadge : ""} │ ${sliceByWidth(basename(agent.cwd), Math.max(10, cols - 60))}${ansi.reset}`
 }
 
 /** Todo/task panel. Returns empty array when no tasks visible. The first row is

package/src/tui/render-loop.mjs

@@ -63,6 +63,16 @@ export function createRenderLoop(state, agent, ctx, pushLine, write = (s) => pro
       // restored to full width only after flush stopped the output). dims are
       // updated by: startup seed + a delayed re-sample + resize events.
       const dims = state.dims ? state.dims.get() : { cols: process.stdout.columns || startupDims.cols, rows: process.stdout.rows || startupDims.rows }
+      // 2026-08-31 流式跟随（会诊 kimi 简化 + deepseek/glm 锚定）：_followTail 即完整语义——
+      // 开 → 渲染前钉底（tool/pushLine 行同样生效，无跟随空洞）；关（用户上滚）→ 锚定补偿：
+      // scroll 是距底偏移，暂停期间 convLen 增长会把用户读的行顶走——按增长量补偿。
+      const convLen = countConvLines(state, dims.cols, dims.rows)
+      if (state._followTail) {
+        state.scroll = 0
+      } else if (state._pauseAnchorLen != null && convLen > state._pauseAnchorLen) {
+        state.scroll += convLen - state._pauseAnchorLen
+      }
+      state._pauseAnchorLen = convLen
 
       // NOTE (§7.2 D6): the old state.outputPanels prune is gone — output panels
       // are abolished; subagent blocks live in the conversation and are never

package/src/tui/render.mjs

@@ -203,6 +203,7 @@ export function layoutInput(chars, cursor, width) {
  * Display-layer only — raw tool results the model sees are unchanged; dirty displays already in session
  * are also cleaned during replay.
  */
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
 const ANSI_SEQUENCE = /\x1b\[[0-9;?]*[a-zA-Z]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b[()][0-9A-B]|\x1b[=>#][0-9]?/
 // Global variant for replace()/split(); the non-global one keeps match.index for slicing
 const ANSI_SEQUENCE_RE = new RegExp(ANSI_SEQUENCE.source, "g")
@@ -211,12 +212,22 @@ export function sanitizeDisplay(s) {
     .replace(ANSI_SEQUENCE_RE, "")
     // §7.2 D5 fallback: an unparsed ⟦ev⟧ event token must never reach the grid —
     // strip the sentinel + its RS-wrapped payload (⟦ev⟧turn\x1e…\x1e / bare RS/GS chars).
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     .replace(/⟦ev⟧[^\x1e\x1d]*\x1e[^\x1e\x1d]*\x1e[^\x1e\x1d]*\x1e[^\x1e\x1d]*\x1e?/g, "")
-    .replace(/⟦ev⟧[^\x1e\x1d]*/g, "")
+    // GitHub-#4-class pitfall (2026-08-31): the residue strip used to be
+    // /⟦ev⟧[^\x1e\x1d]*/ — "swallow to end of line/string", which ATE REAL
+    // CONTENT when the user-visible text legitimately contains the literal
+    // sentinel (e.g. a table describing the ACP bridge's ⟦ev⟧ stripping —
+    // everything from the sentinel to the end vanished on screen). Real relay
+    // tokens start with a phase word (turn/approval); a bare sentinel with no
+    // letters attached is not a live token. Strip only sentinel+letters.
+    .replace(/⟦ev⟧[A-Za-z]*/g, "")
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     .replace(/[\x1d\x1e]/g, "")
     .replace(/\r\n/g, "\n")
     .replace(/\r/g, "\n")
     .replace(/\t/g, "    ")
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     .replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "")
     .replace(/\n+$/, "")
 }

package/src/tui/startup.mjs

@@ -1,14 +1,13 @@
 import { listSlots } from "../session.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { describeToolArgs, toolArgsLines } from "./tool-args.mjs"
-import { sliceByWidth } from "./render.mjs"
 import { slimToolResultForDisplay } from "./tool-events.mjs"
 
 /** Lazy history window (parity with VS Code HISTORY_PAGE_SIZE): first paint loads
  *  the latest INITIAL_HISTORY_MESSAGES, then PgUp-at-top loads HISTORY_PAGE_MESSAGES
  *  more. Rebuilding an 8000-message session eagerly froze startup + first render. */
 export const INITIAL_HISTORY_MESSAGES = 200
-export const HISTORY_PAGE_MESSAGES = 50
+export const HISTORY_PAGE_MESSAGES = 20
 
 /**
  * Convert history[startIdx, endIdx) into conversation source lines (label lines

package/src/tui/subagent-blocks.mjs

@@ -12,10 +12,12 @@
  */
 
 import { C } from "./ansi.mjs"
+import { describeToolArgs } from "./tool-args.mjs"
 
 /** `role#id/` prefix router — hyphen included since the eng-coder fix (2026-08-21). */
 export const SUB_PREFIX_RE = /^([\w-]+)#(\d+)\//
 /** ⟦ev⟧ event token parser (D1/D2): `⟦ev⟧<name>\x1e<n>\x1e<max>\x1e<phase>\x1e<detail>`. */
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
 export const SUB_EVENT_RE = /^⟦ev⟧(turn|approval)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e?([\s\S]*)$/
 /** N2: per-child display-line ring buffer cap — oldest lines drop with a marker. */
 export const SUB_BLOCK_LINE_LIMIT = 500
@@ -306,7 +308,10 @@ export function routeSubToolCall(state, name, args, scheduleRender) {
   sub.currentTool = name.slice(subMatch[0].length)
   sub.toolArgs = args
   sub.approval = null
-  appendSubBlock(sub, "tool", `❯ ${sub.currentTool}${args?.command ? " — " + String(args.command).replace(/\s+/g, " ").trim().slice(0, 80) : ""}\n`, { fresh: true })
+  // 2026-08-31: 工具行带参数摘要（与主 agent 工具块同款 describeToolArgs 单源）——
+  // 此前只显示工具名（bash 独享 "— 命令"），read/grep/glob 等全裸名。
+  const argsDesc = describeToolArgs(sub.currentTool, args)
+  appendSubBlock(sub, "tool", `❯ ${sub.currentTool}${argsDesc ? " " + argsDesc : ""}\n`, { fresh: true })
   scheduleRender()
   return true
 }

package/src/tui/tool-args.mjs

@@ -36,6 +36,10 @@ export function describeToolArgs(name, args) {
       const p = a.path ? ` in "${a.path}"` : ""
       return `/${String(pat)}/${p}`
     }
+    case "ls": {
+      const p = a.path ? String(a.path) : "."
+      return a.filter ? `${p}  (filter: ${String(a.filter)})` : p
+    }
     case "websearch": return String(a.query ?? "")
     case "subagent": case "coder": case "explore": case "plan": case "eng-coder": {
       const task = String(a.task ?? "").replace(/\s+/g, " ").trim()

package/src/tui/tool-events.mjs

@@ -12,7 +12,6 @@
  * flushStream 同时返回给调用方（回合循环 / onTurnEnd 共用）。纯回调装配，无终端副作用
  * （除经 deps 注入的 pushLine/render）。
  */
-import { sliceByWidth } from "./render.mjs"
 import { C } from "./ansi.mjs"
 import { formatToolSummary } from "./tool-summaries.mjs"
 import { describeToolArgs, toolArgsLines } from "./tool-args.mjs"
@@ -129,10 +128,9 @@ function findToolBlock(state, name, toolId) {
 
 
 /** Build the agent callbacks + the shared flushStream for one turn.
- *  deps: { agent, state, pushLine, render, scheduleRender, ensureAssistantLabel,
- *          askPermission, askQuestion, summarize, saveSessionImpl } */
+ *          askPermission, askQuestion, saveSessionImpl } */
 export function buildToolCallbacks(deps) {
-  const { agent, state, pushLine, render, scheduleRender, ensureAssistantLabel, askPermission, askQuestion, summarize, saveSessionImpl } = deps
+  const { agent, state, pushLine, render, scheduleRender, ensureAssistantLabel, askPermission, askQuestion, saveSessionImpl } = deps
 
   // NOTE: advisor buffers (_advisorThink/advisorStreaming) are cleared here too.
   // Timing safety: onToolResult flushes _advisorThink into history and empties