thincoder 0.12.61 → 0.12.63

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 } 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,16 +6,21 @@ 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)
     // 2026-08-31 会诊 F3：resetSessionState 清全量会话态（_fullHistory/title/_sessionStart/
     // 多槽设计凭证（_engDesignTokens——单值镜像 _engDesignToken 已退役 D3）/压缩与验证计数
     // 等）——原实现只清 agent.history，新会话首次落盘把旧会话完整人类线 + 旧标题写进新
     // slot（实锤 .19/.3 双副本）。_slot 更新为粘性新槽位。
     resetSessionState(agent)
     agent._slot = slot
+    // §14.3.4：/new 绑定新槽记录存储（baseHistory 空——identity 此时为 null = 待固化；
+    // 首次保存/首条追加时补写现场身份）
+    bindRecordStore(agent, { slotFile: slotPath(agent.cwd, slot), identity: agent._sessionStart ?? null, baseHistory: [] })
     state.tasks = []
     state.lines = []
+    state._linesChars = 0 // TUI-OOM-ROOTCAUSE（§15.3.2）：行集清空 → 字符账同步归零
     state.streaming = ""
     render()
     pushLine(`New session started (slot ${slot}; /session to switch back)`, C.dim)
@@ -26,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-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 } 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)
@@ -89,14 +110,20 @@ export async function handleSessionCommand(ctx) {
   if (occ.occupied) {
     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)
+  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）回退全量数组。
+  const desc = sessionDescriptor(agent, data)
   state.lines = []
-  restoreLines(state, data.history)
+  state._linesChars = 0 // TUI-OOM-ROOTCAUSE（§15.3.2）：切槽重建行集 → 字符账归零，restoreLines 重新入账
+  restoreLines(state, desc)
   state.tasks = agent.tasks ?? []
   if (state.tasks.length > 0 && state.tasks.every((t) => t.status === "done")) {
     state.tasks = []
   }
-  pushLabel(`── Switched to slot ${e.slot} (${data.history.length} messages) ──`, C.warn)
+  pushLabel(`── Switched to slot ${e.slot} (${desc.total} messages) ──`, C.warn)
   render()
 }

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

@@ -0,0 +1,206 @@
+/**
+ * display-budget.mjs — TUI 显示层额度（TUI-OOM-ROOTCAUSE 批——TUI.md §15.3）。
+ *
+ * 职责（§15.3.2）：常量单源（D-TB4）+ 行/载体计长（`lineChars`）+ `state.lines` 总量
+ * 对账（`syncLineBudget`）。纯函数本体（`capText` / `appendCappedText`）住
+ * `thincoder-core/text-budget.mjs`（零依赖）——与 agent 侧捕获共用（AGENT-LOOP.md §23.3.1，D2 单源）；
+ * 本模块只承载 TUI 面常量与对账。
+ *
+ * 依赖方向：本模块只引 `./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 "@thincoder/core/text-budget.mjs"
+
+export { capText }
+
+// ─── 常量（§15.3.1——单源；数值改动一处生效）────────────────────────────────
+
+/** 单行（pushLine/pushLabel/恢复行/流式 flush 行）字符额度。 */
+export const LINE_MAX_CHARS = 64_000
+/** 工具块 `argsJson` 总量。 */
+export const ARGS_JSON_MAX_CHARS = 24_000
+/** 工具块 `result` 行数组总量（与既有 400 行双维）。 */
+export const TOOL_RESULT_MAX_CHARS = 64_000
+/** 输出环单条目（超出：尾截断 + 标记）。 */
+export const TOOL_OUTPUT_ENTRY_MAX_CHARS = 8_000
+/** 输出环总量（超出：与既有 200 条目环同款丢最旧）。 */
+export const TOOL_OUTPUT_TOTAL_MAX_CHARS = 128_000
+/** 子代理块单环（与 500 显示行双维；裁最旧——省略标记 N6 语义不变）。 */
+export const SUB_BLOCK_CHAR_LIMIT = 128_000
+/** 评审载体（`_advisorBlocks` 累积 + `_frozenAdvisor`）：头 32K + 尾 96K + 中段标记。 */
+export const ADVISOR_TEXT_MAX_CHARS = 128_000
+/** 流式缓冲（`state.streaming` / `state.reasoning`）累积额度。 */
+export const STREAM_MAX_CHARS = 256_000
+/** `state.lines` 全部行与载体文本总量（超出：最小步进裁头 + 冻结锚点平移 + 收据行——保底见下行）。 */
+export const LINES_CHAR_BUDGET = 2_000_000
+/** 字符超额裁剪保底行数——裁剪不得使 `state.lines` 低于该值；触底仍未脱额即停（接受超额——上界 = 保底 × 单行上限）。 */
+export const LINES_TRIM_FLOOR = 200
+/** 搜索匹配计数上限（超出截断 + 提示行）。 */
+export const SEARCH_MATCH_CAP = 10_000
+
+// ─── 标记形态（逐字——§15.3.2 进测试断言）──────────────────────────────────
+
+export const LINE_TRUNC_MARKER = "… [line truncated: N chars omitted]"
+export const MIDDLE_TRUNC_MARKER = "… [middle truncated: N chars omitted]"
+
+/** 评审/流式额度头尾分配（头 32K + 尾 96K——保裁决尾部；与常量同基数）。 */
+export const ADVISOR_CAP_OPTS = {
+  hard: ADVISOR_TEXT_MAX_CHARS,
+  head: 32_000,
+  tail: 96_000,
+  marker: MIDDLE_TRUNC_MARKER,
+}
+/** 流式累积额度（头/尾各半——flush 行再受 LINE_MAX_CHARS）。 */
+export const STREAM_CAP_OPTS = {
+  hard: STREAM_MAX_CHARS,
+  head: Math.floor(STREAM_MAX_CHARS / 4),
+  tail: Math.floor(STREAM_MAX_CHARS / 2),
+  marker: MIDDLE_TRUNC_MARKER,
+}
+/** 行截断（单行巨内容场景）：保留头部至 `LINE_MAX_CHARS` + 尾标记（行尾截断语义）。 */
+export function capLine(text) {
+  return capText(text, {
+    max: LINE_MAX_CHARS,
+    keepHead: LINE_MAX_CHARS,
+    keepTail: 0,
+    marker: LINE_TRUNC_MARKER,
+  })
+}
+
+/** TUI 侧流式累积（alias——本体 text-budget.appendCappedText，D2 单源）。 */
+export function appendCapped(prev, add, opts) {
+  return appendCappedText(prev, add, opts)
+}
+
+/** 评审文本单次截断（§15.3.1：头 32K + 尾 96K 保裁决尾部 + 中段标记——与累积侧同源）。 */
+export function capAdvisorText(text) {
+  return capText(text, { max: ADVISOR_TEXT_MAX_CHARS, keepHead: 32_000, keepTail: 96_000, marker: MIDDLE_TRUNC_MARKER })
+}
+
+/**
+ * 行数组总量额度（尾截断 + 标记；首行保真——ARGS_JSON/TOOL_RESULT 双维用）。
+ * 行放不下时：可放部分 → 本行头截断；无空间 → 直接以标记行收尾。
+ * @returns {string[]} 原数组或（截断 + 标记行）新数组
+ */
+export function capLines(lines, max, marker = MIDDLE_TRUNC_MARKER) {
+  const arr = Array.isArray(lines) ? lines : []
+  if (arr.length === 0) return arr
+  let total = 0
+  for (const s of arr) total += typeof s === "string" ? s.length : 0
+  if (total <= max) return arr
+  const out = []
+  let used = 0
+  for (const s of arr) {
+    const str = typeof s === "string" ? s : String(s ?? "")
+    const remain = max - used
+    if (str.length <= remain) { out.push(str); used += str.length; continue }
+    if (remain > 0) {
+      const kept = str.slice(0, remain)
+      out.push(kept)
+      used += kept.length
+    }
+    break
+  }
+  out.push(fillMarker(marker, total - used))
+  return out
+}
+
+// ─── 计长与总量对账（§15.3.2 / §15.3.4）───────────────────────────────────
+
+const arrChars = (a) => {
+  if (!Array.isArray(a)) return 0
+  let n = 0
+  for (const s of a) n += typeof s === "string" ? s.length : 0
+  return n
+}
+
+/** 一行 + 其 `_toolBlock`/`_frozenSubTask`/`_frozenAdvisor` 字段计长（单一口径）。 */
+export function lineChars(l) {
+  if (!l) return 0
+  let n = typeof l.text === "string" ? l.text.length : 0
+  const b = l._toolBlock
+  if (b) {
+    n += typeof b.argsSummary === "string" ? b.argsSummary.length : 0
+    n += typeof b.summary === "string" ? b.summary.length : 0
+    n += arrChars(b.argsJson) + arrChars(b.output) + arrChars(b.result)
+  }
+  if (l._frozenSubTask) n += l._frozenSubTask._charCount ?? 0
+  if (typeof l._frozenAdvisor === "string") n += l._frozenAdvisor.length
+  return n
+}
+
+/** 行增量记账（幂等——行对象上存上次计入值 `_budgetChars`；载体原地变更后重调即自愈）。 */
+export function accountLine(state, l) {
+  if (!l) return
+  const prev = Number.isFinite(l._budgetChars) ? l._budgetChars : 0
+  const next = lineChars(l)
+  state._linesChars = Math.max(0, (state._linesChars ?? 0) + (next - prev))
+  l._budgetChars = next
+}
+
+/** 行移除负向出账（§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
+  for (const l of state.lines ?? []) {
+    const n = lineChars(l)
+    l._budgetChars = n
+    total += n
+  }
+  state._linesChars = total
+  return total
+}
+
+/** 收据行长度预留（`syncLineBudget` 单轮 need 计入的收据余量：前缀 32 + N 数字位 + 尾 17 < 96——覆 7 位数余量）。 */
+const RECEIPT_RESERVE_CHARS = 96
+
+/**
+ * `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 } = {}) {
+  const lines = state.lines
+  if (!Array.isArray(lines)) return 0
+  if (!Number.isFinite(state._linesChars)) accountAll(state)
+  let removed = 0
+  while (state._linesChars > LINES_CHAR_BUDGET && lines.length > 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
+    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]`
+    if (typeof pushLineLike === "function") pushLineLike(receipt)
+    else {
+      const line = { text: receipt, color: C.dim }
+      line._budgetChars = receipt.length
+      lines.unshift(line)
+      state._linesChars += receipt.length
+    }
+    if (typeof onTrim === "function") onTrim(state, take)
+    if (take >= limit) break // 触底（可裁上限用尽）——接受超额；收敛靠本 break，不靠守卫退出
+  }
+  return removed
+}