thincoder 0.12.61 → 0.12.63

package/src/tui/index.mjs

@@ -20,8 +20,8 @@
 
 import { emitKeypressEvents } from "node:readline"
 import { PassThrough } from "node:stream"
-import { saveSession } from "../session.mjs"
-import { closeAllMcp } from "../mcp.mjs"
+import { saveSession } from "@thincoder/core/session.mjs"
+import { closeAllMcp } from "@thincoder/core/mcp.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { createRenderLoop } from "./render-loop.mjs"
 import { makeDimsState } from "./dims.mjs"
@@ -37,17 +37,19 @@ import { runAgentTurn } from "./agent-turn.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"
 
 /**
- * SESSION.md §8 D-S2 — TUI 启动首帧前的 provider 重选流程：
+ * SESSION.md §6.8 D-S2 — TUI 启动首帧前的 provider 重选流程：
  * provider 无效（`_providerInvalid` 标记或 provider 为 null）→ 先弹模型选择 picker
  * （复用 openModelPicker，展示当前可用 providers）；用户选定后继续正常启动。
- * 选择取消（Esc）→ 仍进入 TUI，推送提示行（"未配置有效 provider，可用 /model 选择或
- * /provider 配置"）——绝不因无 provider 拒绝进入。返回 true 表示弹过选择流程。
+ * 选择取消（Esc）→ 仍进入 TUI，推送提示行（"未配置有效 provider，可用 /model 配置
+ * 渠道与模型"）——绝不因无 provider 拒绝进入。返回 true 表示弹过选择流程。
  */
 export async function promptProviderIfInvalid(agent, openModelPicker, pushLine) {
   if (!(agent._providerInvalid || !agent.provider)) return false
@@ -58,7 +60,7 @@ export async function promptProviderIfInvalid(agent, openModelPicker, pushLine)
     const hasProviders = (agent.providers?.length ?? 0) > 0
     pushLine(hasProviders && !agent.config?.defaultModel
       ? "尚未设置默认模型（config.defaultModel——新会话起点）：/config → 默认模型 设置一次；/model 仅改本会话"
-      : "未配置有效 provider，可用 /model 选择或 /provider 配置", C.warn)
+      : "未配置有效 provider，可用 /model 配置渠道与模型", C.warn)
   }
   return true
 }
@@ -115,6 +117,7 @@ export async function startTUI(agent, opts = {}) {
     currentTool: null, // currently executing tool name (shown in status bar)
     processingStarted: 0, // current turn start time (status bar timer)
     status: "Ready",
+    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)）：回合结束等待输入——链尾置位 / 用户输入清位；不落盘、不进会话
@@ -127,6 +130,7 @@ 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
+    _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 反向挂载——
@@ -276,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 })
@@ -284,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()
   }
 
@@ -316,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).
@@ -381,7 +406,7 @@ export async function startTUI(agent, opts = {}) {
   const { persistRaw, syncProviderField, maskKey } = createConfigHelpers(agent)
 
   // Model picker + generic picker: implemented in pickers.mjs
-  const { closePicker, showPicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey, pickModelForSlot } = createPickers({
+  const { closePicker, showPicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey, pickModelForSlot, confirmDelete } = createPickers({
     agent, state, render, ansi, C, pushLine, pushLabel, persistRaw, askQuestion, maskKey,
   })
 
@@ -398,7 +423,7 @@ export async function startTUI(agent, opts = {}) {
   const { handleSlash, completions, handleTab } = createSlashCommands({
     agent, state, distillOpts,
     pushLine, pushLabel, render,
-    showPicker, closePicker, askQuestion, askPermission,
+    showPicker, closePicker, askQuestion, askPermission, confirmDelete,
     persistRaw, syncProviderField, maskKey,
     openModelPicker: () => openModelPicker(),
     selectModel,
@@ -433,11 +458,14 @@ export async function startTUI(agent, opts = {}) {
 
   // ---------------------------------------------------------- Startup screen + background indexing
 
-  // SESSION.md §8 D-S2：startTUI 首帧前 —— provider 无效（_providerInvalid / provider 为 null）
+  // SESSION.md §6.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 })
+  // 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/interaction.mjs

@@ -1,5 +1,6 @@
 import { ansi, C } from "./ansi.mjs"
-import { detectDanger } from "../tools/shared.mjs"
+import { detectDanger } from "@thincoder/core/tools/shared.mjs"
+import { askPermission as coreAskPermission } from "@thincoder/core/permission.mjs"
 
 /** Interaction primitives: permission approval + question input.
  *  Extracted from index.mjs, receives closure dependencies via createInteraction(ctx).
@@ -9,6 +10,11 @@ import { detectDanger } from "../tools/shared.mjs"
  *  answer mode (the user supplements/corrects the AI's preset choices). */
 export const QUESTION_CUSTOM = "\u0001custom-answer"
 
+/** y/n-only modal family（判据单源——key-modes / render-frame 同引）：`continue`（回合帽）
+ *  与 `retry`（provider 失败面）同形 ⇒ 仅 `y` / `n`。`a` 不属该族键面（会翻会话级 AUTO）。 */
+const YES_NO_MODALS = new Set(["continue", "retry"])
+export function isYesNoModal(name) { return YES_NO_MODALS.has(name) }
+
 export function createInteraction(ctx) {
   const { agent, state, pushLine, pushLabel, render, summarize } = ctx
 
@@ -62,12 +68,15 @@ export function createInteraction(ctx) {
       pushLine(`  [auto] ${name}${argSummary ? ` ${argSummary}` : ""}`, C.warn)
       return Promise.resolve(true)
     }
-    // store preview content in permissionPreview, rendered above input box next to "Allow?" prompt
-    state.permissionPreview = formatPermission(name, args)
-    return new Promise((resolve) => {
-      state.permission = { name, args, resolve }
-      state.status = `Waiting: ${name}`
-      render()
+    // 闸语义 / 请示流程 = 核单源（P2 批 §2.20）；本端只供展示面——卡片预览经 `io.ask` 缝
+    // 注入（permissionPreview 渲染在输入框上方，与 "Allow?" 提示同帧）。
+    return coreAskPermission(name, args, {
+      ask: ({ name: n, toolArgs }) => new Promise((resolve) => {
+        state.permissionPreview = formatPermission(n, toolArgs)
+        state.permission = { name: n, args: toolArgs, resolve }
+        state.status = `Waiting: ${n}`
+        render()
+      }),
     })
   }
 

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-modes.mjs

@@ -7,7 +7,7 @@
  */
 import { C } from "./ansi.mjs"
 import { readClipboardText, insertPastedText } from "./clipboard.mjs"
-import { QUESTION_CUSTOM } from "./interaction.mjs"
+import { QUESTION_CUSTOM, isYesNoModal } from "./interaction.mjs"
 import { inputContentWidth } from "./layout.mjs"
 import { moveCursorVertical } from "./render.mjs"
 
@@ -35,14 +35,19 @@ export function denyModalForOwner(state, key, { pushLine, render } = {}) {
 }
 
 /** permission 确认模态：y/n/a（a = approve + AUTO ON）；batch（§16 D-B1）：a/o/n（Esc = deny）。
+ *  `continue` / `retry` = y/n-only 族（判据单源 `isYesNoModal`——X8 跟进①：`retry` 框不
+ *  广告 `a`，零会话级 AUTO 副作用）。
  *  consume：valid 键或 Esc 走 resolve 分支；其余键静默吞掉（模态独占）。 */
 export function handlePermissionMode(str, key, ctx) {
   const { state, agent, pushLine, render } = ctx
   if (!state.permission) return false
   const answer = (str || "").toLowerCase()
+  // `yOnly` = 本框键面仅 y/n（continue / retry）；`isContinue` 仅保轨迹行豁免（continue 有
+  // 自有输出行——retry **保留** `[approved]` / `[denied]` 轨迹行）。
   const isContinue = state.permission.name === "continue"
+  const yOnly = isYesNoModal(state.permission.name)
   const isBatch = Boolean(state.permission.batch)
-  const validKeys = isContinue ? ["y", "n"] : isBatch ? ["a", "o", "n"] : ["y", "n", "a"]
+  const validKeys = yOnly ? ["y", "n"] : isBatch ? ["a", "o", "n"] : ["y", "n", "a"]
   if (validKeys.includes(answer) || key.name === "escape") {
     const { resolve, name } = state.permission
     state.permission = null
@@ -58,13 +63,13 @@ export function handlePermissionMode(str, key, ctx) {
       render()
       return true
     }
-    if (answer === "a" && !isContinue) {
+    if (answer === "a" && !yOnly) {
       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)
+    const approved = answer === "y" || (answer === "a" && !yOnly)
     // 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)

package/src/tui/ledger-surface.mjs

@@ -0,0 +1,85 @@
+/**
+ * ledger-surface.mjs — TUI 台账可见面胶水（LEDGER-SURFACE 批——设计档 §2.30.3.4）。
+ *
+ * 三面：① 启动行（首扫、**任一项目可动作**才出——明细行集每项目一行）② 变化行（老化首次
+ * 越线 / 池达阈值——一次性去重 + **送达门**：未送达不记账）③ 状态位（`state.ledger`——L1
+ * 常驻标记，`render-frame.mjs` 消费；**不受启动行门约束**——F2 按标记态照显）。
+ * 只读台账；唯一写面 = 去重档（`~/.thincoder/ledger-notify.json`）。
+ *
+ * M2/KD-M2-3：核台账面**动态 import**（`@thincoder/core/ledger.mjs` 静态链 `node:sqlite`——
+ * 静态 import 会把 `node:sqlite` 拽进端壳静态面）；载入失败 = 降级不崩（N1），扫描拍重试。
+ */
+import { C } from "./ansi.mjs"
+
+/** 核台账面惰性载入（KD-M2-3 动态 import——失败不缓存，下次扫描拍重试；N1 降级不崩）。 */
+let _core = null
+function loadCore() {
+  if (!_core) {
+    _core = import("@thincoder/core/ledger.mjs")
+    _core.catch(() => { _core = null })
+  }
+  return _core
+}
+
+/** 单次扫描（直驱面——timer 包装见 `startLedgerSurface`）。
+ *  `startup=true` = 会话首扫（补启动行；变化行在前、明细行在后）。 */
+export async function runLedgerScan({ state, agent = null, anchor = null, notifyFile = undefined, pushLine = () => {}, render = () => {}, startup = false } = {}) {
+  const core = await loadCore()
+  const { buildScan, detailScans, discoverFamily, formatDetailLine, formatMarker, loadNotifyState, NOTIFY_FILE, notifyKey, planChangeLines, saveNotifyState } = core
+  const base = anchor ?? agent?.cwd ?? process.cwd()
+  const family = discoverFamily(base)
+  const scans = []
+  for (const p of family.projects) {
+    try { scans.push(buildScan({ cwd: p.root })) } catch { /* 台账不可读 → 该项目跳过（余者照常——N1/T110①） */ }
+  }
+  const current = family.current ? scans.find((s) => s.root === family.current.root) ?? null : null
+  const notify = loadNotifyState(notifyFile ?? NOTIFY_FILE)
+  const plans = scans.map((s) => ({ s, plan: planChangeLines(notify.ledgers[notifyKey(s.ledger)], s) }))
+  const changeLines = plans.flatMap(({ plan }) => plan.lines)
+  const showStartup = startup && scans.some((s) => s.actionable)
+  const rows = showStartup
+    ? [...changeLines, ...detailScans(scans, current).map((s) => ({ text: formatDetailLine(s), warn: s.actionable }))]
+    : changeLines
+  let delivered = true
+  for (const line of rows) {
+    try { pushLine(line.text, line.warn ? C.warn : C.dim) } catch { delivered = false; break }
+  }
+  // 送达门（F5）：有事件行 → 仅在送达后记账；无事件行 → 仅状态确有变化时静默同步（跌回 false 即重置）
+  const changed = plans.some(({ s, plan }) => {
+    const prev = notify.ledgers[notifyKey(s.ledger)]
+    return !prev || JSON.stringify(prev.aged ?? []) !== JSON.stringify(plan.next.aged) || Boolean(prev.threshold) !== plan.next.threshold
+  })
+  if (changeLines.length ? delivered : changed) {
+    const ledgers = { ...notify.ledgers }
+    for (const { s, plan } of plans) ledgers[notifyKey(s.ledger)] = { ...plan.next, updatedAt: Date.now() }
+    saveNotifyState(notifyFile ?? NOTIFY_FILE, { version: 1, ledgers })
+  }
+  state.ledger = { marker: current ? formatMarker(current) : null, warn: Boolean(current && current.aged > 0), scannedAt: Date.now() }
+  render()
+}
+
+/** TUI 挂载：首扫（`setImmediate`——不抢首帧）+ 周期（`REFRESH_MS`；`state.processing` 期间跳过本轮）。 */
+export function startLedgerSurface(ctx = {}) {
+  let disposed = false
+  let timer = null
+  const tick = async (startup) => {
+    if (disposed) return
+    if (!startup && ctx.state?.processing) return // 扫描不打断回合帧
+    try { await runLedgerScan({ ...ctx, startup }) } catch { /* 可见面尽力——不崩 TUI（N1） */ }
+  }
+  setImmediate(async () => {
+    if (disposed) return
+    tick(true)
+    const core = await loadCore().catch(() => null)
+    if (disposed || !core) return // 载入失败 → 无周期（N1——降级不崩）
+    timer = setInterval(() => tick(false), core.REFRESH_MS)
+    timer.unref?.()
+  })
+  return {
+    dispose() {
+      disposed = true
+      if (timer) clearInterval(timer)
+      timer = null
+    },
+  }
+}

package/src/tui/model-catalog.mjs

@@ -1,7 +1,7 @@
 /**
  * model-catalog.mjs — 会话级模型清单 helper（PROVIDER.md §16.2 M2/M9——2026-09-10 MODEL-SELECTION）。
  *
- * 清单唯一权威 = provider 运行期拉取（`GET /models`——provider/list-models.mjs 按 format 分派）。
+ * 清单唯一权威 = provider 运行期拉取（`GET /models`——thincoder-core/provider/list-models.mjs 按 format 分派）。
  * 本模块提供：
  * - `getProviderModels(providerConfig)`：拉取 + **会话级缓存**（TTL 60s；失败不缓存——下次重试）；
  * - `probeChannelModels(providerConfig)`：配置阶段准入探（M9——探通入缓存候选直接可用 / 探不通返回
@@ -9,14 +9,14 @@
  * - `modelListFailureText(error)`：M8 失败消息本体（逐字长句——界面明示的唯一断言对象）；
  * - `dedupeModels` / `modelSeries`：显示归并（自 model-picker.mjs 迁入——会话面与槽位面共用）。
  *
- * 缓存时钟可注入（`_catalogHooks.now`——先例 rate.mjs `_rateHooks`）：测试假时钟确定性断言 T6 不依赖壁钟。
+ * 缓存时钟可注入（`_catalogHooks.now`——先例 thincoder-core/provider/rate.mjs `_rateHooks`）：测试假时钟确定性断言 T6 不依赖壁钟。
  */
-import { listModels } from "../provider/list-models.mjs"
+import { listModels } from "@thincoder/core/provider/list-models.mjs"
 
 /** 会话级缓存 TTL（§16.4 a2：连续操作不重复付网络；60s 新鲜窗口）。 */
 const CACHE_TTL_MS = 60_000
 
-/** 测试钩子（先例 `rate.mjs` `_rateHooks`）：时钟可注入——T6 假时钟断言。 */
+/** 测试钩子（先例 thincoder-core/provider/rate.mjs `_rateHooks`）：时钟可注入——T6 假时钟断言。 */
 export const _catalogHooks = { now: () => Date.now() }
 
 /** 会话内缓存：key = name + baseURL（同渠道不同端点各自成条）；value = { models, at }。 */

package/src/tui/model-picker.mjs

@@ -10,16 +10,16 @@
  * 渠道管理流（add/remove/key/context）是 provider 级 config 写——语义不变。F-4 (ISSUE-FIX-BATCH)：
  * removeProviderFlow 级联清理悬挂引用（cascadeRemoveProvider——文件尾导出）。
  * ctx: { agent, state, render, ansi, C, pushLine, persistRaw, askQuestion, maskKey, showPicker,
- *      closePicker, renderPickerLines }（后三者为 pickers.mjs 通用 picker 绑定——闭包入参，环安全）。
+ *      closePicker, renderPickerLines, confirmDelete }（后四者为 pickers.mjs 通用 picker 绑定——闭包入参，环安全）。
  */
 import { sliceByWidth } from "./render.mjs"
-import { PROVIDER_PRESETS as PRESETS, providerSpec, specMatch } from "../config.mjs"
-import { saveSession } from "../session.mjs"
+import { PROVIDER_PRESETS as PRESETS, providerSpec, specMatch } from "@thincoder/core/config.mjs"
+import { saveSession } from "@thincoder/core/session.mjs"
 import { getProviderModels, probeChannelModels, modelListFailureText, dedupeModels } from "./model-catalog.mjs"
 
 /** createModelPicker(ctx) → { openModelPicker, selectModel, setProviderKey, setContextFlow, pickModelForSlot } */
 export function createModelPicker(ctx) {
-  const { agent, state, pushLine, persistRaw, askQuestion, maskKey, showPicker, closePicker, renderPickerLines } = ctx
+  const { agent, state, pushLine, persistRaw, askQuestion, maskKey, showPicker, closePicker, renderPickerLines, confirmDelete = () => { throw new Error("ctx.confirmDelete missing — deletion refused (fail-closed)") } } = ctx
   const { ansi, C } = ctx
 
   /** entry 唯一标识：异步更新 entries 后按它恢复选中项 */
@@ -231,7 +231,7 @@ export function createModelPicker(ctx) {
     agent.provider = { ...target }
     agent.provider.model = item.model
     if (agent.config?.agent?.compactThresholdAuto) {
-      const { resolveCompactThreshold } = await import("../config.mjs")
+      const { resolveCompactThreshold } = await import("@thincoder/core/config.mjs")
       agent.config.agent.compactThreshold = resolveCompactThreshold(null, agent.provider).value
     }
     // 写会话槽（saveSession——槽双字段恒非空）——config 文件零写
@@ -280,7 +280,7 @@ export function createModelPicker(ctx) {
   /** Slot 面 fetch：模型直接并入可选行（旧 pickModelForSlot 语义——自由面；槽位面零改——
    *  仅随 M1 获得三 format 支持 + 占位行（同会话面：0 item 的 picker 不会打开））。 */
   async function fetchSlotModels(providerName, providerConfig, entries) {
-    const { listModels } = await import("../provider/index.mjs")
+    const { listModels } = await import("@thincoder/core/provider/index.mjs")
     let selKey = null
     try {
       const models = await listModels(
@@ -379,6 +379,7 @@ export function createModelPicker(ctx) {
       ...candidates.map((p) => ({ type: "item", text: `${p.name} (${defaultModelLabel(p)})`, name: p.name })),
     ])
     if (!se) return
+    if (!(await confirmDelete(`Remove provider ${se.name}?`))) return
     await persistRaw((raw) => {
       raw.providers ??= []
       const idx = raw.providers.findIndex((p) => p?.name === se.name)
@@ -460,7 +461,7 @@ export function createModelPicker(ctx) {
       if (newCtx === undefined) delete agent.provider.context
       else agent.provider.context = newCtx
       if (agent.config?.agent?.compactThresholdAuto) {
-        const { resolveCompactThreshold } = await import("../config.mjs")
+        const { resolveCompactThreshold } = await import("@thincoder/core/config.mjs")
         agent.config.agent.compactThreshold = resolveCompactThreshold(null, agent.provider).value
       }
     }

package/src/tui/mouse.mjs

@@ -17,9 +17,9 @@
 import { computeLayout, subagentLineIndex } from "./layout.mjs"
 import { buildConvLines, convViewport } from "./render-conversation.mjs"
 import { toggleFoldBlock, scrollFoldBlock, foldScrollOffset } from "./fold-block.mjs"
-import { cancelAsyncSubagent, cancelSyncChild } from "../agent-tools/subagent-async.mjs"
-import { cancelAsyncAdvisor } from "../agent-tools/advisor-async.mjs"
-import { maybeRefillAsync, refreshQueuedTokens } from "../agent-tools/subagent-scheduler.mjs" // F-2：queued 取消后续（补位/位置刷新）——叶子模块
+import { cancelAsyncSubagent, cancelSyncChild } from "@thincoder/core/agent-tools/subagent-async.mjs"
+import { cancelAsyncAdvisor, refreshAdvisorQueuedTokens } from "@thincoder/core/agent-tools/advisor-async.mjs" // ED-4：评审队列排队块刷新
+import { maybeRefillAsync, refreshQueuedTokens } from "@thincoder/core/agent-tools/subagent-scheduler.mjs" // F-2：queued 取消后续（补位/位置刷新）——叶子模块
 import { routeSubToken } from "./subagent-blocks.mjs" // F-2：queued 取消块移除（⟦ev⟧cancelled 就地路由——引擎动作路径同通道）
 import { denyModalForOwner } from "./key-modes.mjs"
 import { C } from "./ansi.mjs"
@@ -199,12 +199,14 @@ export function createMouseDispatch({ agent, state, pushLine, render, popPicker
     try {
       const id = key.slice(key.lastIndexOf("#") + 1)
       const isAdvisorBlock = key.startsWith("advisor#")
+      // af 批 #1（发射单源化）：`emit` = 本层通道，传进核调用供其单点发射（本层不另发）。
+      const emit = (t) => { if (!routeSubToken(state, t, render)) pushLine(t, C.dim) }
       // §11.2 D-24b (②-6b): ⏹ on an advisor block cancels the background review
       // (directed abort → cancelled settle: no pending entry / no token).
       // SYNC-CANCEL F3: async 池/advisor miss 后查 sync registry（⏹ 门控已放开 sync——
       // cancelSyncChild 与 async cancel 同模块同形态——subagent-async.mjs）。
       let r = isAdvisorBlock
-        ? cancelAsyncAdvisor(agent, id)
+        ? cancelAsyncAdvisor(agent, id, emit)
         : cancelAsyncSubagent(agent, id)
       let syncStopped = false
       if (!isAdvisorBlock && r?.status === "error") {
@@ -230,11 +232,14 @@ export function createMouseDispatch({ agent, state, pushLine, render, popPicker
         // 无 settle 事件链）——UI 直连路径无回合 ctx 事件流——补 executeCancelAction
         // 同款 TUI 维护：等待块移除（⟦ev⟧cancelled 就地路由——守卫同 routeSubToken
         // cancelled 分支——不冻结）+ 补位 + 剩余排队头位置/依赖标注刷新（⟦ev⟧queued）。
+        // af 批去重（#1 单源化）：共享行加 `!isAdvisorBlock` 守卫——评审族发射已由核单点经
+        // 上方 `emit` 通道完成；子代理族自持发射面零改（该族两路互斥、各发一次）。
         if (r?.was === "queued") {
-          const emit = (t) => { if (!routeSubToken(state, t, render)) pushLine(t, C.dim) }
-          emit(`${key}/⟦ev⟧cancelled\x1e`)
+          if (!isAdvisorBlock) emit(`${key}/⟦ev⟧cancelled\x1e`)
           maybeRefillAsync(agent)
           refreshQueuedTokens(agent, emit)
+          // ED-4（评审池排队语义）：advisor 队列余位位置刷新（subagent 队列同构面）。
+          if (isAdvisorBlock) refreshAdvisorQueuedTokens(agent, emit)
         }
         pushLine(`[subagent ${key} stop requested]`, C.warn)
       }

package/src/tui/pickers.mjs

@@ -9,6 +9,7 @@ import { createModelPicker } from "./model-picker.mjs"
  *  通用绑定（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）。
+ *  删除类二次确认件：confirmDelete（TUI-COMMANDS.md §5.4 单源——形态同 cmd-clear / cmd-new 先例）。
  *  选中即关闭（Enter = resolve + pop）；Esc = pop 当前层并 resolve(null)。菜单循环由调用方 while 重开。 */
 export function createPickers(ctx) {
   const { agent, state, render, ansi, C, pushLine, persistRaw, askQuestion, maskKey } = ctx
@@ -105,13 +106,25 @@ export function createPickers(ctx) {
 
   function renderPickerLines() { rebuildLines() }
 
+  /** 删除类入口二次确认件（单源——TUI-COMMANDS.md §5.4）：形态 = 既有二次确认 picker
+   *  （与 cmd-clear.mjs:6-9 · cmd-new.mjs:30-33 先例逐字同形，禁新造模态）。
+   *  defaultIndex 恒指 Cancel（反误触——直接 Enter 不会删除）；Esc / Cancel ⇒ false
+   *  ⇒ 调用方零动作（取消先于落盘发生）。入口 ctx 缺此绑定 ⇒ 调用方报错（fail-closed）。 */
+  async function confirmDelete(question = "Delete?") {
+    const e = await showPicker(question, [
+      { type: "item", text: "Yes, delete", action: "yes" },
+      { type: "item", text: "Cancel", action: "no" },
+    ], { defaultIndex: 1 })
+    return e?.action === "yes"
+  }
+
   // /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,
+    showPicker, closePicker, renderPickerLines, confirmDelete,
   })
 
-  return { showPicker, closePicker, popPicker, renderPickerLines, ...modelPicker }
+  return { showPicker, closePicker, popPicker, renderPickerLines, confirmDelete, ...modelPicker }
 }

package/src/tui/render-conversation.mjs

@@ -15,7 +15,7 @@ import {
   isExpanded, foldHintLine, renderExpandedBlock, renderBlockTimeline,
   renderMathAndMarkdown, foldCapRows, renderFoldedHead, foldTailLines,
 } from "./fold-block.mjs"
-import { ADVISOR_THINKING_PLACEHOLDER } from "../advisor/run.mjs"
+import { ADVISOR_THINKING_PLACEHOLDER } from "@thincoder/core/advisor/run.mjs"
 import { frozenSubSeg, toolSeg, frozenAdvSeg } from "./render-segments.mjs"
 
 

package/src/tui/render-frame.mjs

@@ -9,10 +9,11 @@
 import { ansi, C, ESC } from "./ansi.mjs"
 import { convCacheKey, renderConversation, countConvLines } from "./render-conversation.mjs"
 import { sliceByWidth, stringWidth } from "./render.mjs"
-import { providerSpec } from "../config.mjs"
+import { providerSpec } from "@thincoder/core/config.mjs"
 import { computeLayout, subagentVisibleLines } from "./layout.mjs"
 import { basename } from "node:path"
 import { readFileSync } from "node:fs"
+import { isYesNoModal } from "./interaction.mjs" // X8 跟进①：y/n-only 族判据单源
 
 export { convCacheKey, renderConversation, countConvLines } from "./render-conversation.mjs"
 
@@ -39,7 +40,7 @@ const SLASH_HINTS = {
 
 /** Header panel (always 1 line). */
 export function renderHeader(agent, cols) {
-  // 2026-09-02 Q1（SESSION.md §8）：provider 可为 null（无效 provider 被清空后用户 Esc 取消重选）
+  // 2026-09-02 Q1（SESSION.md §6.8）：provider 可为 null（无效 provider 被清空后用户 Esc 取消重选）
   // —— 可选链守卫，头部显示 "no provider" 占位
   const model = agent.provider?.model ?? "no provider"
   // providerSpec（PROVIDER.md §15）：模型信息显示跟随 provider 级 context 覆盖（D-C5）；
@@ -323,7 +324,9 @@ function inputBoxStyle(state) {
     borderColor = C.tool; title = " Question "
   } else if (state.permission) {
     borderColor = C.warn
-    title = state.permission.name === "continue" ? " Continue? (y/n) "
+    // X8 跟进①：y/n-only 族（continue / retry）按名分流——`a` 不属该族键面
+    title = isYesNoModal(state.permission.name)
+      ? (state.permission.name === "continue" ? " Continue? (y/n) " : " Retry? (y/n) ")
       : state.permission.batch ? ` Allow ${state.permission.name}? (a/o/n) `
       : ` Allow ${state.permission.name}? (y/n/a) `
   } else if (state.picker) {
@@ -349,7 +352,9 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
       : " Type answer then Enter │ Esc: cancel"
   }
   if (state.permission) {
-    if (state.permission.name === "continue") return " y: continue │ n: stop"
+    if (isYesNoModal(state.permission.name)) {
+      return state.permission.name === "continue" ? " y: continue │ n: stop" : " y: retry │ n: stop"
+    }
     if (state.permission.batch) return " a: approve all │ o: one by one │ n: deny"
     return " y: approve │ n: deny │ a: approve all (AUTO)"
   }
@@ -383,7 +388,7 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
   const elapsed = state.processing ? ` ${Math.floor((Date.now() - state.processingStarted) / 1000)}s` : ""
   const toolHint = state.currentTool ? ` ${state.currentTool}…` : ""
   const statusText = state.processing ? `${state.status}${toolHint}${elapsed}` : state.status
-  // 2026-09-02 Q1（SESSION.md §8）：provider 可为 null —— providerSpec(null) 保守 128K 不抛错
+  // 2026-09-02 Q1（SESSION.md §6.8）：provider 可为 null —— providerSpec(null) 保守 128K 不抛错
   // 2026-09-02 §15：context 窗口跟随 providers[].context 覆盖（T-C6——百分比基于覆盖后的窗口）
   const modelContext = providerSpec(agent.provider).context
   const ctxPct = Math.round((state.ctxCache.tokens / modelContext) * 100)
@@ -393,5 +398,11 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
   // INPUT-LOCK-ASYNC（C'——F-3）：busy（processing 含 digest）状态栏提示——取代旧
   // 排队提示（F-7 已删）——“主会话处理中——Enter 提交禁用”
   const enterHint = state.processing ? `主会话处理中 — Enter 提交禁用（字符可输入，回合结束请重按 Enter）` : "Enter: send"
-  return ` ${statusText}${taskHint}${turnHint}${tokenHint}${ctxHint}${scrollHint} │ ${enterHint} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+I: inject │ Ctrl+C: exit (×2)`
+  // 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

@@ -14,7 +14,7 @@
  * so recomputing the frame each paint is cheap.
  */
 import { countConvLines, renderRows } from "./render-frame.mjs"
-import { estimateTokens } from "../context.mjs"
+import { estimateTokens } from "@thincoder/core/context.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { isTuiActive } from "./tui-lifecycle.mjs" // F-2 渲染抑制守卫（RESIZE-MOUSE-LEAK-FIX）
 

package/src/tui/render-segments.mjs

@@ -86,7 +86,9 @@ function frozenSubTaskLines(state, sub, cols, maxRows) {
   const modelPart = sub.model ? ` · ${sub.model}` : ""
   const turnPart = sub.maxTurns > 0 ? ` · turn ${sub.turn}/${sub.maxTurns}` : ""
   const errPart = sub.lastError ? ` — ${sub.lastError}` : ""
-  const icon = sub.approval ? "⏸" : "✓"
+  // 图标三态互斥（2026-09-20 端差·显示面消差批 M5）：修前 stopped 冻结头 `✓` 与 verb 相抵
+  // ⇒ 补齐 VSC `webview/activity-view.js:46-49` 已成的 cancelled → `⏹` 形态（VSC 标尺，CLI 缺面）。
+  const icon = sub.approval ? "⏸" : sub.stopped ? "⏹" : "✓"
   const verb = sub.stopped ? "stopped" : "done" // §19.5: cancel 冻结标题 "stopped"
   const header = `[${icon} ${sub.key}${modePart}${modelPart} · ${verb} ${elapsed}s${turnPart}${errPart}]`
   const out = []

package/src/tui/slash-commands.mjs

@@ -9,7 +9,7 @@
  */
 
 import { C } from "./ansi.mjs"
-import { specForModel } from "../config.mjs"
+import { specForModel } from "@thincoder/core/config.mjs"
 import { handleClearCommand } from "./cmd-clear.mjs"
 import { handleNewCommand } from "./cmd-new.mjs"
 import { handleExitCommand } from "./cmd-exit.mjs"