thincoder 0.12.60 → 0.12.62

package/src/tui/display-budget.mjs

@@ -0,0 +1,184 @@
+/**
+ * display-budget.mjs — TUI 显示层额度（TUI-OOM-ROOTCAUSE 批——TUI.md §15.3）。
+ *
+ * 职责（§15.3.2）：常量单源（D-TB4）+ 行/载体计长（`lineChars`）+ `state.lines` 总量
+ * 对账（`syncLineBudget`）。纯函数本体（`capText` / `appendCappedText`）住
+ * `src/text-budget.mjs`（零依赖）——与 agent 侧捕获共用（AGENT-LOOP.md §23.3.1，D2 单源）；
+ * 本模块只承载 TUI 面常量与对账。
+ *
+ * 依赖方向：本模块只引 `./ansi.mjs` + `../text-budget.mjs`（叶子——不引 subagent 族，
+ * 冻结锚点平移由调用方经 `onTrim` 注入，避环）。
+ *
+ * 计量口径 = UTF-16 码元（`String.length`——TUI.md §15.2 表 1）；行数维（5000 行环 /
+ * 500 行块环 / 200 条目环）**原样保留**，字符维为第二维（D-TB5——既有 N5/N6 语义不动）。
+ */
+import { C } from "./ansi.mjs"
+import { capText, appendCappedText, fillMarker } from "../text-budget.mjs"
+
+export { capText }
+
+// ─── 常量（§15.3.1——单源；数值改动一处生效）────────────────────────────────
+
+/** 单行（pushLine/pushLabel/恢复行/流式 flush 行）字符额度。 */
+export const LINE_MAX_CHARS = 64_000
+/** 工具块 `argsJson` 总量。 */
+export const ARGS_JSON_MAX_CHARS = 24_000
+/** 工具块 `result` 行数组总量（与既有 400 行双维）。 */
+export const TOOL_RESULT_MAX_CHARS = 64_000
+/** 输出环单条目（超出：尾截断 + 标记）。 */
+export const TOOL_OUTPUT_ENTRY_MAX_CHARS = 8_000
+/** 输出环总量（超出：与既有 200 条目环同款丢最旧）。 */
+export const TOOL_OUTPUT_TOTAL_MAX_CHARS = 128_000
+/** 子代理块单环（与 500 显示行双维；裁最旧——省略标记 N6 语义不变）。 */
+export const SUB_BLOCK_CHAR_LIMIT = 128_000
+/** 评审载体（`_advisorBlocks` 累积 + `_frozenAdvisor`）：头 32K + 尾 96K + 中段标记。 */
+export const ADVISOR_TEXT_MAX_CHARS = 128_000
+/** 流式缓冲（`state.streaming` / `state.reasoning`）累积额度。 */
+export const STREAM_MAX_CHARS = 256_000
+/** `state.lines` 全部行与载体文本总量（超出：与 5000 行环同款裁头 1000 行 + 收据行）。 */
+export const LINES_CHAR_BUDGET = 2_000_000
+/** 搜索匹配计数上限（超出截断 + 提示行）。 */
+export const SEARCH_MATCH_CAP = 10_000
+
+// ─── 标记形态（逐字——§15.3.2 进测试断言）──────────────────────────────────
+
+export const LINE_TRUNC_MARKER = "… [line truncated: N chars omitted]"
+export const MIDDLE_TRUNC_MARKER = "… [middle truncated: N chars omitted]"
+
+/** 评审/流式额度头尾分配（头 32K + 尾 96K——保裁决尾部；与常量同基数）。 */
+export const ADVISOR_CAP_OPTS = {
+  hard: ADVISOR_TEXT_MAX_CHARS,
+  head: 32_000,
+  tail: 96_000,
+  marker: MIDDLE_TRUNC_MARKER,
+}
+/** 流式累积额度（头/尾各半——flush 行再受 LINE_MAX_CHARS）。 */
+export const STREAM_CAP_OPTS = {
+  hard: STREAM_MAX_CHARS,
+  head: Math.floor(STREAM_MAX_CHARS / 4),
+  tail: Math.floor(STREAM_MAX_CHARS / 2),
+  marker: MIDDLE_TRUNC_MARKER,
+}
+/** 行截断（单行巨内容场景）：保留头部至 `LINE_MAX_CHARS` + 尾标记（行尾截断语义）。 */
+export function capLine(text) {
+  return capText(text, {
+    max: LINE_MAX_CHARS,
+    keepHead: LINE_MAX_CHARS,
+    keepTail: 0,
+    marker: LINE_TRUNC_MARKER,
+  })
+}
+
+/** TUI 侧流式累积（alias——本体 text-budget.appendCappedText，D2 单源）。 */
+export function appendCapped(prev, add, opts) {
+  return appendCappedText(prev, add, opts)
+}
+
+/** 评审文本单次截断（§15.3.1：头 32K + 尾 96K 保裁决尾部 + 中段标记——与累积侧同源）。 */
+export function capAdvisorText(text) {
+  return capText(text, { max: ADVISOR_TEXT_MAX_CHARS, keepHead: 32_000, keepTail: 96_000, marker: MIDDLE_TRUNC_MARKER })
+}
+
+/**
+ * 行数组总量额度（尾截断 + 标记；首行保真——ARGS_JSON/TOOL_RESULT 双维用）。
+ * 行放不下时：可放部分 → 本行头截断；无空间 → 直接以标记行收尾。
+ * @returns {string[]} 原数组或（截断 + 标记行）新数组
+ */
+export function capLines(lines, max, marker = MIDDLE_TRUNC_MARKER) {
+  const arr = Array.isArray(lines) ? lines : []
+  if (arr.length === 0) return arr
+  let total = 0
+  for (const s of arr) total += typeof s === "string" ? s.length : 0
+  if (total <= max) return arr
+  const out = []
+  let used = 0
+  for (const s of arr) {
+    const str = typeof s === "string" ? s : String(s ?? "")
+    const remain = max - used
+    if (str.length <= remain) { out.push(str); used += str.length; continue }
+    if (remain > 0) {
+      const kept = str.slice(0, remain)
+      out.push(kept)
+      used += kept.length
+    }
+    break
+  }
+  out.push(fillMarker(marker, total - used))
+  return out
+}
+
+// ─── 计长与总量对账（§15.3.2 / §15.3.4）───────────────────────────────────
+
+const arrChars = (a) => {
+  if (!Array.isArray(a)) return 0
+  let n = 0
+  for (const s of a) n += typeof s === "string" ? s.length : 0
+  return n
+}
+
+/** 一行 + 其 `_toolBlock`/`_frozenSubTask`/`_frozenAdvisor` 字段计长（单一口径）。 */
+export function lineChars(l) {
+  if (!l) return 0
+  let n = typeof l.text === "string" ? l.text.length : 0
+  const b = l._toolBlock
+  if (b) {
+    n += typeof b.argsSummary === "string" ? b.argsSummary.length : 0
+    n += typeof b.summary === "string" ? b.summary.length : 0
+    n += arrChars(b.argsJson) + arrChars(b.output) + arrChars(b.result)
+  }
+  if (l._frozenSubTask) n += l._frozenSubTask._charCount ?? 0
+  if (typeof l._frozenAdvisor === "string") n += l._frozenAdvisor.length
+  return n
+}
+
+/** 行增量记账（幂等——行对象上存上次计入值 `_budgetChars`；载体原地变更后重调即自愈）。 */
+export function accountLine(state, l) {
+  if (!l) return
+  const prev = Number.isFinite(l._budgetChars) ? l._budgetChars : 0
+  const next = lineChars(l)
+  state._linesChars = Math.max(0, (state._linesChars ?? 0) + (next - prev))
+  l._budgetChars = next
+}
+
+/** 直算对账（双算法对照 / 初始化 / 漂移自愈——测试直算同源）。 */
+export function accountAll(state) {
+  let total = 0
+  for (const l of state.lines ?? []) {
+    const n = lineChars(l)
+    l._budgetChars = n
+    total += n
+  }
+  state._linesChars = total
+  return total
+}
+
+/**
+ * `state.lines` 总量对账（§15.3.3 落点表末行）：超 `LINES_CHAR_BUDGET` → 与 5000 行环
+ * 同款裁头 1000 行 + 收据行；`onTrim(state, removedCount)` 由调用方注入冻结锚点平移
+ * （display-budget 不引 subagent 族——避环）。幂等（未超限零动作）。
+ * @returns {number} 本轮裁掉的行数
+ */
+export function syncLineBudget(state, { pushLineLike = null, onTrim = null } = {}) {
+  const lines = state.lines
+  if (!Array.isArray(lines)) return 0
+  if (!Number.isFinite(state._linesChars)) accountAll(state)
+  let removed = 0
+  while (state._linesChars > LINES_CHAR_BUDGET && lines.length > 1) {
+    const take = Math.min(1000, lines.length - 1)
+    const dropped = lines.splice(0, take)
+    let freed = 0
+    for (const l of dropped) freed += lineChars(l)
+    state._linesChars = Math.max(0, state._linesChars - freed)
+    removed += take
+    const receipt = `... [earlier messages trimmed — ${lines.length} lines remaining]`
+    if (typeof pushLineLike === "function") pushLineLike(receipt)
+    else {
+      const line = { text: receipt, color: C.dim }
+      line._budgetChars = receipt.length
+      lines.unshift(line)
+      state._linesChars += receipt.length
+    }
+    if (typeof onTrim === "function") onTrim(state, take)
+  }
+  return removed
+}

package/src/tui/index.mjs

@@ -25,20 +25,22 @@ import { closeAllMcp } from "../mcp.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { createRenderLoop } from "./render-loop.mjs"
 import { makeDimsState } from "./dims.mjs"
-import { SLASH_COMMANDS, SLASH_ALIASES, createSlashCommands } from "./slash-commands.mjs"
+import { SLASH_COMMANDS, createSlashCommands } from "./slash-commands.mjs"
 import { createWizard } from "./wizard.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"
 import { pasteClipboardImage as pasteClipboardImageImpl, insertPastedText, translateShiftEnter, stripKeyboardProtocol } from "./clipboard.mjs"
-import { parseMouseClicks, handleWheel, createMouseDispatch } from "./mouse.mjs"
+import { parseMouseClicks, handleWheel, createMouseDispatch, mouseOob } from "./mouse.mjs"
 import { runAgentTurn } from "./agent-turn.mjs"
-import { createKeyHandler, convMaxScroll } from "./key-handler.mjs"
+import { createKeyHandler, convMaxScroll, clearAttention } from "./key-handler.mjs"
 import { showStartup, backgroundIndex, createLoadOlder } from "./startup.mjs"
 import { shiftFreezeAnchors } from "./subagent-blocks.mjs"
+import { capLine, accountLine, accountAll, syncLineBudget } from "./display-budget.mjs"
 import { createConfigHelpers } from "./config-helpers.mjs"
 import { createUpdateNotice, pendingNoticeReady } from "./update-notice.mjs"
+import { startLedgerSurface } from "./ledger-surface.mjs"
 
 export { upgradeFailureText, pendingNoticeReady } from "./update-notice.mjs"
 
@@ -53,7 +55,12 @@ 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)
+    // MODEL-MERGE-SESSION 引导 A（F-6）：空槽 + defaultModel 未设 → 提示 /config 默认模型入口
+    // （index.mjs 本行为 D-S2 取消提示扩展——设计文件清单外——随批上报）
+    const hasProviders = (agent.providers?.length ?? 0) > 0
+    pushLine(hasProviders && !agent.config?.defaultModel
+      ? "尚未设置默认模型（config.defaultModel——新会话起点）：/config → 默认模型 设置一次；/model 仅改本会话"
+      : "未配置有效 provider，可用 /model 选择或 /provider 配置", C.warn)
   }
   return true
 }
@@ -106,12 +113,14 @@ 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（冻结锚点）, 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）
+    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: []（SUBAGENT-TAIL：嵌套子代理**守护载体**——内容行并入本块 blocks——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（SUBAGENT-TAIL 单环：内层行同环计数、单载体最旧先行——TUI.md §6）
     currentTool: null, // currently executing tool name (shown in status bar)
     processingStarted: 0, // current turn start time (status bar timer)
     status: "Ready",
-    queue: [], // queued messages while processing: [{ text }], auto-dequeued when current turn finishes
-    interruptPrompt: null, // Ctrl+I interrupt message input: { text: "" } or null
+    ledger: { marker: null, warn: false, scannedAt: 0 }, // LEDGER-SURFACE（§2.30.3.4）：L1 标记位——ledger-surface 写 / render-frame 读
+    queue: [], // 交接残项单容器 [{ text }]（INPUT-LOCK：submit 不再排队——仅释放窗口兜底/挂起中止残余——回合尾队列循环续发，至多一条）
+    interruptPrompt: null, // Ctrl+I inject box（第 31 批——TUI-INPUT-BOX.md §8）: { chars: string[], cursor: number } or null
+    attentionAwaiting: false, // 第 33 批（TUI §14.3(f)）：回合结束等待输入——链尾置位 / 用户输入清位；不落盘、不进会话
     search: null, // Ctrl+F search mode: { query: "", matches: [{lineIndex, charIndex}], index: 0 } or null
     expandedBlocks: new Set(), // block hashes that are expanded (Enter toggles)
     foldEnabled: true, // global fold toggle — /fold on|off
@@ -121,13 +130,16 @@ export async function startTUI(agent, opts = {}) {
     _historyLoaded: 0, // messages loaded from the TAIL of _fullHistory
     _historyTotal: 0, // total messages in the restored session
     _hasOlder: false, // more earlier messages remain unloaded
-    _agent: null, // §19.6 D-P1 面板镜像挂载点：startTUI 装配时置 agent 引用——subagent-blocks
-    // syncPanelSnapshot 经此写 agent._panelSnapshot（块级状态变更即刷——subagent
-    // action:"panel" 读——模型可查面板视图 + 门控补发冻结）。headless/VS Code 无此
-    // 挂载 = 无镜像 → panel 动作恒降级池视图（CLI-only 完整能力——AC-P4）。
+    _linesChars: 0, // TUI-OOM-ROOTCAUSE（§15.3.2）：state.lines 全部行与载体文本总量（字符账——唯一新增状态位）
+    _agent: null, // TUI state → agent 回指挂载点：startTUI 装配时置 agent 引用——
+    // ① SYNC-CANCEL ⏹ 门控读 state._agent._syncChildAborts（subagent-panel.mjs，2026-09-09）；
+    // ② CLI-ACTIVITY-DEBLOAT F-3（2026-09-10）：agent._tuiState = state 反向挂载——
+    // action:"panel" 经 ctx.state（= agent._tuiState）**读时现算**面板块（computePanelBlocks
+    // ——subTasks 活值纯推导——单账本）。headless/VS Code 无此装配 = 无面板 → panel 动作
+    // 恒降级池视图（CLI-only 完整能力——AC-P4）。
   }
   state._agent = agent
-  agent._panelSnapshot = [] // 镜像初始态 = 空面板（非"无镜像"——[] 与 undefined 区分）
+  agent._tuiState = state // F-3：面板视图现算通道（替代退役的手工面板镜像）
 
   // On session restore, if all tasks are completed, auto-collapse the todo panel (match runtime behavior)
   if (state.tasks.length > 0 && state.tasks.every((t) => t.status === "done")) {
@@ -160,6 +172,10 @@ export async function startTUI(agent, opts = {}) {
       let text = mousePending + utf8Decoder.decode(chunk, { stream: true })
       mousePending = ""
 
+    // 第 33 批（TUI §14.3(e) 鼠标点）：stdin 数据到达即用户在场 ⇒ 清 attention 位
+    // （单点覆盖下方滚轮分支与 onMouseClick；键盘入口在 key-handler）。
+    clearAttention(state, render)
+
     // Bracketed paste: terminal wraps pasted text in \x1b[200~ ... \x1b[201~
     // Route pasted content to the active text target (question answer / input box) in one shot,
     // avoiding slow char-by-char keypress render — see insertPastedText in clipboard.mjs
@@ -209,6 +225,10 @@ export async function startTUI(agent, opts = {}) {
     for (const m of text.matchAll(/\x1b\[<(\d+);(\d+);(\d+)([Mm])/g)) {
       const button = Number(m[1])
       if (button === 64 || button === 65) {
+        // F-3 sane-gate ③（RESIZE-MOUSE-LEAK-FIX）：越界 wheel 禁止会话滚动——handleWheel
+        // 对越界返回未消费会穿到 fallback 滚动（mouse.mjs 内 gate 覆盖不到此路径）
+        const dims = state.dims ? state.dims.get() : { cols: process.stdout.columns || 80, rows: process.stdout.rows || 24 }
+        if (mouseOob(Number(m[2]), Number(m[3]), dims)) continue
         const consumed = handleWheel(mouseCtx(), button, Number(m[2]), Number(m[3]))
         if (!consumed) {
           if (button === 64) {
@@ -260,7 +280,11 @@ export async function startTUI(agent, opts = {}) {
   process.on("exit", cleanup)
 
   const pushLine = (text, color, kind) => {
-    state.lines.push({ text, color, _kind: kind })
+    // TUI-OOM-ROOTCAUSE（TUI.md §15.3.1/§15.3.3）：行额度单点——行文本过 capLine
+    // （LINE_MAX_CHARS——单行巨内容/无换行巨 chunk 的堵口）+ 总量账 + 预算对账。
+    const line = { text: capLine(text), color, _kind: kind }
+    state.lines.push(line)
+    accountLine(state, line)
     if (state.lines.length > 5000) {
       state.lines.splice(0, 1000)
       state.lines.unshift({ text: `... [earlier messages trimmed — ${state.lines.length} lines remaining]`, color: C.dim })
@@ -268,14 +292,24 @@ export async function startTUI(agent, opts = {}) {
       // 流位置）——不校正则池空补发冻结（freezeSubTaskLines splice）落点漂移；校正量
       // = 净位移（裁 1000 补 1 标记行 → −999，code review round1 #3）。
       shiftFreezeAnchors(state, 1000)
+      accountAll(state) // 行对象集合已变（splice/unshift 直写）——直算重对账
     }
+    syncLineBudget(state, { onTrim: (st, n) => shiftFreezeAnchors(st, n) })
     render()
   }
 
   /** Message block label: blank line + label line. Breathing space between user/assistant messages */
   const pushLabel = (text, color) => {
-    if (state.lines.length > 0) state.lines.push({ text: "", color: C.dim })
-    state.lines.push({ text, color })
+    // 行额度同 pushLine（§15.3.1——恢复行/标签行同口径）
+    if (state.lines.length > 0) {
+      const blank = { text: "", color: C.dim }
+      state.lines.push(blank)
+      accountLine(state, blank)
+    }
+    const line = { text: capLine(text), color }
+    state.lines.push(line)
+    accountLine(state, line)
+    syncLineBudget(state, { onTrim: (st, n) => shiftFreezeAnchors(st, n) })
     render()
   }
 
@@ -300,6 +334,13 @@ export async function startTUI(agent, opts = {}) {
   // 声明在此（render 已可用）——data 回调（滚轮分支）与 createKeyHandler ctx（PgUp）共用。
   const loadOlder = createLoadOlder({ agent, state, render })
 
+  // TUI-OOM-ROOTCAUSE（CRASH-REPORTS.md §8.3 订阅接线）：堆预警行入对话流（pushLine 已 render）——
+  // 不新增 TUI 定时器（采样定时器住 heap-watch 模块，bin 入口武装）；订阅失败不影响启动。
+  try {
+    const { onHeapWarn } = await import("../heap-watch.mjs")
+    onHeapWarn((line) => pushLine(line, C.warn))
+  } catch { /* 尽力面 */ }
+
   // Resize events are genuine dimension changes on every terminal (2026-08-31
   // simplification: the earlier settle-timer/double-confirm machinery was built
   // on the misdiagnosed ConPTY-stale hypothesis and even stalled drag-shrink).
@@ -314,6 +355,14 @@ export async function startTUI(agent, opts = {}) {
   async function submit() {
     const text = state.input.join("").trim()
     if (!text) return
+    // INPUT-LOCK 防御（C'——2026-09-09）+ INPUT-LOCK-BEHAVIOR-REVISED（2026-09-09——白名单
+    // 已删——busy 全拒）：提交吞的门禁在 key-handler（busy Enter 已吞 + 提示，文本保留）——
+    // submit 只在非 busy 期达此；防御直呼/上游改动：busy 期拒绝（不清输入框不吞内容）。
+    if (state.processing) {
+      pushLine(`[主会话处理中 —— 消息未发送（回合结束后请重按 Enter）]`, C.warn)
+      render()
+      return
+    }
     state.input = []
     state.cursor = 0
     const wasInHistory = state.historyIndex !== -1
@@ -323,37 +372,14 @@ export async function startTUI(agent, opts = {}) {
     state.scroll = 0
     state._followTail = true // 2026-08-31 会诊 deepseek：新消息恢复跟随（注释曾承诺、实现缺漏）
 
-    // Slash commands: handled locally, don't enter agent loop
+    // Slash commands: handled locally, don't enter agent loop. busy 期提交在 key-handler
+    // 门禁被吞（白名单已删——斜杠同吞——INPUT-LOCK-BEHAVIOR-REVISED）——submit 仅非 busy 期可达。
     if (text.startsWith("/")) {
-      if (state.processing) {
-        // While processing: allowlisted commands execute directly (they only touch
-        // local TUI/agent config, never the in-flight turn); the rest are queued
-        const cmd0 = text.split(/\s+/)[0].toLowerCase()
-        const resolved0 = SLASH_ALIASES[cmd0] ?? cmd0
-        const safeDuringProcessing = new Set(["/help", "/exit", "/model", "/submodel", "/shell", "/think", "/config", "/skills", "/mcp", "/goal", "/session"])
-        if (safeDuringProcessing.has(resolved0)) {
-          await handleSlash(text)
-          render()
-        } else {
-          state.queue.push({ text })
-          render()
-        }
-        return
-      }
       await handleSlash(text)
       render()
       return
     }
 
-    // While processing: queue for later, don't execute immediately.
-    // The queue panel (renderQueue) already shows pending items — don't also
-    // push to the conversation area, or the text scrolls up with streaming tokens.
-    if (state.processing) {
-      state.queue.push({ text })
-      render()
-      return
-    }
-
     await turn(text)
   }
 
@@ -437,6 +463,9 @@ export async function startTUI(agent, opts = {}) {
   await promptProviderIfInvalid(agent, () => openModelPicker(), pushLine)
 
   showStartup({ agent, state, opts, pushLine, pushLabel, render, startWizard })
+  // LEDGER-SURFACE（§2.30.3.4）：台账可见面——首扫（setImmediate）+ 周期；dispose 挂进程退出（:278 cleanup 先例）
+  const ledgerSurface = startLedgerSurface({ state, agent, pushLine, render })
+  process.on("exit", () => ledgerSurface.dispose())
   backgroundIndex({ agent, state, render })
 
   // Check for updates (non-blocking, after startup screen)——实现 update-notice.mjs

package/src/tui/key-handler-search.mjs

@@ -1,20 +1,28 @@
-/** Perform search on state.lines, update state.search.matches and clamp index */
+/** Perform search on state.lines, update state.search.matches and clamp index
+ *  TUI-OOM-ROOTCAUSE（TUI.md §15.3.1 SEARCH_MATCH_CAP）：匹配计数上限——超限截断 +
+ *  `state.search.capped` 提示标志（渲染面提示行；次要无界面）。
+ */
+import { SEARCH_MATCH_CAP } from "./display-budget.mjs"
+
 export function performSearch(state) {
   if (!state.search) return
   const query = state.search.query.toLowerCase()
   state.search.matches = []
+  state.search.capped = false
   // Clear old highlights
   state.lines.forEach(l => delete l._searchMatches)
 
   if (!query) { state.search.index = 0; return }
 
   state.lines.forEach((line, lineIndex) => {
+    if (state.search.matches.length >= SEARCH_MATCH_CAP) { state.search.capped = true; return }
     const text = (line.text || "").toLowerCase()
     let charIndex = text.indexOf(query)
     if (charIndex !== -1) {
       line._searchMatches = []
     }
     while (charIndex !== -1) {
+      if (state.search.matches.length >= SEARCH_MATCH_CAP) { state.search.capped = true; break }
       state.search.matches.push({ lineIndex, charIndex })
       line._searchMatches.push(charIndex)
       charIndex = text.indexOf(query, charIndex + 1)

package/src/tui/key-handler.mjs

@@ -1,10 +1,22 @@
 import { ansi, C } from "./ansi.mjs"
 import { readClipboardText, insertPastedText } from "./clipboard.mjs"
-import { computeLayout } from "./layout.mjs"
+import { computeLayout, inputContentWidth } from "./layout.mjs"
+import { moveCursorVertical } from "./render.mjs"
 import { handleSearchKey } from "./key-handler-search.mjs"
 import { countConvLines } from "./render-conversation.mjs"
 import { handlePermissionMode, handleQuestionMode, handleInterruptMode } from "./key-modes.mjs"
 
+/** 第 33 批（TUI §14.3(e)——attention 清位）：输入即在场——仅当原值为真时置假 + `render()`
+ *  （已假则零副作用、零重绘）。键盘入口与本文件（`onKeypress`）与鼠标输入路径（index.mjs
+ *  stdin data 处理器）两点共用；blocked 两态无需清位（实时派生）。
+ *  @returns {boolean} 本次是否发生清位 */
+export function clearAttention(state, render) {
+  if (!state.attentionAwaiting) return false
+  state.attentionAwaiting = false
+  render()
+  return true
+}
+
 /** Current conversation max scroll offset (display lines beyond the visible panel). */
 export function convMaxScroll(state) {
   const d = state.dims ? state.dims.get() : {} // Single source (ConPTY instability, 2026-08-30) — cached dims
@@ -24,6 +36,9 @@ export function createKeyHandler(ctx) {
   const { agent, state, render, popPicker, renderPickerLines, handleSlash, handleTab, submit, pasteClipboardImage, wizardChooseProvider, wizardSubmitText, cancelWizard, wizardProviderItems, renderWizard, pushLine, cleanup, showPicker, loadOlder } = ctx
 
   return function onKeypress(str, key = {}) {
+    // 第 33 批（TUI §14.3(e) 键盘点）：模态分派**之前**——任意按键 = 用户在场 ⇒ 清 attention
+    // 位（仅复位呈现态字段，按键语义 / 模态判定 / busy 门禁零改）。
+    clearAttention(state, render)
     // permission confirm: y/n/a (a = approve + AUTO ON); batch (§16 D-B1): a/o/n (Esc = deny)
     // ——模态实现 key-modes.mjs handlePermissionMode（2026-09-03 D-S4）
     if (handlePermissionMode(str, key, { state, agent, pushLine, render })) return
@@ -59,12 +74,13 @@ export function createKeyHandler(ctx) {
           state.suspended
         if (hasStopTarget) {
           // 当前回合平 abort（无 interrupt——命中 agent.mjs 回合收尾清池分支——全停）
-          if (state.processing && state.controller) state.controller.abort()
+          // §20.3 站点 #11（第 24 批）：整批 / 会话级停 = stop（reason 载荷）
+          if (state.processing && state.controller) state.controller.abort({ abortTrigger: "stop", abortDetail: "session-stop" })
           // 会话 abort 集合 = 链条内全部 controller（含 Ctrl+I/ContinueError 重建的旧
           // controller——children 不逃逸，round1 偏差 #3）。挂起态才标记 _suspAborted +
           // 唤醒 driver（driver 收尾清池）——非挂起语境置位会粘滞阻塞未来挂起会话重入
           // （round2 偏差 #1 语义）。
-          for (const c of agent._sessionAbortAll ?? (agent._sessionAbort ? [agent._sessionAbort] : [])) c?.abort()
+          for (const c of agent._sessionAbortAll ?? (agent._sessionAbort ? [agent._sessionAbort] : [])) c?.abort({ abortTrigger: "stop", abortDetail: "session-stop" })
           if (state.suspended) {
             state._suspAborted = true
             state._suspWake?.()
@@ -159,7 +175,8 @@ export function createKeyHandler(ctx) {
     // Ctrl+I (or Tab during processing): interrupt and inject a message
     if ((key.ctrl && !key.alt && key.name === "i") || (key.name === "tab" && state.processing && !state.interruptPrompt)) {
       if (state.processing && state.controller && !state.interruptPrompt) {
-        state.interruptPrompt = { text: "" }
+        // 注入框状态模型（第 31 批——TUI-INPUT-BOX.md §1 不变量 9）：{ chars, cursor }，空态 = { chars: [], cursor: 0 }
+        state.interruptPrompt = { chars: [], cursor: 0 }
         render()
       }
       return
@@ -263,17 +280,19 @@ export function createKeyHandler(ctx) {
     }
 
     if (state.processing) {
-      // during processing, allow input (queued), but block arrow-key history and Tab completion
-      if (key.name === "tab" || key.name === "up" || key.name === "down") return
-      // Ctrl+D: remove last item from queue
-      if (key.ctrl && key.name === "d") {
-        if (state.queue.length > 0) {
-          state.queue.pop()
-          render()
-        }
+      // busy 门禁（INPUT-LOCK C'——2026-09-09 + INPUT-LOCK-BEHAVIOR-REVISED——2026-09-09）：
+      // processing（含 digest——单一判据）输入不禁——吞提交不吞字符（打字照常回显）；Enter
+      // 提交吞 + busy 提示——斜杠同禁发（白名单已删——/exit 也发不出——退出靠 Ctrl+C 终端
+      // 层通道——门禁前不误伤）；空 Enter 静默（text 非空才吞）；多行换行
+      // （meta/enter——编辑）照常放行。**第 31 批**：↑↓ 不再在此全屏蔽——分流下沉到下方
+      // 三规则块（竖移放行 / 历史导航禁；TUI-INPUT-BOX.md §3）；Tab 仍吞（死条件在案——原样保留）。
+      if (key.name === "tab") return
+      const isSend = (key.name === "return" && !key.meta) || (str === "\r" && !key.meta)
+      if (isSend && state.input.join("").trim()) {
+        pushLine(`[主会话处理中 —— 消息未发送（回合结束后请重按 Enter）]`, C.warn)
+        render()
         return
       }
-      // remaining printable characters go into input box normally
     }
 
     // Tab: slash-command completion (cycle candidates); other input ignored (\t would blow up input box, never inserted directly)
@@ -291,7 +310,24 @@ export function createKeyHandler(ctx) {
       return
     }
 
-    // input history
+    // ↑/↓ 三规则（TUI-INPUT-BOX.md §3——第 31 批）：① 翻历史中恒历史（多行条目不竖移）
+    // ② 竖移优先（可视行口径——折行与 \n 同权；显示列保持 + 短行端钳制）③ 边界回落历史（↑）
+    // ／无动作（↓）。processing 期：竖移放行（纯编辑——与字符/退格/←→ 同权）、历史导航禁
+    // （规则 ①/③ 的历史分支吞——不进入、不切换）。
+    if (key.name === "up" || key.name === "down") {
+      if (state.historyIndex === -1) { // 规则 ① 优先——翻历史中不竖移
+        const cols = (state.dims?.get() ?? {}).cols ?? (process.stdout.columns || 80)
+        const next = moveCursorVertical(state.input, state.cursor, inputContentWidth(cols), key.name)
+        if (next !== null) {
+          state.cursor = next // 规则 ②：竖移（草稿/历史指针零涉——D-31.6）
+          render()
+          return
+        }
+      }
+      if (state.processing) return // 规则 ①/③ 的历史分支吞——processing 期历史导航禁
+    }
+
+    // input history（规则 ① 恒历史 + 规则 ③ 边界回落——历史语义零改）
     if (key.name === "up") {
       if (state.history.length) {
         // Save current input as draft when entering history mode (historyIndex === -1).
@@ -372,15 +408,23 @@ export function createKeyHandler(ctx) {
         render()
       } else {
         const text = state.input.join("").trim()
-        // §17 D-S5/F3/F7 + 偏差 #1：挂起态（suspended 或释放窗口 _suspPending）Enter =
-        // 新回合输入（非打断）——入 pendingInput 由挂起会话调度；输入框零干扰（F3）。
+        // §17 D-S5/F3/F7 + 偏差 #1 + INPUT-LOCK 单槽化（F-6——2026-09-09）：挂起态
+        // （suspended 或释放窗口 _suspPending）Enter = 新回合输入（非打断）——填
+        // pendingInput 单槽（至多一条待交接——busy 提交吞在 L265 门禁先拦，digest 期
+        // 不会到这——仅挂起空闲/释放窗口触达）由挂起会话调度；输入框零干扰（F3）。
+        // 槽满（竞态防御——不覆盖不丢失）→ 吞 + 提示，文本保留在输入框。
         if ((state.suspended || state._suspPending) && text && !text.startsWith("/")) {
+          state.pendingInput ??= []
+          if (state.pendingInput.length > 0) {
+            pushLine(`[主会话处理中 —— 已有一条消息待发送，请等其处理完成后再发送]`, C.warn)
+            render()
+            return
+          }
           state.input = []
           state.cursor = 0
           state.history.push(text)
           state.historyIndex = -1
           state._draft = null
-          state.pendingInput ??= []
           state.pendingInput.push(text)
           state._suspWake?.()
           render()