thincoder 0.12.60 → 0.12.61

package/src/tui/mouse.mjs

@@ -17,8 +17,11 @@
 import { computeLayout, subagentLineIndex } from "./layout.mjs"
 import { buildConvLines, convViewport } from "./render-conversation.mjs"
 import { toggleFoldBlock, scrollFoldBlock, foldScrollOffset } from "./fold-block.mjs"
-import { cancelAsyncSubagent } from "../agent-tools/subagent-async.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 { routeSubToken } from "./subagent-blocks.mjs" // F-2：queued 取消块移除（⟦ev⟧cancelled 就地路由——引擎动作路径同通道）
+import { denyModalForOwner } from "./key-modes.mjs"
 import { C } from "./ansi.mjs"
 
 /** 2026-08-31 滚轮事件分派（用户需求"展开块能滚动阅读全文"）：坐标命中展开块内容行 →
@@ -30,6 +33,7 @@ export function handleWheel(ctx, button, col, row) {
   const r = row - 1
   if (r < 0) return false
   const dims = state.dims ? state.dims.get() : { cols: process.stdout.columns || 80, rows: process.stdout.rows || 24 }
+  if (mouseOob(col, row, dims)) return false // F-3 sane-gate ②：越界滚轮丢弃——不落面板（> 非 >=——末行列合法）
   const layout = computeLayout(state, dims)
   const P = layout.panels
   // §7.2.1 D4: 固定子agent 面板（conversation 与 todo 之间）——面板行默认穿出
@@ -82,6 +86,13 @@ export function parseMouseClicks(text) {
   return out
 }
 
+/** F-3 sane-gate（RESIZE-MOUSE-LEAK-FIX）：越界坐标判定——resize 后短窗口越界上报丢弃
+ *  （col > dims.cols || row > dims.rows——> 非 >=——末行列合法——与 dims.mjs 同哲学）。
+ *  落点：① handleMouseClick 入口 ② handleWheel 入口 ③ index.mjs 滚轮 fallback 前（评审 #3 定稿）。 */
+export function mouseOob(col, row, dims) {
+  return col > dims.cols || row > dims.rows
+}
+
 /** Map a 0-based screen row to a conversation line index (same math as renderConversation). */
 export function convGlobalIndex(convLen, convH, scroll) {
   const { start, pad } = convViewport(convLen, convH, scroll)
@@ -105,6 +116,7 @@ export function handleMouseClick(ctx, col, row) {
   // Single source (Windows ConPTY instability, 2026-08-30): the cached dims,
   // never a live read that can flip between stale and fresh values.
   const dims = state.dims ? state.dims.get() : { cols: process.stdout.columns || 80, rows: process.stdout.rows || 24 }
+  if (mouseOob(col, row, dims)) return false // F-3 sane-gate ①：越界点击丢弃——resize 后短窗口越界上报不落应用（> 非 >=——末行列合法）
   const layout = computeLayout(state, dims)
   const P = layout.panels
 
@@ -128,10 +140,11 @@ export function handleMouseClick(ctx, col, row) {
     // 评审 #4：保底截断后可见行 ≠ 前 h 行——命中映射与 render-frame 同一几何契约
     // （subagentLineIndex：分隔线 + 末尾区块行优先）。
     const lineEl = layout.subagentLines[subagentLineIndex(layout.subagentLines, P.subagent.h, r - P.subagent.y)]
-    // §19.5 D-M7/D-M7b ⏹ 停止标记（round1 #6 + 用户裁定 B 形态）：列级命中——⏹ 列
-    // 点击 = cancel（定向该子代理——ctx.cancelSubagent 直连池 abort 路径，不经模型
-    // 回合），不触发折叠翻转；**仅 async 区块带 _stopSub 元数据**（sync 无 ⏹——
-    // 其右缘点击照常走折叠翻转——D-M7b ③）；⏹ 区外点击照常走折叠/翻窗。
+    // §19.5 D-M7/D-M7b ⏹ 停止标记（round1 #6 + 用户裁定 B 形态）+ SYNC-CANCEL F3
+    // （2026-09-09）：列级命中——⏹ 列点击 = cancel（定向该子代理——ctx.cancelSubagent
+    // 直连池/registry abort 路径，不经模型回合），不触发折叠翻转；**async 区块与 registry
+    // live 的 sync 区块带 _stopSub 元数据**（headless 无 _agent → sync 不钉——零回归）；
+    // ⏹ 区外点击照常走折叠/翻窗。
     if (lineEl?._stopSub && col >= (lineEl._stopCol ?? Infinity)) {
       ctx.cancelSubagent?.(lineEl._stopSub)
       render()
@@ -186,19 +199,43 @@ export function createMouseDispatch({ agent, state, pushLine, render, popPicker
     try {
       const id = key.slice(key.lastIndexOf("#") + 1)
       const isAdvisorBlock = key.startsWith("advisor#")
-      // §24 D-24b (②-6b): ⏹ on an advisor block cancels the background review
+      // §11.2 D-24b (②-6b): ⏹ on an advisor block cancels the background review
       // (directed abort → cancelled settle: no pending entry / no token).
-      const r = isAdvisorBlock
+      // SYNC-CANCEL F3: async 池/advisor miss 后查 sync registry（⏹ 门控已放开 sync——
+      // cancelSyncChild 与 async cancel 同模块同形态——subagent-async.mjs）。
+      let r = isAdvisorBlock
         ? cancelAsyncAdvisor(agent, id)
         : cancelAsyncSubagent(agent, id)
+      let syncStopped = false
+      if (!isAdvisorBlock && r?.status === "error") {
+        r = cancelSyncChild(agent, key)
+        syncStopped = r?.status === "cancelled"
+      }
       if (r?.status === "error") {
-        // 池内无此条目但区块仍 live（!done）→ 阻塞型（sync）spawn 中——无池条目可定向
-        // 中止（§19.5 cancel 只针对 async 后台子代理）；给出可操作指引而非神秘 unknown id
+        // 拒绝文案改（SYNC-CANCEL）：registry/池 miss + live 块 → 定向中止窗口已过
+        // （成功/折叠/整回合停后 finally 注销——"finished or stop no longer applies"——
+        // 原 "blocking (sync) child mid-call — targeted stop not available" 文案退役——
+        // sync 现已可中止）；无 live 块（真 miss/未知 key）→ 原错误直显。
         const liveBlock = state.subTasks?.[key] && !state.subTasks[key].done
         pushLine(liveBlock
-          ? `[subagent stop] ${key} is a blocking (sync) child mid-call — targeted stop is not available; use Ctrl+C to interrupt the turn`
+          ? `[subagent stop] ${key} has finished or stop no longer applies`
           : `[subagent stop] ${r.error}`, C.error)
       } else {
+        // SYNC-CANCEL v2 模态 deny（用户裁）：**sync ⏹** 顺带 deny 该 child 的 pending
+        // ask（权限/continue 模态）——模态立即解除——child 解绕折叠（async cancel 的
+        // 同类缺陷现状已知——非本批引入——v2 deny 机制后续可复用到 async——此处仅
+        // syncStopped 路径 deny——async 成功取消不 deny 模态——零回归）。
+        if (syncStopped) denyModalForOwner(state, key, { pushLine, render })
+        // F-2（QUEUED-VISIBILITY——2026-09-09）：queued 出队（引擎返回 was:"queued"——
+        // 无 settle 事件链）——UI 直连路径无回合 ctx 事件流——补 executeCancelAction
+        // 同款 TUI 维护：等待块移除（⟦ev⟧cancelled 就地路由——守卫同 routeSubToken
+        // cancelled 分支——不冻结）+ 补位 + 剩余排队头位置/依赖标注刷新（⟦ev⟧queued）。
+        if (r?.was === "queued") {
+          const emit = (t) => { if (!routeSubToken(state, t, render)) pushLine(t, C.dim) }
+          emit(`${key}/⟦ev⟧cancelled\x1e`)
+          maybeRefillAsync(agent)
+          refreshQueuedTokens(agent, emit)
+        }
         pushLine(`[subagent ${key} stop requested]`, C.warn)
       }
     } catch (e) {

package/src/tui/pickers.mjs

@@ -1,8 +1,12 @@
-import { sliceByWidth } from "./render.mjs"
-import { PROVIDER_PRESETS as PRESETS, providerSpec } from "../config.mjs"
 import { computeLayout } from "./layout.mjs"
-
-/** Generic list picker + model/provider management.
+import { createModelPicker } from "./model-picker.mjs"
+
+/** Generic list picker plumbing + /model two-level surface delegation.
+ *  MODEL-MERGE-SESSION 拆分（评审 #9）：/model 两级面（L1 provider → L2 模型行——
+ *  2026-09-10 MODEL-SELECTION v2 起 L2 行 = 运行期拉取候选）+ 渠道
+ *  管理流 + selectModel + pickModelForSlot 迁 model-picker.mjs——本文件只留通用 picker
+ *  栈（showPicker/closePicker/popPicker/rebuildLines）——createModelPicker 以 ctx 接收
+ *  通用绑定（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）。
  *  选中即关闭（Enter = resolve + pop）；Esc = pop 当前层并 resolve(null)。菜单循环由调用方 while 重开。 */
@@ -37,6 +41,12 @@ export function createPickers(ctx) {
    *  互斥保护：入栈前把现有挂起 picker 全部 resolve(null)，消除 Promise 悬挂。
    *  （正常嵌套是先 await 上一层返回再开新的，栈深通常为 1。） */
   function showPicker(title, entries, { defaultIndex = 0 } = {}) {
+    if (!Array.isArray(entries)) {
+      const got = entries && typeof entries.then === "function"
+        ? "a Promise (missing `await`?)"
+        : `a ${entries === null ? "null" : typeof entries}`
+      throw new TypeError(`showPicker("${title}"): entries must be an array — got ${got}`)
+    }
     closePicker()
     return new Promise((resolve) => {
       const itemCount = entries.filter((e) => e.type === "item").length
@@ -65,7 +75,12 @@ export function createPickers(ctx) {
         const sel = row === p.index
         if (sel) selLine = lines.length
         const marker = e.marker ? `  ${e.marker}` : ""
-        lines.push({ text: `${sel ? " ▸ " : "   "}${e.text}${marker}`, color: sel ? ansi.bold + C.text : C.dim, _row: row })
+        // A1（第 20 批 §12.5——D-SS7）：item 附注消费——渲染形态 {prefix}{text}{marker}{note}；
+        // header 分支既有消费同形态，无 note 零追加（不产生尾随空格）。宽度预算 =
+        // renderPicker 既有 8 格余量 + 右截断——保序 prefix→text→marker→note，截断从行尾
+        // 开始 = note 段最先牺牲。
+        const note = e.note ? `  ${e.note}` : ""
+        lines.push({ text: `${sel ? " ▸ " : "   "}${e.text}${marker}${note}`, color: sel ? ansi.bold + C.text : C.dim, _row: row })
         row++
       }
     }
@@ -90,410 +105,13 @@ export function createPickers(ctx) {
 
   function renderPickerLines() { rebuildLines() }
 
-  // === two-level model picker ===
-
-  /** Strip known version/date suffixes to get the "series" name of a model.
-   *  e.g. "qwen-max-latest" → "qwen-max", "qwen-max-2024-09-19" → "qwen-max" */
-  function modelSeries(name) {
-    return name
-      .replace(/-latest$/, "")
-      .replace(/-\d{4}-\d{2}-\d{2}$/, "") // date suffix like -2024-09-19
-      .replace(/-\d{8}$/, "")              // date suffix like -20240919
-  }
-
-  /** Dedupe model list: group by series, keep shortest name per group.
-   *  Reduces "qwen-max, qwen-max-latest, qwen-max-2024-09-19" to just "qwen-max". */
-  function dedupeModels(models) {
-    const groups = new Map()
-    for (const m of models) {
-      const series = modelSeries(m)
-      const existing = groups.get(series)
-      if (!existing || m.length < existing.length) {
-        groups.set(series, m)
-      }
-    }
-    return [...groups.values()].sort()
-  }
-
-  /** entry 唯一标识：异步更新 entries 后按它恢复选中项 */
-  function entryKey(e) {
-    if (!e) return null
-    return e.action === "switch" ? `switch:${e.provider}:${e.model}` : `action:${e.action}`
-  }
-
-  /** 模型信息显示的 context 窗口（PROVIDER.md §15 D-C5）：K 单位形态跟随覆盖值
-   *  （config K 是二进制 K：128 → 128×1024 = 131072 → 显示 "128K"）；≥1M tokens 用 M 形态
-   *  （1_000_000 → "1M"），与 spec 值的大窗口惯例一致。 */
-  function fmtContextK(tokens) {
-    if (tokens >= 1_000_000) return `${Math.round(tokens / 1_048_576)}M`
-    return `${Math.round(tokens / 1024)}K`
-  }
-
-  /** Get API key for a provider (config.json only — env vars are not a key source) */
-  function getApiKey(providerName, providerConfig) {
-    return providerConfig.apiKey
-  }
-
-  /** Level 1: Show provider list. Selecting a provider opens Level 2 (model list). */
-  async function openModelPicker() {
-    // 菜单循环：选中即关闭，子流程结束后重开主菜单；Esc 退出
-    for (;;) {
-      const entries = buildProviderEntries()
-      const items = entries.filter((e) => e.type === "item")
-      const current = items.findIndex(
-        (e) => e.action === "open-models" && e.provider === agent.activeProvider)
-      const picked = showPicker("Models & Providers", entries, { defaultIndex: Math.max(0, current) })
-      const e = await picked
-      if (!e) return
-      if (e.action === "open-models") {
-        // Level 2: open model list for this provider
-        const modelSelected = await openModelListForProvider(e.provider)
-        if (modelSelected) return // model selected, close picker
-        // Esc from model list → return to provider list
-      } else if (e.action === "add") {
-        await addProviderFlow()
-      } else if (e.action === "remove") {
-        await removeProviderFlow()
-      } else if (e.action === "key") {
-        await setKeyFlow()
-      } else if (e.action === "context") {
-        await setContextFlow()
-      }
-    }
-  }
-
-  /** Level 2: Show model list for a specific provider. Returns true if a model was selected. */
-  async function openModelListForProvider(providerName) {
-    const providerConfig = agent.providers.find((p) => p.name === providerName)
-    if (!providerConfig) return false
-
-    const entries = buildModelEntriesForProvider(providerName, providerConfig)
-    const items = entries.filter((e) => e.type === "item")
-    const currentModel = providerName === agent.activeProvider
-      ? (agent.activeModel || providerConfig.model)
-      : providerConfig.model
-    const current = items.findIndex((e) => e.model === currentModel)
-    const picked = showPicker(`${providerName} models`, entries, { defaultIndex: Math.max(0, current) })
-
-    // Async fetch models in background
-    fetchModelsForProvider(providerName, entries).catch((err) => {
-      pushLine(`[model] fetch models failed: ${err.message}`, C.error)
-    })
-
-    const e = await picked
-    if (!e) return false // Esc → back to provider list
-    if (e.action === "switch") {
-      await selectModel(e).catch((err) => pushLine(`[error] ${err.message}`, C.error))
-      return true
-    }
-    return false
-  }
-
-  /** Build entries for Level 1: provider list */
-  function buildProviderEntries() {
-    const entries = []
-    for (const p of agent.providers) {
-      const active = p.name === agent.activeProvider
-      const currentModel = active ? (agent.activeModel || p.model) : p.model
-      const marker = active ? "●" : ""
-      const note = active ? " ← current" : ""
-      const keyStatus = p.apiKey ? "" : " (no key)"
-      // context 窗口显示（PROVIDER.md §15 D-C5/T-C6）：跟随 providers[].context 覆盖
-      const ctxTag = ` (ctx ${fmtContextK(providerSpec(p).context)})`
-      entries.push({
-        type: "item",
-        text: `${p.name.padEnd(12)} ${currentModel}${ctxTag}${note}`,
-        action: "open-models",
-        provider: p.name,
-        marker,
-        note: `${p.baseURL}${keyStatus}`,
-      })
-    }
-    entries.push({ type: "header", text: "Management" })
-    entries.push({ type: "item", text: "Add provider…", action: "add" })
-    if (agent.providers.length > 1) entries.push({ type: "item", text: "Remove provider…", action: "remove" })
-    entries.push({ type: "item", text: "Set / change API key…", action: "key" })
-    entries.push({ type: "item", text: "Set context window (K units)…", action: "context" })
-    return entries
-  }
-
-  /** Build entries for Level 2: model list for a specific provider */
-  function buildModelEntriesForProvider(providerName, providerConfig) {
-    const entries = []
-    const active = providerName === agent.activeProvider
-    const currentModel = active ? (agent.activeModel || providerConfig.model) : providerConfig.model
-    const isDefaultModel = currentModel === providerConfig.model
-
-    entries.push({ type: "header", text: "Current model" })
-    entries.push({
-      type: "item",
-      text: currentModel,
-      action: "switch",
-      provider: providerName,
-      model: currentModel,
-      marker: active && isDefaultModel ? "●" : "",
-    })
-
-    entries.push({ type: "header", text: "Available models (loading…)" })
-    return entries
-  }
-
-  /** Async fetch and splice models for a specific provider */
-  async function fetchModelsForProvider(providerName, entries) {
-    const { listModels } = await import("../provider/index.mjs")
-    const providerConfig = agent.providers.find((p) => p.name === providerName)
-    if (!providerConfig) return
-
-    let selKey = null
-    try {
-      const apiKey = getApiKey(providerName, providerConfig)
-      const models = await listModels(
-        { baseURL: providerConfig.baseURL, apiKey: apiKey ?? "" },
-        { signal: AbortSignal.timeout(10000) }
-      )
-      if (state.picker?.entries !== entries) return // picker closed or changed
-      selKey = entryKey(pickerItems(state.picker)[state.picker.index])
-
-      // Dedupe and filter
-      const deduped = dedupeModels(models)
-      const currentModel = providerName === agent.activeProvider
-        ? (agent.activeModel || providerConfig.model)
-        : providerConfig.model
-
-      // Find the "Available models" header and splice after it
-      const headerIdx = entries.findIndex((e) => e.type === "header" && e.text.startsWith("Available models"))
-      if (headerIdx >= 0) {
-        // Update header with count info
-        const hint = deduped.length < models.length
-          ? ` (${models.length} total, ${deduped.length} shown — type to filter)`
-          : ` (${deduped.length})`
-        entries[headerIdx].text = `Available models${hint}`
-
-        // Splice models after header (skip current model)
-        const newModels = deduped.filter((m) => m !== currentModel)
-        entries.splice(headerIdx + 1, 0, ...newModels.map((m) => ({
-          type: "item",
-          text: m,
-          action: "switch",
-          provider: providerName,
-          model: m,
-        })))
-      }
-    } catch (error) {
-      if (state.picker?.entries !== entries) return
-      const headerIdx = entries.findIndex((e) => e.type === "header" && e.text.startsWith("Available models"))
-      if (headerIdx >= 0) {
-        entries[headerIdx].text = `Available models (fetch failed: ${sliceByWidth(error.message, 30)})`
-      }
-    }
-
-    // Restore selection
-    const pk = state.picker
-    const items = pickerItems(pk)
-    const restored = selKey ? items.findIndex((e) => entryKey(e) === selKey) : -1
-    pk.index = restored >= 0 ? restored : Math.min(pk.index, Math.max(0, items.length - 1))
-    rebuildLines()
-  }
-
-  async function selectModel(item) {
-    closePicker()
-    const target = agent.providers.find((pp) => pp.name === item.provider)
-    if (!target) return
-    const providerDefault = target.model
-    const nextActiveModel = item.model !== providerDefault ? item.model : null // default model → clear activeModel
-    // D-F5a（selectModel——清单外同型写回补正）先盘后存：磁盘 fresh raw 单操作（model + active 指针）——冲突放弃不留 ghost
-    await persistRaw((raw) => {
-      raw.providers ??= []
-      const t = raw.providers.find((p) => p?.name === item.provider)
-      if (t) t.model = item.model
-      raw.activeProvider = item.provider
-      raw.activeModel = nextActiveModel || undefined  // null → omit from config
-    })
-    target.model = item.model
-    agent.activeProvider = item.provider
-    agent.activeModel = nextActiveModel
-    agent.provider = { ...target }
-    if (agent.config?.agent?.compactThresholdAuto) {
-      const { resolveCompactThreshold } = await import("../config.mjs")
-      // provider 对象（非 model 字符串）——阈值跟随 providers[].context 覆盖（PROVIDER.md §15 T-C2）
-      agent.config.agent.compactThreshold = resolveCompactThreshold(null, target).value
-    }
-    agent.config.activeProvider = item.provider
-    agent.config.activeModel = agent.activeModel
-    if (!agent.provider.apiKey) {
-      const selKey = await askQuestion(`Enter API key for ${item.provider} (leave empty to skip):`)
-      if (selKey) await setProviderKey(item.provider, selKey)
-    }
-  }
-
-  async function addProviderFlow() {
-    const entries = [
-      { type: "header", text: "Select a preset provider" },
-      ...Object.entries(PRESETS).filter(([name]) => !agent.providers.some((p) => p.name === name))
-        .map(([name, p]) => ({ type: "item", text: `${name.padEnd(10)} ${p.desc ?? ""} (${p.model})`, name, kind: "preset" })),
-      { type: "header", text: "Other" },
-      { type: "item", text: "Custom (manual config)", name: "__custom__", kind: "custom" },
-    ]
-    const se = await showPicker("Add Provider", entries)
-    if (!se) return // Esc → 返回上级（openModelPicker 循环会重开主菜单）
-    if (se.kind === "custom") {
-      const name = await askQuestion("Enter provider name:")
-      if (!name) return
-      if (agent.providers.some((p) => p.name === name)) return
-      const baseURL = (await askQuestion("Enter baseURL:")).replace(/\/+$/, "")
-      if (!baseURL) return
-      const model = await askQuestion("Enter model name:")
-      if (!model) return
-      // D-C1（TUI.md §10.6D）：API format 改 picker 选择（openai/anthropic/google——默认 index=0
-      // openai）——固定枚举不再手输；Esc/取消 = 中止整个 Add Provider 流程（cfg 尚未落盘——
-      // 无半配置，与旧手输非法 abort 同语义）。与 preset 选择器同形态——零新机制。
-      const format = await showPicker("API format", [
-        { type: "item", text: "openai", name: "openai" },
-        { type: "item", text: "anthropic", name: "anthropic" },
-        { type: "item", text: "google", name: "google" },
-      ])
-      if (!format) return // Esc/取消 → 中止流程
-      const cfg = { name, baseURL, model }
-      if (format.name === "anthropic" || format.name === "google") cfg.format = format.name
-      else if (format.name !== "openai") return // 防御：未知格式（理论不可达——picker 枚举）
-      await persistRaw((raw) => { raw.providers ??= []; raw.providers.push(cfg) }) // D-F5a（#3）先盘后存
-      agent.providers.push(cfg)
-      const key = await askQuestion(`Enter API key for ${name} (skip if none):`)
-      if (key) await setProviderKey(name, key)
-      return
-    }
-    const preset = PRESETS[se.name]
-    if (!preset || agent.providers.some((p) => p.name === se.name)) return
-    const cfg = { name: se.name, baseURL: preset.baseURL, model: preset.model }
-    if (preset.thinking) cfg.thinking = preset.thinking
-    if (preset.reasoningEffort) cfg.reasoningEffort = preset.reasoningEffort
-    if (preset.maxTokens) cfg.maxTokens = preset.maxTokens
-    if (preset.chatPath) cfg.chatPath = preset.chatPath
-    if (preset.format) cfg.format = preset.format
-    await persistRaw((raw) => { raw.providers ??= []; raw.providers.push(cfg) }) // D-F5a（#2）先盘后存
-    agent.providers.push(cfg)
-    const key = await askQuestion(`Enter API key for ${se.name} (skip if none):`)
-    if (key) await setProviderKey(se.name, key)
-  }
-
-  async function removeProviderFlow() {
-    const candidates = agent.providers.filter((p) => p.name !== agent.activeProvider)
-    if (!candidates.length) return
-    const se = await showPicker("Remove Provider", [
-      { type: "header", text: "Select provider to remove" },
-      ...candidates.map((p) => ({ type: "item", text: `${p.name} (${p.model})`, name: p.name })),
-    ])
-    if (!se) return
-    // D-F5a（#4）先盘后存：磁盘 fresh raw 上 splice；冲突放弃不留下内存 ghost
-    await persistRaw((raw) => {
-      raw.providers ??= []
-      const idx = raw.providers.findIndex((p) => p?.name === se.name)
-      if (idx !== -1) raw.providers.splice(idx, 1)
-    })
-    agent.providers.splice(agent.providers.findIndex((p) => p.name === se.name), 1)
-  }
-
-  async function setKeyFlow() {
-    const se = await showPicker("Configure API Key", [
-      { type: "header", text: "Select provider" },
-      ...agent.providers.map((p) => ({ type: "item", text: `${p.name} ${p.apiKey ? `(has key: ${maskKey(p.apiKey)})` : "(no key)"}`, name: p.name })),
-    ])
-    if (!se) return
-    const key = await askQuestion(`Enter API key for ${se.name}:`)
-    if (key) await setProviderKey(se.name, key)
-  }
-
-  async function setProviderKey(name, key) {
-    const target = agent.providers.find((p) => p.name === name)
-    if (!target) return
-    // D-F5a（#5）先盘后存：磁盘 fresh raw 上改目标项 apiKey；冲突放弃不留下内存 ghost
-    await persistRaw((raw) => {
-      raw.providers ??= []
-      const t = raw.providers.find((p) => p?.name === name)
-      if (t) t.apiKey = key
-    })
-    target.apiKey = key
-    if (name === agent.activeProvider) agent.provider.apiKey = key
-  }
-
-  /** /model provider 管理：context 窗口字段（K 单位，PROVIDER.md §15 D-C4/D-C5）——picker 选
-   *  provider + 表单输入；空清空/非法不落盘（D-C1）；落盘 = D-F5a（#6）fresh 单字段补丁——先盘后存。 */
-  async function setContextFlow() {
-    const se = await showPicker("Set Context Window", [
-      { type: "header", text: "Select provider" },
-      ...agent.providers.map((p) => ({
-        type: "item",
-        text: `${p.name} (ctx ${fmtContextK(providerSpec(p).context)})`,
-        name: p.name,
-      })),
-    ])
-    if (!se?.name) return // Esc
-    const target = agent.providers.find((p) => p.name === se.name)
-    if (!target) return
-    const current = Number.isInteger(target.context) && target.context > 0 ? target.context : null
-    const val = (await askQuestion(
-      `Context window for ${se.name} in K units (current: ${current ? `${current}K` : "spec default"} — e.g. 128 = 128K; empty to clear):`
-    ))?.trim() ?? ""
-    let newCtx // undefined = 清空（回 spec 值）
-    if (val !== "") {
-      const n = Number(val)
-      if (!Number.isInteger(n) || n <= 0) {
-        pushLine(`Invalid context: "${val}" — must be a positive integer in K units (e.g. 128 = 128K)`, C.error)
-        return
-      }
-      newCtx = n
-    }
-    await persistRaw((raw) => {
-      raw.providers ??= []
-      const t = raw.providers.find((p) => p?.name === se.name)
-      if (!t) return
-      if (newCtx === undefined) delete t.context
-      else t.context = newCtx
-    })
-    if (newCtx === undefined) delete target.context
-    else target.context = newCtx
-    if (se.name === agent.activeProvider) {
-      // 运行时 provider 同步（同 setProviderKey 先例：只补 context，不重建对象以免丢 activeModel 覆盖）
-      if (newCtx === undefined) delete agent.provider.context
-      else agent.provider.context = newCtx
-      if (agent.config?.agent?.compactThresholdAuto) {
-        const { resolveCompactThreshold } = await import("../config.mjs")
-        agent.config.agent.compactThreshold = resolveCompactThreshold(null, agent.provider).value
-      }
-    }
-    pushLine(target.context !== undefined
-      ? `ctx = ${target.context}K (${target.context * 1024} tokens)`
-      : `context cleared — using model spec (${fmtContextK(providerSpec(target).context)})`, C.tool)
-  }
-
-
-  /** Slot-bound model picker: two-level provider → model selection that RETURNS
-   *  { provider, model } instead of writing main-session state — used by /submodel
-   *  to write into a subagent slot (global or per-role). Esc from the model list
-   *  returns to the provider list (openModelPicker parity); Esc from the provider
-   *  list exits → null. */
-  async function pickModelForSlot() {
-    for (;;) {
-      const providers = agent.providers
-      if (!providers.length) return null
-      const e = await showPicker("Select provider", providers.map((p) => ({
-        type: "item",
-        text: `${p.name.padEnd(12)} ${p.model}`,
-        action: "open-models",
-        provider: p.name,
-      })))
-      if (!e?.provider) return null
-      const providerConfig = providers.find((p) => p.name === e.provider)
-      if (!providerConfig) return null
-      const entries = buildModelEntriesForProvider(e.provider, providerConfig)
-      fetchModelsForProvider(e.provider, entries).catch((err) => {
-        pushLine(`[model] fetch models failed: ${err.message}`, C.error)
-      })
-      const me = await showPicker(`${e.provider} models`, entries)
-      if (!me?.model) continue // Esc from model list → back to provider list
-      return { provider: e.provider, model: me.model }
-    }
-  }
+  // /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,
+  })
 
-  return { showPicker, closePicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey, setContextFlow, pickModelForSlot }
+  return { showPicker, closePicker, popPicker, renderPickerLines, ...modelPicker }
 }