thincoder 0.12.62 → 0.12.64

package/src/tui/cmd-mcp.mjs

@@ -2,7 +2,7 @@ import { ansi, C } from "./ansi.mjs"
 import { cloneEntry, fieldPicker, maskToken } from "./cmd-mcp-form.mjs"
 
 /** /mcp command handler: view/add/edit/remove/test/reconnect MCP server.
- *  ctx: { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw, ansi, C }
+ *  ctx: { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw, ansi, C, confirmDelete }
  *  MCP.md §5（2026-09-02，v2）：列表即菜单（F7/D-2）、edit/add 统一字段 picker 表单
  *  （F3/F3b/D-1——表单机制在 cmd-mcp-form.mjs，本文件只调 fieldPicker）、保存前预览
  *  +探活（F2：探活失败回同一 fieldPicker——AC2）、AI 降 transport picker 末位（F4）、
@@ -37,7 +37,7 @@ async function addAndConnect(ctx, srv) {
   agent.config.mcp.servers.push(srv)
   try {
     pushLine(`[mcp] Connecting ${srv.name}...`, C.dim)
-    const { connectMcpServer } = await import("../mcp.mjs")
+    const { connectMcpServer } = await import("@thincoder/core/mcp.mjs")
     const tools = await connectMcpServer(srv)
     agent.tools.push(...tools)
     pushLabel(`❯ MCP`, ansi.bold + C.tool)
@@ -50,7 +50,7 @@ async function addAndConnect(ctx, srv) {
 }
 
 export async function handleMcpCommand(ctx, args = []) {
-  const { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw } = ctx
+  const { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw, confirmDelete = () => { throw new Error("ctx.confirmDelete missing — deletion refused (fail-closed)") } } = ctx
   // 每轮重读：原本无 mcp 配置时 `?? []` 会拿到游离数组，Add server 后快照过期
   const getServers = () => agent.config?.mcp?.servers ?? []
   // D-3/T24：本菜单会话内最新一次磁盘重读是否失败（畸形 config.json → 内存态兜底）
@@ -61,7 +61,7 @@ export async function handleMcpCommand(ctx, args = []) {
    *  测试注入 tmp config 路径用（生产 undefined → 默认 ~/.thincoder）。 */
   let changedNames = [] // 最近一次成功重读的对账结果（T23 ⚠ 标记）
   async function reloadFromDisk() {
-    const { reloadMcpFromDisk } = await import("../config.mjs")
+    const { reloadMcpFromDisk } = await import("@thincoder/core/config.mjs")
     const r = reloadMcpFromDisk(agent, ctx.configPath)
     diskUnreadable = !r.ok
     if (r.ok) changedNames = r.changedNames
@@ -85,6 +85,7 @@ export async function handleMcpCommand(ctx, args = []) {
     // D-F5a（#7）先盘后存：磁盘 fresh raw.mcp.servers 上只删目标条目——不整节写回内存
     // agent.config.mcp.servers（内存含 reloadMcpFromDisk 的 keptConnected 尾巴——
     // 整节写回会把对端磁盘上其他 server 的新改动一起抹掉）；冲突放弃不留内存 ghost
+    if (!(await confirmDelete(`Remove MCP server "${name}"?`))) return
     await persistRaw((raw) => {
       raw.mcp ??= { servers: [] }
       if (!Array.isArray(raw.mcp.servers)) return
@@ -92,14 +93,14 @@ export async function handleMcpCommand(ctx, args = []) {
     })
     agent.config.mcp.servers = getServers().filter((s) => s.name !== name)
     // Remove from tool list
-    const { removeMcpTools } = await import("../mcp.mjs")
+    const { removeMcpTools } = await import("@thincoder/core/mcp.mjs")
     removeMcpTools(agent, name)
     pushLine(`[mcp] ${name} removed`, C.tool)
   }
 
   async function connectServer(name) {
     const srv = getServers().find((s) => s.name === name)
-    const { removeMcpTools, connectMcpServer } = await import("../mcp.mjs")
+    const { removeMcpTools, connectMcpServer } = await import("@thincoder/core/mcp.mjs")
     removeMcpTools(agent, name)
     try {
       pushLine(`[mcp] Reconnecting ${name}...`, C.dim)
@@ -130,7 +131,7 @@ export async function handleMcpCommand(ctx, args = []) {
    *  agent.tools、探完即关）。未保存的临时 entry 直接传 probe（§5 D-1）。 */
   async function probeLineFor(entry) {
     pushLine(`[mcp] Probing ${entry.name}...`, C.dim)
-    const { probeMcpServer } = await import("../mcp.mjs")
+    const { probeMcpServer } = await import("@thincoder/core/mcp.mjs")
     const r = await probeMcpServer(entry)
     return r.ok ? `✓ ${r.toolCount} tools, ${r.latencyMs}ms` : `✗ ${r.error}`
   }
@@ -160,7 +161,7 @@ export async function handleMcpCommand(ctx, args = []) {
     if (!description) return
     pushLine("[mcp] Generating config from description...", C.dim)
     try {
-      const { chat } = await import("../provider/index.mjs")
+      const { chat } = await import("@thincoder/core/provider/index.mjs")
       const res = await chat(agent.provider, {
         messages: [{
           role: "user",

package/src/tui/cmd-model.mjs

@@ -1,5 +1,5 @@
 import { C } from "./ansi.mjs"
-import { parseModelRef } from "../config.mjs"
+import { parseModelRef } from "@thincoder/core/config.mjs"
 
 /** /model command: open the session model picker, or switch the SESSION model directly via
  *  `/model <provider>:<model>`（MODEL-MERGE-SESSION——裁定③：裸 provider 拒——显式 p:m；

package/src/tui/cmd-new.mjs

@@ -1,4 +1,4 @@
-import { newSession, resetSessionState, bindRecordStore, slotPath } from "../session.mjs"
+import { newSession, resetSessionState, bindRecordStore, slotPath } from "@thincoder/core/session.mjs"
 import { C } from "./ansi.mjs"
 
 /** /new command: start a new session in a fresh slot.
@@ -6,8 +6,9 @@ import { C } from "./ansi.mjs"
 export async function handleNewCommand(ctx) {
   const { agent, state, pushLine, showPicker, render } = ctx
 
-  const doNewSession = () => {
-    const slot = newSession(agent.cwd)
+  // F-MI7：newSession = async（探测束）——doNewSession 随之为 async，调用点 await
+  const doNewSession = async () => {
+    const slot = await newSession(agent.cwd, { releaseStale: true }) // F-CR1：/new 释放本进程残留认领（保留集 = {新槽}）；ACP 四点不传（F-CR3）
     // 2026-08-31 会诊 F3：resetSessionState 清全量会话态（_fullHistory/title/_sessionStart/
     // 多槽设计凭证（_engDesignTokens——单值镜像 _engDesignToken 已退役 D3）/压缩与验证计数
     // 等）——原实现只清 agent.history，新会话首次落盘把旧会话完整人类线 + 旧标题写进新
@@ -30,8 +31,8 @@ export async function handleNewCommand(ctx) {
       { type: "item", text: "Yes, start new session in a new slot", action: "yes" },
       { type: "item", text: "Cancel", action: "no" },
     ], { defaultIndex: 1 })
-    if (e?.action === "yes") doNewSession()
+    if (e?.action === "yes") await doNewSession()
     return
   }
-  doNewSession()
+  await doNewSession()
 }

package/src/tui/cmd-plan.mjs

@@ -1,9 +1,18 @@
 /** /plan command: toggle plan mode (read-only explore → design → implement).
  *  ctx: { agent, pushLine, pushLabel } */
 import { ansi, C } from "./ansi.mjs"
+import { PLAN_ENGINEERING_REFUSED } from "@thincoder/core/agent-tools/plan.mjs"
 
 export async function handlePlanCommand(ctx) {
   const { agent, pushLine, pushLabel } = ctx
+  // ENG-PLAN-EXCLUSION（FR31 ② · 设计 `ENGINEERING-MODE-V2.md` §2.3 E7「命令面逐面钉定」）：
+  // 工程模式 ⇒ 拒绝——**前置判**：零翻转（不写 `planMode`）+ 提示行（共用文案常量逐字，
+  // 与 ACP 两面同源）；无成功标签（标签 = 成功回显——拒时零标签防假成功，同 `/eng` 先例）。
+  // 真值 = `agent.config.agent.engineering`（核单源同键）；普通模式四路径全带宽（FR31 边界）。
+  if (agent.config?.agent?.engineering === true) {
+    pushLine(PLAN_ENGINEERING_REFUSED, C.warn)
+    return
+  }
   agent.planMode = !agent.planMode
   pushLabel("❯ Plan", ansi.bold + C.tool)
   pushLine(`Plan mode: ${agent.planMode ? "ON" : "OFF"}`, C.tool)

package/src/tui/cmd-reindex.mjs

@@ -4,7 +4,7 @@ import { C } from "./ansi.mjs"
  *  ctx: { agent, distillOpts, pushLine } */
 export async function handleReindexCommand(ctx) {
   const { agent, distillOpts, pushLine } = ctx
-  const { syncDir, codeSync, docSync } = await import("../memory.mjs")
+  const { syncDir, codeSync, docSync } = await import("@thincoder/core/memory.mjs")
   pushLine("[reindex] Rebuilding index...", C.tool)
   agent.memory.db.prepare("DELETE FROM files").run()
   agent.memory.db.prepare("DELETE FROM code_chunks").run()

package/src/tui/cmd-restore.mjs

@@ -5,14 +5,14 @@ import { ansi, C } from "./ansi.mjs"
  *  (CHECKPOINT.md D8). ctx: { agent, showPicker, pushLine, pushLabel } */
 export async function handleRestoreCommand(ctx) {
   const { agent, showPicker, pushLine, pushLabel } = ctx
-  const { listCheckpoints, rewind, isGitRepo } = await import("../git/checkpoint.mjs")
+  const { listCheckpoints, rewind, isGitRepo } = await import("@thincoder/core/git/checkpoint.mjs")
   if (!isGitRepo(agent.cwd)) {
     pushLine("[rewind] not a git repository, checkpoints unavailable", C.error)
     return
   }
   // F6 lazy fallback——与 git 工具 checkpoint list/create 入口一致（git-checkpoint.mjs）：外部
   // git commit 后（HEAD 时间 > 最新快照）先清空过期快照，/restore 不列出 commit 前状态。
-  const { lazyClearIfCommitted } = await import("../tools/git-checkpoint.mjs")
+  const { lazyClearIfCommitted } = await import("@thincoder/core/tools/git-checkpoint.mjs")
   await lazyClearIfCommitted(agent.cwd)
   const cps = await listCheckpoints(agent.cwd)
   if (cps.length === 0) {

package/src/tui/cmd-session.mjs

@@ -1,4 +1,5 @@
-import { listSlots, switchToSlot, applySession, renameSlot, activeSlot, slotOccupancy, readEndMarker, sessionDescriptor } from "../session.mjs"
+import { listSlots, switchToSlot, applySession, renameSlot, activeSlot, slotOccupancy, readEndMarker, sessionDescriptor, loadSlotFile } from "@thincoder/core/session.mjs"
+import { resolveEngineeringManifest } from "@thincoder/core/manifest.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { restoreLines } from "./startup.mjs"
 import { stringWidth, sliceByWidth } from "./render.mjs"
@@ -81,6 +82,26 @@ export async function handleSessionCommand(ctx) {
   // 2026-08-31 会诊 deepseek 🔴：目标槽被另一活进程占用时 switchToSlot 不认领（避免
   // 劫持对方 active），本次会话仍读到数据，但下次保存会 fork 到新槽——提前提示。
   const occ = slotOccupancy(agent.cwd, e.slot)
+  // #41 先判后切（MANIFEST.md §2.8 F3 · 父侧裁定 3）：目标槽**合值**（§2.2 会话权威值
+  // 「槽带 `engineering` 字段 ? 槽值 : `config.agent.engineering`」）=== true 时，判据前置于
+  // `switchToSlot`——判据落其后会留下「指针已切、会话未换」的半态（下次 `saveSession` 把旧
+  // 会话写回目标槽 = 跨槽覆盖）。预读 = `loadSlotFile`（**纯读**——无认领副作用）。
+  // 触发条件 = 合值（遗留槽（无 `engineering` 字段）自工程会话切入时合值 = true ⇒ 预判据
+  // 照触发——F3 触发条件口径）；槽不可读（preview null）不判：该次切换本就以「Slot not
+  // found」收场（switchToSlot 返回 null），无半态面。拒 ⇒ 切槽整体不发生（switchToSlot /
+  // applySession 均不调——零副作用）+ 原因行；准 ⇒ 既有切换 + applySession 之后一行附着。
+  const preview = loadSlotFile(agent.cwd, e.slot)
+  const slotEng = preview?.engineering
+  const targetEng = preview != null && (slotEng !== undefined ? slotEng === true : agent.config?.agent?.engineering === true)
+  let manifestAfterSwitch = null
+  if (targetEng) {
+    const r = resolveEngineeringManifest(agent.cwd, { writer: "main" })
+    if (!r.ok) {
+      pushLine(`Cannot switch to slot ${e.slot} — ${r.message} (slot unchanged)`, C.warn)
+      return
+    }
+    manifestAfterSwitch = r.manifest
+  }
   const data = switchToSlot(agent.cwd, e.slot)
   if (!data) {
     pushLine(`Slot ${e.slot} not found`, C.dim)
@@ -90,6 +111,8 @@ export async function handleSessionCommand(ctx) {
     pushLine(`⚠ Slot ${e.slot} is being used by another live process (${occ.owner}) — continuing here will create a new copy on the next save`, C.warn)
   }
   applySession(agent, data, occ.occupied ? {} : { slot: e.slot })
+  // #41 准翻列：附着动作 = 翻转面自己赋值（`agent.manifest` ← 判据结果——相位行当回合起活）。
+  if (manifestAfterSwitch) agent.manifest = manifestAfterSwitch
   // Rebuild from history (lazy) — the display snapshot is deprecated.
   // §14.3.6：描述符 { history（尾窗+±1）, total, base }——标签口径 = total（非窗口长度）；
   // 未绑定（占用分支——模式 F）回退全量数组。

package/src/tui/cmd-skills.mjs

@@ -4,7 +4,7 @@ import { ansi, C } from "./ansi.mjs"
  *  ctx: { agent, pushLine, pushLabel } */
 export async function handleSkillsCommand(ctx) {
   const { agent, pushLine, pushLabel } = ctx
-  const { loadSkills } = await import("../skills.mjs")
+  const { loadSkills } = await import("@thincoder/core/skills.mjs")
   const skills = await loadSkills(agent.cwd)
   pushLabel(`❯ Skills`, ansi.bold + C.tool)
   if (skills.length === 0) {

package/src/tui/cmd-think.mjs

@@ -5,7 +5,7 @@ import { ansi, C } from "./ansi.mjs"
 
 export async function handleThinkCommand(ctx, args = []) {
   const { agent, showPicker, syncProviderField, pushLine, pushLabel } = ctx
-  const { specForModel } = await import("../config.mjs")
+  const { specForModel } = await import("@thincoder/core/config.mjs")
 
   // Fast path: direct args — exit immediately
   const cur = agent.provider
@@ -33,7 +33,8 @@ export async function handleThinkCommand(ctx, args = []) {
     if (autoThinkEnabled) { pushLine("Auto-think is ON — manual settings are overridden each turn; turn Auto off first via /think", C.error); return }
     await applyThink({ action: "effort", level }, agent, syncProviderField, spec, isEffortOnly, isCustomThink, thinkOnValue)
     pushLabel("❯ Think", ansi.bold + C.tool)
-    pushLine(`Thinking effort: ${level}`, C.tool)
+    // none = 关思考档（applyThink 内归一到 off 路径）⇒ 回执同 off 文案，不比照档位报“…none”
+    pushLine(level === "none" ? "Thinking: OFF" : `Thinking effort: ${level}`, C.tool)
     return
   }
   if (sub) { pushLine("Usage: /think [on|off|effort <level>]", C.error); return }
@@ -78,18 +79,29 @@ export async function handleThinkCommand(ctx, args = []) {
       pushLine(`Auto-think: ${newAuto ? "ON" : "OFF"}`, C.tool)
       return // exit loop — no useful actions remain when auto mode just changed (T8b 锁定——toggle 即退是已批准语义——2026-09-05 曾误改 OFF 回菜单——测试抓回归——已撤销)
     } else if (e.action === "effort") {
-      pushLine(`Reasoning effort: ${e.level}`, C.tool)
+      pushLine(e.level === "none" ? "Thinking: OFF" : `Reasoning effort: ${e.level}`, C.tool)
     } else {
+      // 与菜单头（:47-48）同式：`thinking:null`（NF1 显式 off）必须落 OFF——本式缺 `!== null` 守卫时
+      // effort 型 off 后回执误报 ON（同一状态、两处公式——单一口径 = 面板式）。
       const nowEnabled = cur.thinking?.type === thinkOnValue
-        || (cur.thinking?.type === undefined && !isCustomThink)
+        || (cur.thinking !== null && cur.thinking?.type === undefined && !isCustomThink)
       pushLine(`Thinking: ${nowEnabled ? "ON" : "OFF"}`, C.tool)
     }
   }
 }
 
-/** Shared apply logic — extracted from handleThinkCommand for reuse in both fast path and loop */
-async function applyThink(e, agent, syncProviderField, spec, isEffortOnly, isCustomThink, thinkOnValue) {
+/** Shared apply logic — extracted from handleThinkCommand for reuse in both fast path and loop.
+ *  Named export (2026-09-20): the on-default-effort rule (§2.8) is unit-tested by driving this
+ *  directly with a synthetic spec — behavior otherwise unchanged.
+ *  Effort 档位 `"none"` = 关思考 ⇒ 入口归一到 off 路径（与菜单 off 项同形——见内注释）。 */
+export async function applyThink(e, agent, syncProviderField, spec, isEffortOnly, isCustomThink, thinkOnValue) {
   const cur = agent.provider
+  // `effort` 档位取 `"none"` = **关思考**（非“强度零”）：与本面 off 动作同语义 ⇒ 归一到 off 路径
+  // （各族取其原生 off 形：effort 型 = `thinking:null`＋删 effort；type 型 = `{type:"disabled"}`）。
+  // 不归一的两处违约：① 菜单头同拍显示「Thinking: ON | Effort: none」自相矛盾（off 标记缺失）；
+  // ② 残留 `reasoningEffort:"none"` 会被载荷层当强度档送（`provider/core.mjs:197-204`），与百炼
+  // qwen 侧 off 判据（`config.mjs:133-139` 的 `thinking === null ⇒ false`）错位 ⇒ 服务端仍思考。
+  if (e.action === "effort" && e.level === "none") e = { action: "off" }
   if (e.action === "auto") {
     const cfg = agent.config.agent ??= {}
     cfg.autoThink = !cfg.autoThink
@@ -113,9 +125,10 @@ async function applyThink(e, agent, syncProviderField, spec, isEffortOnly, isCus
       // Explicit off persists thinking:null (NF1 convention — distinguishable from autoThink's
       // delete/undefined); "on" deletes the marker so enable_thinking maps from effort again.
       if (!enable) { cur.thinking = null; delete cur.reasoningEffort }
-      // "on" 默认 effort 取 spec 枚举首值（交付评审 #2）：硬编码 "high" 对 qwen3.8-max
-      // （enum xhigh/medium/low）无效，会被 core.mjs 枚举校验 throw（400 前置）
-      else { delete cur.thinking; if (!cur.reasoningEffort) cur.reasoningEffort = spec.reasoningEffortEnum?.[0] ?? "high" }
+      // "on" 默认 effort 取 spec 枚举的**首个非 "none"** 档（批次档 §1.8-② / 设计 §2.8 D-9）：硬编码 "high"
+      // 对 qwen3.8-max（enum xhigh/medium/low）无效，会被 core.mjs 枚举校验 throw（400 前置）；而直接取枚举
+      // 首项在新档（首项 "none"）等于把思考关掉 ⇒ 跳过 "none"；枚举全 "none" 时与无枚举同型 ⇒ 回退 "high"
+      else { delete cur.thinking; if (!cur.reasoningEffort) cur.reasoningEffort = spec.reasoningEffortEnum?.find((v) => v !== "none") ?? "high" }
       await syncProviderField(agent.activeProvider, "thinking", cur.thinking)
       if (!enable) await syncProviderField(agent.activeProvider, "reasoningEffort", undefined)
       else await syncProviderField(agent.activeProvider, "reasoningEffort", cur.reasoningEffort)

package/src/tui/config-helpers.mjs

@@ -11,7 +11,7 @@ export function createConfigHelpers(agent, opts = {}) {
   /** 磁盘新鲜读 → mutate（单操作）→ mtime 门控写；冲突时 throw（提示语见下——TUI
    *  slash 分发层统一 [error] 行展示；调用方若自带 try/catch 展示 Save failed 同文案）。 */
   async function persistRaw(mutate) {
-    const { writeConfigAtomic, configPath } = await import("../config.mjs")
+    const { writeConfigAtomic, configPath } = await import("@thincoder/core/config.mjs")
     const r = writeConfigAtomic(cfgPath ?? configPath, mutate)
     if (!r.ok) throw new Error("config changed on disk concurrently — retry")
   }

package/src/tui/display-budget.mjs

@@ -3,17 +3,17 @@
  *
  * 职责（§15.3.2）：常量单源（D-TB4）+ 行/载体计长（`lineChars`）+ `state.lines` 总量
  * 对账（`syncLineBudget`）。纯函数本体（`capText` / `appendCappedText`）住
- * `src/text-budget.mjs`（零依赖）——与 agent 侧捕获共用（AGENT-LOOP.md §23.3.1，D2 单源）；
+ * `thincoder-core/text-budget.mjs`（零依赖）——与 agent 侧捕获共用（AGENT-LOOP.md §23.3.1，D2 单源）；
  * 本模块只承载 TUI 面常量与对账。
  *
- * 依赖方向：本模块只引 `./ansi.mjs` + `../text-budget.mjs`（叶子——不引 subagent 族，
+ * 依赖方向：本模块只引 `./ansi.mjs` + `@thincoder/core/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"
+import { capText, appendCappedText, fillMarker } from "@thincoder/core/text-budget.mjs"
 
 export { capText }
 
@@ -35,8 +35,10 @@ export const SUB_BLOCK_CHAR_LIMIT = 128_000
 export const ADVISOR_TEXT_MAX_CHARS = 128_000
 /** 流式缓冲（`state.streaming` / `state.reasoning`）累积额度。 */
 export const STREAM_MAX_CHARS = 256_000
-/** `state.lines` 全部行与载体文本总量（超出：与 5000 行环同款裁头 1000 行 + 收据行）。 */
+/** `state.lines` 全部行与载体文本总量（超出：最小步进裁头 + 冻结锚点平移 + 收据行——保底见下行）。 */
 export const LINES_CHAR_BUDGET = 2_000_000
+/** 字符超额裁剪保底行数——裁剪不得使 `state.lines` 低于该值；触底仍未脱额即停（接受超额——上界 = 保底 × 单行上限）。 */
+export const LINES_TRIM_FLOOR = 200
 /** 搜索匹配计数上限（超出截断 + 提示行）。 */
 export const SEARCH_MATCH_CAP = 10_000
 
@@ -140,6 +142,14 @@ export function accountLine(state, l) {
   l._budgetChars = next
 }
 
+/** 行移除负向出账（§5.5 记账口径——增删均须过账；不变式 `_linesChars === Σ lineChars`）：
+ *  `state._linesChars -= lineChars(l)`，钳 0。与 `accountLine` 不可互替——后者以行对象
+ *  `_budgetChars` 幂等（行从 `state.lines` 脱落后重调增量恒 0 ⇒ 账不降），移除需本导出。 */
+export function releaseLine(state, l) {
+  if (!l) return
+  state._linesChars = Math.max(0, (state._linesChars ?? 0) - lineChars(l))
+}
+
 /** 直算对账（双算法对照 / 初始化 / 漂移自愈——测试直算同源）。 */
 export function accountAll(state) {
   let total = 0
@@ -152,10 +162,19 @@ export function accountAll(state) {
   return total
 }
 
+/** 收据行长度预留（`syncLineBudget` 单轮 need 计入的收据余量：前缀 32 + N 数字位 + 尾 17 < 96——覆 7 位数余量）。 */
+const RECEIPT_RESERVE_CHARS = 96
+
 /**
- * `state.lines` 总量对账（§15.3.3 落点表末行）：超 `LINES_CHAR_BUDGET` → 与 5000 行环
- * 同款裁头 1000 行 + 收据行；`onTrim(state, removedCount)` 由调用方注入冻结锚点平移
- * （display-budget 不引 subagent 族——避环）。幂等（未超限零动作）。
+ * `state.lines` 总量对账（§15.3.3 落点表末行）：超 `LINES_CHAR_BUDGET` → **最小步进**裁头 +
+ * 收据行，且不使 `lines.length` 低于 `LINES_TRIM_FLOOR`（触底 = 内层 break——接受超额，
+ * 不靠守卫退出：FLOOR+1 且残余超额时守卫仍为真）。每轮裁「至额度内所需最少行数」
+ * （need = 超额 + 收据上界预留；上限 = 可裁至保底的行数）；`onTrim(state, removedCount)` 由
+ * 调用方注入冻结锚点平移（display-budget 不引 subagent 族——避环）。`pushLineLike` 注入面（无生产调用）：
+ * 仅**头插**语义下自洽——尾插会使收据位置、收据 N 口径与「净位移 = 丢行数 − 1」约定失真。
+ * 幂等（未超限 / 行数 ≤ 保底）。
+ * 旧颗粒 `min(1000, lines.length-1)` 在行数 ≤1001 且超额时一轮裁到 1 行（用户实测收据
+ * 「1 lines remaining」——TUI-HISTORY-TRIM 批修复：保底 200 + 最小步进）。
  * @returns {number} 本轮裁掉的行数
  */
 export function syncLineBudget(state, { pushLineLike = null, onTrim = null } = {}) {
@@ -163,11 +182,13 @@ export function syncLineBudget(state, { pushLineLike = null, onTrim = null } = {
   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)
+  while (state._linesChars > LINES_CHAR_BUDGET && lines.length > LINES_TRIM_FLOOR) {
+    const limit = lines.length - LINES_TRIM_FLOOR
+    const need = state._linesChars - LINES_CHAR_BUDGET + RECEIPT_RESERVE_CHARS
+    let take = 0
     let freed = 0
-    for (const l of dropped) freed += lineChars(l)
+    while (take < limit && freed < need) { freed += lineChars(lines[take]); take++ }
+    lines.splice(0, take)
     state._linesChars = Math.max(0, state._linesChars - freed)
     removed += take
     const receipt = `... [earlier messages trimmed — ${lines.length} lines remaining]`
@@ -179,6 +200,7 @@ export function syncLineBudget(state, { pushLineLike = null, onTrim = null } = {
       state._linesChars += receipt.length
     }
     if (typeof onTrim === "function") onTrim(state, take)
+    if (take >= limit) break // 触底（可裁上限用尽）——接受超额；收敛靠本 break，不靠守卫退出
   }
   return removed
 }

package/src/tui/index.mjs

@@ -19,15 +19,16 @@
  */
 
 import { emitKeypressEvents } from "node:readline"
+import { readFileSync } from "node:fs"
 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"
 import { SLASH_COMMANDS, createSlashCommands } from "./slash-commands.mjs"
 import { createWizard } from "./wizard.mjs"
-import { writeStartupSequence, setTuiActive, createExitCleanup } from "./tui-lifecycle.mjs"
+import { writeStartupSequence, writeLoadingLine, setTuiActive, createExitCleanup } from "./tui-lifecycle.mjs"
 import { createPickers } from "./pickers.mjs"
 import { runDistill as runDistillImpl } from "./distill-cmd.mjs"
 import { createInteraction } from "./interaction.mjs"
@@ -45,11 +46,11 @@ 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
@@ -60,7 +61,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
 }
@@ -159,6 +160,13 @@ export async function startTUI(agent, opts = {}) {
   // modifyOtherKeys lvl 2 (\x1b[>4;2m): Shift+Enter → \x1b[27;2;13~ (mintty / Git Bash)
   // translateShiftEnter (stdin layer) maps both to \x1b\r → meta+return → multiline branch.
   writeStartupSequence()
+  // 启动加载画面（2026-09-21 用户）：冷启动剩余期（memory 同步 / 索引扫描）非黑。
+  // 静态读（render-frame 先例——module-load 一次 ✗ 首帧 render 覆盖本行 ✗ 无需清除逻辑）。
+  {
+    let v = ""
+    try { v = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url), "utf8")).version } catch { /* 尽力面 */ }
+    writeLoadingLine(undefined, v)
+  }
   setTuiActive(true) // R25（F-R25a）：终端接管完成——置 TUI 活动态（崩溃钩子恢复判定源）
 
   const utf8Decoder = new TextDecoder("utf-8", { fatal: false })
@@ -406,7 +414,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,
   })
 
@@ -423,7 +431,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,
@@ -458,7 +466,7 @@ 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)
 

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-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)