thincoder 0.12.54 → 0.12.59

package/src/tui/index.mjs

@@ -14,6 +14,8 @@
  *   config-helpers.mjs — persistRaw / syncProviderField / maskKey
  *   clipboard.mjs     — clipboard image paste
  *   distill-cmd.mjs   — /distill command
+ *   mouse.mjs         — SGR mouse parsing + dispatch assembly (createMouseDispatch)
+ *   update-notice.mjs — background update notice + startup check
  */
 
 import { emitKeypressEvents } from "node:readline"
@@ -30,22 +32,30 @@ 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, handleMouseClick, handleWheel } from "./mouse.mjs"
+import { parseMouseClicks, handleWheel, createMouseDispatch } from "./mouse.mjs"
 import { runAgentTurn } from "./agent-turn.mjs"
 import { createKeyHandler, convMaxScroll } from "./key-handler.mjs"
-import { showStartup, backgroundIndex, historyToLines, HISTORY_PAGE_MESSAGES } from "./startup.mjs"
-import { countConvLines } from "./render-conversation.mjs"
+import { showStartup, backgroundIndex, createLoadOlder } from "./startup.mjs"
+import { shiftFreezeAnchors } from "./subagent-blocks.mjs"
 import { createConfigHelpers } from "./config-helpers.mjs"
+import { createUpdateNotice, pendingNoticeReady } from "./update-notice.mjs"
 
-/** 升级失败提示文案：附 npm 输出尾部（最多 3 行），方便定位失败原因。 */
-export function upgradeFailureText(code, output) {
-  const tail = (output ?? "").trimEnd().split("\n").slice(-3).join("\n")
-  return `✗ Upgrade failed (exit ${code}). Run \`thincoder upgrade\` manually.${tail ? `\n${tail}` : ""}`
-}
+export { upgradeFailureText, pendingNoticeReady } from "./update-notice.mjs"
 
-/** 后台更新提示可弹出的条件：无任何交互弹层（picker/permission/question）激活。 */
-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
 }
 
 /**
@@ -96,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 } } — 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（冻结锚点） } } — 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
     currentTool: null, // currently executing tool name (shown in status bar)
     processingStarted: 0, // current turn start time (status bar timer)
     status: "Ready",
@@ -111,7 +121,13 @@ 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）。
   }
+  state._agent = agent
+  agent._panelSnapshot = [] // 镜像初始态 = 空面板（非"无镜像"——[] 与 undefined 区分）
 
   // 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")) {
@@ -137,38 +153,6 @@ export async function startTUI(agent, opts = {}) {
   let pasteMode = false
   let pasteAccum = ""
 
-  /** 懒加载更早历史（2026-08-31 用户约定："滚动到头自动加载"——滚轮/PgUp 到顶皆触发；
-   *  2026-08-31 前只挂 PgUp 键 = 违约，滚轮到头无反应）。加载后滚动补偿保持锚定。
-   *  外层作用域：data 回调（滚轮分支）与 createKeyHandler ctx（PgUp 分支）共用。 */
-  const loadOlder = () => {
-    if (!state._hasOlder) return
-    const full = agent._fullHistory ?? []
-    const loaded = state._historyLoaded
-    const start = Math.max(0, full.length - loaded - HISTORY_PAGE_MESSAGES)
-    const end = full.length - loaded
-    if (start >= end) return
-
-    const d = state.dims ? state.dims.get() : {}
-    const cols = d.cols ?? ((state.dims?.get() ?? {}).cols ?? (process.stdout.columns || 80))
-    const before = countConvLines(state, cols, d.rows ?? (process.stdout.rows || 24))
-
-    if (state.lines[0]?.text?.startsWith("… ")) state.lines.shift()
-    state._lineIdCounter = state._lineIdCounter ?? 0
-    const older = historyToLines(full, start, end)
-    for (const l of older) l._lineId = ++state._lineIdCounter
-    state.lines.unshift(...older)
-    state._historyLoaded += end - start
-    state._hasOlder = start > 0
-    if (state._hasOlder) {
-      state.lines.unshift({ text: `… ${start} more earlier messages (scroll to top to load)`, color: C.dim })
-    }
-
-    const after = countConvLines(state, cols, (state.dims?.get() ?? {}).rows ?? (process.stdout.rows || 24))
-    state.scroll += Math.max(0, after - before)
-    render()
-  }
-
-
   process.stdin.on("data", (chunk) => {
     try {
 
@@ -221,7 +205,6 @@ 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 双线分隔）
     for (const m of text.matchAll(/\x1b\[<(\d+);(\d+);(\d+)([Mm])/g)) {
       const button = Number(m[1])
       if (button === 64 || button === 65) {
@@ -251,9 +234,7 @@ 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 双线分隔）
     text = text.replace(/\x1b\[<\d+;\d+;\d+[Mm]/g, "")
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     const tail = text.match(/\x1b\[<[\d;]*$/)
     if (tail) {
       mousePending = tail[0]
@@ -282,6 +263,10 @@ export async function startTUI(agent, opts = {}) {
     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 })
+      // 2026-09-03 修复轮（冻结锚点）：头裁对在途 settled 锚点整体前移（锚点是绝对
+      // 流位置）——不校正则池空补发冻结（freezeSubTaskLines splice）落点漂移；校正量
+      // = 净位移（裁 1000 补 1 标记行 → −999，code review round1 #3）。
+      shiftFreezeAnchors(state, 1000)
     }
     render()
   }
@@ -310,6 +295,10 @@ export async function startTUI(agent, opts = {}) {
     pushLine)
   const { render, scheduleRender } = renderLoop
 
+  // 懒加载更早历史（startup.mjs createLoadOlder——D-S1b）：滚轮/PgUp 到顶自动加载；
+  // 声明在此（render 已可用）——data 回调（滚轮分支）与 createKeyHandler ctx（PgUp）共用。
+  const loadOlder = createLoadOlder({ agent, state, render })
+
   // 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).
@@ -368,7 +357,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,
   })
 
@@ -378,7 +367,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 },
   }
@@ -437,58 +426,23 @@ export async function startTUI(agent, opts = {}) {
     }
   })
 
-  // Mouse clicks (SGR \x1b[<0;col;rowM) — picker selection + fold expansion.
-  const onMouseClick = (col, row) => handleMouseClick({ state, render, popPicker }, col, row)
-  const mouseCtx = () => ({ state, render })
+  // 鼠标点击/滚轮 ctx 装配（mouse.mjs createMouseDispatch——D-S1a：cancelSubagent/onMouseClick/mouseCtx）
+  const { onMouseClick, mouseCtx } = createMouseDispatch({ agent, state, pushLine, render, popPicker })
 
   // ---------------------------------------------------------- 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 })
 
-  // Check for updates (non-blocking, after startup screen)
-  // 有 picker 打开时不硬抢：挂到 state.pendingNotice，picker 全部关闭后由 doRender 弹出
-  const showUpdateNotice = async (result) => {
-    const sel = await showPicker(`Update available: ${result.local} → ${result.latest}`, [
-      { type: "header", text: `thincoder ${result.latest} is available (current: ${result.local})` },
-      { type: "item", text: "Upgrade now", action: "upgrade" },
-      { type: "item", text: "Later", action: "later" },
-    ])
-    if (sel?.action !== "upgrade") return
-    pushLabel(`❯ Upgrade`, ansi.bold + C.tool)
-    pushLine(`Upgrading to ${result.latest}...`, C.tool)
-    const { exec } = await import("node:child_process")
-    const cp = exec("npm install -g thincoder@latest", { windowsHide: true })
-    let stdout = ""
-    cp.stdout?.on("data", (d) => { stdout += d })
-    cp.stderr?.on("data", (d) => { stdout += d })
-    cp.on("close", (code) => {
-      if (code === 0) {
-        pushLine(`✓ Upgraded to ${result.latest}. Restart to apply.`, C.tool)
-      } else {
-        pushLine(upgradeFailureText(code, stdout), C.error)
-      }
-      render()
-    })
-  }
-  ;(async () => {
-    try {
-      const { readFileSync } = await import("node:fs")
-      const pkg = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url), "utf8"))
-      const { checkForUpdate } = await import("../upgrade.mjs")
-      const result = await checkForUpdate(pkg.version)
-      if (result?.newer) {
-        // Defer: if wizard is still active, just show a dim line
-        if (state.wizard) {
-          pushLine(`Tip: thincoder ${result.latest} is available (run /upgrade later or restart)`, C.dim)
-          render()
-        } else {
-          state.pendingNotice = result
-          render()
-        }
-      }
-    } catch { /* network error or timeout — silently skip */ }
-  })()
+  // Check for updates (non-blocking, after startup screen)——实现 update-notice.mjs
+  // （D-S1c）：有 picker 打开时不硬抢——挂到 state.pendingNotice，picker 全部关闭后由
+  // doRender 弹出（showUpdateNotice 经 renderLoop ctx getter 懒引用）。
+  const { showUpdateNotice, checkUpdates } = createUpdateNotice({ state, showPicker, pushLine, pushLabel, render })
+  checkUpdates()
 }
 
 function summarize(obj) {

package/src/tui/interaction.mjs

@@ -42,7 +42,16 @@ export function createInteraction(ctx) {
     }
     if (base === "delete") return [`${args.path}${args.force ? " (force: also delete tracked files)" : ""}`]
     if (base === "subagent") return cap(args.task ?? "", 500).split("\n")
-    if (base === "memory_put") return [`[${args.type ?? ""}] ${args.title ?? ""}`, ...cap(args.content ?? "", 500).split("\n")]
+    if (base === "memory") {
+      // §6 action-routed preview (D-M5): put shows content, batch delete/clear show gate args
+      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}`]
+      return [cap(summarize(args), 300)]
+    }
     return [cap(summarize(args), 300)]
   }
 
@@ -62,6 +71,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
@@ -71,10 +107,12 @@ export function createInteraction(ctx) {
     }
     if (!options.length) {
       // free text: open input mode for user typing, Enter to submit
+      // q.cursor 装配（TUI-INPUT-BOX.md §7.2/§7.5 #10b）：answer 存 codepoint 数组（同
+      // state.input 语义——emoji 不劈半），进入自由文本态即 cursor = answer.length（= 0）。
       pushLabel(`❯ Question`, ansi.bold + C.tool)
       for (const line of text.split("\n")) pushLine(`  ${line}`, C.text)
       return new Promise((resolve) => {
-        state.question = { text, options: [], resolve }
+        state.question = { text, options: [], answer: [], cursor: 0, resolve }
         state.status = "Waiting for answer..."
         render()
       })
@@ -91,5 +129,5 @@ export function createInteraction(ctx) {
     })
   }
 
-  return { askPermission, askQuestion, formatPermission }
+  return { askPermission, askQuestion, formatPermission, askBatchPermission }
 }

package/src/tui/key-handler.mjs

@@ -3,12 +3,11 @@ import { readClipboardText, insertPastedText } from "./clipboard.mjs"
 import { computeLayout } from "./layout.mjs"
 import { handleSearchKey } from "./key-handler-search.mjs"
 import { countConvLines } from "./render-conversation.mjs"
-import { QUESTION_CUSTOM } from "./interaction.mjs"
+import { handlePermissionMode, handleQuestionMode, handleInterruptMode } from "./key-modes.mjs"
 
 /** Current conversation max scroll offset (display lines beyond the visible panel). */
 export function convMaxScroll(state) {
-  // Single source (Windows ConPTY instability, 2026-08-30) — cached dims.
-  const d = state.dims ? state.dims.get() : {}
+  const d = state.dims ? state.dims.get() : {} // Single source (ConPTY instability, 2026-08-30) — cached dims
   const cols = d.cols ?? ((state.dims?.get() ?? {}).cols ?? (process.stdout.columns || 80))
   const rows = d.rows ?? (process.stdout.rows || 24)
   const layout = computeLayout(state, { cols, rows })
@@ -25,119 +24,99 @@ 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 = {}) {
-    // permission confirm state: y approve / n deny / a approve + turn ON AUTO (no further prompts)
-    if (state.permission) {
-      const answer = (str || "").toLowerCase()
-      const isContinue = state.permission.name === "continue"
-      const validKeys = isContinue ? ["y", "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 (answer === "a" && !isContinue) {
-          agent.autoApprove = true
-          agent._pendingReminders = agent._pendingReminders ?? []
-          agent._pendingReminders.push("[System reminder: AUTO mode is now ON. All tool calls are automatically approved. Use /auto to disable.]")
-          pushLine(`  [auto] AUTO ON: tool calls no longer prompt for approval (/auto to disable)`, C.warn)
-        }
-        const approved = answer === "y" || (answer === "a" && !isContinue)
-        // leave trail: record approval/denial in conversation (continue prompt has its own output, don't duplicate)
-        if (!isContinue) {
-          pushLine(`  [${approved ? "approved" : "denied"}] ${name}`, approved ? C.dim : C.error)
-        }
-        resolve(approved)
-        render()
-      }
-      return
-    }
+    // 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
 
-    // question tool callback: free text / option selection
-    if (state.question) {
-      const q = state.question
-      if (q.options.length > 0) {
-        // options mode: ↑↓ select, Enter confirm, Esc cancel
-        if (key.name === "escape") {
-          q.resolve("")
-          state.question = null
-          state.status = "Processing..."
-          render()
-        } else if (key.name === "up") {
-          q.selected = Math.max(0, (q.selected ?? 0) - 1)
-          render()
-        } else if (key.name === "down") {
-          q.selected = Math.min(q.options.length - 1, (q.selected ?? 0) + 1)
-          render()
-        } else if (key.name === "return") {
-          const answer = q.options[q.selected ?? 0]
-          if (answer === QUESTION_CUSTOM) {
-            // Switch to free-text mode — the user wants to type their own answer.
-            q.options = []
-            q.answer = ""
-            q.selected = undefined
-            state.status = "Waiting for answer..."
-            render()
-            return
-          }
-          q.resolve(answer)
-          state.question = null
-          state.status = "Processing..."
-          pushLine(`  → ${answer}`, C.tool)
-          render()
-        }
-      } else {
-        // free text: type answer, Enter submit, Esc cancel
-        if (key.name === "escape") {
-          q.resolve("")
-          state.question = null
-          state.status = "Processing..."
-          render()
-        } else if (key.name === "return") {
-          if (q._pasting) return // block Enter while paste is in flight
-          const answer = (q.answer ?? "").trim()
-          q.resolve(answer || "")
-          state.question = null
-          state.status = "Processing..."
-          pushLine(`  → ${answer || "(empty)"}`, C.tool)
-          render()
-        } else if (key.name === "backspace") {
-          q.answer = (q.answer ?? "").slice(0, -1)
-          render()
-        } else if (key.ctrl && !key.alt && key.name === "v") {
-          // Ctrl+V paste: read clipboard text (fires when the terminal passes Ctrl+V through
-          // as a key event; bracketed-paste terminals are handled upstream in the stdin handler)
-          if (q._pasting) return
-          q._pasting = true
-          readClipboardText().then((text) => {
-            q._pasting = false
-            if (text) {
-              insertPastedText(state, text)
-              render()
-            }
-          }).catch((e) => {
-            q._pasting = false
-            console.error(`[tui] clipboard paste failed: ${e.message}`)
-          })
-        } else if (str && !key.ctrl && !key.meta) {
-          q.answer = (q.answer ?? "") + str
-          render()
-        }
-      }
-      return
-    }
+    // question tool callback: free text / option selection——模态实现
+    // key-modes.mjs handleQuestionMode（D-S4）
+    if (handleQuestionMode(str, key, { state, pushLine, render })) return
 
     // Search mode: Ctrl+F to enter, Ctrl+N/Ctrl+P (or Ctrl+G/Ctrl+R) navigate, Esc exit
     if (handleSearchKey(str, key, state, render)) return
 
-  if (key.ctrl && key.name === "c") {
+    if (key.ctrl && key.name === "c") {
       // picker 打开时 Ctrl+C = 取消当前 picker（等同 Esc），不杀进程
       if (state.picker) {
         popPicker(null)
         return
       }
+      // §17.6（2026-09-03）：武装窗口内第二次 Ctrl+C = 显式全停（D-C4 /abort 语义）。
+      // 在状态路由前检查（picker 取消分支例外——picker 打开时 Ctrl+C 语义 = 取消
+      // picker，武装让位；场景极窄——3s 窗口内需另有 picker 被打开）——两次按下之间
+      // 状态会迁移（首按停回合 → 释放窗口/挂起会话启动），武装必须跨态桥接：只查挂起
+      // 分支会让非挂起 processing 首按后的二按落入空闲退出分支（三按误退出应用）。
+      if (state.suspAbortArmed) {
+        if (ctx.suspArmTimer) clearTimeout(ctx.suspArmTimer)
+        state.suspAbortArmed = false
+        // 无可停目标（无 processing 回合 / 无会话 abort 集合 / 未挂起）时不吞键：
+        // 首按停的是普通回合（无后台池）——二按落回下方空闲退出分支（exitArmed 双
+        // 确认），不打印误导性的 "[Aborting background subagents…]"（advisor round1
+        // 🟡——停回合后连按退出的第二次按下被空转吞掉 → 退出从 3 按变 4 按）。
+        const hasStopTarget = (state.processing && state.controller) ||
+          (agent._sessionAbortAll?.length ?? 0) > 0 ||
+          (agent._sessionAbort != null && !agent._sessionAbort.signal.aborted) ||
+          state.suspended
+        if (hasStopTarget) {
+          // 当前回合平 abort（无 interrupt——命中 agent.mjs 回合收尾清池分支——全停）
+          if (state.processing && state.controller) state.controller.abort()
+          // 会话 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()
+          if (state.suspended) {
+            state._suspAborted = true
+            state._suspWake?.()
+          }
+          pushLine("[Aborting background subagents…]", C.warn)
+          render()
+          return
+        }
+        // 无目标可停 → 落空继续到下方分支（processing 已停 → 空闲态 exitArmed 双确认）
+      }
+      if (state.suspended) {
+        // §17 D-S9 + round2 偏差 #4（2026-09-02）+ §17.6 修订（2026-09-03）：挂起态
+        // Ctrl+C = 武装窗口两级中止——一次按键直接清池中止全部后台子代理的误触代价高
+        // （digest 刷屏时用户可能只想停住当前回合）；仿空闲态退出武装语义（同下方空闲态
+        // exitArmed 双确认分支）。§17.6 修订 ①：中止当前回合的 abort 带 interrupt
+        // （无 message）——此前平 abort 命中 agent.mjs 回合收尾清池分支（aborted &&
+        // !reason.interrupt → 无条件 _asyncSubagents.clear()），一次首按即误杀全部后台
+        // 子代理（2026-09-03 用户两次实测——提示"再按才杀"与实际"一次就全杀"不符）；
+        // interrupt 排除清池分支——会话与后台保留（agent-turn 区分：无 message 停回合
+        // 不续跑）：
+        //   ① 未武装 + 有回合在跑（digest 消化/会话内回合）：仅中止当前回合
+        //      （controller.abort({ interrupt: true })）——会话继续、后台子代理不受
+        //      影响，回挂起等待；
+        //   ② 未武装 + 纯挂起等待：仅提示不清池；
+        //   ③ 3s 武装窗口内再次 Ctrl+C：彻底中止——上方统一块（二按语义不变）。
+        if (state.processing && state.controller) {
+          state.controller.abort({ interrupt: true }) // ① 仅中止当前回合（digest/会话内回合），不碰后台池
+          pushLine("[stopped current turn — press Ctrl+C again within 3s to abort all background subagents]", C.warn)
+        } else {
+          const bgActive = [...(agent._asyncSubagents?.values() ?? [])].filter((e) => e.status === "running").length + (agent._asyncQueue?.length ?? 0)
+          pushLine(`[abort] Press Ctrl+C again within 3s to abort all background subagents (${bgActive} running)`, C.warn)
+        }
+        state.suspAbortArmed = true
+        if (ctx.suspArmTimer) clearTimeout(ctx.suspArmTimer)
+        ctx.suspArmTimer = setTimeout(() => { state.suspAbortArmed = false }, ctx.exitArmDelay ?? 3000)
+        ctx.suspArmTimer.unref?.()
+        render()
+        return
+      }
       if (state.processing && state.controller) {
-        state.controller.abort()
-        pushLine("[Aborting…]", C.warn)
+        // §17.6 D-C1（2026-09-03 紧急修复——processing 态曾无武装窗口，第一按直接平
+        // abort() → 命中 agent.mjs 回合收尾清池分支 → 一次 Ctrl+C 误杀全部后台子代理，
+        // 用户两次实测被坑）：首按 = interrupt 语义（无 message——停当前回合不续跑——
+        // interrupt 排除 agent.mjs 清池分支——后台池保留——agent-turn 区分不重建续跑）
+        // + 武装 3s（复用 suspArmTimer/exitArmDelay——与挂起态同构——过期自动复位）；
+        // 窗口内再按 = 上方统一块全停（平 abort → agent.mjs 清池）。
+        state.controller.abort({ interrupt: true })
+        pushLine("[stopped current turn — press Ctrl+C again within 3s to abort all background subagents]", C.warn)
+        state.suspAbortArmed = true
+        if (ctx.suspArmTimer) clearTimeout(ctx.suspArmTimer)
+        ctx.suspArmTimer = setTimeout(() => { state.suspAbortArmed = false }, ctx.exitArmDelay ?? 3000)
+        ctx.suspArmTimer.unref?.()
         render()
         return
       }
@@ -162,7 +141,7 @@ export function createKeyHandler(ctx) {
     // F1: 显示快捷键帮助
     if (key.name === "f1" && !state.picker && !state.permission && !state.question) {
       showPicker("Keyboard Shortcuts", [
-        { type: "item", text: "Ctrl+C — Cancel/Abort; idle: press twice to exit" },
+        { type: "item", text: "Ctrl+C — Cancel/Abort; first press stops the turn (or arms), twice within 3s stops all / exits" },
         { type: "item", text: "Ctrl+I — Interrupt and inject message" },
         { type: "item", text: "Ctrl+F — Search conversation history" },
         { type: "item", text: "Shift+Enter / Ctrl+J — Insert newline (multiline input)" },
@@ -186,34 +165,9 @@ export function createKeyHandler(ctx) {
       return
     }
 
-    // Interrupt prompt mode: type message, Enter to inject, Esc to cancel
-    if (state.interruptPrompt) {
-      if (key.name === "escape") {
-        state.interruptPrompt = null
-        render()
-      } else if (key.name === "return") {
-        const msg = (state.interruptPrompt.text ?? "").trim()
-        state.interruptPrompt = null
-        if (msg) {
-          // Guard: if the turn already finished while the user was typing, the controller
-          // may have been replaced or already aborted — don't abort a live turn by mistake.
-          if (state.processing && state.controller && !state.controller.signal.aborted) {
-            pushLine(`  [inject] ${msg}`, C.warn)
-            state.controller.abort({ interrupt: true, message: msg })
-          } else {
-            pushLine(`  [inject — turn ended, message queued] ${msg}`, C.dim)
-          }
-          render()
-        }
-      } else if (key.name === "backspace") {
-        state.interruptPrompt.text = state.interruptPrompt.text.slice(0, -1)
-        render()
-      } else if (str && !key.ctrl && !key.meta) {
-        state.interruptPrompt.text += str.replace(/[\r\n]+/g, "")
-        render()
-      }
-      return
-    }
+    // Interrupt prompt mode: type message, Enter to inject, Esc to cancel——模态实现
+    // key-modes.mjs handleInterruptMode（D-S4）
+    if (handleInterruptMode(str, key, { state, pushLine, render })) return
 
     // generic list picker: ↑↓/PgUp/PgDn/Home/End 导航，输入即过滤，Enter 选中，Esc 取消
     if (state.picker) {
@@ -255,7 +209,6 @@ 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 双线分隔）
         if (text && !/[\x00-\x1f\x7f]/.test(text)) applyFilter(p.filter + text)
       }
       return
@@ -411,19 +364,28 @@ export function createKeyHandler(ctx) {
       return
     }
     if (key.name === "return" || key.name === "enter" || str === "\r") {
-      // Multiline newline — three entry points (docs/design/TUI-INPUT-BOX.md §1.5):
-      //  1. Alt+Enter: readline parses \x1b\r as meta+return (all terminals)
-      //  2. Shift+Enter: keyboard-enhanced terminals send \x1b[13;2u / \x1b[27;2;13~,
-      //     translateShiftEnter maps them to \x1b\r → also meta+return
-      //  3. Ctrl+J: sends \n (0x0A), readline parses as name:"enter" — the universal
-      //     fallback: \n and \r are distinct bytes in EVERY terminal, no protocol needed
-      //     (legacy conhost users: Shift+Enter is a bare \r there, physically
-      //     indistinguishable from Enter — Ctrl+J is their newline key)
+      // Multiline newline (docs/design/TUI-INPUT-BOX.md §1.5): Alt+Enter / Shift+Enter
+      // (translateShiftEnter) / Ctrl+J — the universal no-protocol fallback.
       if ((key.name === "return" && key.meta) || key.name === "enter") {
         state.input.splice(state.cursor, 0, "\n")
         state.cursor++
         render()
       } else {
+        const text = state.input.join("").trim()
+        // §17 D-S5/F3/F7 + 偏差 #1：挂起态（suspended 或释放窗口 _suspPending）Enter =
+        // 新回合输入（非打断）——入 pendingInput 由挂起会话调度；输入框零干扰（F3）。
+        if ((state.suspended || state._suspPending) && text && !text.startsWith("/")) {
+          state.input = []
+          state.cursor = 0
+          state.history.push(text)
+          state.historyIndex = -1
+          state._draft = null
+          state.pendingInput ??= []
+          state.pendingInput.push(text)
+          state._suspWake?.()
+          render()
+          return
+        }
         submit().catch((e) => pushLine(`[error] ${e.message}`, C.error))
       }
       return