thincoder 0.12.53 → 0.12.58

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

package/src/tui/render-frame.mjs

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

@@ -114,7 +114,7 @@ export function createRenderLoop(state, agent, ctx, pushLine, write = (s) => pro
       const hasOverlay = state.permission || state.question || state.picker || state.wizard?.step === "provider"
       const cursorSuffix = hasOverlay ? "" : `\x1b[${cursorRow};${cursorCol}H${ansi.hideCursor}`
 
-      if (out.length || cursorSuffix) write(ansi.syncUpdateStart + out.join("") + ansi.syncUpdateEnd + cursorSuffix)
+      if (out.length || cursorSuffix) write(ansi.wrapOff + ansi.syncUpdateStart + out.join("") + ansi.syncUpdateEnd + cursorSuffix + ansi.wrapOn)
     } catch (e) {
       // Don't let a render error crash the TUI
       if (process.env.THINCODER_DEBUG_RENDER) process.stderr.write(`[render-error] ${e?.stack ?? e}\n`)

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

@@ -140,12 +140,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)
 

package/src/tui/subagent-blocks.mjs

@@ -16,9 +16,12 @@ import { describeToolArgs } from "./tool-args.mjs"
 
 /** `role#id/` prefix router — hyphen included since the eng-coder fix (2026-08-21). */
 export const SUB_PREFIX_RE = /^([\w-]+)#(\d+)\//
-/** ⟦ev⟧ event token parser (D1/D2): `⟦ev⟧<name>\x1e<n>\x1e<max>\x1e<phase>\x1e<detail>`. */
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
-export const SUB_EVENT_RE = /^⟦ev⟧(turn|approval)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e?([\s\S]*)$/
+/** ⟦ev⟧ event token parser (D1/D2): `⟦ev⟧<name>\x1e<n>\x1e<max>\x1e<phase>\x1e<detail>`.
+ *  phase "done" (§15 D-A3): async child finished — settle-time emits (each entry,
+ *  it so the child's block freezes (the spawn tool result is a status JSON and
+ *  must not freeze a still-running block). */
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+export const SUB_EVENT_RE = /^⟦ev⟧(turn|approval|done)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e?([\s\S]*)$/
 /** N2: per-child display-line ring buffer cap — oldest lines drop with a marker. */
 export const SUB_BLOCK_LINE_LIMIT = 500
 /** N1: render-layer throttle for child tool-output appends (generation relays verbatim). */
@@ -267,8 +270,21 @@ export function routeSubToken(state, t, scheduleRender) {
   if (!sub) return true // frozen tombstone — late token from an aborted child: drop
   const payload = t.slice(subMatch[0].length)
   // ⟦ev⟧ event token: turn/approval progress → header ONLY (never blocks,
-  // never the main stream — D1).
+  // never the main stream — D1). phase "done" (§15 D-A3): the async child
+  // finished — freeze its block (it stayed live through the background run).
   if (payload.startsWith("⟦ev⟧")) {
+    const ev = payload.match(SUB_EVENT_RE)
+    if (ev?.[1] === "done") {
+      sub.done = true
+      sub.doneAt = Date.now()
+      sub.currentTool = null
+      sub.approval = null
+      sub.blockEpoch = (sub.blockEpoch ?? 0) + 1
+      freezeSubTaskLines(state, sub)
+      delete state.subTasks[sub.key]
+      scheduleRender()
+      return true
+    }
     applySubEvent(sub, payload)
     scheduleRender()
     return true
@@ -329,3 +345,102 @@ export function routeSubToolOutput(state, name, part, scheduleRender) {
   throttleSubRender(scheduleRender)
   return true
 }
+
+// ─── Compression panel (CONTEXT-COMPACTION.md §7 D-C2) ─────────────────────
+// The compression session reuses the subagent block machinery — user ruling
+// "压缩会话像子agent 面板那样显示". While the summary call is in flight the panel
+// lives in state.subTasks (role "compress") and renders in the running subagent
+// panel (subagent-panel.mjs) — the existing 1s turn ticker (agent-turn.mjs
+// subRunning) makes the elapsed header tick; on completion/fallback it freezes
+// into the stream as a collapsible block via freezeSubTaskLines, exactly like a
+// finished child. The panel carries STATUS ONLY (D-C2): the summary body is a
+// machine artifact and never enters the blocks.
+
+let _compressSeq = 0
+
+/** Live compression panel (role "compress", not done) or null. */
+function liveCompressPanel(state) {
+  return Object.values(state.subTasks ?? {}).find((s) => s.role === "compress" && !s.done) ?? null
+}
+
+/**
+ * Open (or reset — retry) the compression panel. Fired by onCompressStart BEFORE
+ * the summary LLM call. info.messages = number of history messages being
+ * summarized ("summarizing N messages" stage label). Each attempt restarts the
+ * elapsed ticker (panel.started); the previous attempt's failure line stays in
+ * the block timeline so the retry history is visible.
+ */
+export function ensureCompressPanel(state, info = {}) {
+  state.subTasks ??= {}
+  let panel = liveCompressPanel(state)
+  if (!panel) {
+    panel = {
+      key: `compress#${++_compressSeq}`,
+      role: "compress",
+      model: undefined,
+      started: Date.now(), done: false, doneAt: null,
+      blocks: [], currentTool: null, toolArgs: null,
+      turn: 0, maxTurns: 0, approval: null,
+      lastError: null, dropped: 0,
+    }
+    state.subTasks[panel.key] = panel
+  }
+  // Per-attempt reset (D-C2 state machine): retries return to "Compressing…",
+  // the elapsed ticker restarts from this attempt's start.
+  panel.done = false
+  panel.doneAt = null
+  panel.lastError = null
+  panel.started = Date.now()
+  panel.currentTool = "compressing context…"
+  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 })
+  return panel
+}
+
+/** Failure state (onCompressFail): error text ONLY — no degradation note. The
+ *  fallback note is bound to 3 CONSECUTIVE failures (markCompressFallback) and
+ *  must not appear on a single failure (D-C2 state machine). */
+export function markCompressFailed(state, error) {
+  const panel = liveCompressPanel(state)
+  if (!panel) return
+  const text = error?.message ? String(error.message) : String(error ?? "unknown error")
+  panel.lastError = text
+  appendSubBlock(panel, "err", `Compression failed: ${text}\n`, { fresh: true })
+}
+
+/** Freeze the compression panel into the stream (collapsible, subagent-style —
+ *  same carrier/fold-key as a finished child) and release the live entry. */
+function freezeCompressPanel(state, panel) {
+  freezeSubTaskLines(state, panel)
+  delete state.subTasks[panel.key]
+}
+
+/** Completion state (onCompress, LLM summary): "Compressed: N tokens freed →
+ *  summary (Xs)" — N = pre-compression estimate − post-compression estimate,
+ *  Xs = elapsed seconds. Block frozen + collapsible (T2). */
+export function markCompressDone(state, info = {}) {
+  const panel = liveCompressPanel(state)
+  if (!panel) return
+  const tokensFreed = Number.isFinite(info.tokensFreed) ? Math.max(0, Math.round(info.tokensFreed)) : 0
+  const seconds = Number.isFinite(info.elapsedMs) ? Math.max(0, Math.round(info.elapsedMs / 1000)) : 0
+  panel.done = true
+  panel.doneAt = Date.now()
+  panel.currentTool = null
+  appendSubBlock(panel, "status", `Compressed: ${tokensFreed} tokens freed → summary (${seconds}s)\n`, { fresh: true })
+  freezeCompressPanel(state, panel)
+}
+
+/** Fallback state (onCompress with mode:"fallback"): the 3-consecutive-failures
+ *  degradation note "Compression failed — fallback: truncated to N messages"
+ *  (N = tail messages retained). Frozen + collapsible (T3b). */
+export function markCompressFallback(state, info = {}) {
+  const panel = liveCompressPanel(state)
+  if (!panel) return
+  const tailMessages = Number.isFinite(info.tailMessages) ? Math.round(info.tailMessages) : "?"
+  panel.done = true
+  panel.doneAt = Date.now()
+  panel.currentTool = null
+  appendSubBlock(panel, "err", `Compression failed — fallback: truncated to ${tailMessages} messages\n`, { fresh: true })
+  freezeCompressPanel(state, panel)
+}

package/src/tui/subagent-panel.mjs

@@ -0,0 +1,81 @@
+/**
+ * subagent-panel.mjs — 运行中子 agent 固定底部面板渲染（AGENT-LOOP.md §7.2.1 D1/D2）。
+ *
+ * 面板位于 conversation 与 todo 之间（布局顺序 header → conversation → 面板 →
+ * todo → picker → permission → queue → input → status），高度完全自适应 = 全部
+ * 运行中区块的渲染行数（F2，会话区被挤小）；无运行中区块 → 返回 []（F6 空态，
+ * 无悬空分隔线）。子 agent 完成后立即冻结进会话流（subagent-blocks.mjs
+ * freezeSubTaskLines，✓ 头 + 可展开，§7.2 D4 现状不变），面板下一帧自然移除
+ * 该区块（F5）——本模块只渲染 `!done` 条目。
+ *
+ * 中立模块（D1 评审 #6）：layout.mjs 调 renderSubagentPanel 预计算面板高度
+ * （subagentLines → subagentH），render-frame.mjs 直接 put 预计算行（不重复
+ * 渲染）——若本函数放 render-frame 会引入 layout↔render-frame 循环依赖。
+ *
+ * 区块渲染逻辑自 render-conversation.mjs buildConvLines runningSubs 段迁移
+ * （§7.2.1 D2）：折叠头 `[▶/⏸ key · model · elapsed · turn] state`（⏸ = 等待
+ * 审批态图标，sub.approval 非空时显示）+ tail 3；展开态经 fold-block.mjs 公共
+ * 组件（renderBlockTimeline + renderExpandedBlock，60% 封顶 + 块内滚动）。
+ * 折叠状态 key = `sub-${key}` 跨 turn 保持（D5，与冻结区块同一 key——冻结边界
+ * 无缝衔接）。
+ */
+import { C } from "./ansi.mjs"
+import { sliceByWidth, stringWidth } from "./render.mjs"
+import { isExpanded, renderBlockTimeline, renderExpandedBlock, foldTailLines } from "./fold-block.mjs"
+
+/**
+ * 面板行构建（纯函数）：顶部分隔线 `─` + 各运行中区块（折叠头 + tail 3 /
+ * 展开全量）。maxRows = 终端行数（展开态 60% 封顶窗口化）；省略 = 不封顶
+ * （单测/无终端环境）。
+ * @returns {Array<{text: string, color: string, ...}>}
+ */
+export function renderSubagentPanel(state, cols, maxRows) {
+  const runningSubs = Object.values(state.subTasks ?? {}).filter((s) => !s.done)
+  if (runningSubs.length === 0) return []
+  const out = []
+  // 面板顶部边界线（现状分隔线语义迁移，§7.2.1 D2/NF2）——面板存在即画线，
+  // 无运行区块时面板整体不渲染（F6：无悬空线）。
+  out.push({ text: "─".repeat(Math.max(1, cols - 1)), color: C.dim, _skipDimFold: true })
+  for (const sub of runningSubs) {
+    const foldKey = `sub-${sub.key}`
+    // 头部摘要：`[▶ coder#1 · glm-5.3 · 45s · turn 12/100] bash — npm test`
+    // ⏸ = 等待审批态（sub.approval 非空，评审 #5 定义）；图标在括号内，
+    // 与冻结头 `[✓ …]` 格式统一（任务简报 UI 决策）。
+    const icon = sub.approval ? "⏸" : "▶"
+    const elapsed = Math.floor((Date.now() - sub.started) / 1000)
+    // 评审 #1 宽度预算：模型名先单独按显示宽度截断（[model] token 原样记录可长
+    // 20-30+ 字符，不截断则括号前缀宽度不可预算、状态区被挤出终端右边距）；
+    // 再量括号前缀实际显示宽度，状态区按 cols - bracketWidth - 2 截断——整行
+    // ≤ cols 铁律（TUI 布局纪律：任何写入帧的行 ≤ cols）。极端窄终端下括号
+    // 前缀自身也按 cols-2 截断兜底（状态区宁可让位也不撑破帧）。
+    const modelPart = sub.model
+      ? ` · ${sliceByWidth(sub.model, Math.max(8, Math.floor(cols / 3)))}`
+      : ""
+    const turnPart = sub.maxTurns > 0 ? ` · turn ${sub.turn}/${sub.maxTurns}` : ""
+    const bracket = sliceByWidth(`[${icon} ${sub.key}${modelPart} · ${elapsed}s${turnPart}]`, Math.max(1, cols - 2))
+    const bracketWidth = stringWidth(bracket)
+    let statePart
+    if (sub.approval) statePart = `等待审批: ${sub.approval}`
+    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)}`
+      : ""
+    out.push({
+      text: `${bracket} ${sliceByWidth(statePart + argSummary, Math.max(0, cols - 2 - bracketWidth))}`,
+      color: C.tool,
+      _foldToggle: foldKey,
+    })
+    if (isExpanded(state, foldKey)) {
+      // 展开态：全量活动时间线（per-kind 着色，60% 屏封顶 + 块内滚动——公共组件）。
+      const body = renderBlockTimeline(sub.blocks, cols)
+      out.push(...renderExpandedBlock({ body, foldKey, state, maxRows, cols, label: "subagent activity" }))
+    } else {
+      // 折叠态：tail 3 非空 block 行（最近活动），dim。
+      for (const line of foldTailLines(sub.blocks)) {
+        out.push({ text: `│ ${sliceByWidth(line, cols - 4)}`, color: C.dim })
+      }
+    }
+  }
+  return out
+}