thincoder 0.12.60 → 0.12.62

package/src/tui/render.mjs

@@ -161,14 +161,19 @@ export function layoutInput(chars, cursor, width) {
   const PROMPT = "\u25b8 "  // first-line prefix (display width 2)
   const CONT = "  "         // continuation prefix (width 2) — keeps left edge aligned
   const lines = []
+  const starts = []         // lineStarts so far（第 31 批 additive）：每个可视行的行首下标
+  let lineStart = 0         // 当前行的行首下标（chars 索引空间）
   let cursorLine = 0
   let cursorCol = 0
   let cur = ""
   let col = 0
   let firstLine = true
   const avail = () => width - 2 // every line reserves 2 cols for its prefix
-  const flush = () => {
+  // next = 下一行的行首下标（折行 = 当前字符 i；行尾 \n 之后 = i + 1）
+  const flush = (next) => {
     lines.push((firstLine ? PROMPT : CONT) + cur)
+    starts.push(lineStart)
+    lineStart = next
     firstLine = false
     cur = ""
     col = 0
@@ -177,7 +182,7 @@ export function layoutInput(chars, cursor, width) {
     const ch = chars[i]
     if (ch !== undefined && ch !== "\n") {
       const w = charWidth(ch.codePointAt(0))
-      if (col + w > avail()) flush()
+      if (col + w > avail()) flush(i)
       if (i === cursor) {
         cursorLine = lines.length
         cursorCol = 2 + col
@@ -189,12 +194,39 @@ export function layoutInput(chars, cursor, width) {
         cursorLine = lines.length
         cursorCol = 2 + col
       }
-      if (ch === "\n") flush()
+      if (ch === "\n") flush(i + 1)
     }
   }
   const endsWithNewline = chars.length > 0 && chars[chars.length - 1] === "\n"
-  if (cur || lines.length === 0 || endsWithNewline) flush()
-  return { lines, cursorLine, cursorCol }
+  if (cur || lines.length === 0 || endsWithNewline) flush(chars.length)
+  // lineStarts[k] = 第 k 行行首；行 k 区间 = [lineStarts[k], lineStarts[k+1])（含行尾 \n）；
+  // 末项哨兵 = chars.length（上界、不指向行）——竖移定位用（TUI-INPUT-BOX.md §1 不变量 5）。
+  return { lines, cursorLine, cursorCol, lineStarts: [...starts, chars.length] }
+}
+
+/** 竖直移动定位（第 31 批——TUI-INPUT-BOX.md §3 规则 2 / §9.3 #2）：纯函数，
+ *  `(chars, cursor, width, dir) → number | null`（null = 该方向无邻行）。
+ *  目标行显示列 = 当前光标显示列（列保持——`layoutInput` 同源行列；行前缀 2 列等宽故整体
+ *  相减）；目标行更短则钳制到行尾（行尾含 \n → 落在 \n 前）。逐键现算——不记忆列（D-31.2）。
+ *  不读不写任何 state。 */
+export function moveCursorVertical(chars, cursor, width, dir) {
+  const { cursorLine, cursorCol, lineStarts } = layoutInput(chars, cursor, width)
+  const lineCount = lineStarts.length - 1
+  const targetLine = dir === "up" ? cursorLine - 1 : cursorLine + 1
+  if (targetLine < 0 || targetLine >= lineCount) return null
+  const targetCol = Math.max(0, cursorCol - 2) // 2 列行前缀（`▸ ` / 续行空格）——各行等宽
+  const start = lineStarts[targetLine]
+  let end = lineStarts[targetLine + 1]
+  if (end > start && chars[end - 1] === "\n") end -= 1 // 行尾 \n 不占显示列
+  let col = 0
+  let idx = start
+  while (idx < end) {
+    const w = charWidth(chars[idx].codePointAt(0))
+    if (col + w > targetCol) break // 宽字符列中不落点——落在该字符起点
+    col += w
+    idx += 1
+  }
+  return idx
 }
 
 /**

package/src/tui/slash-commands.mjs

@@ -42,7 +42,7 @@ export const SLASH_COMMANDS = [
   { name: "/eng", group: "Agent", desc: "toggle engineering mode — strict methodology enforcement" },
   { name: "/advisor", group: "Agent", desc: "advisor settings (model, thinking, review gate)" },
   { name: "/model", group: "Agent", desc: "select model & manage providers" },
-  { name: "/submodel", group: "Agent", desc: "subagent model per type (explore/plan/coder/eng-coder)" },
+  { name: "/submodel", group: "Agent", desc: "subagent model per type (explore/plan/coder/eng-coder/eng-designer)" },
   { name: "/shell", group: "System", desc: "bash tool shell (git-bash/pwsh path; win11 cmd encoding fix)" },
   { name: "/goal", group: "Agent", desc: "set/view/cancel long-term goal" },
   { name: "/think", group: "Agent", desc: "thinking mode & reasoning effort" },
@@ -144,7 +144,7 @@ export function createSlashCommands(ctx) {
     const match = (cands) => cands.filter((c) => c.startsWith(last)).map((c) => `${head} ${c}`)
     if (cmd === "/model" && argIndex === 0) return match(agent.providers.map((p) => p.name))
     if (cmd === "/submodel") {
-      if (argIndex === 0) return match(["explore", "plan", "coder", "eng-coder", "reset"])
+      if (argIndex === 0) return match(["explore", "plan", "coder", "eng-coder", "eng-designer", "reset"])
       if (parts[1] && !["reset"].includes(parts[1]) && argIndex === 1) return match(agent.providers.map((p) => p.name))
     }
     if (cmd === "/think") {

package/src/tui/startup.mjs

@@ -3,6 +3,9 @@ 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"
+// TUI-OOM-ROOTCAUSE（TUI.md §15.3.3）：恢复/翻页行过额度 + state.lines 总量对账。
+import { capLine, accountLine, accountAll, syncLineBudget } from "./display-budget.mjs"
+import { shiftFreezeAnchors } from "./subagent-blocks.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
@@ -115,24 +118,34 @@ export function historyToLines(history, startIdx, endIdx) {
  * INITIAL_HISTORY_MESSAGES, set the _history* counters the loadOlder closure
  * reads, and prepend the "… N more earlier messages" placeholder. Shared by
  * startup restore and /session switching (the display snapshot is deprecated).
+ * TUI-OOM-ROOTCAUSE（SESSION.md §14.3.6）：desc = `{ history, total, base? }`——
+ * history = 尾窗（≤200，含 ±1 页沿头一条——跨页回标判定用；不渲染）、total = 绝对总条数
+ * （「N messages」标签口径）、base = history[0] 的绝对序号（缺省由 total − len 推导）。
  */
-export function restoreLines(state, history) {
-  const total = Array.isArray(history) ? history.length : 0
-  if (total === 0) return
-  const start = Math.max(0, total - INITIAL_HISTORY_MESSAGES)
+export function restoreLines(state, desc) {
+  const window = Array.isArray(desc?.history) ? desc.history : (Array.isArray(desc) ? desc : [])
+  const total = Number.isFinite(desc?.total) ? desc.total : window.length
+  if (window.length === 0 || total === 0) return
+  const base = Number.isFinite(desc?.base) ? desc.base : Math.max(0, total - window.length)
+  // 已载入量 = 渲染窗口大小（±1 页沿头一条不计数），绝对起点 = total − loaded
+  const loaded = Math.min(INITIAL_HISTORY_MESSAGES, total)
+  const start = total - loaded
   state._lineIdCounter = state._lineIdCounter ?? 0
-  const fresh = historyToLines(history, start, total)
+  const fresh = historyToLines(window, Math.max(0, start - base), window.length)
+  for (const l of fresh) l.text = capLine(l.text) // 行额度（§15.3.3 恢复行过 capText）
   // Stable per-line ids (P1, 2026-08-30): fold keys for tool blocks derive from
   // _lineId so loadOlder's head-unshift cannot re-bind an expanded block to a
   // different tool (positional tool-{i} keys drift under unshift).
   for (const l of fresh) l._lineId = ++state._lineIdCounter
   state.lines.push(...fresh)
-  state._historyLoaded = total - start
+  state._historyLoaded = loaded
   state._historyTotal = total
   state._hasOlder = start > 0
   if (state._hasOlder) {
     state.lines.unshift({ text: `… ${start} more earlier messages (PgUp at top to load)`, color: C.dim })
   }
+  accountAll(state) // 行集重建 → 总量直算重对账（§15.3.4）
+  syncLineBudget(state, { onTrim: (st, n) => shiftFreezeAnchors(st, n) })
 }
 /** 懒加载更早历史（2026-08-31 用户约定："滚动到头自动加载"——滚轮/PgUp 到顶皆触发；
  *  2026-08-31 前只挂 PgUp 键 = 违约，滚轮到头无反应）。加载后滚动补偿保持锚定。
@@ -142,10 +155,12 @@ export function restoreLines(state, history) {
 export function createLoadOlder({ agent, state, render }) {
   return () => {
     if (!state._hasOlder) return
-    const full = agent._fullHistory ?? []
+    // 翻页锚 = 恢复时点 total（state._historyTotal）——活消息增长不再使页码漂移
+    // （§14.1 事实 4 / §14.3.6 顺带修复）。
+    const total = state._historyTotal ?? 0
     const loaded = state._historyLoaded
-    const start = Math.max(0, full.length - loaded - HISTORY_PAGE_MESSAGES)
-    const end = full.length - loaded
+    const start = Math.max(0, total - loaded - HISTORY_PAGE_MESSAGES)
+    const end = total - loaded
     if (start >= end) return
 
     const d = state.dims ? state.dims.get() : {}
@@ -154,14 +169,29 @@ export function createLoadOlder({ agent, state, render }) {
 
     if (state.lines[0]?.text?.startsWith("… ")) state.lines.shift()
     state._lineIdCounter = state._lineIdCounter ?? 0
-    const older = historyToLines(full, start, end)
+    // 页源（§14.3.6）：绑定态 → store.page 绝对区间 + ±1 页沿（页前一消息供跨页回合
+    // 标签判定、页后一消息供 tool_result 配对）；未绑定（模式 F）→ 内存全量数组回退。
+    const store = agent._recordStore
+    let older
+    if (store?.page) {
+      const { messages, base } = store.page(start, end, { margin: 1 })
+      older = historyToLines(messages, Math.max(0, start - base), Math.min(messages.length, end - base))
+    } else {
+      older = historyToLines(agent._fullHistory ?? [], start, end)
+    }
+    for (const l of older) l.text = capLine(l.text) // 行额度（§15.3.3 翻页行过 capText）
     for (const l of older) l._lineId = ++state._lineIdCounter
     state.lines.unshift(...older)
+    for (const l of older) accountLine(state, l)
     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 ph = { text: `… ${start} more earlier messages (scroll to top to load)`, color: C.dim }
+      state.lines.unshift(ph)
+      accountLine(state, ph)
     }
+    // 页内不裁头（保锚定）——§15.3.3：总量的裁头由 syncLineBudget 兜（此处只对账字符预算）
+    syncLineBudget(state, { onTrim: (st, n) => shiftFreezeAnchors(st, n) })
 
     const after = countConvLines(state, cols, (state.dims?.get() ?? {}).rows ?? (process.stdout.rows || 24))
     state.scroll += Math.max(0, after - before)
@@ -194,8 +224,10 @@ export function showStartup(ctx) {
   // Recover previous session: rebuild from history (lazy — display snapshot is
   // deprecated; it drifted out of sync with history on VS Code writes).
   if (opts.restored?.history?.length) {
-    restoreLines(state, opts.restored.history)
-    pushLabel(`── Restored previous session (${opts.restored.history.length} messages); /new for a fresh session ──`, C.warn)
+    restoreLines(state, opts.restored)
+    // 「N messages」标签口径 = total（§14.3.6——非窗口长度）
+    const total = Number.isFinite(opts.restored.total) ? opts.restored.total : opts.restored.history.length
+    pushLabel(`── Restored previous session (${total} messages); /new for a fresh session ──`, C.warn)
   }
 
   // Hint when multiple sessions exist

package/src/tui/subagent-blocks.mjs

@@ -4,27 +4,34 @@
  * undefined = sync）, started, done, doneAt, blocks:
  * [{kind,text}], currentTool, toolArgs, turn, maxTurns, approval, lastError,
  * dropped, blockEpoch, awaitingDigest（§17）, _freezeAt（冻结锚点）, stopped（§19.5）,
- * children: []（R23——嵌套子代理子块载体——见 subagent-children.mjs）}。
- * 职责：前缀路由（parseRelayPath——**R23：嵌套段不再子标渲染——建子块载体归属**）、
- * 事件 token 解析（**R23：内层 ⟦ev⟧done/stopped 生成侧补发射（D-R23c1）路由到子块
- * 定格；§27.1 F2：done 后完全定格——迟到 chunk 丢弃**）、kind 合并、N2 树级环形上限（R23 NFR——子块计入外层配额）、N1 渲染节流、
- * 完成冻结（freezeSubTaskLines 家族——锚点 splice）。
+ * children: []（SUBAGENT-TAIL：嵌套子代理**守护载体**——内容并入本块 blocks——见
+ * subagent-children.mjs）}。
+ * 职责：前缀路由（parseRelayPath——**SUBAGENT-TAIL（D-ST1）：嵌套段内容行并入外层
+ * blocks——append 目标上移，子块载体只余守护元数据**）、
+ * 事件 token 解析（**内层 ⟦ev⟧done/stopped 生成侧补发射（D-R23c1）路由到子块
+ * 定格；F2：done 后完全定格——迟到 chunk 丢弃**）、kind 合并、N2 单环 500 显示行上限
+ * （SUBAGENT-TAIL D-ST4——内层行同环计数、单载体最旧先行）、N1 渲染节流、
+ * 完成冻结（freezeSubTaskLines 家族——锚点 splice）。显示契约 = docs/design/TUI.md §6。
  */
 
 import { C } from "./ansi.mjs"
+// 第 27 批 §12.3①/②：relay 前缀文法单一权威 = src/agent/relay-prefix.mjs——本文件
+// 不再自持前缀正则/解析副本（防第二套平行正则再漂移）。
+import { parseRelayPath } from "../agent/relay-prefix.mjs"
 import { describeToolArgs } from "./tool-args.mjs"
 import {
-  SUB_BLOCK_LINE_LIMIT, appendSubBlock, appendSubChild, ensureSubChild, descendSubChild,
+  appendSubBlock, descendSubChild,
   closeSubChild,
 } from "./subagent-children.mjs"
 export { SUB_BLOCK_LINE_LIMIT, appendSubBlock } from "./subagent-children.mjs"
-// 2026-09-05 module-split：finish/freeze 族 + §19.6 面板镜像迁 subagent-freeze.mjs——
+// 2026-09-05 module-split：finish/freeze 族 + §19.6 面板现算迁 subagent-freeze.mjs——
 // routeSub*/compression panel 内部用本地 import；re-export 保外部 import 面（index.mjs 等）
-import { freezeSubTaskLines, syncPanelSnapshot, finishSubTaskKey, finishSubTask, freezeDoneSubTasks, finishSubTasksByRole, freezeAllSubTasks, freezeReclaimDigestedBlocks, shiftFreezeAnchors } from "./subagent-freeze.mjs"
-export { syncPanelSnapshot, finishSubTask, finishSubTaskKey, freezeSubTaskLines, shiftFreezeAnchors, freezeDoneSubTasks, finishSubTasksByRole, freezeAllSubTasks, freezeReclaimDigestedBlocks } from "./subagent-freeze.mjs"
+// CLI-ACTIVITY-DEBLOAT F-3（2026-09-10）：面板手工镜像退役——re-export 面换现算导出
+// computePanelBlocks（读时现算），本文件全部刷镜调用点删除（单账本——变更点不再手动同步）。
+import { freezeSubTaskLines, finishSubTaskKey, finishSubTask, freezeDoneSubTasks, finishSubTasksByRole, freezeAllSubTasks, freezeReclaimDigestedBlocks, shiftFreezeAnchors } from "./subagent-freeze.mjs"
+export { computePanelBlocks, finishSubTask, finishSubTaskKey, freezeSubTaskLines, shiftFreezeAnchors, freezeDoneSubTasks, finishSubTasksByRole, freezeAllSubTasks, freezeReclaimDigestedBlocks } from "./subagent-freeze.mjs"
 
-/** `role#id/` prefix router — hyphen included since the eng-coder fix (2026-08-21). */
-export const SUB_PREFIX_RE = /^([\w-]+)#(\d+)\//
+// 前缀文法/解析已迁 src/agent/relay-prefix.mjs（第 27 批 §12.3②）——本文件不自持副本。
 /** ⟦ev⟧ token parser：`⟦ev⟧<name>\x1e<n>\x1e<max>\x1e<phase>\x1e<detail>`。phase done
  *  = async 完成即冻结（settle 时发）；settled = 挂起期完成——冻结延迟至 digest 消化
  *  完成（§17.5.5 freezeReclaimDigestedBlocks 逐条回收——不等池空）或池空退出兜底补发；
@@ -38,32 +45,14 @@ export const SUB_PREFIX_RE = /^([\w-]+)#(\d+)\//
  *  （块尚未创建）缓冲 `state._pendingAsyncKeys`——ensureSubTaskKey 块创建时应用（兜底）。 */
 export const SUB_EVENT_RE = /^⟦ev⟧(turn|approval|done|settled|stopped|queued)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e?([\s\S]*)$/
 
-/** §19.5 D-M8 嵌套 relay 前缀通用解析（循环解析任意深度——R23 保持为路由源）：
- *  `eng-coder#2/explore#1/read` → { head（块路由）, inner[], label（inner 链——R23：
- *  子块折叠键/外层 currentTool 全路径用）, rest }。
- *  单层 = inner[]/label ""——与既有单段匹配语义零改；无前缀 → null。 */
-export function parseRelayPath(text) {
-  const segments = []
-  let rest = String(text)
-  for (;;) {
-    const m = rest.match(SUB_PREFIX_RE)
-    if (!m) break
-    segments.push(`${m[1]}#${m[2]}`)
-    rest = rest.slice(m[0].length)
-  }
-  if (segments.length === 0) return null
-  return {
-    head: segments[0],
-    inner: segments.slice(1),
-    label: segments.slice(1).join("/"),
-    rest,
-  }
-}
+// parseRelayPath 自 src/agent/relay-prefix.mjs import（第 27 批 §12.3①——文法单一权威，
+// 语义与迁移前逐字一致；“嵌套解析任意深度/无前缀 → null”见该模块）。
 
 /** N1: render-layer throttle for child tool-output appends (generation relays verbatim). */
 export const SUB_RELAY_THROTTLE_MS = 250
-/** Roles a subagent tool child can take (finishSubTask matches the block's role). */
-export const SUBAGENT_ROLES = ["sub", "explore", "plan", "coder", "eng-coder"]
+/** Roles a subagent tool child can take（⏹ 门控/渲染角色判据；F-2 后角色匹配完成面 =
+ *  finishSubTasksByRole——finishSubTask 已收窄 no-op）。 */
+export const SUBAGENT_ROLES = ["sub", "explore", "plan", "coder", "eng-coder", "eng-designer"]
 
 let _subRenderLast = 0
 let _subRenderTimer = null
@@ -98,14 +87,14 @@ export function ensureSubTaskKey(state, key, role) {
       key, role, model: undefined, started: Date.now(), done: false, doneAt: null,
       blocks: [], currentTool: null, toolArgs: null, turn: 0, maxTurns: 0, approval: null,
       lastError: null, dropped: 0,
+      _lineCount: 0, _charCount: 0, // 双维记账（TUI.md §15.3.4——行数维 + 字符维，subagent-children.mjs）
       stopped: false, // §19.5: ⟦ev⟧stopped 冻结标记（标题 "stopped"）
-      children: [], // R23: 嵌套子代理子块载体（subagent-children.mjs——D-R23a）
+      children: [], // SUBAGENT-TAIL: 嵌套子代理守护载体（内容并入本块——subagent-children.mjs）
     }
     // §19.5 D-M7b ①（处置 #4 兜底——2026-09-03）：缺失 key 的 ⟦ev⟧async 事件已缓冲
     // pending 标志（routeSubToken——async 先于块创建到达：排队条目补位启动的时序窗口）
     // ——块创建（此处）即应用——sub.async 区块创建即知（⏹ 门控/头标判定源保真）。
     if (state._pendingAsyncKeys?.delete(key)) state.subTasks[key].async = true
-    syncPanelSnapshot(state) // §19.6 D-P1: 块创建 → running 入镜
   }
   return state.subTasks[key]
 }
@@ -114,9 +103,10 @@ export function ensureSubTask(state, subMatch) {
   return ensureSubTaskKey(state, `${subMatch[1]}#${subMatch[2]}`, subMatch[1])
 }
 
-/** Append（kind 合并追加）+ N2 树级环形上限；fresh=true 强制新块（每工具调用）。
- *  R23（2026-09-07）：appendSubBlock/trimSubBlocks 实现迁 subagent-children.mjs（树级
- *  配额——子块计入外层 500 行环）——本文件 import + re-export 保 import 面（压缩面板等）。 */
+/** Append（kind 合并追加）+ N2 单环 500 显示行上限；fresh=true 强制新块（每工具调用）。
+ *  R23（2026-09-07）：appendSubBlock/trimSubBlocks 实现迁 subagent-children.mjs——
+ *  SUBAGENT-TAIL（D-ST4）后为单载体最旧先行（内层并入行同环计数）；本文件 import +
+ *  re-export 保 import 面（压缩面板等）。 */
 /** 事件 token → 区块头部（turn/approval 更新 turn n/max + 等待态）。事件永不进
  *  blocks/主流——仅头部。@returns {boolean} 良构事件（已消费） */
 export function applySubEvent(sub, payload) {
@@ -136,10 +126,12 @@ export function applySubEvent(sub, payload) {
 
 // ─── Prefix routing（agent-turn callbacks 委派）：true = 带前缀已消费；false = 主路径
 
-/** onToken 分支：子文本 / [model] 元数据 / ⟦ev⟧ 事件。§27 R23（supersede §19.5 D-M8
- *  子标方案）：head 段路由块——inner 段**建子块载体归属内容**（D-R23a——subagent-children.mjs）；
- *  内层 [model] 记子块模型；内层 ⟦ev⟧ 除 done/stopped（生成侧补发射——D-R23c1——路由
- *  子块定格）外剥除不路由（防 explore 进度污染外层块头——round1 #4）。 */
+/** onToken 分支：子文本 / [model] 元数据 / ⟦ev⟧ 事件。SUBAGENT-TAIL（D-ST1——supersede
+ *  R23 子块段方案，显示契约 docs/design/TUI.md §6）：head 段路由块——inner 段**内容行
+ *  并入外层块 blocks**（append 目标上移），子块载体只余守护元数据（done 守卫——F2
+ *  迟到丢弃；currentTool——fresh 判别）；内层 [model] 记子块模型；内层 ⟦ev⟧ 除
+ *  done/stopped（生成侧补发射——D-R23c1——路由子块定格）外剥除不路由（防 explore
+ *  进度污染外层块头——round1 #4）。 */
 export function routeSubToken(state, t, scheduleRender) {
   const path = parseRelayPath(t)
   if (!path) return false
@@ -163,7 +155,6 @@ export function routeSubToken(state, t, scheduleRender) {
       if (live.queued) {
         delete live.queued
         live.started = Date.now()
-        syncPanelSnapshot(state) // §19.6 D-P1: queued → running 状态变更刷镜
       }
     }
     else {
@@ -182,7 +173,6 @@ export function routeSubToken(state, t, scheduleRender) {
     const live = state.subTasks?.[path.head]
     if (live && !live.done && live.async !== true) {
       delete state.subTasks[path.head]
-      syncPanelSnapshot(state) // §19.6 D-P1: 移除后刷镜（块出面板）
     }
     scheduleRender()
     return true
@@ -195,16 +185,17 @@ export function routeSubToken(state, t, scheduleRender) {
   // queued（§20 D-SD3b）= 排队 spawn 等待块（spawn 返回即建/状态变迁刷新——覆盖式
   // 更新 sub.queued——块不可展开（无活动流）；启动后 async 事件清标转 running）。
   if (payload.startsWith("⟦ev⟧")) {
-    // R23（supersede D-M8"内层事件剥除不路由"——评审 #1 🅰）：done/stopped 完成信号 =
-    // 生成侧补发射（D-R23c1——sync 同步收尾段带完整嵌套前缀）→ 路由到子块定格
-    // （D-R23c2——closeSubChild——不冻结外层、不落 preview）；缺失子块（迟到事件/
+    // 内层完成信号（沿革：D-M8 子标 → R23 子块段 → SUBAGENT-TAIL 并入——显示契约
+    // docs/design/TUI.md §6）：done/stopped = 生成侧补发射（D-R23c1——sync 同步收尾段带
+    // 完整嵌套前缀）→ 路由到子块定格（closeSubChild——不冻结外层、不落 preview）；
+    // 缺失子块（迟到事件/
     // 从未开块）→ 不建幻影（no-op）。其余内层事件（turn/approval/queued/settled/
     // async/cancelled）剥除不路由（防 explore 进度污染外层块头——round1 #4）。
     if (nested) {
       const innerEv = payload.match(SUB_EVENT_RE)
       if (innerEv && (innerEv[1] === "done" || innerEv[1] === "stopped")) {
         const leaf = descendSubChild(sub, path.inner, { create: false })
-        // §27.1 F2: done 子块完全定格——迟到 done/stopped 丢弃（重复 done 不重放
+        // F2 保全：done 子块完全定格——迟到 done/stopped 丢弃（重复 done 不重放
         // 定格；stopped 不打回 done 定格块）
         if (leaf && !leaf.done) closeSubChild(sub, leaf, innerEv[1] === "stopped", path.label)
         scheduleRender()
@@ -224,7 +215,6 @@ export function routeSubToken(state, t, scheduleRender) {
       sub.currentTool = null
       sub.approval = null
       sub.blockEpoch = (sub.blockEpoch ?? 0) + 1
-      syncPanelSnapshot(state) // §19.6 D-P1: waiting 块建/刷新刷镜
       scheduleRender()
       return true
     }
@@ -239,7 +229,6 @@ export function routeSubToken(state, t, scheduleRender) {
       sub.currentTool = null
       sub.approval = null
       sub.blockEpoch = (sub.blockEpoch ?? 0) + 1
-      syncPanelSnapshot(state) // §19.6 D-P1: settled → awaitingDigest 状态变更刷镜
       scheduleRender()
       return true
     }
@@ -251,7 +240,6 @@ export function routeSubToken(state, t, scheduleRender) {
       sub.blockEpoch = (sub.blockEpoch ?? 0) + 1
       freezeSubTaskLines(state, sub)
       delete state.subTasks[sub.key]
-      syncPanelSnapshot(state) // §19.6 D-P1: 冻结删除后刷镜
       scheduleRender()
       return true
     }
@@ -264,7 +252,6 @@ export function routeSubToken(state, t, scheduleRender) {
       sub.blockEpoch = (sub.blockEpoch ?? 0) + 1
       freezeSubTaskLines(state, sub)
       delete state.subTasks[sub.key]
-      syncPanelSnapshot(state) // §19.6 D-P1: 冻结删除后刷镜
       scheduleRender()
       return true
     }
@@ -276,11 +263,12 @@ export function routeSubToken(state, t, scheduleRender) {
   // parent's) — shown in the block header, NOT appended to its content stream.
   // Only treat as metadata when the model isn't set yet (it's always the FIRST token);
   // a child content token that happens to start with "[model]" must not be swallowed.
-  // R23：内层 [model] 记到子块（D-R23a 子块状态字段——不再剥除丢弃）；单层规则不变。
+  // SUBAGENT-TAIL：内层 [model] 记到守护载体（类目 B 字面量——不渲染、无正读者；
+  // docs/design/TUI.md §6）；单层规则不变。
   if (payload.startsWith("[model]") && (nested || sub.model === undefined)) {
     if (nested) {
       const leaf = descendSubChild(sub, path.inner)
-      // §27.1 F2: done 子块完全定格——迟到 [model] 不写定格块头
+      // F2: done 子块完全定格——迟到 [model] 不写定格块头
       if (!leaf.done && leaf.model === undefined) {
         leaf.model = payload.slice(7)
         scheduleRender()
@@ -291,82 +279,76 @@ export function routeSubToken(state, t, scheduleRender) {
     }
     return true
   }
-  // Child LLM text → text block (N2 cap inside appendSubBlock). R23：内层文本归属子块
-  // （D-R23b——子块行——不再混外层 blocks/子标）。§27.1 F2：done 子块完全定格——
-  // 迟到 chunk 丢弃（与 appendSubChild 数据层守卫同义——此处免无谓 render）。
-  if (nested) {
-    const leaf = descendSubChild(sub, path.inner)
-    if (leaf.done) return true
-    appendSubChild(sub, leaf, "text", payload)
-  } else appendSubBlock(sub, "text", payload)
+  // Child LLM text → text block (N2 cap inside appendSubBlock). SUBAGENT-TAIL（D-ST1）：
+  // 内层文本**并入外层 blocks**（append 目标上移——子块不再承载内容行，取代小节）。
+  // F2：done 子块完全定格——迟到 chunk 丢弃（leaf.done 守卫——免无谓 render）。
+  const leaf = nested ? descendSubChild(sub, path.inner) : null
+  if (leaf?.done) return true
+  appendSubBlock(sub, "text", payload)
   scheduleRender()
   return true
 }
 
 /** Child reasoning token → think block (F2: same treatment as main reasoning).
- *  §27 R23 nested think：归属内层子块（supersede D-M8 子标渲染——D-R23a/b）。 */
+ *  SUBAGENT-TAIL：内层 think 并入外层 blocks（append 目标上移——显示契约 TUI.md §6）。 */
 export function routeSubReasoning(state, t, scheduleRender) {
   const path = parseRelayPath(t)
   if (!path) return false
   const sub = ensureSubTaskKey(state, path.head, path.head.slice(0, path.head.lastIndexOf("#")))
   if (!sub) return true // frozen tombstone — drop late token
   const nested = path.inner.length > 0
-  if (nested) {
-    const leaf = descendSubChild(sub, path.inner)
-    if (leaf.done) return true // §27.1 F2: done 子块完全定格——迟到 think 丢弃
-    appendSubChild(sub, leaf, "think", path.rest)
-  } else appendSubBlock(sub, "think", path.rest)
+  const leaf = nested ? descendSubChild(sub, path.inner) : null
+  if (leaf?.done) return true // F2: done 子块完全定格——迟到 think 丢弃
+  appendSubBlock(sub, "think", path.rest)
   scheduleRender()
   return true
 }
 
-/** Child tool call → fresh tool block + header currentTool。§27 R23 嵌套（supersede
- *  D-M8 子标工具行）：工具行归属内层子块（子块内 `❯ tool`）；currentTool 外层存全路径
- *  （`explore#1/read`——评审 #8：外层块头状态区现状保持不缩改）+ 子块存工具名（子块内
- *  输出归属判别）。 */
+/** Child tool call → fresh tool block + header currentTool。SUBAGENT-TAIL（D-ST1）：内层
+ *  工具行并入外层 blocks（同款 `❯ tool` 行——取代小节）；currentTool 外层存全路径
+ *  （`explore#1/read`——评审 #8：外层块头状态区现状保持不缩改）+ 子块存工具名（守护
+ *  元数据——fresh 判别源，routeSubToolOutput 读）。 */
 export function routeSubToolCall(state, name, args, scheduleRender) {
   const path = parseRelayPath(name)
   if (!path) return false
   const sub = ensureSubTaskKey(state, path.head, path.head.slice(0, path.head.lastIndexOf("#")))
   if (!sub) return true // frozen tombstone — drop late token
   const nested = path.inner.length > 0
-  // §27.1 F2: done 子块完全定格——迟到 tool call 丢弃（不复活外层 currentTool/子块状态）
+  // F2: done 子块完全定格——迟到 tool call 丢弃（不复活外层 currentTool/子块状态）
   const leaf = nested ? descendSubChild(sub, path.inner) : null
   if (leaf?.done) return true
   sub.currentTool = nested ? `${path.label}/${path.rest}` : path.rest
   sub.toolArgs = args
   sub.approval = null
   const argsDesc = describeToolArgs(path.rest, args)
-  if (nested) {
+  if (leaf) {
     leaf.currentTool = path.rest
     leaf.toolArgs = args
     leaf.approval = null
-    appendSubChild(sub, leaf, "tool", `❯ ${path.rest}${argsDesc ? " " + argsDesc : ""}\n`, { fresh: true })
-  } else {
-    appendSubBlock(sub, "tool", `❯ ${path.rest}${argsDesc ? " " + argsDesc : ""}\n`, { fresh: true })
   }
+  appendSubBlock(sub, "tool", `❯ ${path.rest}${argsDesc ? " " + argsDesc : ""}\n`, { fresh: true })
   scheduleRender()
   return true
 }
 
 /** Child tool output（D1 前缀 name relay）→ 追加当前 tool block。RAW 拼接（2026-09-03
  *  修复轮——relay chunk 是任意字节边界碎片，逐 chunk 补 \n 会把词拦腰断行 + 烧 N2
- *  配额；emit 端自带换行结构无损还原）。§27 R23 嵌套：输出归属内层子块（T-R23a.2——
- *  输出全在子块——外层流无混入）；fresh 判别在子块层（子块 currentTool=工具名）——
- *  内外/同层同名工具互不串块。 */
+ *  配额；emit 端自带换行结构无损还原）。SUBAGENT-TAIL（D-ST1）：内层输出并入外层
+ *  blocks（append 目标上移）；fresh 判别照旧在子块层（守护元数据 leaf.currentTool=
+ *  工具名）——内外/同层同名工具互不串块。 */
 export function routeSubToolOutput(state, name, part, scheduleRender) {
   const path = parseRelayPath(name)
   if (!path) return false
   const sub = ensureSubTaskKey(state, path.head, path.head.slice(0, path.head.lastIndexOf("#")))
   if (!sub) return true // frozen tombstone — drop late token
-  if (path.inner.length > 0) {
-    const leaf = descendSubChild(sub, path.inner)
-    if (leaf.done) return true // §27.1 F2: done 子块完全定格——迟到输出丢弃（不复活 currentTool）
-    const leafTool = path.rest
-    appendSubChild(sub, leaf, "tool", part.text, { fresh: leaf.currentTool !== leafTool })
-    if (leaf.currentTool !== leafTool) leaf.currentTool = leafTool
+  const nested = path.inner.length > 0
+  const leaf = nested ? descendSubChild(sub, path.inner) : null
+  if (leaf?.done) return true // F2: done 子块完全定格——迟到输出丢弃（不复活 currentTool）
+  const toolName = path.rest
+  if (leaf) {
+    appendSubBlock(sub, "tool", part.text, { fresh: leaf.currentTool !== toolName })
+    if (leaf.currentTool !== toolName) leaf.currentTool = toolName
   } else {
-    const toolName = path.rest
     appendSubBlock(sub, "tool", part.text, { fresh: sub.currentTool !== toolName })
     if (sub.currentTool !== toolName) sub.currentTool = toolName
   }
@@ -410,7 +392,6 @@ export function ensureCompressPanel(state, info = {}) {
   const messages = Number.isInteger(info.messages) && info.messages >= 0 ? info.messages : "?"
   appendSubBlock(panel, "status", "Compressing context…\n", { fresh: true })
   appendSubBlock(panel, "meta", `summarizing ${messages} messages\n`, { fresh: true })
-  syncPanelSnapshot(state) // §19.6 D-P1: 压缩面板建/重置刷镜
   return panel
 }
 
@@ -427,7 +408,6 @@ export function markCompressFailed(state, error) {
 function freezeCompressPanel(state, panel) {
   freezeSubTaskLines(state, panel)
   delete state.subTasks[panel.key]
-  syncPanelSnapshot(state) // §19.6 D-P1: 压缩面板冻结删除后刷镜
 }
 
 /** 完成态（onCompress）："Compressed: N tokens freed → summary (Xs)"——冻结可折叠。 */