thincoder 0.12.59 → 0.12.60

package/src/tui/cmd-new.mjs

@@ -9,8 +9,9 @@ export async function handleNewCommand(ctx) {
   const doNewSession = () => {
     const slot = newSession(agent.cwd)
     // 2026-08-31 会诊 F3：resetSessionState 清全量会话态（_fullHistory/title/_sessionStart/
-    // _engDesignToken/压缩与验证计数等）——原实现只清 agent.history，新会话首次落盘把旧
-    // 会话完整人类线 + 旧标题写进新 slot（实锤 .19/.3 双副本）。_slot 更新为粘性新槽位。
+    // 多槽设计凭证（_engDesignTokens——单值镜像 _engDesignToken 已退役 D3）/压缩与验证计数
+    // 等）——原实现只清 agent.history，新会话首次落盘把旧会话完整人类线 + 旧标题写进新
+    // slot（实锤 .19/.3 双副本）。_slot 更新为粘性新槽位。
     resetSessionState(agent)
     agent._slot = slot
     state.tasks = []

package/src/tui/cmd-session.mjs

@@ -1,4 +1,4 @@
-import { listSlots, switchToSlot, applySession, renameSlot, activeSlot, slotOccupancy } from "../session.mjs"
+import { listSlots, switchToSlot, applySession, renameSlot, activeSlot, slotOccupancy, readEndMarker } from "../session.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { restoreLines } from "./startup.mjs"
 import { stringWidth, sliceByWidth } from "./render.mjs"
@@ -19,8 +19,16 @@ export async function handleRenameCommand(ctx, args) {
     pushLine(`Title too long (max 80 chars)`, C.error)
     return
   }
-  if (!renameSlot(agent.cwd, slot, title)) {
-    pushLine(`Rename failed — active session (slot ${slot}) not found`, C.error)
+  // §12.2.5：renameSlot 契约 { ok, reason }——失败原因对用户可见（F3）
+  const r = renameSlot(agent.cwd, slot, title)
+  if (!r.ok) {
+    const why = {
+      "file-missing": `active session (slot ${slot}) not found`,
+      "parse-failure": `session file (slot ${slot}) is corrupted`,
+      "mtime-conflict": "session changed on disk concurrently — retry",
+      "invalid-slot": `invalid slot ${slot}`,
+    }[r.reason] ?? r.reason
+    pushLine(`Rename failed — ${why}`, C.error)
     return
   }
   agent.title = title
@@ -37,6 +45,13 @@ export async function handleSessionCommand(ctx) {
     pushLine("No sessions (use /new to start a new session)", C.dim)
     return
   }
+  // 2026-09-05 §10 D-5：本端高亮按端记录（● = 记录槽 ∈ 列表 ? 记录槽 : manifest active
+  // 回退——含"记录槽已被对端删除"的守卫）；listSlots 的 manifest active 语义不变
+  // （ACP session/list 零变化——manifest active 保留为列表回退高亮）
+  const rec = readEndMarker(agent.cwd)
+  const highlightSlot = (rec?.slot != null && slots.some((s) => s.slot === rec.slot))
+    ? rec.slot
+    : (slots.find((s) => s.isActive)?.slot ?? null)
   const shortDate = (d) => {
     const dt = new Date(d)
     return `${dt.getMonth() + 1}/${dt.getDate()} ${String(dt.getHours()).padStart(2, "0")}:${String(dt.getMinutes()).padStart(2, "0")}`
@@ -53,7 +68,7 @@ export async function handleSessionCommand(ctx) {
       const turns = s.turnCount > 0 ? `${s.turnCount} turns` : "0 turns"
       const when = shortDate(s.updatedAt)
       const model = s.activeProvider ? ` — ${s.activeProvider}` : ""
-      const marker = s.isActive ? " ●" : ""
+      const marker = s.slot === highlightSlot ? " ●" : ""
       return {
         type: "item",
         text: `Slot ${s.slot} │ ${turns} │ ${when} │ ${label}${model}${marker}`,

package/src/tui/cmd-think.mjs

@@ -97,16 +97,16 @@ async function applyThink(e, agent, syncProviderField, spec, isEffortOnly, isCus
       // 开 auto = 要思考：清显式 off 标记（thinking:null，NF1 约定；交付评审 #1）——残留 null
       // 会让 auto 每轮写入的 reasoning_effort 与 enable_thinking:false 矛盾同发（F2 违约）。
       // 仅清 null：thinking-type 模型的 {type:"disabled"} 不在评审 #1 范围，保持既有语义。
-      if (cur.thinking === null) { delete cur.thinking; await syncProviderField("thinking", undefined) }
+      if (cur.thinking === null) { delete cur.thinking; await syncProviderField(agent.activeProvider, "thinking", undefined) }
       delete cur.reasoningEffort
-      await syncProviderField("reasoningEffort", undefined)
+      await syncProviderField(agent.activeProvider, "reasoningEffort", undefined)
     }
   } else if (e.action === "effort") {
     // 选档位 = 要思考：清显式 off 标记（thinking:null，NF1 约定；交付评审 #1）——残留 null 会让
     // enable_thinking:false 与 reasoning_effort 矛盾同发（F2 违约）。仅清 null（同上注释）。
-    if (cur.thinking === null) { delete cur.thinking; await syncProviderField("thinking", undefined) }
+    if (cur.thinking === null) { delete cur.thinking; await syncProviderField(agent.activeProvider, "thinking", undefined) }
     cur.reasoningEffort = e.level
-    await syncProviderField("reasoningEffort", e.level)
+    await syncProviderField(agent.activeProvider, "reasoningEffort", e.level)
   } else {
     const enable = e.action === "on"
     if (isEffortOnly) {
@@ -116,9 +116,9 @@ async function applyThink(e, agent, syncProviderField, spec, isEffortOnly, isCus
       // "on" 默认 effort 取 spec 枚举首值（交付评审 #2）：硬编码 "high" 对 qwen3.8-max
       // （enum xhigh/medium/low）无效，会被 core.mjs 枚举校验 throw（400 前置）
       else { delete cur.thinking; if (!cur.reasoningEffort) cur.reasoningEffort = spec.reasoningEffortEnum?.[0] ?? "high" }
-      await syncProviderField("thinking", cur.thinking)
-      if (!enable) await syncProviderField("reasoningEffort", undefined)
-      else await syncProviderField("reasoningEffort", cur.reasoningEffort)
+      await syncProviderField(agent.activeProvider, "thinking", cur.thinking)
+      if (!enable) await syncProviderField(agent.activeProvider, "reasoningEffort", undefined)
+      else await syncProviderField(agent.activeProvider, "reasoningEffort", cur.reasoningEffort)
     } else {
       if (enable) {
         cur.thinking = { type: thinkOnValue }
@@ -127,11 +127,11 @@ async function applyThink(e, agent, syncProviderField, spec, isEffortOnly, isCus
         cur.thinking = isCustomThink ? undefined : { type: "disabled" }
         delete cur.reasoningEffort
       }
-      await syncProviderField("thinking", cur.thinking)
+      await syncProviderField(agent.activeProvider, "thinking", cur.thinking)
       if (enable) {
-        await syncProviderField("reasoningEffort", cur.reasoningEffort)
+        await syncProviderField(agent.activeProvider, "reasoningEffort", cur.reasoningEffort)
       } else {
-        await syncProviderField("reasoningEffort", undefined)
+        await syncProviderField(agent.activeProvider, "reasoningEffort", undefined)
       }
     }
   }

package/src/tui/cmd-upgrade.mjs

@@ -1,9 +1,10 @@
 import { ansi, C } from "./ansi.mjs"
+import { upgradeFailureText } from "./update-notice.mjs"
 
 /** /upgrade command: check for updates and optionally upgrade.
  *  ctx: { agent, pushLine, pushLabel, showPicker } */
 export async function handleUpgradeCommand(ctx) {
-  const { pushLine, pushLabel, showPicker } = ctx
+  const { pushLine, pushLabel, showPicker, render } = ctx
   const { checkForUpdate } = await import("../upgrade.mjs")
   const { readFileSync } = await import("node:fs")
 
@@ -31,13 +32,27 @@ export async function handleUpgradeCommand(ctx) {
   pushLine(`Upgrading to ${result.latest}...`, C.tool)
   const { exec } = await import("node:child_process")
   const cp = exec("npm install -g thincoder@latest", { windowsHide: true })
-  cp.stdout?.on("data", () => {})
-  cp.stderr?.on("data", () => {})
+  let stdout = ""
+  let done = false
+  cp.stdout?.on("data", (d) => { stdout += d })
+  cp.stderr?.on("data", (d) => { stdout += d })
+  // 2026-09-05（advisor 🟡#5/#7）：异步回调必须显式 render（pushLine 只写 lines 不绘制——
+  // handleSlash 返回后的统一 render 先于 exec 完成，结论行要等下次输入才可见）；失败文案
+  // 复用 upgradeFailureText（附 npm 输出尾 ≤3 行——与 update-notice 后台路径同诊断能力）
+  cp.on("error", (e) => {
+    if (done) return
+    done = true
+    pushLine(`✗ Upgrade failed (${e.message}). Run \`thincoder upgrade\` manually.`, C.error)
+    render?.()
+  })
   cp.on("close", (code) => {
+    if (done) return
+    done = true
     if (code === 0) {
       pushLine(`✓ Upgraded to ${result.latest}. Restart to apply.`, C.tool)
     } else {
-      pushLine(`✗ Upgrade failed (exit ${code}). Run \`thincoder upgrade\` manually.`, C.error)
+      pushLine(upgradeFailureText(code, stdout), C.error)
     }
+    render?.()
   })
 }

package/src/tui/config-helpers.mjs

@@ -1,26 +1,38 @@
-import { existsSync, readFileSync } from "node:fs"
-
 /** persistRaw / syncProviderField / maskKey: config read/write helpers.
  *  Extracted from index.mjs for shared use by slash-commands, wizard, and pickers.
- *  createConfigHelpers(agent) returns { persistRaw, syncProviderField, maskKey } */
-export function createConfigHelpers(agent) {
-  /** Read config.json → mutate → persist to disk */
+ *  createConfigHelpers(agent) returns { persistRaw, syncProviderField, maskKey }
+ *  R10 F5（D-F5b）：persistRaw 全链（磁盘新鲜读→mutate→写）收口进 config.mjs
+ *  writeConfigAtomic——mtime 门控 + .bak + 冲突放弃（见 MULTI-INSTANCE-COLLAB.md §2a.2）。
+ *  createConfigHelpers(agent, opts)：opts.configPath 为测试注入缝（默认 configPath——
+ *  生产 index.mjs 单参调用零变化）。 */
+export function createConfigHelpers(agent, opts = {}) {
+  const cfgPath = opts.configPath ?? null // null → 默认 configPath（动态 import 解）
+
+  /** 磁盘新鲜读 → mutate（单操作）→ mtime 门控写；冲突时 throw（提示语见下——TUI
+   *  slash 分发层统一 [error] 行展示；调用方若自带 try/catch 展示 Save failed 同文案）。 */
   async function persistRaw(mutate) {
-    const { saveConfig, configPath } = await import("../config.mjs")
-    const raw = existsSync(configPath) ? JSON.parse(readFileSync(configPath, "utf8")) : {}
-    mutate(raw)
-    saveConfig(raw)
+    const { writeConfigAtomic, configPath } = await import("../config.mjs")
+    const r = writeConfigAtomic(cfgPath ?? configPath, mutate)
+    if (!r.ok) throw new Error("config changed on disk concurrently — retry")
   }
 
-  /** Sync a field of the current provider to the providers array and persist to disk */
-  async function syncProviderField(field, value) {
-    const target = agent.providers.find((p) => p.name === agent.activeProvider)
-    if (!target) return
-    if (value === undefined) delete target[field]
-    else target[field] = value
+  /** Sync a field of a provider (by name) to the providers array and persist to disk.
+   *  D-F5a（#1）：磁盘 fresh raw.providers 上单字段补丁——不取 agent.providers 整数组
+   *  （长跑进程的内存 providers 快照不得整体写回——会抹掉对端对磁盘其他改动的保留）。
+   *  内存 agent.providers 目标项同步镜像（旧行为：改内存 + 整节写盘——镜像保留内存
+   *  一致性，磁盘写只剩单字段）。value === undefined → 删除该字段。 */
+  async function syncProviderField(name, field, value) {
+    const mem = agent.providers?.find((p) => p?.name === name)
+    if (!mem) return // 内存无此 provider（旧语义 early return——不产生空写）
     await persistRaw((raw) => {
-      raw.providers = agent.providers
+      raw.providers ??= []
+      const target = raw.providers.find((p) => p?.name === name)
+      if (!target) return // 磁盘目标已被对端删除 → 只做内存镜像，不落盘
+      if (value === undefined) delete target[field]
+      else target[field] = value
     })
+    if (value === undefined) delete mem[field]
+    else mem[field] = value
   }
 
   /** Mask API key for display */

package/src/tui/distill-cmd.mjs

@@ -22,7 +22,7 @@ export async function runDistill(ctx) {
     }
     let saved = 0
     for (const c of candidates) {
-      pushLine(`── Candidate [${c.type}] ${c.title} (scope: ${c.scope ?? "personal"})`, C.warn)
+      pushLine(`── Candidate [${c.type}] ${c.title} (layer: ${c.layer ?? "personal"})`, C.warn)
       for (const line of c.content.split("\n").slice(0, 6)) pushLine(`   ${line}`, C.dim)
       if (c.type === "rule") pushLine("   (rule type — consider writing manually; press y to extract)", C.warn)
       const accept = await askPermission("distill-save", { title: c.title })

package/src/tui/index.mjs

@@ -27,7 +27,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 { writeStartupSequence, setTuiActive, createExitCleanup } from "./tui-lifecycle.mjs"
 import { createPickers } from "./pickers.mjs"
 import { runDistill as runDistillImpl } from "./distill-cmd.mjs"
 import { createInteraction } from "./interaction.mjs"
@@ -106,7 +106,7 @@ export async function startTUI(agent, opts = {}) {
     reasoning: "", // thinking stream buffer (dimmed display)
     completion: null, // Tab completion state { candidates, index }
 
-    subTasks: {}, // sub-agent activity blocks (§7.2 D4): { "coder#1": { key, role, model, started, done, doneAt, blocks: [{kind,text}], currentTool, toolArgs, turn, maxTurns, approval, lastError, dropped, blockEpoch, awaitingDigest（§17 挂起中间态）, _freezeAt（冻结锚点） } } — rendered as collapsible in-conversation blocks; persists across turns (blocks are the child activity's ONLY carrier — child tool calls never enter the parent history); bounded by the N2 500-line per-child ring buffer
+    subTasks: {}, // sub-agent activity blocks (§7.2 D4): { "coder#1": { key, role, model, started, done, doneAt, blocks: [{kind,text}], currentTool, toolArgs, turn, maxTurns, approval, lastError, dropped, blockEpoch, awaitingDigest（§17 挂起中间态）, _freezeAt（冻结锚点）, stopped, children: []（§27 R23 嵌套子代理子块载体——subagent-children.mjs） } } — rendered as collapsible in-conversation blocks; persists across turns (blocks are the child activity's ONLY carrier — child tool calls never enter the parent history); bounded by the N2 500-line per-child ring buffer（R23：子块计入外层同配额——树级 trim）
     currentTool: null, // currently executing tool name (shown in status bar)
     processingStarted: 0, // current turn start time (status bar timer)
     status: "Ready",
@@ -147,6 +147,7 @@ export async function startTUI(agent, opts = {}) {
   // 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.
   writeStartupSequence()
+  setTuiActive(true) // R25（F-R25a）：终端接管完成——置 TUI 活动态（崩溃钩子恢复判定源）
 
   const utf8Decoder = new TextDecoder("utf-8", { fatal: false })
 

package/src/tui/interaction.mjs

@@ -47,9 +47,9 @@ export function createInteraction(ctx) {
       const action = String(args.action ?? "")
       if (action === "put") return [`[${args.type ?? ""}] ${args.title ?? ""}`, ...cap(args.content ?? "", 500).split("\n")]
       if (action === "delete") return args.id
-        ? [`delete single: ${args.id} (scope ${args.scope})`]
-        : [`batch delete scope=${args.scope} type=${args.type ?? ""} keyword=${args.keyword ?? ""}`, `confirm=${args.confirm}`]
-      if (action === "clear") return [`clear personal memory`, `scope=${args.scope} confirm=${args.confirm}`]
+        ? [`delete single: ${args.id}${args.layer ? ` (layer ${args.layer})` : ""}`]
+        : [`batch delete layer=${args.layer ?? ""} type=${args.type ?? ""} keyword=${args.keyword ?? ""}`, `confirm=${args.confirm}`]
+      if (action === "clear") return [`clear personal memory`, `layer=${args.layer ?? ""} confirm=${args.confirm}`]
       return [cap(summarize(args), 300)]
     }
     return [cap(summarize(args), 300)]

package/src/tui/mouse.mjs

@@ -18,6 +18,7 @@ import { computeLayout, subagentLineIndex } from "./layout.mjs"
 import { buildConvLines, convViewport } from "./render-conversation.mjs"
 import { toggleFoldBlock, scrollFoldBlock, foldScrollOffset } from "./fold-block.mjs"
 import { cancelAsyncSubagent } from "../agent-tools/subagent-async.mjs"
+import { cancelAsyncAdvisor } from "../agent-tools/advisor-async.mjs"
 import { C } from "./ansi.mjs"
 
 /** 2026-08-31 滚轮事件分派（用户需求"展开块能滚动阅读全文"）：坐标命中展开块内容行 →
@@ -184,7 +185,12 @@ export function createMouseDispatch({ agent, state, pushLine, render, popPicker
   const cancelSubagent = (key) => {
     try {
       const id = key.slice(key.lastIndexOf("#") + 1)
-      const r = cancelAsyncSubagent(agent, id)
+      const isAdvisorBlock = key.startsWith("advisor#")
+      // §24 D-24b (②-6b): ⏹ on an advisor block cancels the background review
+      // (directed abort → cancelled settle: no pending entry / no token).
+      const r = isAdvisorBlock
+        ? cancelAsyncAdvisor(agent, id)
+        : cancelAsyncSubagent(agent, id)
       if (r?.status === "error") {
         // 池内无此条目但区块仍 live（!done）→ 阻塞型（sync）spawn 中——无池条目可定向
         // 中止（§19.5 cancel 只针对 async 后台子代理）；给出可操作指引而非神秘 unknown id

package/src/tui/pickers.mjs

@@ -300,22 +300,24 @@ export function createPickers(ctx) {
     const target = agent.providers.find((pp) => pp.name === item.provider)
     if (!target) return
     const providerDefault = target.model
+    const nextActiveModel = item.model !== providerDefault ? item.model : null // default model → clear activeModel
+    // D-F5a（selectModel——清单外同型写回补正）先盘后存：磁盘 fresh raw 单操作（model + active 指针）——冲突放弃不留 ghost
+    await persistRaw((raw) => {
+      raw.providers ??= []
+      const t = raw.providers.find((p) => p?.name === item.provider)
+      if (t) t.model = item.model
+      raw.activeProvider = item.provider
+      raw.activeModel = nextActiveModel || undefined  // null → omit from config
+    })
     target.model = item.model
     agent.activeProvider = item.provider
-    // If selecting the provider's default model, clear activeModel; otherwise set it
-    agent.activeModel = item.model !== providerDefault ? item.model : null
+    agent.activeModel = nextActiveModel
     agent.provider = { ...target }
     if (agent.config?.agent?.compactThresholdAuto) {
       const { resolveCompactThreshold } = await import("../config.mjs")
       // provider 对象（非 model 字符串）——阈值跟随 providers[].context 覆盖（PROVIDER.md §15 T-C2）
       agent.config.agent.compactThreshold = resolveCompactThreshold(null, target).value
     }
-    await persistRaw((raw) => {
-      // 落盘前剥离运行时注入的 proxyUri（由 loadConfig + injectProxy 在加载时重建）
-      raw.providers = agent.providers.map(({ proxyUri: _, ...p }) => p)
-      raw.activeProvider = item.provider
-      raw.activeModel = agent.activeModel || undefined  // null → omit from config
-    })
     agent.config.activeProvider = item.provider
     agent.config.activeModel = agent.activeModel
     if (!agent.provider.apiKey) {
@@ -354,8 +356,8 @@ export function createPickers(ctx) {
       const cfg = { name, baseURL, model }
       if (format.name === "anthropic" || format.name === "google") cfg.format = format.name
       else if (format.name !== "openai") return // 防御：未知格式（理论不可达——picker 枚举）
+      await persistRaw((raw) => { raw.providers ??= []; raw.providers.push(cfg) }) // D-F5a（#3）先盘后存
       agent.providers.push(cfg)
-      await persistRaw((raw) => { raw.providers = agent.providers })
       const key = await askQuestion(`Enter API key for ${name} (skip if none):`)
       if (key) await setProviderKey(name, key)
       return
@@ -368,8 +370,8 @@ export function createPickers(ctx) {
     if (preset.maxTokens) cfg.maxTokens = preset.maxTokens
     if (preset.chatPath) cfg.chatPath = preset.chatPath
     if (preset.format) cfg.format = preset.format
+    await persistRaw((raw) => { raw.providers ??= []; raw.providers.push(cfg) }) // D-F5a（#2）先盘后存
     agent.providers.push(cfg)
-    await persistRaw((raw) => { raw.providers = agent.providers })
     const key = await askQuestion(`Enter API key for ${se.name} (skip if none):`)
     if (key) await setProviderKey(se.name, key)
   }
@@ -382,8 +384,13 @@ export function createPickers(ctx) {
       ...candidates.map((p) => ({ type: "item", text: `${p.name} (${p.model})`, name: p.name })),
     ])
     if (!se) return
+    // D-F5a（#4）先盘后存：磁盘 fresh raw 上 splice；冲突放弃不留下内存 ghost
+    await persistRaw((raw) => {
+      raw.providers ??= []
+      const idx = raw.providers.findIndex((p) => p?.name === se.name)
+      if (idx !== -1) raw.providers.splice(idx, 1)
+    })
     agent.providers.splice(agent.providers.findIndex((p) => p.name === se.name), 1)
-    await persistRaw((raw) => { raw.providers = agent.providers })
   }
 
   async function setKeyFlow() {
@@ -399,14 +406,18 @@ export function createPickers(ctx) {
   async function setProviderKey(name, key) {
     const target = agent.providers.find((p) => p.name === name)
     if (!target) return
+    // D-F5a（#5）先盘后存：磁盘 fresh raw 上改目标项 apiKey；冲突放弃不留下内存 ghost
+    await persistRaw((raw) => {
+      raw.providers ??= []
+      const t = raw.providers.find((p) => p?.name === name)
+      if (t) t.apiKey = key
+    })
     target.apiKey = key
     if (name === agent.activeProvider) agent.provider.apiKey = key
-    await persistRaw((raw) => { raw.providers = agent.providers })
   }
 
-  /** /model provider 管理：context 窗口字段（K 单位，PROVIDER.md §15 D-C4/D-C5）——
-   *  picker 选 provider + 表单输入（复用 syncProviderField 的落盘模式：改 agent.providers 目标项
-   *  → persistRaw 全量写盘）；空输入清空（回 spec 值）；非法输入报错不落盘（D-C1 语义同 loadConfig）。 */
+  /** /model provider 管理：context 窗口字段（K 单位，PROVIDER.md §15 D-C4/D-C5）——picker 选
+   *  provider + 表单输入；空清空/非法不落盘（D-C1）；落盘 = D-F5a（#6）fresh 单字段补丁——先盘后存。 */
   async function setContextFlow() {
     const se = await showPicker("Set Context Window", [
       { type: "header", text: "Select provider" },
@@ -423,26 +434,33 @@ export function createPickers(ctx) {
     const val = (await askQuestion(
       `Context window for ${se.name} in K units (current: ${current ? `${current}K` : "spec default"} — e.g. 128 = 128K; empty to clear):`
     ))?.trim() ?? ""
-    if (val === "") {
-      delete target.context
-    } else {
+    let newCtx // undefined = 清空（回 spec 值）
+    if (val !== "") {
       const n = Number(val)
       if (!Number.isInteger(n) || n <= 0) {
         pushLine(`Invalid context: "${val}" — must be a positive integer in K units (e.g. 128 = 128K)`, C.error)
         return
       }
-      target.context = n
+      newCtx = n
     }
+    await persistRaw((raw) => {
+      raw.providers ??= []
+      const t = raw.providers.find((p) => p?.name === se.name)
+      if (!t) return
+      if (newCtx === undefined) delete t.context
+      else t.context = newCtx
+    })
+    if (newCtx === undefined) delete target.context
+    else target.context = newCtx
     if (se.name === agent.activeProvider) {
       // 运行时 provider 同步（同 setProviderKey 先例：只补 context，不重建对象以免丢 activeModel 覆盖）
-      if (target.context === undefined) delete agent.provider.context
-      else agent.provider.context = target.context
+      if (newCtx === undefined) delete agent.provider.context
+      else agent.provider.context = newCtx
       if (agent.config?.agent?.compactThresholdAuto) {
         const { resolveCompactThreshold } = await import("../config.mjs")
         agent.config.agent.compactThreshold = resolveCompactThreshold(null, agent.provider).value
       }
     }
-    await persistRaw((raw) => { raw.providers = agent.providers })
     pushLine(target.context !== undefined
       ? `ctx = ${target.context}K (${target.context * 1024} tokens)`
       : `context cleared — using model spec (${fmtContextK(providerSpec(target).context)})`, C.tool)

package/src/tui/render-segments.mjs

@@ -10,7 +10,7 @@ import { formatTables, sanitizeDisplay, sliceByWidth, wrapText } from "./render.
 import {
   foldTailLines, isExpanded, renderBlockTimeline, renderExpandedBlock, renderFoldedHead, renderMathAndMarkdown,
 } from "./fold-block.mjs"
-import { styleSubLabelRow } from "./subagent-panel.mjs"
+import { renderSubChildSections, subChildFoldKey } from "./subagent-panel.mjs"
 import { SUBAGENT_ROLES } from "./subagent-blocks.mjs"
 
 const _toolSegCache = new WeakMap()
@@ -70,7 +70,8 @@ export function toolSeg(state, l, i, cols, maxRows) {
 
 /** 冻结子agent 活动块渲染（§7.2 D4）：state.lines 载体 {_frozenSubTask: sub}（subagent-blocks.mjs
  *  freezeSubTaskLines 推入）。折叠 = 身份头 + tail 3；展开 = 共享组件（60% 屏幕封顶 + 底部可达
- *  折叠控制）。折叠键 `sub-${key}`——与运行中面板区块同键，折叠态跨冻结边界无缝延续。 */
+ *  折叠控制）。折叠键 `sub-${key}`——与运行中面板区块同键，折叠态跨冻结边界无缝延续。
+ *  §27 R23：子块段（renderSubChildSections）随冻结载体渲染（冻结含子块——T-R23d.1）。 */
 function frozenSubTaskLines(state, sub, cols, maxRows) {
   const foldKey = `sub-${sub.key}`
   const elapsed = Math.floor(((sub.doneAt ?? Date.now()) - sub.started) / 1000)
@@ -92,7 +93,7 @@ function frozenSubTaskLines(state, sub, cols, maxRows) {
   if (isExpanded(state, foldKey)) {
     // Expanded: shared component renders blank + ▼ control + full timeline,
     // capped at 60% of the screen with a bottom collapse control.
-    const body = renderBlockTimeline(sub.blocks, cols).map(styleSubLabelRow)
+    const body = renderBlockTimeline(sub.blocks, cols)
     out.push(...renderExpandedBlock({ body, foldKey, state, maxRows, cols, label: "subagent activity" }))
   } else {
     // Folded: the header line itself is the control (▶ affordance), then tail 3.
@@ -105,22 +106,38 @@ function frozenSubTaskLines(state, sub, cols, maxRows) {
       out.push({ text: `│ ${sliceByWidth(line, cols - 4)}`, color: C.dim, _skipDimFold: true })
     }
   }
+  // §27 R23：子块段随冻结载体（折叠/展开两态都渲染——子块自身折叠键独立控制）。
+  out.push(...renderSubChildSections(state, sub, cols, maxRows))
   return out
 }
 
-/** 冻结子agent 段入口（2026-08-31 段缓存：冻结后内容不变——签名含 sub.key + blocks 计数；
- *  注：foldKey 由位置键升级为 sub.key（loadOlder unshift 后不重绑——sub 自身携带 key）。 */
+/** 冻结子agent 段入口（2026-08-31 段缓存：冻结后内容不变——签名含 sub.key + blocks 计数 +
+ *  子块树签名（R23——children 折叠态/滚动/行数参与——toggle 子块/翻窗必须失效）；注：
+ *  foldKey 由位置键升级为 sub.key（loadOlder unshift 后不重绑——sub 自身携带 key）。 */
 export function frozenSubSeg(state, l, i, cols, maxRows) {
   const fKey = `sub-${l._frozenSubTask.key}`
+  // §27 R23：子块树渲染输入签名（key/done/stopped/blocks 数/折叠态/窗口偏移——递归）
+  const sub = l._frozenSubTask
+  let childSig = ""
+  const walk = (carrier, path) => {
+    for (const c of carrier.children ?? []) {
+      const innerPath = path ? `${path}/${c.key}` : c.key
+      const fk = subChildFoldKey(sub.key, innerPath)
+      childSig += `${innerPath}:${c.done ? 1 : 0}:${c.stopped ? 1 : 0}:${c.blocks?.length ?? 0}:${state.expandedBlocks?.has(fk) ? 1 : 0}:${state._foldScroll?.get(fk) ?? 0};`
+      walk(c, innerPath)
+    }
+  }
+  walk(sub, "")
   const fSig = [
-    cols, maxRows ?? 0, l._frozenSubTask.key, l._frozenSubTask.blocks?.length ?? 0,
-    l._frozenSubTask.done ? 1 : 0, state.foldEnabled === false ? 0 : 1,
+    cols, maxRows ?? 0, sub.key, sub.blocks?.length ?? 0,
+    sub.done ? 1 : 0, state.foldEnabled === false ? 0 : 1,
     state.expandedBlocks?.has(fKey) ? 1 : 0, state._foldScroll?.get(fKey) ?? 0,
+    childSig,
   ].join("|")
   const hit = _frozenSubCache.get(l)
-  if (hit && hit.textRef === l._frozenSubTask && hit.sig === fSig) return hit.rows
-  const rows = frozenSubTaskLines(state, l._frozenSubTask, cols, maxRows)
-  _frozenSubCache.set(l, { textRef: l._frozenSubTask, sig: fSig, rows })
+  if (hit && hit.textRef === sub && hit.sig === fSig) return hit.rows
+  const rows = frozenSubTaskLines(state, sub, cols, maxRows)
+  _frozenSubCache.set(l, { textRef: sub, sig: fSig, rows })
   return rows
 }
 

package/src/tui/startup.mjs

@@ -187,6 +187,10 @@ export function showStartup(ctx) {
   }
   pushLine(`Tools: ${agent.tools.map((t) => t.name).join(", ")}`, C.dim)
 
+  // R25（F-R25c）：上次运行异常终止提示——bin 入口扫描 crash-reports（24h 窗）经
+  // startTUI opts.crashNotice 传入——无匹配为 undefined → 不提示（负例）
+  if (opts.crashNotice) pushLine(opts.crashNotice, C.warn)
+
   // 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) {