thincoder 0.12.53 → 0.12.54

package/src/tui/ansi.mjs

@@ -25,6 +25,8 @@ export const ansi = {
   restoreCursor: `${ESC}8`,   // DECRC — restore cursor position
   syncUpdateStart: `${ESC}[?2026h`, // DECSET 2026 — buffer output until syncUpdateEnd
   syncUpdateEnd: `${ESC}[?2026l`,   // DECRST 2026 — flush buffered output atomically
+  wrapOff: `${ESC}[?7l`, // DECRST 7 — disable auto-wrap: over-wide rows hard-truncate at the margin instead of wrapping to the next physical line (2026-08-31 会诊：Ambiguous 宽度字符如 │/—/●/▸ 在中文 locale 终端渲染 2 格而 stringWidth 按 1 格算 → 行实际超宽 → wrap 污染下一物理行 + \x1b[K 清错行 → picker 残影)
+  wrapOn: `${ESC}[?7h`,  // DECSET 7 — restore auto-wrap (TUI exit; also re-enable per-frame after write)
   reset: `${ESC}[0m`,
   dim: `${ESC}[2m`,
   bold: `${ESC}[1m`,

package/src/tui/cmd-new.mjs

@@ -1,4 +1,4 @@
-import { newSession } from "../session.mjs"
+import { newSession, resetSessionState } from "../session.mjs"
 import { C } from "./ansi.mjs"
 
 /** /new command: start a new session in a fresh slot.
@@ -8,11 +8,11 @@ export async function handleNewCommand(ctx) {
 
   const doNewSession = () => {
     const slot = newSession(agent.cwd)
-    agent.history = []
-    agent.tasks = []
-    agent.planMode = false
-    agent.goal = null
-    agent._pendingReminders = []
+    // 2026-08-31 会诊 F3：resetSessionState 清全量会话态（_fullHistory/title/_sessionStart/
+    // _engDesignToken/压缩与验证计数等）——原实现只清 agent.history，新会话首次落盘把旧
+    // 会话完整人类线 + 旧标题写进新 slot（实锤 .19/.3 双副本）。_slot 更新为粘性新槽位。
+    resetSessionState(agent)
+    agent._slot = slot
     state.tasks = []
     state.lines = []
     state.streaming = ""

package/src/tui/cmd-restore.mjs

@@ -1,7 +1,8 @@
 import { ansi, C } from "./ansi.mjs"
 
-/** /restore command: list git checkpoints and roll back to selected snapshot.
- *  ctx: { agent, showPicker, pushLine, pushLabel } */
+/** /restore command: pick a snapshot, then pick ONE file from it to restore.
+ *  Full restore is disabled (v2) — this is the user-side per-file recovery entry
+ *  (CHECKPOINT.md D8). ctx: { agent, showPicker, pushLine, pushLabel } */
 export async function handleRestoreCommand(ctx) {
   const { agent, showPicker, pushLine, pushLabel } = ctx
   const { listCheckpoints, rewind, isGitRepo } = await import("../git/checkpoint.mjs")
@@ -9,25 +10,45 @@ export async function handleRestoreCommand(ctx) {
     pushLine("[rewind] not a git repository, checkpoints unavailable", C.error)
     return
   }
+  // F6 lazy fallback——与 git 工具 checkpoint list/create 入口一致（git-checkpoint.mjs）：外部
+  // git commit 后（HEAD 时间 > 最新快照）先清空过期快照，/restore 不列出 commit 前状态。
+  const { lazyClearIfCommitted } = await import("../tools/git-checkpoint.mjs")
+  await lazyClearIfCommitted(agent.cwd)
   const cps = await listCheckpoints(agent.cwd)
   if (cps.length === 0) {
     pushLine("(no checkpoints — created automatically before each task)", C.dim)
     return
   }
+  // Level 1: pick a snapshot (untracked shown as array length — CHECKPOINT.md D8).
   const entries = [
-    { type: "header", text: "Checkpoints (↑↓ select, Enter restore, Esc cancel)" },
+    { type: "header", text: "Checkpoints — 全量恢复已禁用，逐文件恢复 (↑↓ select, Enter next, Esc cancel)" },
     ...cps.slice(0, 12).map((cp) => ({
       type: "item",
-      text: `${cp.id}  ${new Date(cp.time).toLocaleString()}  (+${cp.untracked} untracked files)`,
+      text: `${cp.id}  ${new Date(cp.time).toLocaleString()}  (+${(cp.untracked ?? []).length} untracked files)`,
       id: cp.id,
     })),
   ]
   const e = await showPicker("Restore Checkpoint", entries)
   if (!e) return
+  const cp = cps.find((c) => c.id === e.id)
+  if (!cp) return
+  // Level 2: pick a file from the snapshot's tracked/untracked merged list.
+  const files = [...(cp.tracked ?? []), ...(cp.untracked ?? [])]
+  if (files.length === 0) {
+    pushLine("该快照无文件，无法逐文件恢复", C.dim)
+    return
+  }
+  const fileEntries = [
+    { type: "header", text: `Files in ${cp.id} (↑↓ select, Enter restore, Esc cancel)` },
+    ...files.map((f) => ({ type: "item", text: f, id: f })),
+  ]
+  const fe = await showPicker("Restore File", fileEntries)
+  if (!fe) return
   try {
-    const summary = await rewind(agent.cwd, e.id)
+    // v2 return: { path, type, restored } — rewind snapshots current state first (reversible).
+    const summary = await rewind(agent.cwd, cp.id, { path: fe.id })
     pushLabel(`❯ Rewind`, ansi.bold + C.warn)
-    pushLine(`Restored to ${e.id}: patch ${summary.patchApplied ? "applied" : "none"}, deleted ${summary.deleted} new files, restored ${summary.restored} file(s)`, C.tool)
+    pushLine(`Restored ${summary.type}: ${summary.path}${summary.restored ? "" : " — nothing restored (snapshot copy missing)"}`, C.tool)
     pushLine("(current state saved as new checkpoint; /restore again to go back)", C.dim)
   } catch (error) {
     pushLine(`[rewind] ${error.message}`, C.error)

package/src/tui/cmd-session.mjs

@@ -1,11 +1,14 @@
-import { listSlots, switchToSlot, applySession, renameSlot, activeSlot } from "../session.mjs"
+import { listSlots, switchToSlot, applySession, renameSlot, activeSlot, slotOccupancy } from "../session.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { restoreLines } from "./startup.mjs"
+import { stringWidth, sliceByWidth } from "./render.mjs"
 
 /** /rename <title> — rename the ACTIVE session (slot file + manifest, shared with VS Code). */
 export async function handleRenameCommand(ctx, args) {
   const { agent, pushLine, pushLabel, render } = ctx
-  const slot = activeSlot(agent.cwd)
+  // 2026-09-01 会诊 glm 🟡：用粘性槽而非 activeSlot（后者有认领副作用）——与 saveSession
+  // 的 _slot ??= activeSlot 语义一致：已钉槽直接重命名，未钉才认领。
+  const slot = agent._slot ?? activeSlot(agent.cwd)
   const current = agent.title || "(untitled)"
   const title = args.join(" ").trim()
   if (!title) {
@@ -38,11 +41,15 @@ export async function handleSessionCommand(ctx) {
     const dt = new Date(d)
     return `${dt.getMonth() + 1}/${dt.getDate()} ${String(dt.getHours()).padStart(2, "0")}:${String(dt.getMinutes()).padStart(2, "0")}`
   }
-  const truncate = (s, n) => s.length <= n ? s : s.slice(0, n - 1) + "…"
+  const truncate = (s, n) => (stringWidth(s) <= n ? s : sliceByWidth(s, Math.max(1, n - 1)) + "…")
   const entries = [
     { type: "header", text: `Sessions (● = active, ↑↓ select, Enter switch, Esc cancel; /rename <title> renames the active one)` },
     ...slots.map((s) => {
-      const label = s.title || (s.firstMessage ? `"${truncate(s.firstMessage, 40)}"` : "(empty)")
+      // 2026-08-31 会诊：行宽必须按显示宽度截断（原按 UTF-16 length 截 40 = 中文 80 格，
+      // 顶到右边距后叠加二义字符宽度低估（│/—/● 渲染 2 格算 1 格）→ 行实际超宽 → 物理
+      // wrap → 残影）；title 此前完全不截断（可任意长）也是超宽源，一并宽度截断。
+      const rawLabel = s.title || (s.firstMessage ? `"${s.firstMessage}"` : "(empty)")
+      const label = truncate(rawLabel, 36)
       const turns = s.turnCount > 0 ? `${s.turnCount} turns` : "0 turns"
       const when = shortDate(s.updatedAt)
       const model = s.activeProvider ? ` — ${s.activeProvider}` : ""
@@ -56,11 +63,17 @@ export async function handleSessionCommand(ctx) {
   ]
   const e = await showPicker("Sessions", entries)
   if (!e) return
+  // 2026-08-31 会诊 deepseek 🔴：目标槽被另一活进程占用时 switchToSlot 不认领（避免
+  // 劫持对方 active），本次会话仍读到数据，但下次保存会 fork 到新槽——提前提示。
+  const occ = slotOccupancy(agent.cwd, e.slot)
   const data = switchToSlot(agent.cwd, e.slot)
   if (!data) {
     pushLine(`Slot ${e.slot} not found`, C.dim)
     return
   }
+  if (occ.occupied) {
+    pushLine(`⚠ Slot ${e.slot} is being used by another live process (${occ.owner}) — continuing here will create a new copy on the next save`, C.warn)
+  }
   applySession(agent, data)
   // Rebuild from history (lazy) — the display snapshot is deprecated.
   state.lines = []

package/src/tui/index.mjs

@@ -25,6 +25,7 @@ import { createRenderLoop } from "./render-loop.mjs"
 import { makeDimsState } from "./dims.mjs"
 import { SLASH_COMMANDS, SLASH_ALIASES, createSlashCommands } from "./slash-commands.mjs"
 import { createWizard } from "./wizard.mjs"
+import { writeStartupSequence, createExitCleanup } from "./tui-lifecycle.mjs"
 import { createPickers } from "./pickers.mjs"
 import { runDistill as runDistillImpl } from "./distill-cmd.mjs"
 import { createInteraction } from "./interaction.mjs"
@@ -129,7 +130,7 @@ export async function startTUI(agent, opts = {}) {
   // kitty push (\x1b[>1u): Shift+Enter → \x1b[13;2u (Windows Terminal 1.19+, VS Code, kitty, iTerm2)
   // modifyOtherKeys lvl 2 (\x1b[>4;2m): Shift+Enter → \x1b[27;2;13~ (mintty / Git Bash)
   // translateShiftEnter (stdin layer) maps both to \x1b\r → meta+return → multiline branch.
-  process.stdout.write(ansi.altBuffer + ansi.hideCursor + ansi.mouseOn + ansi.bracketedPasteOn + ansi.keyboardPush + ansi.modifyOtherKeysOn)
+  writeStartupSequence()
 
   const utf8Decoder = new TextDecoder("utf-8", { fatal: false })
 
@@ -273,27 +274,7 @@ export async function startTUI(agent, opts = {}) {
     }
   })
 
-  let cleanedUp = false
-  const cleanup = () => {
-    if (cleanedUp) return
-    cleanedUp = true
-    // Save session before exit (synchronous write).
-    // Archiving to a slot is handled by /new and /session switch — not on every exit,
-    // otherwise simply opening and closing the TUI repeatedly would fill all slots with duplicates.
-    try {
-      saveSession(agent)
-    } catch {
-      // Save failure shouldn't block exit
-    }
-    // Kill MCP stdio subprocesses, don't leave orphans
-    try {
-      closeAllMcp(agent)
-    } catch {
-      // Can't close? fine, process is exiting anyway
-    }
-    process.stdin.setRawMode(false)
-    process.stdout.write(ansi.clearScreen + ansi.mouseOff + ansi.bracketedPasteOff + ansi.keyboardPop + ansi.modifyOtherKeysOff + ansi.mainBuffer + ansi.showCursor + ansi.reset)
-  }
+  const cleanup = createExitCleanup({ agent, saveSession, closeAllMcp })
   process.on("exit", cleanup)
 
   const pushLine = (text, color, kind) => {

package/src/tui/layout.mjs

@@ -3,13 +3,17 @@
  * Computes position and height of each panel from state + terminal dimensions.
  * Does not modify state — side effects are performed by the caller before rendering.
  *
- *   header → conversation → todo → picker → permission → queue → input → status
- * Subagent activity renders INSIDE the conversation as collapsible blocks
- * (AGENT-LOOP.md §7.2 D4) — no dedicated subagent/output panels anymore.
+ *   header → conversation → subagent 面板 → todo → picker → permission → queue → input → status
+ * Running subagent activity renders in a FIXED bottom panel between the
+ * conversation and the todo panel (AGENT-LOOP.md §7.2.1) — full adaptive height
+ * (the conversation shrinks); compressed away first on small terminals (to 0 =
+ * hidden, data stays in the buffer). Done children are frozen into the
+ * conversation stream (§7.2 D4, unchanged). Output panels abolished (§7.2 D6).
  * Fixed panels deducted first, conditional panels allocated by priority, remaining space to conversation.
  */
 import { layoutInput, wrapText } from "./render.mjs"
 import { QUESTION_CUSTOM } from "./interaction.mjs"
+import { renderSubagentPanel } from "./subagent-panel.mjs"
 
 /** 防御：question options 声明为 string[]，但 LLM 可能误传对象；取 label/text/title 兜底，避免渲染 "[object Object]"。 */
 function optText(opt) {
@@ -75,9 +79,20 @@ export function computeLayout(state, { cols, rows }) {
   const taskPanelH = visibleTasks.length > 0 ? visibleTasks.length + 1 : 0
   // Squeeze target: the divider line yields first under small terminals (the
   // task rows themselves never compress away — put() truncates by panel h).
-  let todoFinalH = taskPanelH
 
-  // Subagent activity: rendered inside the conversation (§7.2 D4) — no panel slot.
+  // Subagent panel (§7.2.1 D1): RUNNING blocks only, between conversation and
+  // todo. Height = the FULL rendered height of every running block (F2 — fully
+  // adaptive, no cap; the conversation shrinks accordingly). Precomputed here
+  // via renderSubagentPanel (neutral module, no layout↔render-frame cycle);
+  // render-frame puts `subagentLines` directly (no double render). Done
+  // children are frozen into state.lines (subagent-blocks.mjs
+  // freezeSubTaskLines) and excluded here — the panel only shows running blocks.
+  let subagentLines = []
+  let subagentH = 0
+  if (Object.values(state.subTasks ?? {}).some((s) => !s.done)) {
+    subagentLines = renderSubagentPanel(state, cols, rows)
+    subagentH = subagentLines.length
+  }
 
   // Permission preview (height depends on wrapped content)
   let permPreviewLines = []
@@ -97,32 +112,47 @@ export function computeLayout(state, { cols, rows }) {
   const queueH = state.queue.length > 0 && state.processing ? 1 : 0
 
   // --- elastic panel: conversation takes remaining space ---
-  const fixedH = headerH + inputBoxH + statusH + pickerH + taskPanelH + permPreviewH + queueH
+  const fixedH = headerH + inputBoxH + statusH + pickerH + taskPanelH + permPreviewH + queueH + subagentH
   let convH = Math.max(1, rows - fixedH)
 
-  // 小终端高度补偿：先压 conversation 到最小 1 行，再压 picker 到最小 3 行，
-  // 仍溢出再压 permission preview 到最小 1 行（仅标题）。
+  // 小终端高度补偿：subagent 面板最先让位（可至 0 隐藏，活动仍进缓冲区不丢），
+  // 再压 conversation 到最小 1 行，再压 picker 到最小 3 行，仍溢出再压
+  // permission preview 到最小 1 行（仅标题）——输入框/状态栏/会话区保留。
+  let subagentFinalH = subagentH
   let pickerFinalH = pickerH
   let permFinalH = permPreviewH
+  let todoFinalH = taskPanelH
   const overflow = fixedH + convH - rows
   if (overflow > 0) {
-    if (pickerH > 0) {
-      pickerFinalH = Math.max(Math.min(3, pickerH), pickerH - overflow)
-    }
-    const afterPicker = fixedH - pickerH + pickerFinalH
-    convH = Math.max(1, rows - afterPicker)
-    const remaining = afterPicker + convH - rows
-    if (remaining > 0 && permPreviewH > 0) {
-      permFinalH = Math.max(1, permPreviewH - remaining)
-      convH = Math.max(1, rows - (afterPicker - permPreviewH + permFinalH))
+    // 压缩链第 1 级（§7.2.1 NF1/评审 #2 措辞统一）：subagent 面板最先让位——
+    // 可压缩至 0 隐藏（运行中活动仍在缓冲区不丢），输入框/状态栏/会话区不可挤没。
+    let afterSub = fixedH
+    if (subagentH > 0) {
+      subagentFinalH = Math.max(0, subagentH - overflow)
+      afterSub = fixedH - subagentH + subagentFinalH
+      convH = Math.max(1, rows - afterSub)
     }
-    // 压缩链末级：todo 面板的分隔线行让位（任务行保留——put 按 h 截断自动
-    // 丢弃第一行的分隔线，2026-08-30 用户请求加的 divider 不得在小终端挤掉输入框）。
-    const afterPerm = afterPicker - permPreviewH + permFinalH
-    const finalOverflow = afterPerm + convH - rows
-    if (finalOverflow > 0 && taskPanelH > visibleTasks.length) {
-      todoFinalH = Math.max(visibleTasks.length, taskPanelH - finalOverflow)
-      convH = Math.max(1, rows - (afterPerm - taskPanelH + todoFinalH))
+    // 压缩链第 2/3 级（既有逻辑）：picker → 最小 3 行，permission → 最小 1 行
+    const overflow2 = afterSub + convH - rows
+    if (overflow2 > 0) {
+      if (pickerH > 0) {
+        pickerFinalH = Math.max(Math.min(3, pickerH), pickerH - overflow2)
+      }
+      const afterPicker = afterSub - pickerH + pickerFinalH
+      convH = Math.max(1, rows - afterPicker)
+      const remaining = afterPicker + convH - rows
+      if (remaining > 0 && permPreviewH > 0) {
+        permFinalH = Math.max(1, permPreviewH - remaining)
+        convH = Math.max(1, rows - (afterPicker - permPreviewH + permFinalH))
+      }
+      // 压缩链末级：todo 面板的分隔线行让位（任务行保留——put 按 h 截断自动
+      // 丢弃第一行的分隔线，2026-08-30 用户请求加的 divider 不得在小终端挤掉输入框）。
+      const afterPerm = afterPicker - permPreviewH + permFinalH
+      const finalOverflow = afterPerm + convH - rows
+      if (finalOverflow > 0 && taskPanelH > visibleTasks.length) {
+        todoFinalH = Math.max(visibleTasks.length, taskPanelH - finalOverflow)
+        convH = Math.max(1, rows - (afterPerm - taskPanelH + todoFinalH))
+      }
     }
   }
 
@@ -130,6 +160,7 @@ export function computeLayout(state, { cols, rows }) {
   let y = 0
   const header = { y, h: headerH }; y += headerH
   const conversation = { y, h: convH }; y += convH
+  const subagent = subagentFinalH > 0 ? { y, h: subagentFinalH } : null; y += subagentFinalH
   const todo = todoFinalH > 0 ? { y, h: todoFinalH } : null; y += todoFinalH
   const picker = pickerFinalH > 0 ? { y, h: pickerFinalH } : null; y += pickerFinalH
   const permission = permFinalH > 0 ? { y, h: permFinalH } : null; y += permFinalH
@@ -139,13 +170,38 @@ export function computeLayout(state, { cols, rows }) {
 
   return {
     W, cols, rows,
-    panels: { header, conversation, picker, todo, permission, queue, inputBox, status },
+    panels: { header, conversation, subagent, picker, todo, permission, queue, inputBox, status },
     // precomputed content (affects height, reused during render)
     inputLayout,
     inputOffset,
     boxLines,
     visibleTasks,
     permPreviewLines,
+    subagentLines,
     overlay,
   }
 }
+
+/**
+ * §7.2.1 评审 #4：面板部分压缩（subagentFinalH < subagentLines.length）时 render-frame
+ * 实际显示的行——**保底截断**：分隔线 + 末尾 (h-1) 行（最新启动区块优先；小终端上仍
+ * 能看到最新子 agent 活动，旧 slice(0,h) 保留顶部会把最新活动裁掉）。分隔线始终保留
+ * （面板边界语义）。h ≥ 全长 → 原样；h = 0 → []（layout 侧 panels.subagent 已为 null，
+ * 防御分支）；h = 1 → 只显示分隔线（极端小终端）。
+ */
+export function subagentVisibleLines(subagentLines, h) {
+  if (h >= subagentLines.length) return subagentLines
+  if (h <= 0) return []
+  if (h === 1) return [subagentLines[0]]
+  return [subagentLines[0], ...subagentLines.slice(-(h - 1))]
+}
+
+/** 与 subagentVisibleLines 同一几何契约：可见面板行（0-based 行内坐标）→
+ *  subagentLines 索引（mouse 命中映射用——保底截断后可见行 ≠ 前 h 行）；
+ *  localRow 越界 → -1。 */
+export function subagentLineIndex(subagentLines, h, localRow) {
+  if (localRow < 0 || localRow >= h) return -1
+  if (h >= subagentLines.length) return localRow
+  if (localRow === 0) return 0
+  return subagentLines.length - h + localRow
+}

package/src/tui/mouse.mjs

@@ -14,7 +14,7 @@
  *   - picker option click = select it
  *   - folded-block hint click = expand it
  */
-import { computeLayout } from "./layout.mjs"
+import { computeLayout, subagentLineIndex } from "./layout.mjs"
 import { buildConvLines, convViewport } from "./render-conversation.mjs"
 import { toggleFoldBlock, scrollFoldBlock, foldScrollOffset } from "./fold-block.mjs"
 
@@ -29,6 +29,24 @@ export function handleWheel(ctx, button, col, row) {
   const dims = state.dims ? state.dims.get() : { cols: process.stdout.columns || 80, rows: process.stdout.rows || 24 }
   const layout = computeLayout(state, dims)
   const P = layout.panels
+  // §7.2.1 D4: 固定子agent 面板（conversation 与 todo 之间）——面板行默认穿出
+  // 滚会话（F3，与 todo 面板同型）；命中展开区块内容行（_foldBlock 标记）→
+  // 块内滚动（现状能力不丢）。
+  if (P.subagent && r >= P.subagent.y && r < P.subagent.y + P.subagent.h) {
+    // 评审 #4：面板部分压缩（保底截断）后可见行 = 分隔线 + 末尾行——命中映射经
+    // subagentLineIndex（与 render-frame 同一几何契约），不再把行内坐标直接当索引用。
+    const lineEl = layout.subagentLines[subagentLineIndex(layout.subagentLines, P.subagent.h, r - P.subagent.y)]
+    if (!lineEl?._foldBlock || !lineEl._foldTotal) return false
+    // 穿出语义与会话区块一致：块内到边界（顶滚上 / 底滚下）→ 交还会话滚动
+    const before = foldScrollOffset(state, lineEl._foldBlock)
+    const winH = lineEl._foldWindow ?? 1
+    const total = lineEl._foldTotal
+    if (dir < 0 && before <= 0) return false
+    if (dir > 0 && before >= total - winH) return false
+    scrollFoldBlock(state, lineEl._foldBlock, dir, 3)
+    ctx.render?.()
+    return true
+  }
   if (r < P.conversation.y || r >= P.conversation.y + P.conversation.h) return false
   const convLines = buildConvLines(state, dims.cols, dims.rows)
   const gIdx = convGlobalIndex(convLines.length, P.conversation.h, state.scroll ?? 0)(r - P.conversation.y)
@@ -101,6 +119,27 @@ export function handleMouseClick(ctx, col, row) {
     return true
   }
 
+  // ── §7.2.1 D4: 固定子agent 面板（conversation 与 todo 之间）——折叠/展开/翻窗
+  // 坐标映射到面板行（与 todo 面板同型；layout.subagentLines = 面板渲染行）。
+  if (P.subagent && r >= P.subagent.y && r < P.subagent.y + P.subagent.h) {
+    // 评审 #4：保底截断后可见行 ≠ 前 h 行——命中映射与 render-frame 同一几何契约
+    // （subagentLineIndex：分隔线 + 末尾区块行优先）。
+    const lineEl = layout.subagentLines[subagentLineIndex(layout.subagentLines, P.subagent.h, r - P.subagent.y)]
+    if (lineEl?._foldScrollUp || lineEl?._foldScrollDown) {
+      // ▲/▼ 控制行点击翻窗（60% 封顶保留、窗口随翻滚动，全文可达）
+      scrollFoldBlock(state, lineEl._foldScrollUp ?? lineEl._foldScrollDown,
+        lineEl._foldScrollUp ? -1 : 1, lineEl._foldWindow ?? 1,
+        typeof lineEl._foldTotal === "number" ? Math.max(0, lineEl._foldTotal - (lineEl._foldWindow ?? 1)) : undefined)
+      render()
+      return true
+    }
+    if (!lineEl?._foldToggle) return false
+    // 双向切换（fold-block.mjs 单源）：折叠头展开 / ▼ 控制收起
+    toggleFoldBlock(state, lineEl._foldToggle)
+    render()
+    return true
+  }
+
   // ── Conversation: click a fold marker (expand hint or collapse marker) toggles it ──
   if (r >= P.conversation.y && r < P.conversation.y + P.conversation.h) {
     const convLines = buildConvLines(state, dims.cols, dims.rows)

package/src/tui/render-conversation.mjs

@@ -181,30 +181,21 @@ export function convCacheKey(state, maxRows) {
   // 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
@@ -225,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}|${foldScrollSig}`
+  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).
@@ -257,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)
@@ -337,7 +330,8 @@ 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) {
       // 2026-08-31 段缓存：frozenSubTask 冻结后内容不变——签名含 sub.key + blocks 计数
       const fKey = `sub-${l._frozenSubTask.key}`
@@ -425,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