thincoder 0.12.52 → 0.12.54

package/src/tui/render-conversation.mjs

@@ -24,37 +24,178 @@ 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(",")
-  // Subagent activity blocks (§7.2 D5): O(1) counter-style signature — a running
-  // epoch (any block/header change bumps it, subagent-blocks.mjs appendSubBlock /
-  // finishSubTask) + per-child totals. Running children also fold in a
-  // second-granularity elapsed part (see below). NOT a full text concat: N3
-  // forbids O(n) signature cost on every token.
-  let subSig = ""
-  for (const key in state.subTasks) {
-    const s = state.subTasks[key]
-    // Running children include a second-granularity elapsed component: the 1s
-    // ticker re-renders to tick the header countdown — without this the cache
-    // would hit and the "45s" display would freeze during silent stretches
-    // (long child tool runs with no chunks). Done children are constant — no
-    // per-second invalidation for them.
-    const elapsedPart = s.done ? "" : `:${Math.floor((Date.now() - s.started) / 1000)}`
-    subSig += `${key}:${s.done ? 1 : 0}${elapsedPart}:${s.turn}/${s.maxTurns}:${s.currentTool ?? ""}:${s.approval ?? ""}:${s.blockEpoch ?? 0}:${s.model ?? ""};`
-  }
-  // Frozen blocks ride state.lines ({_frozenSubTask}) — the lines.length part of
-  // this key covers their existence; expanding/collapsing one flips expandedBlocks
-  // (covered by `exp`). One extra: the last frozen payload's header depends on
-  // blocks content which never changes post-freeze — nothing more needed.
-  // Same single pass also builds the per-line COLOR-CLASS signature: foldability
-  // is decided by color class since main output (C.text) never folds while
-  // thinking/dim do (2026-08-30) — two states differing only in line color used
-  // to collide on this key and serve a stale cached render.
+  // NOTE (§7.2.1): running subagent blocks are NOT part of the conversation
+  // anymore — they render in the fixed bottom panel (subagent-panel.mjs,
+  // uncached per frame: the 1s ticker refreshes the panel's elapsed display).
+  // The old subSig (blockEpoch/turn/elapsed invalidation) is removed: the panel
+  // re-renders independently, so child activity must NOT invalidate the
+  // conversation cache (that would rebuild the whole conversation per child
+  // token — exactly what the 2026-08-31 lazy-load optimization eliminated).
+  // Frozen blocks ride state.lines ({_frozenSubTask}) — the lines.length part
+  // of this key covers their existence; expanding/collapsing one flips
+  // expandedBlocks (covered by `exp`). One extra: the last frozen payload's
+  // header depends on blocks content which never changes post-freeze — nothing
+  // more needed. Same single pass also builds the per-line COLOR-CLASS
+  // signature: foldability is decided by color class since main output (C.text)
+  // never folds while thinking/dim do (2026-08-30) — two states differing only
+  // in line color used to collide on this key and serve a stale cached render.
   // Tool-block carriers ({_toolBlock}) contribute their BUFFER SIZE signature:
   // output/result arrays mutate in place (streaming appends, result landing),
   // and carrier text is always "" — without this the cache serves a stale block
@@ -75,7 +216,7 @@ 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}|${frozenSig}|${toolSig}|${colorSig}|${state.foldEnabled !== false ? "f" : "u"}|${exp}|${capPart}|${searchPart}|${foldScrollSig}`
 }
 
 /** Fold marker line: bold-cyan icon + "click to …" phrase underlined (clickable affordance).
@@ -107,14 +248,16 @@ function highlightSearchMatches(text, query, matchesInLine, globalCurrentIndex,
 }
 
 /** Render a FROZEN child activity block carried on a state.lines entry
- *  (subagent-blocks.mjs freezeSubTaskLines pushes {_frozenSubTask: sub}). Identical
- *  interaction to the running tail section: 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 live 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). */
+ *  (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)
@@ -187,49 +330,48 @@ function buildConvLines(state, cols, maxRows) {
       blankAfter = !nextMain
     }
     // Frozen subagent activity block (§7.2 D4, 2026-08-30): rendered as its own
-    // collapsible section — clickable expand/collapse like the running block.
+    // collapsible section in the stream (running blocks live in the fixed panel,
+    // §7.2.1 — the frozen form keeps the same clickable interaction).
     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
     }
@@ -238,93 +380,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.
@@ -333,65 +419,14 @@ function buildConvLines(state, cols, maxRows) {
       blankAfter = false
     }
   }
-  // ── Subagent activity blocks (§7.2 D4) — RUNNING blocks only ──────────────
-  // Rendered BEFORE the advisor blocks section. A child's block lives here only
-  // while it runs: on completion onToolResult freezes the block into state.lines
-  // (subagent-blocks.mjs freezeSubTaskLines) so it scrolls away with the conversation
-  // instead of staying pinned above the input box ("ghost" report 2026-08-30).
-  // Default folded = header summary line (▶ role#id · model · elapsed · turn
-  // n/max | current state) + tail 3 block lines; expanded = shared component
-  // (full timeline, 60% screen cap).
-  const runningSubs = Object.values(state.subTasks ?? {}).filter((s) => !s.done)
-  if (runningSubs.length > 0) {
-    // Divider between the conversation body and the running-subagent band
-    // (user request 2026-08-30, mirroring the task-panel divider in
-    // render-frame renderTodo). Only when at least one block actually renders —
-    // done children are frozen into state.lines above, so a divider for an
-    // empty band would hang over the section boundary.
-    // Unconditional divider (task-panel style): the preceding main-output
-    // trailing blank is breathing room, the divider is the section boundary —
-    // both belong. Only dedupe against another divider (idempotent re-render).
-    if (convLines.at(-1)?.color !== C.dim || !convLines.at(-1)?.text?.startsWith("─")) {
-      convLines.push({ text: "─".repeat(Math.max(1, cols - 1)), color: C.dim, _skipDimFold: true })
-    }
-    for (const sub of runningSubs) {
-      // Done children never reach this loop (filtered above): they are frozen
-      // into state.lines by subagent-blocks.mjs freezeSubTaskLines and removed
-      // from subTasks — a restored leftover would otherwise pin at the tail.
-      const foldKey = `sub-${sub.key}`
-      // Header summary: `[▶ coder#1 · glm-5.3 · 45s · turn 12/100] bash — npm test`
-      const icon = sub.approval ? "⏸" : "▶"
-      const elapsed = Math.floor(((sub.done ? sub.doneAt : Date.now()) - sub.started) / 1000)
-      const modelPart = sub.model ? ` · ${sub.model}` : ""
-      const turnPart = sub.maxTurns > 0 ? ` · turn ${sub.turn}/${sub.maxTurns}` : ""
-      let statePart
-      if (sub.approval) statePart = `等待审批: ${sub.approval}`
-      else if (sub.done) {
-        statePart = `done ${elapsed}s${sub.lastError ? ` — ${sub.lastError}` : ""}`
-      } else if (sub.currentTool) statePart = sub.currentTool
-      else statePart = "thinking..."
-      const argSummary = sub.currentTool && sub.toolArgs?.command
-        ? ` — ${String(sub.toolArgs.command).replace(/\s+/g, " ").trim().slice(0, 60)}`
-        : ""
-      convLines.push({
-        text: `[${icon} ${sub.key}${modelPart} · ${elapsed}s${turnPart}] ${sliceByWidth(statePart + argSummary, Math.max(20, cols - 30))}`,
-        color: sub.done ? C.dim : C.tool,
-        _foldToggle: foldKey,
-      })
-      if (isExpanded(state, foldKey)) {
-        // Full activity timeline via the shared component (per-kind colors,
-        // 60% screen cap — the header control may sit above the viewport once
-        // expanded, the capped bottom control stays reachable).
-        const body = renderBlockTimeline(sub.blocks, cols)
-        convLines.push(...renderExpandedBlock({ body, foldKey, state, maxRows, cols, label: "subagent activity" }))
-      } else {
-        // Folded: tail 3 non-empty block lines (most recent activity), dim.
-        for (const line of foldTailLines(sub.blocks)) {
-          convLines.push({ text: `│ ${sliceByWidth(line, cols - 4)}`, color: C.dim })
-        }
-      }
-    }
-  }
+  // ── Subagent activity blocks (§7.2.1 D2) — RUNNING blocks MOVED to the fixed
+  // bottom panel (subagent-panel.mjs renderSubagentPanel, layout.mjs precomputes
+  // the panel height; render-frame puts it between conversation and todo).
+  // 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).
+
   if (state.reasoning) {
     // Live thinking streams INSIDE the unified box (user ruling 2026-08-30:
     // "思考过程中为什么不是直接进这个框" — the flat tail render was a
@@ -463,7 +498,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) {
@@ -475,7 +509,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).
@@ -514,13 +551,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

@@ -10,7 +10,7 @@ import { ansi, C, ESC } from "./ansi.mjs"
 import { convCacheKey, renderConversation, countConvLines } from "./render-conversation.mjs"
 import { sliceByWidth, stringWidth } from "./render.mjs"
 import { specForModel } from "../config.mjs"
-import { computeLayout } from "./layout.mjs"
+import { computeLayout, subagentVisibleLines } from "./layout.mjs"
 import { basename } from "node:path"
 import { readFileSync } from "node:fs"
 
@@ -89,8 +89,10 @@ export function renderPicker(state, cols, panel, overlay) {
   // 过滤提示：无filter时显示 "type to filter"，有filter时显示输入内容
   const filterHint = p ? (p.filter ? `│ ${p.filter}` : "│ type to filter") : ""
   const rawLeft = p ? ` ❯ ${p.title} ${filterHint} ` : " ❯ Setup "
-  const left = sliceByWidth(rawLeft, Math.max(1, cols - 2 - stringWidth(right)))
-  const titlePad = " ".repeat(Math.max(1, cols - 1 - stringWidth(left) - stringWidth(right)))
+  // 2026-08-31 会诊（advisor round1 🔵）：标题行与条目行一致留 8 格余量——Ambiguous 字符
+  // （❯/│ 等）在 CJK 终端渲染 2 格，余量不足时右侧 n/m 位置指示会被截。
+  const left = sliceByWidth(rawLeft, Math.max(1, cols - 8 - stringWidth(right)))
+  const titlePad = " ".repeat(Math.max(1, cols - 8 - stringWidth(left) - stringWidth(right)))
   out.push(`${ansi.bold}${C.tool}${left}${ansi.reset}${ansi.dim}${titlePad}${right}${ansi.reset}`)
   const hasMoreAbove = start > 0
   const hasMoreBelow = start + winH < total
@@ -100,10 +102,14 @@ export function renderPicker(state, cols, panel, overlay) {
     const moreAbove = i === 0 && hasMoreAbove
     const moreBelow = i === shown.length - 1 && hasMoreBelow
     const ind = moreAbove && moreBelow ? "↑↓ more" : moreAbove ? "↑ more" : moreBelow ? "↓ more" : ""
-    const maxW = cols - 1 - (ind ? stringWidth(ind) + 1 : 0)
+    // 2026-08-31 会诊：右边距留 8 格余量——Ambiguous 宽度字符（│/—/●/▸/…/↑↓ 等）在中文
+    // locale 终端渲染 2 格而 stringWidth 按 1 格算，/session 行最坏带 ~7 个（▸ 前缀 +
+    // │×3 + … + — + ●）→ 行宽低估 7+ 格 → 实际超宽 → 物理 wrap → 残影；8 格余量覆盖
+    // 常见低估，最坏残余由 DECAWM 关闭硬截断兜底（见 render-loop）。
+    const maxW = cols - 8 - (ind ? stringWidth(ind) + 1 : 0)
     // 超宽行截断并加省略号
     const text = stringWidth(l.text) > maxW ? sliceByWidth(l.text, Math.max(0, maxW - 1)) + "…" : l.text
-    const pad = ind ? " ".repeat(Math.max(1, cols - 1 - stringWidth(text) - stringWidth(ind))) : ""
+    const pad = ind ? " ".repeat(Math.max(1, cols - 8 - stringWidth(text) - stringWidth(ind))) : ""
     out.push(`${l.color}${text}${ansi.reset}${ind ? `${ansi.dim}${pad}${ind}${ansi.reset}` : ""}`)
   }
   for (let i = shown.length; i < winH; i++) out.push("")
@@ -221,7 +227,7 @@ export function renderRows(state, agent, opts) {
   const slashCommands = opts.slashCommands ?? []
 
   const layout = computeLayout(state, { cols, rows })
-  const { W, panels, inputLayout, inputOffset, boxLines, visibleTasks, permPreviewLines, overlay } = layout
+  const { W, panels, inputLayout, inputOffset, boxLines, visibleTasks, permPreviewLines, overlay, subagentLines } = layout
 
   const screen = new Array(rows).fill("")
   const put = (y, lines) => {
@@ -232,6 +238,16 @@ export function renderRows(state, agent, opts) {
 
   put(panels.header.y, [renderHeader(agent, cols)])
   put(panels.conversation.y, renderConversation(state, cols, panels.conversation.h, state.scroll, rows))
+  // §7.2.1 D2: running-subagent fixed panel (between conversation and todo) —
+  // lines precomputed by layout (subagent-panel.mjs, neutral module), put
+  // directly (no double render); absent when no block is running (F6). Lines
+  // are objects ({text, color, _foldToggle/_foldBlock…} — mouse hit-testing
+  // reads the same array), converted to ANSI strings here like renderTodo.
+  if (panels.subagent) {
+    // 评审 #4：部分压缩（h < 全长）时保底截断——分隔线 + 末尾区块行（最新活动
+    // 优先），与 mouse 命中映射同一几何契约（subagentVisibleLines / subagentLineIndex）。
+    put(panels.subagent.y, subagentVisibleLines(subagentLines, panels.subagent.h).map((l) => `${l.color ?? ""}${l.text}${ansi.reset}`))
+  }
   if (panels.todo) put(panels.todo.y, renderTodo(visibleTasks, cols))
   if (panels.picker) put(panels.picker.y, renderPicker(state, cols, panels.picker, overlay))
   if (panels.permission) put(panels.permission.y, renderPermission(permPreviewLines))