thincoder 0.12.60 → 0.12.62

package/src/tui/clipboard.mjs

@@ -97,8 +97,14 @@ export function insertPastedText(state, rawText, activeQuestion = null) {
   }
   // IKBU3J (2026-08-28)：Ctrl+I 注入框激活时，粘贴进注入文本（与按键路径同语义：去换行保单行），
   // 不得落入主输入框——此前缺失该分支导致粘贴进 state.input、Esc 后残留主输入框。
+  // 第 31 批：注入框 = { chars, cursor } codepoint 模型——粘贴落 cursor 位置（§8.1 键表）。
   if (state.interruptPrompt) {
-    state.interruptPrompt.text += rawText.replace(/[\r\n]+/g, "")
+    const p = state.interruptPrompt
+    if (!Array.isArray(p.chars)) p.chars = p.chars ? [...p.chars] : [] // 形态防御（同 question 面——保文本不丢）
+    const cur = Math.max(0, Math.min(p.cursor ?? p.chars.length, p.chars.length))
+    const chars = [...rawText.replace(/[\r\n]+/g, "").replace(/\t/g, "  ")]
+    p.chars.splice(cur, 0, ...chars)
+    p.cursor = cur + chars.length
     return
   }
   const text = rawText.replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/\t/g, "  ")

package/src/tui/cmd-advisor.mjs

@@ -86,7 +86,7 @@ export async function handleAdvisorCommand(ctx) {
   async function thinkingPicker() {
     let thinkIdx = 0
     for (;;) {
-      const entries = buildThinkingEntries(agent, cfg)
+      const entries = await buildThinkingEntries(agent, cfg)
       const c = await showPicker("Advisor Thinking", entries, { defaultIndex: thinkIdx })
       if (!c) return
       thinkIdx = Math.max(0, entries.filter((e) => e.type === "item").indexOf(c))
@@ -183,7 +183,8 @@ async function fetchAdvisorModels(agent) {
   const result = new Map()
   await Promise.all((agent.providers || []).map(async (p) => {
     try {
-      const models = await listModels({ baseURL: p.baseURL, apiKey: p.apiKey ?? "" }, { signal: AbortSignal.timeout(10000) })
+      // format 透传（M1 分派依据——claude/gemini 走 anthropic/google 拉取分支）
+      const models = await listModels({ baseURL: p.baseURL, apiKey: p.apiKey ?? "", format: p.format }, { signal: AbortSignal.timeout(10000) })
       result.set(p.name, { models, error: null })
     } catch (err) {
       result.set(p.name, { models: [], error: err.message.slice(0, 40) })

package/src/tui/cmd-clear.mjs

@@ -9,12 +9,14 @@ export async function handleClearCommand(ctx) {
     ], { defaultIndex: 1 })
     if (e?.action === "yes") {
       state.lines = []
+      state._linesChars = 0 // TUI-OOM-ROOTCAUSE（§15.3.2）：行集清空 → 字符账同步归零
       state.streaming = ""
       render()
     }
     return
   }
   state.lines = []
+  state._linesChars = 0 // TUI-OOM-ROOTCAUSE（§15.3.2）：行集清空 → 字符账同步归零
   state.streaming = ""
   render()
 }

package/src/tui/cmd-config.mjs

@@ -1,4 +1,5 @@
 import { ansi, C } from "./ansi.mjs"
+import { probeChannelModels, dedupeModels } from "./model-catalog.mjs"
 /** Merge an embedding-key save into the raw config, backfilling baseURL/model from defaults.
  *  Keeps existing custom values (Ollama/local embedding); defaults are the single source
  *  (TUI.md §9.3D — NF1). Exported for unit tests. */
@@ -12,6 +13,13 @@ export function embeddingPatch(raw, embKey, defaults) {
   }
 }
 
+/** 并发池三键当前值读取（POOL-CONFIG-UNIFIED F-3——2026-09-09）：配置值合法（≥1 整数）
+ *  读配置——非法/缺省回退 DEFAULTS（agent.poolLimits 三键——/config 并发池子菜单/
+ *  主菜单/view 三面共用同一读取——config-pool.test.mjs 单测面）。 */
+export function poolCur(pl, defaults) {
+  return (k) => (Number.isInteger(pl?.[k]) && pl[k] >= 1 ? pl[k] : defaults.agent.poolLimits[k])
+}
+
 /** /config command: view and set agent/embedding/proxy config. */
 export async function handleConfigCommand(ctx, args = []) {
   const { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw, maskKey, pickModelForSlot } = ctx
@@ -43,50 +51,53 @@ export async function handleConfigCommand(ctx, args = []) {
     return true
   }
 
-  /** 保存后的公共重载：loadConfig → injectProxy → 恢复 provider 选择。
-   *  运行时 /model 切过 provider（未落盘）时保持它，不回滚到磁盘值。 */
+  /** 保存后的公共重载：loadConfig → injectProxy → 恢复运行时 provider 选择。
+   *  MODEL-MERGE-SESSION 三支改写（cfg 无 active*）：运行时由「会话槽复合仍在 providers 中 →
+   *  保持槽值」或「config defaultModel（新会话起点）」决定——不再有渠道默认字段可回退。 */
   async function reloadConfig() {
     const { loadConfig } = await import("../config.mjs")
     const { injectProxy } = await import("../proxy.mjs")
     const cfg = loadConfig()
     injectProxy(cfg.providersList, cfg)
-    const runtimeName = agent.activeProvider
-    const runtimeModel = agent.activeModel
+    const sessionName = agent.activeProvider
+    const sessionModel = agent.activeModel
     agent.providers = cfg.providersList
     agent.config = cfg
     agent.config.agent ??= {}
-    const keep = cfg.providersList.find((p) => p.name === runtimeName)
-    if (runtimeName && runtimeName !== cfg.activeProvider && keep) {
-      // 运行时选择在新配置里仍存在 → 保持（provider 为注入 proxyUri 后的新对象）
-      agent.activeProvider = runtimeName
-      agent.activeModel = runtimeModel
+    const keep = sessionName ? cfg.providersList.find((p) => p.name === sessionName) : null
+    if (keep) {
+      // 会话 provider 仍存在 → 会话复合优先（槽值——不看 cfg 默认；模型空时落默认复合/渠道默认单值）
+      const dm = cfg.provider.name ? cfg.provider : null
+      const model = sessionModel ?? (dm && dm.name === sessionName ? dm.model : keep.model ?? "")
+      agent.activeProvider = keep.name
+      agent.activeModel = model || null
       agent.provider = { ...keep }
-      if (agent.activeModel) agent.provider.model = agent.activeModel
-    } else if (runtimeName && runtimeName === cfg.activeProvider && runtimeModel) {
-      // Same provider, runtime had a model override — keep it
-      agent.activeProvider = cfg.activeProvider
-      agent.activeModel = runtimeModel
-      const p = cfg.providersList.find((pr) => pr.name === cfg.activeProvider)
-      agent.provider = p ? { ...p } : cfg.provider
-      agent.provider.model = runtimeModel
-      agent.provider.proxyUri = p?.proxyUri
+      agent.provider.model = model
     } else {
-      agent.activeProvider = cfg.activeProvider
-      agent.activeModel = cfg.activeModel ?? null
-      agent.provider = cfg.provider
-      agent.provider.proxyUri = cfg.providersList.find((p) => p.name === cfg.activeProvider)?.proxyUri
+      // 会话 provider 没了（D-S3 静默保留处置）/尚未选 → 采纳 config defaultModel 运行时
+      agent.activeProvider = cfg.provider.name ?? ""
+      agent.activeModel = cfg.provider.model ?? null
+      agent.provider = cfg.provider.name ? { ...cfg.provider } : {}
+    }
+    // 运行时重建后同步注入结果（cfg.provider 系 loadConfig 内建——injectProxy 后建）
+    agent.provider.proxyUri = cfg.providersList.find((p) => p.name === agent.activeProvider)?.proxyUri
+    if (agent.config?.agent?.compactThresholdAuto) {
+      const { resolveCompactThreshold } = await import("../config.mjs")
+      agent.config.agent.compactThreshold = resolveCompactThreshold(null, agent.provider).value
     }
   }
 
   /** 保存 config（mutate 改 raw）→ reloadConfig（provider 代理无需重启即生效）。
    *  D-F5b：磁盘新鲜读 → mutate → 写前 mtime 门控（writeConfigAtomic——冲突放弃 +
    *  .bak 留现场）；冲突时先 reloadConfig 采纳磁盘新值再 throw——调用方 try/catch
-   *  统一展示 "Save failed: config changed on disk concurrently — retry"。 */
+   *  统一展示 "Save failed: config changed on disk concurrently — retry"。
+   *  写链走 ctx.persistRaw（与 TUI 其余 config 写点同源——createConfigHelpers 的
+   *  configPath 测试注入缝随之生效；生产 = 同一 writeConfigAtomic 调用）。 */
   async function saveProxy(mutate) {
-    const { writeConfigAtomic, configPath } = await import("../config.mjs")
-    const r = writeConfigAtomic(configPath, mutate)
+    let failure = null
+    try { await persistRaw(mutate) } catch (e) { failure = e }
     await reloadConfig()
-    if (!r.ok) throw new Error("config changed on disk concurrently — retry")
+    if (failure) throw failure
   }
 
   // ── Proxy sub-menu loop：每轮重建 entries 显示最新状态，defaultIndex 记住上次位置 ──
@@ -231,19 +242,21 @@ export async function handleConfigCommand(ctx, args = []) {
     }
   }
 
-  // ── 并发池子菜单（§24 D-24a/R14——agent.poolLimits——读/改两域；保存经 saveProxy
+  // ── 并发池子菜单（§11.1/§11.2——agent.poolLimits——读/改三域；保存经 saveProxy
   // 落盘 + reloadConfig 热应用——下个 spawn 生效）──
   async function poolMenu() {
     let poolIdx = 0
     for (;;) {
       const pl = agent.config?.agent?.poolLimits ?? {}
       // 显示回退与默认同源（DEFAULTS.agent.poolLimits——配置 DEFAULTS 与运行时回退常量
-      // ASYNC_POOL_LIMITS 的耦合由 T-24a4 锚定断言锁住——防默认值单侧漂移）
-      const cur = (k) => (Number.isInteger(pl[k]) && pl[k] >= 1 ? pl[k] : DEFAULTS.agent.poolLimits[k])
+      // ASYNC_POOL_LIMITS/ADVISOR_POOL_LIMIT 的耦合由 T-24a4 锚定断言（config-pool.test.mjs）
+      // 锁住——防默认值单侧漂移）
+      const cur = poolCur(pl, DEFAULTS)
       const entries = [
-        { type: "header", text: `Async pools: eng-coder ${cur("engCoder")} / other ${cur("other")}（默认 4/4——分域互不阻塞——超限排队）` },
+        { type: "header", text: `Async pools: eng-coder ${cur("engCoder")} / other ${cur("other")} / advisor ${cur("advisor")}（默认 4/4/4——分域互不阻塞——subagent 超限排队/advisor 超限即拒）` },
         { type: "item", text: `eng-coder 池上限 = ${cur("engCoder")}`, action: "engCoder" },
         { type: "item", text: `其他角色池上限 = ${cur("other")}`, action: "other" },
+        { type: "item", text: `advisor 评审池上限 = ${cur("advisor")}`, action: "advisor" },
       ]
       const c = await showPicker("并发池（agent.poolLimits）", entries, { defaultIndex: poolIdx })
       if (!c) return // Esc 返回主菜单
@@ -252,11 +265,62 @@ export async function handleConfigCommand(ctx, args = []) {
       if (!val) continue // 空输入不改动
       const num = Number(val)
       if (!Number.isInteger(num) || num < 1) { pushLine("Pool limit must be a positive integer (≥1)", C.error); continue }
-      const next = { engCoder: cur("engCoder"), other: cur("other"), [c.action]: num }
+      // 写盘全对象（三键——未触碰的键带当前值重写——全非法/空输入不改动）
+      const next = { engCoder: cur("engCoder"), other: cur("other"), advisor: cur("advisor"), [c.action]: num }
+      try {
+        await saveProxy((raw) => { raw.agent ??= {}; raw.agent.poolLimits = { engCoder: next.engCoder, other: next.other, advisor: next.advisor } })
+        pushLabel("❯ Config", ansi.bold + C.tool)
+        pushLine(`agent.poolLimits = { engCoder: ${next.engCoder}, other: ${next.other}, advisor: ${next.advisor} }（下个 spawn 生效——分域互不阻塞）`, C.tool)
+      } catch (error) { pushLine(`Save failed: ${error.message}`, C.error) }
+    }
+  }
+
+  // ── 默认模型子菜单（F-5：config.defaultModel 专用入口——L1 provider → L2 **运行期拉取**候选 →
+  // 写 config.defaultModel——saveProxy/writeConfigAtomic 通道——不落会话槽；不加手输行——O1 已裁）──
+  async function defaultModelMenu() {
+    let idx = 0
+    // M9 配置阶段准入：进本子菜单探一次各渠道 `/models`（复用 M1 + 会话缓存）。
+    // 探通 → 渠道可用 + 候选直接可用；探不通 → 不缓存不阻断（标「不可用」且不入可选来源）。
+    const probes = new Map()
+    pushLine("Fetching channel model lists (GET /models)…", C.dim)
+    await Promise.all(agent.providers.map(async (p) => {
+      const r = await probeChannelModels(p)
+      probes.set(p.name, r)
+      if (r.ok) delete p._unavailable
+      else p._unavailable = true
+    }))
+    for (;;) {
+      const dm = agent.config?.defaultModel ?? null
+      const entries = [
+        { type: "header", text: `config.defaultModel = ${dm ?? "(not set — 新会话起点未配置)"}` },
+        ...agent.providers.map((p) => {
+          const r = probes.get(p.name)
+          if (!r?.ok) return { type: "item", text: `${p.name.padEnd(10)} 不可用`, action: "provider", provider: p.name, unavailable: true }
+          const n = r.list.length
+          // M3③：渠道行显示渠道默认模型（单值）+ 探得候选数
+          return { type: "item", text: `${p.name.padEnd(10)} ${p.model ?? "(no default model)"} (${n} model${n === 1 ? "" : "s"})`, action: "provider", provider: p.name }
+        }),
+      ]
+      const c = await showPicker("Default Model (新会话起点)", entries, { defaultIndex: idx })
+      if (!c) return // Esc → 返回主菜单
+      idx = Math.max(0, entries.filter((e) => e.type === "item").indexOf(c))
+      if (c.action !== "provider") continue
+      const r = probes.get(c.provider)
+      if (!r?.ok) {
+        // 准入判据：探不通的渠道不作为默认模型的可选来源——明示原因（M8 长句），不阻断菜单
+        pushLine(r?.message ?? `${c.provider} 不可用`, C.error)
+        continue
+      }
+      if (r.list.length === 0) { pushLine(`${c.provider}: /models 未返回任何模型`, C.error); continue }
+      const me = await showPicker(`${c.provider} models`, [
+        { type: "header", text: "选为 config.defaultModel（新会话起点——当前会话槽不受影响）" },
+        ...dedupeModels(r.list).map((m) => ({ type: "item", text: m, action: "model", model: m })),
+      ])
+      if (!me) continue // Esc → 回默认模型菜单
       try {
-        await saveProxy((raw) => { raw.agent ??= {}; raw.agent.poolLimits = { engCoder: next.engCoder, other: next.other } })
+        await saveProxy((raw) => { raw.defaultModel = `${c.provider}:${me.model}` })
         pushLabel("❯ Config", ansi.bold + C.tool)
-        pushLine(`agent.poolLimits = { engCoder: ${next.engCoder}, other: ${next.other} }（下个 spawn 生效——分域互不阻塞）`, C.tool)
+        pushLine(`config.defaultModel = ${c.provider}:${me.model}（新会话起点；会话模型不受影响）`, C.tool)
       } catch (error) { pushLine(`Save failed: ${error.message}`, C.error) }
     }
   }
@@ -271,13 +335,14 @@ export async function handleConfigCommand(ctx, args = []) {
     tc = agent.config?.traces ?? {}
     const consultCount = (ac.consultModels ?? []).length
     const pl = ac.poolLimits ?? {}
-    const cur = (k) => (Number.isInteger(pl[k]) && pl[k] >= 1 ? pl[k] : DEFAULTS.agent.poolLimits[k])
+    const cur = poolCur(pl, DEFAULTS)
     const mainEntries = [
       { type: "header", text: `proxy=${proxySummary()} | maxTurns=${ac.maxTurns ?? 200} | compactThreshold=${ac.compactThreshold ?? 100000} | verifyGuard=${ac.verifyGuard === true ? "on" : "off"} | consult=${consultCount} model(s) | embedding=${agent.memory?.embedder ? "on" : "off"} | traces=${tc.enabled === false ? "off" : "on"}` },
       { type: "item", text: `agent.maxTurns = ${ac.maxTurns ?? 200}`, action: "agent.maxTurns" },
       { type: "item", text: `agent.subagentTurns = ${ac.subagentTurns ?? 100}`, action: "agent.subagentTurns" },
-      { type: "item", text: `并发池 agent.poolLimits = engCoder ${cur("engCoder")} / other ${cur("other")}（async 分域上限）`, action: "pool" },
+      { type: "item", text: `并发池 agent.poolLimits = engCoder ${cur("engCoder")} / other ${cur("other")} / advisor ${cur("advisor")}（async 分域上限）`, action: "pool" },
       { type: "item", text: `agent.compactThreshold = ${ac.compactThreshold ?? 100000}${agent.config?.agent?.compactThresholdAuto ? " (auto)" : ""}`, action: "agent.compactThreshold" },
+      { type: "item", text: `config.defaultModel = ${agent.config?.defaultModel ?? "(未设置 — 新会话起点)"}`, action: "defaultModel" },
       { type: "item", text: `agent.verifyGuard = ${ac.verifyGuard === true ? "on" : "off"}`, action: "agent.verifyGuard" },
       { type: "item", text: `traces.enabled = ${tc.enabled === false ? "off" : "on"}（轨迹存档——发布默认关——隐私）`, action: "traces.enabled" },
       { type: "item", text: `traces.retentionHours = ${tc.retentionHours ?? 24} h（超期文件启动时清理）`, action: "traces.retentionHours" },
@@ -295,7 +360,8 @@ export async function handleConfigCommand(ctx, args = []) {
 
     if (choice.action === "view") {
       pushLabel("❯ Config", ansi.bold + C.tool)
-      pushLine(`Active: ${agent.activeProvider} / ${agent.provider.model}`, C.dim)
+      pushLine(`Session model: ${agent.activeProvider ? `${agent.activeProvider}:${agent.activeModel ?? ""}` : "(none)"}`, C.dim)
+      pushLine(`defaultModel (config): ${agent.config?.defaultModel ?? "(not set — 新会话起点)"}`, C.dim)
       pushLine(`Key:    ${maskKey(agent.provider.apiKey)}`, C.dim)
       pushLine(`agent.maxTurns: ${ac.maxTurns ?? 200}`, C.dim)
       pushLine(`agent.subagentTurns: ${ac.subagentTurns ?? 100}`, C.dim)
@@ -304,7 +370,7 @@ export async function handleConfigCommand(ctx, args = []) {
       pushLine(`traces.enabled: ${tc.enabled === false ? "off" : "on"}（默认 off——发布隐私——本地分析可开）`, C.dim)
       pushLine(`traces.retentionHours: ${tc.retentionHours ?? 24}（超期文件启动清理——D-TR10）`, C.dim)
       pushLine(`agent.consultModels: ${(ac.consultModels ?? []).map((m) => `${m.provider}:${m.model}${m.effort ? ` (${m.effort})` : ""}`).join(", ") || "(none)"}`, C.dim)
-      pushLine(`agent.poolLimits: { engCoder: ${cur("engCoder")}, other: ${cur("other")} }（async 分域上限——默认 4/4——agent.poolLimits 可配）`, C.dim)
+      pushLine(`agent.poolLimits: { engCoder: ${cur("engCoder")}, other: ${cur("other")}, advisor: ${cur("advisor")} }（async 分域上限——默认 4/4/4——agent.poolLimits 可配）`, C.dim)
       pushLine(`agent.consultTurns: ${ac.consultTurns ?? 40}`, C.dim)
       pushLine(`agent.consultTimeoutMs: ${Math.round((ac.consultTimeoutMs ?? 600000) / 60000)} min`, C.dim)
       pushLine(`embedding: ${agent.memory?.embedder ? `enabled (${ec.model ?? ""})` : "disabled (FTS only)"}`, C.dim)
@@ -328,6 +394,11 @@ export async function handleConfigCommand(ctx, args = []) {
       continue
     }
 
+    if (choice.action === "defaultModel") {
+      await defaultModelMenu()
+      continue
+    }
+
     if (choice.action === "embedkey") {
       await setEmbedKey() // 保存成功/取消都回主菜单（Esc 退出）
       continue

package/src/tui/cmd-eng.mjs

@@ -1,14 +1,14 @@
 /** /eng command: toggle engineering mode.
- *  Requires METHODOLOGY.md in project root. Offers to create one if missing.
- *  ctx: { agent, pushLine, pushLabel, showPicker } */
-import { existsSync, copyFileSync, readFileSync, writeFileSync, mkdirSync, renameSync, unlinkSync } from "node:fs"
-import { join, dirname } from "node:path"
-import { fileURLToPath } from "node:url"
+ *  No prerequisites (FR11): the mode works on any project — no methodology file,
+ *  no docs tree, no git. The retired gate demanded a methodology file and offered
+ *  to create it from a template that no longer ships — that option crashed
+ *  (PORTABILITY P14). ctx: { agent, pushLine, pushLabel } */
+import { readFileSync, writeFileSync, mkdirSync, renameSync, unlinkSync } from "node:fs"
+import { dirname } from "node:path"
 import { ansi, C } from "./ansi.mjs"
 import { activeSlot, slotPath } from "../session.mjs"
 import { purgeExpiredDesignTokens } from "../token-ttl.mjs"
 
-const templateDir = join(fileURLToPath(import.meta.url), "..", "..", "prompts")
 import { ENG_OFF_REMINDER } from "../agent.mjs"
 
 /** Atomic slot write (same shape as session.mjs writeSessionFile — kept local to avoid a
@@ -26,29 +26,13 @@ export function writeSessionFile(p, data) {
 }
 
 export async function handleEngCommand(ctx) {
-  const { agent, pushLine, pushLabel, showPicker } = ctx
+  const { agent, pushLine, pushLabel } = ctx
   agent.config.agent ??= {}
-  const methodologyPath = join(agent.cwd, "METHODOLOGY.md")
-
-  // Toggle on: check METHODOLOGY.md exists
-  if (!agent.config.agent.engineering) {
-    if (!existsSync(methodologyPath)) {
-      pushLabel("❯ Eng", ansi.bold + C.tool)
-      pushLine("METHODOLOGY.md not found in project root.", C.warn)
-      const choice = await showPicker("Create METHODOLOGY.md?", [
-        { type: "header", text: "Engineering mode requires a methodology file" },
-        { type: "item", text: "Yes, create from template", action: "create" },
-        { type: "item", text: "No, cancel", action: "cancel" },
-      ])
-      if (!choice || choice.action !== "create") return
-      const src = join(templateDir, "methodology-template.md")
-      copyFileSync(src, methodologyPath)
-      pushLine(`Created METHODOLOGY.md (from template) → edit it to fit your project`, C.tool)
-    }
-  }
 
+  // Toggle on/off — no prerequisite check (FR11: engineering mode depends on no
+  // project file at all; a missing docs tree or git repo must not block it).
   agent.config.agent.engineering = !agent.config.agent.engineering
-  // §24 D-24b: per-review instances die with the mode (fresh convergence cycles
+  // §11.2 D-24b: per-review instances die with the mode (fresh convergence cycles
   // on the next toggle).
   agent._advisorRuns = new Map()
   if (!agent.config.agent.engineering) {
@@ -67,7 +51,7 @@ export async function handleEngCommand(ctx) {
   pushLabel("❯ Eng", ansi.bold + C.tool)
   pushLine(`Engineering mode: ${agent.config.agent.engineering ? "ON" : "OFF"} (session)`, C.tool)
   if (agent.config.agent.engineering) {
-    pushLine(`  → strictly following ${methodologyPath}`, C.dim)
+    pushLine(`  → design-before-code enforced (design review + user approval before code)`, C.dim)
     if (clearedExpired > 0) {
       pushLine(`  → cleared ${clearedExpired} expired design token${clearedExpired === 1 ? "" : "s"}; valid tokens from prior reviews stay usable`, C.dim)
     }

package/src/tui/cmd-exit.mjs

@@ -1,9 +1,7 @@
-/** /exit command: exit TUI (same path as Ctrl+C).
- *  Direct synchronous process.exit — prevents the post-handler render()
- *  from redrawing the TUI over the cleaned terminal. The actual cleanup
- *  (saveSession + closeMcp + terminal reset) runs once
- *  via the process.on("exit") handler registered in index.mjs.
- */
-export async function handleExitCommand(_ctx) {
-  process.exit(0)
+/** /exit command: exit TUI via ctx.exit（F-2——RESIZE-MOUSE-LEAK-FIX——与 Ctrl+C 同退出
+ *  形态：cleanup 同步执行 + 延迟 exit——非同派发路径）。不再直调 process.exit(0)（零提前量——
+ *  清理押 'exit' 事件）；handleSlash 返回后的无条件 render() 由 render-loop tuiActive 守卫
+ *  抑制（cleanup 已清活动态——不把 TUI 帧重绘到已恢复的主屏）。 */
+export async function handleExitCommand(ctx) {
+  ctx.exit?.() // ctx.exit 由 index.mjs 装配（cleanup + 100ms 延迟 exit）
 }

package/src/tui/cmd-model.mjs

@@ -1,23 +1,25 @@
 import { C } from "./ansi.mjs"
+import { parseModelRef } from "../config.mjs"
 
-/** /model command: open model picker, or switch provider directly via `/model <provider>[:model]`.
+/** /model command: open the session model picker, or switch the SESSION model directly via
+ *  `/model <provider>:<model>`（MODEL-MERGE-SESSION——裁定③：裸 provider 拒——显式 p:m；
+ *  MODEL-SELECTION v2：显式复合一律放行——仅[空值/裸值/未知 provider]无效（M4），候选清单
+ *  由运行期拉取决定——不再有成员校验）。
+ *  /model 是会话级操作（写槽——不写 config）——config 默认模型走 /config → 默认模型。
  *  ctx: { agent, openModelPicker, selectModel, pushLine } */
 export async function handleModelCommand(ctx, args = []) {
-  const raw = args[0]?.toLowerCase()
+  const raw = args[0]?.trim()
   if (!raw) {
     ctx.openModelPicker().catch((e) => ctx.pushLine(`[error] ${e.message}`, C.error))
     return
   }
-  // Parse "provider:model" syntax
-  const colonIdx = raw.indexOf(":")
-  const providerName = colonIdx >= 0 ? raw.slice(0, colonIdx) : raw
-  const modelName = colonIdx >= 0 ? raw.slice(colonIdx + 1) : null
-
-  const target = ctx.agent.providers.find((p) => p.name.toLowerCase() === providerName)
-  if (!target) {
-    const available = ctx.agent.providers.map((p) => p.name).join(", ")
-    ctx.pushLine(`Unknown provider: ${providerName} (available: ${available})`, C.error)
+  // 首冒号复合解析（parseModelRef——裸 provider / 未知 provider / 空模型段 → ok:false；
+  // 候选外/多冒号一律放行——M4）
+  const parsed = parseModelRef(raw, ctx.agent.providers)
+  if (!parsed.ok) {
+    ctx.pushLine(`[error] ${parsed.reason}`, C.error)
+    ctx.pushLine(`/model 用法: /model provider:model（会话级——config 默认走 /config → 默认模型）`, C.dim)
     return
   }
-  await ctx.selectModel({ provider: target.name, model: modelName || target.model }).catch((e) => ctx.pushLine(`[error] ${e.message}`, C.error))
+  await ctx.selectModel({ provider: parsed.provider.name, model: parsed.model }).catch((e) => ctx.pushLine(`[error] ${e.message}`, C.error))
 }

package/src/tui/cmd-new.mjs

@@ -1,4 +1,4 @@
-import { newSession, resetSessionState } from "../session.mjs"
+import { newSession, resetSessionState, bindRecordStore, slotPath } from "../session.mjs"
 import { C } from "./ansi.mjs"
 
 /** /new command: start a new session in a fresh slot.
@@ -14,8 +14,12 @@ export async function handleNewCommand(ctx) {
     // 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)

package/src/tui/cmd-reindex.mjs

@@ -40,5 +40,12 @@ export async function handleReindexCommand(ctx) {
   ])
   pushLine(`  code: ${cr.total} files, +${cr.updated} ~${cr.skipped} -${cr.removed}`, C.dim)
   pushLine(`  doc: ${dr.total} files, +${dr.updated} ~${dr.skipped} -${dr.removed}`, C.dim)
+  // Unlisted extensions (PORTABILITY PO-9): files the index skipped because no
+  // index claims their extension — visible here + declarable in the project.
+  const unlisted = cr?.unlistedExts?.count ? cr.unlistedExts : dr?.unlistedExts
+  if (unlisted?.count > 0) {
+    const sample = unlisted.exts.map((e) => e.ext).join(" ")
+    pushLine(`  ${unlisted.count} file(s) with unlisted extension(s) skipped (${sample}) — declare them in .thincoder/conventions.json (index.codeExtensions / index.docExtensions) to index them`, C.warn)
+  }
   pushLine(`[reindex] Done, ${total} entries total. Vectors will be lazily generated on next search.`, C.tool)
 }

package/src/tui/cmd-session.mjs

@@ -1,4 +1,4 @@
-import { listSlots, switchToSlot, applySession, renameSlot, activeSlot, slotOccupancy, readEndMarker } from "../session.mjs"
+import { listSlots, switchToSlot, applySession, renameSlot, activeSlot, slotOccupancy, readEndMarker, sessionDescriptor } from "../session.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { restoreLines } from "./startup.mjs"
 import { stringWidth, sliceByWidth } from "./render.mjs"
@@ -89,14 +89,18 @@ 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 })
   // 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-submodel.mjs

@@ -1,7 +1,7 @@
 import { ansi, C } from "./ansi.mjs"
 
 /** Subagent role slots — each has an independent model override slot */
-export const SUBMODEL_SLOTS = ["explore", "plan", "coder", "eng-coder"]
+export const SUBMODEL_SLOTS = ["explore", "plan", "coder", "eng-coder", "eng-designer"]
 
 /** Human-readable effective display with inheritance source. role=null → global slot.
  *  source semantics: "type" = role-specific override (subagentModels[role]),
@@ -21,12 +21,14 @@ function slotDisplay(agent, role) {
 
 /** /submodel command: subagent model config — picker menu (default) or direct args.
  *  ctx: { agent, pushLine, showPicker, askQuestion, persistRaw, pickModelForSlot }
- *  /submodel                        → picker: global + 4 role slots
+ *  /submodel                        → picker: global + 5 role slots
  *  /submodel <value>                → set global default
  *  /submodel <type> <value>         → set a role slot
  *  /submodel <type>                 → show a slot
  *  /submodel reset [type]           → clear global (or a slot)
- *  value forms: provider:model | provider name | model name (same as subagent tool model arg) */
+ *  value forms: provider:model | provider name | model name (same as subagent tool model arg) —
+ *  MODEL-MERGE-SESSION：会话模型 = provider:model 复合（agent.activeProvider/activeModel 双字段
+ *  恒非空——无渠道默认字段——父会话模型引用一律复合值）。 */
 export async function handleSubmodelCommand(ctx, args = []) {
   const { agent, pushLine, showPicker, askQuestion, persistRaw, pickModelForSlot } = ctx
   const input = args.join(" ").trim()
@@ -85,7 +87,7 @@ export async function handleSubmodelCommand(ctx, args = []) {
     return
   }
 
-  // ── Picker menu: global + 4 role slots ──
+  // ── Picker menu: global + 5 role slots ──
   // for(;;) loop relies on showPicker's async/Promise suspension — every iteration
   // awaits a user choice; Esc (null) exits. Mirrors openModelPicker's menu-loop pattern.
   for (;;) {
@@ -132,7 +134,8 @@ export async function handleSubmodelCommand(ctx, args = []) {
         pushLine(`Subagent global model set to \`${value}\`.`, C.text)
       }
     } else if (sub.action === "parent") {
-      const value = `${agent.activeProvider}:${agent.activeModel ?? agent.provider?.model}`
+      // 会话复合值语义（MODEL-MERGE-SESSION——activeModel 恒非空——不再回退渠道字段）
+      const value = `${agent.activeProvider}:${agent.activeModel ?? ""}`
       if (role) {
         await persist((a) => { a.subagentModels ??= {}; a.subagentModels[role] = value })
       } else {

package/src/tui/cmd-undo.mjs

@@ -6,7 +6,7 @@
  */
 
 import { existsSync, writeFileSync, unlinkSync, readFileSync } from "node:fs"
-import { join } from "node:path"
+import { isAbsolute, join } from "node:path"
 import { ansi, C } from "./ansi.mjs"
 
 const MAX_UNDO = 50
@@ -20,7 +20,8 @@ export function snapshotForUndo(agent, toolName, args, cwd) {
   const path = args.path ?? args.file
   if (!path || typeof path !== "string") return
 
-  const abs = join(cwd, ...path.split("/"))
+  // 绝对路径直接用（path.join 对绝对段不重置——Windows 反斜杠路径也不按 "/" 切分）；相对路径整段 join(cwd)。
+  const abs = isAbsolute(path) ? path : join(cwd, path)
   let backup = null
   try {
     if (existsSync(abs)) {
@@ -68,7 +69,7 @@ export async function handleUndoCommand(ctx) {
   const e = await showPicker("Undo", entries)
   if (!e) return
   const item = stack[e.idx]
-  const abs = join(agent.cwd, ...item.path.split("/"))
+  const abs = isAbsolute(item.path) ? item.path : join(agent.cwd, item.path)
 
   try {
     if (item.backup === null) {