thincoder 0.12.60 → 0.12.62

package/src/tui/pickers.mjs

@@ -1,8 +1,12 @@
-import { sliceByWidth } from "./render.mjs"
-import { PROVIDER_PRESETS as PRESETS, providerSpec } from "../config.mjs"
 import { computeLayout } from "./layout.mjs"
-
-/** Generic list picker + model/provider management.
+import { createModelPicker } from "./model-picker.mjs"
+
+/** Generic list picker plumbing + /model two-level surface delegation.
+ *  MODEL-MERGE-SESSION 拆分（评审 #9）：/model 两级面（L1 provider → L2 模型行——
+ *  2026-09-10 MODEL-SELECTION v2 起 L2 行 = 运行期拉取候选）+ 渠道
+ *  管理流 + selectModel + pickModelForSlot 迁 model-picker.mjs——本文件只留通用 picker
+ *  栈（showPicker/closePicker/popPicker/rebuildLines）——createModelPicker 以 ctx 接收
+ *  通用绑定（showPicker/closePicker/renderPickerLines）再行装配——index.mjs 消费面不变。
  *  单一 Promise API：showPicker(title, entries, { defaultIndex }) → Promise<entry|null>。
  *  picker 栈：state.pickerStack，state.picker 始终指向栈顶（layout/render/key-handler 都只读 state.picker）。
  *  选中即关闭（Enter = resolve + pop）；Esc = pop 当前层并 resolve(null)。菜单循环由调用方 while 重开。 */
@@ -37,6 +41,12 @@ export function createPickers(ctx) {
    *  互斥保护：入栈前把现有挂起 picker 全部 resolve(null)，消除 Promise 悬挂。
    *  （正常嵌套是先 await 上一层返回再开新的，栈深通常为 1。） */
   function showPicker(title, entries, { defaultIndex = 0 } = {}) {
+    if (!Array.isArray(entries)) {
+      const got = entries && typeof entries.then === "function"
+        ? "a Promise (missing `await`?)"
+        : `a ${entries === null ? "null" : typeof entries}`
+      throw new TypeError(`showPicker("${title}"): entries must be an array — got ${got}`)
+    }
     closePicker()
     return new Promise((resolve) => {
       const itemCount = entries.filter((e) => e.type === "item").length
@@ -65,7 +75,12 @@ export function createPickers(ctx) {
         const sel = row === p.index
         if (sel) selLine = lines.length
         const marker = e.marker ? `  ${e.marker}` : ""
-        lines.push({ text: `${sel ? " ▸ " : "   "}${e.text}${marker}`, color: sel ? ansi.bold + C.text : C.dim, _row: row })
+        // A1（第 20 批 §12.5——D-SS7）：item 附注消费——渲染形态 {prefix}{text}{marker}{note}；
+        // header 分支既有消费同形态，无 note 零追加（不产生尾随空格）。宽度预算 =
+        // renderPicker 既有 8 格余量 + 右截断——保序 prefix→text→marker→note，截断从行尾
+        // 开始 = note 段最先牺牲。
+        const note = e.note ? `  ${e.note}` : ""
+        lines.push({ text: `${sel ? " ▸ " : "   "}${e.text}${marker}${note}`, color: sel ? ansi.bold + C.text : C.dim, _row: row })
         row++
       }
     }
@@ -90,410 +105,13 @@ export function createPickers(ctx) {
 
   function renderPickerLines() { rebuildLines() }
 
-  // === two-level model picker ===
-
-  /** Strip known version/date suffixes to get the "series" name of a model.
-   *  e.g. "qwen-max-latest" → "qwen-max", "qwen-max-2024-09-19" → "qwen-max" */
-  function modelSeries(name) {
-    return name
-      .replace(/-latest$/, "")
-      .replace(/-\d{4}-\d{2}-\d{2}$/, "") // date suffix like -2024-09-19
-      .replace(/-\d{8}$/, "")              // date suffix like -20240919
-  }
-
-  /** Dedupe model list: group by series, keep shortest name per group.
-   *  Reduces "qwen-max, qwen-max-latest, qwen-max-2024-09-19" to just "qwen-max". */
-  function dedupeModels(models) {
-    const groups = new Map()
-    for (const m of models) {
-      const series = modelSeries(m)
-      const existing = groups.get(series)
-      if (!existing || m.length < existing.length) {
-        groups.set(series, m)
-      }
-    }
-    return [...groups.values()].sort()
-  }
-
-  /** entry 唯一标识：异步更新 entries 后按它恢复选中项 */
-  function entryKey(e) {
-    if (!e) return null
-    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
-  }
-
-  /** Level 1: Show provider list. Selecting a provider opens Level 2 (model list). */
-  async function openModelPicker() {
-    // 菜单循环：选中即关闭，子流程结束后重开主菜单；Esc 退出
-    for (;;) {
-      const entries = buildProviderEntries()
-      const items = entries.filter((e) => e.type === "item")
-      const current = items.findIndex(
-        (e) => e.action === "open-models" && e.provider === agent.activeProvider)
-      const picked = showPicker("Models & Providers", entries, { defaultIndex: Math.max(0, current) })
-      const e = await picked
-      if (!e) return
-      if (e.action === "open-models") {
-        // Level 2: open model list for this provider
-        const modelSelected = await openModelListForProvider(e.provider)
-        if (modelSelected) return // model selected, close picker
-        // Esc from model list → return to provider list
-      } else if (e.action === "add") {
-        await addProviderFlow()
-      } else if (e.action === "remove") {
-        await removeProviderFlow()
-      } else if (e.action === "key") {
-        await setKeyFlow()
-      } else if (e.action === "context") {
-        await setContextFlow()
-      }
-    }
-  }
-
-  /** Level 2: Show model list for a specific provider. Returns true if a model was selected. */
-  async function openModelListForProvider(providerName) {
-    const providerConfig = agent.providers.find((p) => p.name === providerName)
-    if (!providerConfig) return false
-
-    const entries = buildModelEntriesForProvider(providerName, providerConfig)
-    const items = entries.filter((e) => e.type === "item")
-    const currentModel = providerName === agent.activeProvider
-      ? (agent.activeModel || providerConfig.model)
-      : providerConfig.model
-    const current = items.findIndex((e) => e.model === currentModel)
-    const picked = showPicker(`${providerName} models`, entries, { defaultIndex: Math.max(0, current) })
-
-    // Async fetch models in background
-    fetchModelsForProvider(providerName, entries).catch((err) => {
-      pushLine(`[model] fetch models failed: ${err.message}`, C.error)
-    })
-
-    const e = await picked
-    if (!e) return false // Esc → back to provider list
-    if (e.action === "switch") {
-      await selectModel(e).catch((err) => pushLine(`[error] ${err.message}`, C.error))
-      return true
-    }
-    return false
-  }
-
-  /** Build entries for Level 1: provider list */
-  function buildProviderEntries() {
-    const entries = []
-    for (const p of agent.providers) {
-      const active = p.name === agent.activeProvider
-      const currentModel = active ? (agent.activeModel || p.model) : p.model
-      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}${ctxTag}${note}`,
-        action: "open-models",
-        provider: p.name,
-        marker,
-        note: `${p.baseURL}${keyStatus}`,
-      })
-    }
-    entries.push({ type: "header", text: "Management" })
-    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
-  }
-
-  /** Build entries for Level 2: model list for a specific provider */
-  function buildModelEntriesForProvider(providerName, providerConfig) {
-    const entries = []
-    const active = providerName === agent.activeProvider
-    const currentModel = active ? (agent.activeModel || providerConfig.model) : providerConfig.model
-    const isDefaultModel = currentModel === providerConfig.model
-
-    entries.push({ type: "header", text: "Current model" })
-    entries.push({
-      type: "item",
-      text: currentModel,
-      action: "switch",
-      provider: providerName,
-      model: currentModel,
-      marker: active && isDefaultModel ? "●" : "",
-    })
-
-    entries.push({ type: "header", text: "Available models (loading…)" })
-    return entries
-  }
-
-  /** Async fetch and splice models for a specific provider */
-  async function fetchModelsForProvider(providerName, entries) {
-    const { listModels } = await import("../provider/index.mjs")
-    const providerConfig = agent.providers.find((p) => p.name === providerName)
-    if (!providerConfig) return
-
-    let selKey = null
-    try {
-      const apiKey = getApiKey(providerName, providerConfig)
-      const models = await listModels(
-        { baseURL: providerConfig.baseURL, apiKey: apiKey ?? "" },
-        { signal: AbortSignal.timeout(10000) }
-      )
-      if (state.picker?.entries !== entries) return // picker closed or changed
-      selKey = entryKey(pickerItems(state.picker)[state.picker.index])
-
-      // Dedupe and filter
-      const deduped = dedupeModels(models)
-      const currentModel = providerName === agent.activeProvider
-        ? (agent.activeModel || providerConfig.model)
-        : providerConfig.model
-
-      // Find the "Available models" header and splice after it
-      const headerIdx = entries.findIndex((e) => e.type === "header" && e.text.startsWith("Available models"))
-      if (headerIdx >= 0) {
-        // Update header with count info
-        const hint = deduped.length < models.length
-          ? ` (${models.length} total, ${deduped.length} shown — type to filter)`
-          : ` (${deduped.length})`
-        entries[headerIdx].text = `Available models${hint}`
-
-        // Splice models after header (skip current model)
-        const newModels = deduped.filter((m) => m !== currentModel)
-        entries.splice(headerIdx + 1, 0, ...newModels.map((m) => ({
-          type: "item",
-          text: m,
-          action: "switch",
-          provider: providerName,
-          model: m,
-        })))
-      }
-    } catch (error) {
-      if (state.picker?.entries !== entries) return
-      const headerIdx = entries.findIndex((e) => e.type === "header" && e.text.startsWith("Available models"))
-      if (headerIdx >= 0) {
-        entries[headerIdx].text = `Available models (fetch failed: ${sliceByWidth(error.message, 30)})`
-      }
-    }
-
-    // Restore selection
-    const pk = state.picker
-    const items = pickerItems(pk)
-    const restored = selKey ? items.findIndex((e) => entryKey(e) === selKey) : -1
-    pk.index = restored >= 0 ? restored : Math.min(pk.index, Math.max(0, items.length - 1))
-    rebuildLines()
-  }
-
-  async function selectModel(item) {
-    closePicker()
-    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
-    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
-    }
-    agent.config.activeProvider = item.provider
-    agent.config.activeModel = agent.activeModel
-    if (!agent.provider.apiKey) {
-      const selKey = await askQuestion(`Enter API key for ${item.provider} (leave empty to skip):`)
-      if (selKey) await setProviderKey(item.provider, selKey)
-    }
-  }
-
-  async function addProviderFlow() {
-    const entries = [
-      { type: "header", text: "Select a preset provider" },
-      ...Object.entries(PRESETS).filter(([name]) => !agent.providers.some((p) => p.name === name))
-        .map(([name, p]) => ({ type: "item", text: `${name.padEnd(10)} ${p.desc ?? ""} (${p.model})`, name, kind: "preset" })),
-      { type: "header", text: "Other" },
-      { type: "item", text: "Custom (manual config)", name: "__custom__", kind: "custom" },
-    ]
-    const se = await showPicker("Add Provider", entries)
-    if (!se) return // Esc → 返回上级（openModelPicker 循环会重开主菜单）
-    if (se.kind === "custom") {
-      const name = await askQuestion("Enter provider name:")
-      if (!name) return
-      if (agent.providers.some((p) => p.name === name)) return
-      const baseURL = (await askQuestion("Enter baseURL:")).replace(/\/+$/, "")
-      if (!baseURL) return
-      const model = await askQuestion("Enter model name:")
-      if (!model) return
-      // D-C1（TUI.md §10.6D）：API format 改 picker 选择（openai/anthropic/google——默认 index=0
-      // openai）——固定枚举不再手输；Esc/取消 = 中止整个 Add Provider 流程（cfg 尚未落盘——
-      // 无半配置，与旧手输非法 abort 同语义）。与 preset 选择器同形态——零新机制。
-      const format = await showPicker("API format", [
-        { type: "item", text: "openai", name: "openai" },
-        { type: "item", text: "anthropic", name: "anthropic" },
-        { type: "item", text: "google", name: "google" },
-      ])
-      if (!format) return // Esc/取消 → 中止流程
-      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)
-      const key = await askQuestion(`Enter API key for ${name} (skip if none):`)
-      if (key) await setProviderKey(name, key)
-      return
-    }
-    const preset = PRESETS[se.name]
-    if (!preset || agent.providers.some((p) => p.name === se.name)) return
-    const cfg = { name: se.name, baseURL: preset.baseURL, model: preset.model }
-    if (preset.thinking) cfg.thinking = preset.thinking
-    if (preset.reasoningEffort) cfg.reasoningEffort = preset.reasoningEffort
-    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)
-    const key = await askQuestion(`Enter API key for ${se.name} (skip if none):`)
-    if (key) await setProviderKey(se.name, key)
-  }
-
-  async function removeProviderFlow() {
-    const candidates = agent.providers.filter((p) => p.name !== agent.activeProvider)
-    if (!candidates.length) return
-    const se = await showPicker("Remove Provider", [
-      { type: "header", text: "Select provider to remove" },
-      ...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)
-  }
-
-  async function setKeyFlow() {
-    const se = await showPicker("Configure API Key", [
-      { type: "header", text: "Select provider" },
-      ...agent.providers.map((p) => ({ type: "item", text: `${p.name} ${p.apiKey ? `(has key: ${maskKey(p.apiKey)})` : "(no key)"}`, name: p.name })),
-    ])
-    if (!se) return
-    const key = await askQuestion(`Enter API key for ${se.name}:`)
-    if (key) await setProviderKey(se.name, key)
-  }
-
-  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
-  }
-
-  /** /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" },
-      ...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() ?? ""
-    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
-      }
-      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 (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
-      }
-    }
-    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
-   *  to write into a subagent slot (global or per-role). Esc from the model list
-   *  returns to the provider list (openModelPicker parity); Esc from the provider
-   *  list exits → null. */
-  async function pickModelForSlot() {
-    for (;;) {
-      const providers = agent.providers
-      if (!providers.length) return null
-      const e = await showPicker("Select provider", providers.map((p) => ({
-        type: "item",
-        text: `${p.name.padEnd(12)} ${p.model}`,
-        action: "open-models",
-        provider: p.name,
-      })))
-      if (!e?.provider) return null
-      const providerConfig = providers.find((p) => p.name === e.provider)
-      if (!providerConfig) return null
-      const entries = buildModelEntriesForProvider(e.provider, providerConfig)
-      fetchModelsForProvider(e.provider, entries).catch((err) => {
-        pushLine(`[model] fetch models failed: ${err.message}`, C.error)
-      })
-      const me = await showPicker(`${e.provider} models`, entries)
-      if (!me?.model) continue // Esc from model list → back to provider list
-      return { provider: e.provider, model: me.model }
-    }
-  }
+  // /model 两级面 + selectModel + 渠道管理 + pickModelForSlot —— 迁 model-picker.mjs
+  // （MODEL-MERGE-SESSION——pick 后本文件 ≤450）。createModelPicker 返回同名单函数，
+  // 经本层原样转发（index.mjs/wizard/slash-commands 消费面零变化）。
+  const modelPicker = createModelPicker({
+    agent, state, render, ansi, C, pushLine, persistRaw, askQuestion, maskKey,
+    showPicker, closePicker, renderPickerLines,
+  })
 
-  return { showPicker, closePicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey, setContextFlow, pickModelForSlot }
+  return { showPicker, closePicker, popPicker, renderPickerLines, ...modelPicker }
 }

package/src/tui/render-frame.mjs

@@ -72,13 +72,6 @@ export function renderPermission(permPreviewLines) {
   return [`${ansi.bold}${C.warn}❯ Permission Request${ansi.reset}`, ...permPreviewLines.map((w) => `${C.warn}${w}${ansi.reset}`)]
 }
 
-/** Queue preview (1 line when queue has items during processing). */
-export function renderQueue(state, W) {
-  if (state.queue.length === 0 || !state.processing) return ""
-  const preview = sliceByWidth(state.queue[0].text, W - 20)
-  return `${C.dim}❯ Queue: ${state.queue.length} pending${state.queue.length > 1 ? ` (next: ${preview}…)` : ` (next: ${preview})`} — Ctrl+D delete │ Ctrl+I inject${ansi.reset}`
-}
-
 /** Picker/wizard overlay panel. Returns empty when no overlay. */
 export function renderPicker(state, cols, panel, overlay) {
   if (!panel || !overlay) return []
@@ -139,8 +132,8 @@ export function renderInputBox(state, W, boxLines, cols, inputLayout, inputOffse
         ? " ↑↓ select │ Enter confirm │ Esc: cancel "
         : " Enter submit │ Esc: cancel │ Ctrl+U clear │ Ctrl+V paste ")
     }
-    if (title === " Inject Message ") parts.push(" Enter send, Esc cancel ")
-    if (title !== " Question ") {
+    if (title === " Inject Message ") parts.push(" Enter send, Esc cancel │ ←→↑↓ Home/End move │ Ctrl+V paste ")
+    if (title === " Input " || title === " Processing... ") {
       parts.push(" Shift+Enter / Ctrl+J newline ")
       parts.push(" Ctrl+V paste ")
       parts.push(" Ctrl+I inject ")
@@ -160,8 +153,8 @@ export function renderInputBox(state, W, boxLines, cols, inputLayout, inputOffse
   const curLine = (!hasOverlay && inputLayout) ? inputLayout.cursorLine - (inputOffset ?? 0) : -1
   const curCol = (!hasOverlay && inputLayout) ? inputLayout.cursorCol : -1
 
-  // Interrupt prompt 空文本占位符：灰色提示用户该做什么
-  const isInterruptEmpty = state.interruptPrompt && !state.interruptPrompt.text
+  // Interrupt prompt 空文本占位符：灰色提示用户该做什么（第 31 批：chars 数组判空——§8）
+  const isInterruptEmpty = state.interruptPrompt && state.interruptPrompt.chars.length === 0
   const interruptPlaceholder = "Type message to inject (Enter send, Esc cancel)"
 
   for (let li = 0; li < boxLines.length; li++) {
@@ -212,6 +205,15 @@ export function renderInputBox(state, W, boxLines, cols, inputLayout, inputOffse
   return out
 }
 
+/** 第 33 批（TUI §14.3(a)——纯函数派生，无副作用）：blocked = 审批/提问卡挂起（实时派生，
+ *  提示消解即消失）；awaiting = 回合结束等待输入（链尾置位——processing / 挂起两态期间不派生）。
+ *  @returns {"blocked"|"awaiting"|null} */
+export function attentionKind(state) {
+  if (state.permission || state.question) return "blocked"
+  if (state.attentionAwaiting && !state.processing && !state.suspended && !state._suspPending) return "awaiting"
+  return null
+}
+
 /** Status bar (always 1 line). */
 export function renderStatus(state, agent, cols, slashCommands) {
   const statusLine = buildStatusLine(state, agent, { cols, slashCommands })
@@ -220,8 +222,20 @@ export function renderStatus(state, agent, cols, slashCommands) {
   const advisorBanner = agent.config?.advisor?.guard === true ? `${C.advisor} ADVISOR${ansi.reset}${ansi.dim}│` : ""
   const engBanner = agent.config?.agent?.engineering ? `${C.advisor} ENG${ansi.reset}${ansi.dim}│` : ""
   const bannerPrefix = (agent.planMode ? " PLAN│ " : "") + (agent.autoApprove ? " AUTO│ " : "") + (agent.config?.advisor?.guard === true ? " ADVISOR│ " : "") + (agent.config?.agent?.engineering ? " ENG│ " : "")
-  const statusMax = cols - 1 - (bannerPrefix ? stringWidth(bannerPrefix) : 0)
-  return `${ansi.dim}${planBanner}${autoBanner}${advisorBanner}${engBanner}${sliceByWidth(statusLine, Math.max(10, statusMax))}${ansi.reset}`
+  // 第 33 批（TUI §14.3(b)/(c)）：attention 态 = chip 行首 + 整行注意力色对包裹（blocked >
+  // awaiting；blocked 内 permission > question——与按键分发优先级同序）；平态零注入。
+  const kind = attentionKind(state)
+  const chip = kind === "blocked" ? (state.permission ? "⚠ 等待你的审批" : "⚠ 等待你的回答")
+    : kind === "awaiting" ? "⚠ 等待你的输入" : ""
+  const attentionPad = chip ? `${chip} │ ` : ""
+  // 宽度预算（N9④）：chip 占位计入——整行仍 ≤ cols − 1（既有口径）。
+  const statusMax = cols - 1 - (bannerPrefix ? stringWidth(bannerPrefix) : 0) - (attentionPad ? stringWidth(attentionPad) : 0)
+  const inner = `${ansi.dim}${planBanner}${autoBanner}${advisorBanner}${engBanner}${sliceByWidth(statusLine, Math.max(10, statusMax))}`
+  // 负向锁（§14.3）：attention 为 null ⇒ 半态路径逐字节等价（不经包裹 / 零字节注入）。
+  if (!chip) return `${inner}${ansi.reset}`
+  // 底色存活（§14.3）：既有内容含内部 ansi.reset（banner / ctx 警示段）——每次内部复位后
+  // 重施加注意力色对，再整体包裹（内容零省略）。
+  return `${C.attention}${(chip + " │ " + inner).replaceAll(ansi.reset, ansi.reset + C.attention)}${ansi.reset}`
 }
 
 // ====================================================================
@@ -266,7 +280,7 @@ export function renderRows(state, agent, opts) {
   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))
-  if (panels.queue) put(panels.queue.y, [renderQueue(state, W)])
+  // 排队面板提示已撤（INPUT-LOCK-ASYNC F-7——2026-09-09——busy 提交吞——无排队展示）
   // question 自由文本态：box 内容是 layoutAnswer 行——光标布局/滚动随 box 内容走
   // （questionLayout/questionOffset）；主输入 inputLayout 此时无意义（被 question 行替换）。
   const qFree = Boolean(state.question && state.question.options.length === 0)
@@ -376,6 +390,14 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
   const ctxTokensHint = state.ctxCache.tokens > 0 ? ` ${fmtK(state.ctxCache.tokens)}` : ""
   const ctxHint = ctxPct > 0
     ? ctxPct >= 80 ? ` │ ${ansi.reset}${C.warn}context ${ctxPct}%${ctxTokensHint}${ansi.reset}${ansi.dim}` : ` │ context ${ctxPct}%${ctxTokensHint}` : ""
-  const queueHint = state.queue.length > 0 ? ` │ queue: ${state.queue.length}` : ""
-  return ` ${statusText}${taskHint}${turnHint}${tokenHint}${ctxHint}${queueHint}${scrollHint} │ Enter: send${state.processing ? " (queue)" : ""} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+I: inject │ Ctrl+C: exit (×2)`
+  // INPUT-LOCK-ASYNC（C'——F-3）：busy（processing 含 digest）状态栏提示——取代旧
+  // 排队提示（F-7 已删）——“主会话处理中——Enter 提交禁用”
+  const enterHint = state.processing ? `主会话处理中 — Enter 提交禁用（字符可输入，回合结束请重按 Enter）` : "Enter: send"
+  // LEDGER-SURFACE（§2.30.3.3/§2.30.3.4）：L1 常驻标记——状态段簇尾（scrollHint 后、键位组前）；
+  // 空标记零注入（半态逐字节等价——同 :233-238 纪律）；warn = 当前项目老化 > 0（警示色段包裹）
+  const lg = state.ledger
+  const ledgerHint = lg?.marker
+    ? ` │ ${lg.warn ? `${ansi.reset}${C.warn}${lg.marker}${ansi.reset}${ansi.dim}` : lg.marker}`
+    : ""
+  return ` ${statusText}${taskHint}${turnHint}${tokenHint}${ctxHint}${scrollHint}${ledgerHint} │ ${enterHint} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+I: inject │ Ctrl+C: exit (×2)`
 }

package/src/tui/render-loop.mjs

@@ -16,6 +16,7 @@
 import { countConvLines, renderRows } from "./render-frame.mjs"
 import { estimateTokens } from "../context.mjs"
 import { ansi, C } from "./ansi.mjs"
+import { isTuiActive } from "./tui-lifecycle.mjs" // F-2 渲染抑制守卫（RESIZE-MOUSE-LEAK-FIX）
 
 const MIN_RENDER_INTERVAL_MS = 16
 
@@ -55,6 +56,7 @@ export function createRenderLoop(state, agent, ctx, pushLine, write = (s) => pro
   }
 
   function doRender() {
+    if (!isTuiActive()) return // F-2 渲染抑制（RESIZE-MOUSE-LEAK-FIX）：cleanup 已清活动态——退出期不再把 TUI 帧重绘到已恢复的主屏
     try {
       // Single source (Windows ConPTY instability, 2026-08-30). CACHE ONLY —
       // no per-frame refresh: during heavy streaming output ConPTY reports a

package/src/tui/render-segments.mjs

@@ -10,7 +10,6 @@ import { formatTables, sanitizeDisplay, sliceByWidth, wrapText } from "./render.
 import {
   foldTailLines, isExpanded, renderBlockTimeline, renderExpandedBlock, renderFoldedHead, renderMathAndMarkdown,
 } from "./fold-block.mjs"
-import { renderSubChildSections, subChildFoldKey } from "./subagent-panel.mjs"
 import { SUBAGENT_ROLES } from "./subagent-blocks.mjs"
 
 const _toolSegCache = new WeakMap()
@@ -71,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}`——与运行中面板区块同键，折叠态跨冻结边界无缝延续。
- *  §27 R23：子块段（renderSubChildSections）随冻结载体渲染（冻结含子块——T-R23d.1）。 */
+ *  SUBAGENT-TAIL：内层内容已并入 sub.blocks（数据层——取代小节；docs/design/TUI.md §6）
+ *  ——本段只渲染单流（无子块段/无子块头）。 */
 function frozenSubTaskLines(state, sub, cols, maxRows) {
   const foldKey = `sub-${sub.key}`
   const elapsed = Math.floor(((sub.doneAt ?? Date.now()) - sub.started) / 1000)
@@ -106,33 +106,19 @@ 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 计数 +
- *  子块树签名（R23——children 折叠态/滚动/行数参与——toggle 子块/翻窗必须失效）；注：
- *  foldKey 由位置键升级为 sub.key（loadOlder unshift 后不重绑——sub 自身携带 key）。 */
+/** 冻结子agent 段入口（2026-08-31 段缓存：冻结后内容不变——签名含 sub.key + blocks 计数；
+ *  注：foldKey 由位置键升级为 sub.key（loadOlder unshift 后不重绑——sub 自身携带 key）。
+ *  SUBAGENT-TAIL：子块树签名退役（子块无内容行、无独立折叠键——渲染零读 children）。 */
 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, 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 === sub && hit.sig === fSig) return hit.rows