thincoder 0.12.53 → 0.12.58

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"
@@ -47,6 +48,22 @@ export function pendingNoticeReady(state) {
   return Boolean(state.pendingNotice && !state.picker && !state.permission && !state.question)
 }
 
+/**
+ * SESSION.md §8 D-S2 — TUI 启动首帧前的 provider 重选流程：
+ * provider 无效（`_providerInvalid` 标记或 provider 为 null）→ 先弹模型选择 picker
+ * （复用 openModelPicker，展示当前可用 providers）；用户选定后继续正常启动。
+ * 选择取消（Esc）→ 仍进入 TUI，推送提示行（"未配置有效 provider，可用 /model 选择或
+ * /provider 配置"）——绝不因无 provider 拒绝进入。返回 true 表示弹过选择流程。
+ */
+export async function promptProviderIfInvalid(agent, openModelPicker, pushLine) {
+  if (!(agent._providerInvalid || !agent.provider)) return false
+  await openModelPicker()
+  if (!agent.provider) {
+    pushLine("未配置有效 provider，可用 /model 选择或 /provider 配置", C.warn)
+  }
+  return true
+}
+
 /**
  * Start the TUI, taking over the terminal until exit.
  * agent: return value of createAgent
@@ -129,7 +146,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 })
 
@@ -220,7 +237,7 @@ export async function startTUI(agent, opts = {}) {
 
     // Scroll wheel: \x1b[<64;col;rowM = up, \x1b[<65;col;rowM = down（3 lines each）
     // 2026-08-31：坐标命中展开块内容行 → 块内滚动（handleWheel）；未命中 → 会话滚动（现状）
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     for (const m of text.matchAll(/\x1b\[<(\d+);(\d+);(\d+)([Mm])/g)) {
       const button = Number(m[1])
       if (button === 64 || button === 65) {
@@ -250,9 +267,9 @@ export async function startTUI(agent, opts = {}) {
     }
 
     // Strip complete mouse sequences; keep incomplete tail for reassembly with next chunk
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     text = text.replace(/\x1b\[<\d+;\d+;\d+[Mm]/g, "")
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     const tail = text.match(/\x1b\[<[\d;]*$/)
     if (tail) {
       mousePending = tail[0]
@@ -273,27 +290,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) => {
@@ -387,7 +384,7 @@ export async function startTUI(agent, opts = {}) {
   }
 
   // Interaction primitives: permission approval + Q&A input, implemented in interaction.mjs
-  const { askPermission, askQuestion } = createInteraction({
+  const { askPermission, askQuestion, askBatchPermission } = createInteraction({
     agent, state, pushLine, pushLabel, render, summarize,
   })
 
@@ -397,7 +394,7 @@ export async function startTUI(agent, opts = {}) {
   // Agent loop: implemented in agent-turn.mjs
   const turnCtx = {
     agent, state, pushLine, pushLabel, render, scheduleRender: render, ensureAssistantLabel,
-    askPermission, askQuestion, handleSlash: null,
+    askPermission, askQuestion, askBatchPermission, handleSlash: null,
     get assistantLabeled() { return assistantLabeled },
     set assistantLabeled(v) { assistantLabeled = v },
   }
@@ -462,6 +459,10 @@ export async function startTUI(agent, opts = {}) {
 
   // ---------------------------------------------------------- Startup screen + background indexing
 
+  // SESSION.md §8 D-S2：startTUI 首帧前 —— provider 无效（_providerInvalid / provider 为 null）
+  // → 先弹模型选择 picker（keyStream 已挂 keypress，Esc/Enter 可用）；Esc → 提示行，仍进 TUI
+  await promptProviderIfInvalid(agent, () => openModelPicker(), pushLine)
+
   showStartup({ agent, state, opts, pushLine, pushLabel, render, startWizard })
   backgroundIndex({ agent, state, render })
 

package/src/tui/interaction.mjs

@@ -62,6 +62,33 @@ export function createInteraction(ctx) {
     })
   }
 
+  /** Batch permission ask (AGENT-LOOP.md §16 D-B1): one merged prompt covering N
+   *  non-readonly tools from the same toolCalls array — approve all / one by one /
+   *  deny. Verdicts resolve as "approveAll" | "oneByOne" | "deny". */
+  const BATCH_PREVIEW_LINES_PER_TOOL = 8
+  function askBatchPermission({ tools, count }) {
+    if (agent.autoApprove) {
+      pushLine(`  [auto] ${count} tools: ${tools.map((t) => t.name).join(", ")}`, C.warn)
+      return Promise.resolve("approveAll")
+    }
+    const names = [...new Set(tools.map((t) => t.name))]
+    const label = `${count} tools need permission: ${names.join(", ")}`
+    // Preview: one compact block per tool (name header + first N formatted lines)
+    state.permissionPreview = [
+      label,
+      ...tools.flatMap((t) => {
+        const lines = formatPermission(t.name, t.args)
+        const shown = lines.slice(0, BATCH_PREVIEW_LINES_PER_TOOL)
+        return [` ${t.name}:`, ...shown.map((l) => `  ${l}`), ...(lines.length > shown.length ? [`  … (${lines.length - shown.length} more lines)`] : [])]
+      }),
+    ]
+    return new Promise((resolve) => {
+      state.permission = { name: label, args: {}, resolve, batch: { tools, count } }
+      state.status = `Waiting: ${label}`
+      render()
+    })
+  }
+
   function askQuestion(text, options = []) {
     // only one question at a time: question is a read-only tool on a parallel channel,
     // a second concurrent one is rejected directly; otherwise the later one overwrites
@@ -91,5 +118,5 @@ export function createInteraction(ctx) {
     })
   }
 
-  return { askPermission, askQuestion, formatPermission }
+  return { askPermission, askQuestion, formatPermission, askBatchPermission }
 }

package/src/tui/key-handler.mjs

@@ -26,15 +26,27 @@ export function createKeyHandler(ctx) {
 
   return function onKeypress(str, key = {}) {
     // permission confirm state: y approve / n deny / a approve + turn ON AUTO (no further prompts)
+    // batch state (§16 D-B1): a approve all / o one by one / n deny (Esc = deny)
     if (state.permission) {
       const answer = (str || "").toLowerCase()
       const isContinue = state.permission.name === "continue"
-      const validKeys = isContinue ? ["y", "n"] : ["y", "n", "a"]
+      const isBatch = Boolean(state.permission.batch)
+      const validKeys = isContinue ? ["y", "n"] : isBatch ? ["a", "o", "n"] : ["y", "n", "a"]
       if (validKeys.includes(answer) || key.name === "escape") {
         const { resolve, name } = state.permission
         state.permission = null
         state.permissionPreview = []
         state.status = "Processing..."
+        if (isBatch) {
+          // Merged batch ask: resolve the verdict string; dispatch applies it
+          // (approveAll = batch-scope allowance only, NOT the persistent AUTO flag).
+          const verdict = answer === "a" ? "approveAll" : answer === "o" ? "oneByOne" : "deny"
+          const tone = verdict === "approveAll" ? C.dim : C.error
+          pushLine(`  [${verdict === "approveAll" ? "approved" : verdict === "deny" ? "denied" : "one by one"}] ${name}`, tone)
+          resolve(verdict)
+          render()
+          return
+        }
         if (answer === "a" && !isContinue) {
           agent.autoApprove = true
           agent._pendingReminders = agent._pendingReminders ?? []
@@ -255,7 +267,7 @@ export function createKeyHandler(ctx) {
       } else if (str && !key.ctrl && !key.meta) {
         // 输入即过滤；粘贴的多行文本先去换行（与输入框清洗口径一致），仍含控制字符则整段丢弃
         const text = str.replace(/[\r\n]+/g, "")
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
         if (text && !/[\x00-\x1f\x7f]/.test(text)) applyFilter(p.filter + text)
       }
       return

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)
@@ -54,7 +72,7 @@ export function handleWheel(ctx, button, col, row) {
 /** Extract left-click presses from a chunk. Returns [{ col, row }] (1-based). */
 export function parseMouseClicks(text) {
   const out = []
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
   for (const m of text.matchAll(/\x1b\[<0;(\d+);(\d+)M/g)) {
     out.push({ col: Number(m[1]), row: Number(m[2]) })
   }
@@ -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/pickers.mjs

@@ -1,5 +1,5 @@
 import { sliceByWidth } from "./render.mjs"
-import { PROVIDER_PRESETS as PRESETS } from "../config.mjs"
+import { PROVIDER_PRESETS as PRESETS, providerSpec } from "../config.mjs"
 import { computeLayout } from "./layout.mjs"
 
 /** Generic list picker + model/provider management.
@@ -121,6 +121,14 @@ export function createPickers(ctx) {
     return e.action === "switch" ? `switch:${e.provider}:${e.model}` : `action:${e.action}`
   }
 
+  /** 模型信息显示的 context 窗口（PROVIDER.md §15 D-C5）：K 单位形态跟随覆盖值
+   *  （config K 是二进制 K：128 → 128×1024 = 131072 → 显示 "128K"）；≥1M tokens 用 M 形态
+   *  （1_000_000 → "1M"），与 spec 值的大窗口惯例一致。 */
+  function fmtContextK(tokens) {
+    if (tokens >= 1_000_000) return `${Math.round(tokens / 1_048_576)}M`
+    return `${Math.round(tokens / 1024)}K`
+  }
+
   /** Get API key for a provider (config.json only — env vars are not a key source) */
   function getApiKey(providerName, providerConfig) {
     return providerConfig.apiKey
@@ -148,6 +156,8 @@ export function createPickers(ctx) {
         await removeProviderFlow()
       } else if (e.action === "key") {
         await setKeyFlow()
+      } else if (e.action === "context") {
+        await setContextFlow()
       }
     }
   }
@@ -188,9 +198,11 @@ export function createPickers(ctx) {
       const marker = active ? "●" : ""
       const note = active ? " ← current" : ""
       const keyStatus = p.apiKey ? "" : " (no key)"
+      // context 窗口显示（PROVIDER.md §15 D-C5/T-C6）：跟随 providers[].context 覆盖
+      const ctxTag = ` (ctx ${fmtContextK(providerSpec(p).context)})`
       entries.push({
         type: "item",
-        text: `${p.name.padEnd(12)} ${currentModel}${note}`,
+        text: `${p.name.padEnd(12)} ${currentModel}${ctxTag}${note}`,
         action: "open-models",
         provider: p.name,
         marker,
@@ -201,6 +213,7 @@ export function createPickers(ctx) {
     entries.push({ type: "item", text: "Add provider…", action: "add" })
     if (agent.providers.length > 1) entries.push({ type: "item", text: "Remove provider…", action: "remove" })
     entries.push({ type: "item", text: "Set / change API key…", action: "key" })
+    entries.push({ type: "item", text: "Set context window (K units)…", action: "context" })
     return entries
   }
 
@@ -294,7 +307,8 @@ export function createPickers(ctx) {
     agent.provider = { ...target }
     if (agent.config?.agent?.compactThresholdAuto) {
       const { resolveCompactThreshold } = await import("../config.mjs")
-      agent.config.agent.compactThreshold = resolveCompactThreshold(null, item.model).value
+      // provider 对象（非 model 字符串）——阈值跟随 providers[].context 覆盖（PROVIDER.md §15 T-C2）
+      agent.config.agent.compactThreshold = resolveCompactThreshold(null, target).value
     }
     await persistRaw((raw) => {
       // 落盘前剥离运行时注入的 proxyUri（由 loadConfig + injectProxy 在加载时重建）
@@ -382,6 +396,50 @@ export function createPickers(ctx) {
     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）。 */
+  async function setContextFlow() {
+    const se = await showPicker("Set Context Window", [
+      { type: "header", text: "Select provider" },
+      ...agent.providers.map((p) => ({
+        type: "item",
+        text: `${p.name} (ctx ${fmtContextK(providerSpec(p).context)})`,
+        name: p.name,
+      })),
+    ])
+    if (!se?.name) return // Esc
+    const target = agent.providers.find((p) => p.name === se.name)
+    if (!target) return
+    const current = Number.isInteger(target.context) && target.context > 0 ? target.context : null
+    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 {
+      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
+    }
+    if (se.name === agent.activeProvider) {
+      // 运行时 provider 同步（同 setProviderKey 先例：只补 context，不重建对象以免丢 activeModel 覆盖）
+      if (target.context === undefined) delete agent.provider.context
+      else agent.provider.context = target.context
+      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)
+  }
+
 
   /** Slot-bound model picker: two-level provider → model selection that RETURNS
    *  { provider, model } instead of writing main-session state — used by /submodel
@@ -411,5 +469,5 @@ export function createPickers(ctx) {
     }
   }
 
-  return { showPicker, closePicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey, pickModelForSlot }
+  return { showPicker, closePicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey, setContextFlow, pickModelForSlot }
 }