thincoder 0.12.54 → 0.12.59

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

@@ -9,7 +9,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 { providerSpec } from "../config.mjs"
 import { computeLayout, subagentVisibleLines } from "./layout.mjs"
 import { basename } from "node:path"
 import { readFileSync } from "node:fs"
@@ -39,11 +39,15 @@ const SLASH_HINTS = {
 
 /** Header panel (always 1 line). */
 export function renderHeader(agent, cols) {
-  const model = agent.provider.model
-  const spec = specForModel(model)
+  // 2026-09-02 Q1（SESSION.md §8）：provider 可为 null（无效 provider 被清空后用户 Esc 取消重选）
+  // —— 可选链守卫，头部显示 "no provider" 占位
+  const model = agent.provider?.model ?? "no provider"
+  // providerSpec（PROVIDER.md §15）：模型信息显示跟随 provider 级 context 覆盖（D-C5）；
+  // provider 为 null 时返回默认 spec 且不产生 "no provider" 查表警告（specForModel("") 空串不告警）
+  const spec = providerSpec(agent.provider)
   const thinkOnValue = spec.thinkEnabledValue ?? "enabled"
-  const t = agent.provider.thinking
-  const effort = agent.provider.reasoningEffort
+  const t = agent.provider?.thinking
+  const effort = agent.provider?.reasoningEffort
   const thinkBadge = t?.type === "disabled" ? "│ think: off"
     : effort ? `│ think: ${effort}`
     : t?.type === thinkOnValue ? "│ think: on" : ""
@@ -128,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 {
@@ -140,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
 
@@ -252,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 }
@@ -288,7 +309,9 @@ function inputBoxStyle(state) {
     borderColor = C.tool; title = " Question "
   } else if (state.permission) {
     borderColor = C.warn
-    title = state.permission.name === "continue" ? " Continue? (y/n) " : ` Allow ${state.permission.name}? (y/n/a) `
+    title = state.permission.name === "continue" ? " Continue? (y/n) "
+      : state.permission.batch ? ` Allow ${state.permission.name}? (a/o/n) `
+      : ` Allow ${state.permission.name}? (y/n/a) `
   } else if (state.picker) {
     title = " Select "
   } else if (state.wizard) {
@@ -312,9 +335,9 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
       : " Type answer then Enter │ Esc: cancel"
   }
   if (state.permission) {
-    return state.permission.name === "continue"
-      ? " y: continue │ n: stop"
-      : " y: approve │ n: deny │ a: approve all (AUTO)"
+    if (state.permission.name === "continue") return " y: continue │ n: stop"
+    if (state.permission.batch) return " a: approve all │ o: one by one │ n: deny"
+    return " y: approve │ n: deny │ a: approve all (AUTO)"
   }
   if (state.picker) return " type: filter │ ↑↓/PgUp/PgDn: select │ Enter: confirm │ Esc: cancel"
   if (state.wizard) {
@@ -346,7 +369,9 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
   const elapsed = state.processing ? ` ${Math.floor((Date.now() - state.processingStarted) / 1000)}s` : ""
   const toolHint = state.currentTool ? ` ${state.currentTool}…` : ""
   const statusText = state.processing ? `${state.status}${toolHint}${elapsed}` : state.status
-  const modelContext = specForModel(agent.provider.model).context
+  // 2026-09-02 Q1（SESSION.md §8）：provider 可为 null —— providerSpec(null) 保守 128K 不抛错
+  // 2026-09-02 §15：context 窗口跟随 providers[].context 覆盖（T-C6——百分比基于覆盖后的窗口）
+  const modelContext = providerSpec(agent.provider).context
   const ctxPct = Math.round((state.ctxCache.tokens / modelContext) * 100)
   const ctxTokensHint = state.ctxCache.tokens > 0 ? ` ${fmtK(state.ctxCache.tokens)}` : ""
   const ctxHint = ctxPct > 0

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)

package/src/tui/render-segments.mjs

@@ -0,0 +1,165 @@
+/**
+ * render-segments.mjs — 对话行三类特殊段渲染（2026-09-03 D-S2 自 render-conversation.mjs 拆出）：
+ * tool 块 / frozenSubTask 冻结子agent 块 / frozenAdvisor 冻结评审块。各段自带独立 WeakMap
+ * 段级缓存（行对象载体系互斥——_toolBlock/_frozenSubTask/_frozenAdvisor 三型不共存于一行，
+ * 分支互斥 if——与共享缓存行为等价）；签名由各段集中计算（该段输出的所有决定因素，漏一项
+ * → 缓存失效不全 → 显示 stale）。buildConvLines 主循环只留三分支 ~3 行调用。
+ */
+import { C } from "./ansi.mjs"
+import { formatTables, sanitizeDisplay, sliceByWidth, wrapText } from "./render.mjs"
+import {
+  foldTailLines, isExpanded, renderBlockTimeline, renderExpandedBlock, renderFoldedHead, renderMathAndMarkdown,
+} from "./fold-block.mjs"
+import { styleSubLabelRow } from "./subagent-panel.mjs"
+import { SUBAGENT_ROLES } from "./subagent-blocks.mjs"
+
+const _toolSegCache = new WeakMap()
+const _frozenSubCache = new WeakMap()
+const _frozenAdvCache = new WeakMap()
+
+/** 工具块段（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
+}
+
+/** 工具块段入口（2026-08-31 段缓存：工具块签名含三缓冲长度+done/elapsed/summary+该块展开态——
+ *  流式 append 使 output.length 变 → 失效；real 会话 106 个工具块每帧全量 wrap 实测
+ *  32ms（rebuild 40ms 的大头），入缓存后命中只算签名拼接）。 */
+export function toolSeg(state, l, i, cols, maxRows) {
+  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 hit = _toolSegCache.get(l)
+  if (hit && hit.textRef === b && hit.sig === tSig) return hit.rows
+  const rows = buildToolBlockSeg(state, l, i, cols, maxRows)
+  _toolSegCache.set(l, { textRef: b, sig: tSig, rows })
+  return rows
+}
+
+/** 冻结子agent 活动块渲染（§7.2 D4）：state.lines 载体 {_frozenSubTask: sub}（subagent-blocks.mjs
+ *  freezeSubTaskLines 推入）。折叠 = 身份头 + tail 3；展开 = 共享组件（60% 屏幕封顶 + 底部可达
+ *  折叠控制）。折叠键 `sub-${key}`——与运行中面板区块同键，折叠态跨冻结边界无缝延续。 */
+function frozenSubTaskLines(state, sub, cols, maxRows) {
+  const foldKey = `sub-${sub.key}`
+  const elapsed = Math.floor(((sub.doneAt ?? Date.now()) - sub.started) / 1000)
+  // §19.5 D-M7b ②: 冻结头保留 sync/async 标识（done 头含历史语义——与 model 标识
+  // 同生命周期）；仅真实 subagent 角色（compress 冻结等无语义）。整行 dim——
+  // 无需 ANSI 注入（running 面板头则套 dim + 恢复行色——subagent-panel.mjs）。
+  const isSubRole = SUBAGENT_ROLES.includes(sub.role)
+  // §20：冻结的 queued 块（中止清场兜底——interrupted）标 waiting——不误标 sync
+  const modePart = isSubRole
+    ? ` · ${sub.queued ? "waiting" : (sub.async === true ? "async" : "sync")}`
+    : ""
+  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 verb = sub.stopped ? "stopped" : "done" // §19.5: cancel 冻结标题 "stopped"
+  const header = `[${icon} ${sub.key}${modePart}${modelPart} · ${verb} ${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).map(styleSubLabelRow)
+    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
+}
+
+/** 冻结子agent 段入口（2026-08-31 段缓存：冻结后内容不变——签名含 sub.key + blocks 计数；
+ *  注：foldKey 由位置键升级为 sub.key（loadOlder unshift 后不重绑——sub 自身携带 key）。 */
+export function frozenSubSeg(state, l, i, cols, maxRows) {
+  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 hit = _frozenSubCache.get(l)
+  if (hit && hit.textRef === l._frozenSubTask && hit.sig === fSig) return hit.rows
+  const rows = frozenSubTaskLines(state, l._frozenSubTask, cols, maxRows)
+  _frozenSubCache.set(l, { textRef: l._frozenSubTask, sig: fSig, rows })
+  return rows
+}
+
+/** frozenAdvisor 段渲染——冻结后文本不变（markdown 渲染、无 gutter——review 历史惯例）；
+ *  foldKey 由 advisor-done-${i}（位置键）升级为 advisor-done-${_lineId ?? i}（同 long-N
+ *  判例——loadOlder unshift 后不重绑）。 */
+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
+}
+
+/** frozenAdvisor 段入口（2026-08-31 段缓存：frozenAdvisor 文本冻结不变——签名含文本长度 + 展开态）。 */
+export function frozenAdvSeg(state, l, i, cols, maxRows) {
+  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 hit = _frozenAdvCache.get(l)
+  if (hit && hit.textRef === l._frozenAdvisor && hit.sig === aSig) return hit.rows
+  const rows = buildFrozenAdvSeg(state, l, i, cols, maxRows)
+  _frozenAdvCache.set(l, { textRef: l._frozenAdvisor, sig: aSig, rows })
+  return rows
+}

package/src/tui/render.mjs

@@ -203,7 +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 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（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")
@@ -212,7 +212,7 @@ 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 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     .replace(/⟦ev⟧[^\x1e\x1d]*\x1e[^\x1e\x1d]*\x1e[^\x1e\x1d]*\x1e[^\x1e\x1d]*\x1e?/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
@@ -222,12 +222,12 @@ export function sanitizeDisplay(s) {
     // 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 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（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 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     .replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "")
     .replace(/\n+$/, "")
 }

package/src/tui/startup.mjs

@@ -2,6 +2,7 @@ import { listSlots } from "../session.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { describeToolArgs, toolArgsLines } from "./tool-args.mjs"
 import { slimToolResultForDisplay } from "./tool-events.mjs"
+import { countConvLines } from "./render-conversation.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
@@ -133,6 +134,41 @@ export function restoreLines(state, history) {
     state.lines.unshift({ text: `… ${start} more earlier messages (PgUp at top to load)`, color: C.dim })
   }
 }
+/** 懒加载更早历史（2026-08-31 用户约定："滚动到头自动加载"——滚轮/PgUp 到顶皆触发；
+ *  2026-08-31 前只挂 PgUp 键 = 违约，滚轮到头无反应）。加载后滚动补偿保持锚定。
+ *  2026-09-03 D-S1b 自 index.mjs 迁入（startup 职责本含懒加载历史窗口——TUI.md §1 归属修复）：
+ *  调用方（index.mjs）= stdin data 滚轮分支 + createKeyHandler ctx（PgUp 分支）。
+ *  ctx: { agent, state, render } */
+export function createLoadOlder({ agent, state, render }) {
+  return () => {
+    if (!state._hasOlder) return
+    const full = agent._fullHistory ?? []
+    const loaded = state._historyLoaded
+    const start = Math.max(0, full.length - loaded - HISTORY_PAGE_MESSAGES)
+    const end = full.length - loaded
+    if (start >= end) return
+
+    const d = state.dims ? state.dims.get() : {}
+    const cols = d.cols ?? ((state.dims?.get() ?? {}).cols ?? (process.stdout.columns || 80))
+    const before = countConvLines(state, cols, d.rows ?? (process.stdout.rows || 24))
+
+    if (state.lines[0]?.text?.startsWith("… ")) state.lines.shift()
+    state._lineIdCounter = state._lineIdCounter ?? 0
+    const older = historyToLines(full, start, end)
+    for (const l of older) l._lineId = ++state._lineIdCounter
+    state.lines.unshift(...older)
+    state._historyLoaded += end - start
+    state._hasOlder = start > 0
+    if (state._hasOlder) {
+      state.lines.unshift({ text: `… ${start} more earlier messages (scroll to top to load)`, color: C.dim })
+    }
+
+    const after = countConvLines(state, cols, (state.dims?.get() ?? {}).rows ?? (process.stdout.rows || 24))
+    state.scroll += Math.max(0, after - before)
+    render()
+  }
+}
+
 /** Startup screen + session recovery + background indexing.
  *  Extracted from index.mjs.
  *  ctx: { agent, state, opts, pushLine, pushLabel, render, startWizard } */
@@ -140,12 +176,14 @@ export function showStartup(ctx) {
   const { agent, state, opts, pushLine, pushLabel, render, startWizard } = ctx
 
   // Startup screen
-  if (!agent.provider.apiKey) {
+  // 2026-09-02 Q1（SESSION.md §8 D-S2）：provider 可为 null（无效 provider 被清空后用户 Esc 取消重选）
+  // —— 可选链守卫；`!apiKey` 触发既有 wizard（其 provider 菜单列出已存在 providers，可选中恢复，F3）
+  if (!agent.provider?.apiKey) {
     pushLabel(`Welcome to ThinCoder!`, ansi.bold + C.tool)
     pushLine("No API key configured yet — entering initial setup (Esc to skip anytime)", C.text)
     startWizard()
   } else {
-    pushLine(`Welcome to ThinCoder. Provider: ${agent.activeProvider} / ${agent.provider.model}`, C.dim)
+    pushLine(`Welcome to ThinCoder. Provider: ${agent.activeProvider} / ${agent.provider?.model ?? "(none)"}`, C.dim)
   }
   pushLine(`Tools: ${agent.tools.map((t) => t.name).join(", ")}`, C.dim)