thincoder 0.10.0 → 0.11.1

package/src/tui/key-handler.mjs

@@ -1,14 +1,15 @@
 import { ansi, C } from "./ansi.mjs"
 import { readClipboardText, insertPastedText } from "./clipboard.mjs"
+import { computeLayout } from "./layout.mjs"
 
 /** Keyboard event dispatch: permission confirm / question / picker / wizard / edit / scroll / history / paste.
  *  Extracted from index.mjs.
- *  ctx: { agent, state, render, renderPickerLines, closePicker,
+ *  ctx: { agent, state, render, renderPickerLines, popPicker,
  *         handleSlash, handleTab, submit, pasteClipboardImage,
  *         wizardChooseProvider, wizardSubmitText, cancelWizard, wizardProviderItems,
  *         renderWizard, pushLine, cleanup } */
 export function createKeyHandler(ctx) {
-  const { agent, state, render, closePicker, renderPickerLines, handleSlash, handleTab, submit, pasteClipboardImage, wizardChooseProvider, wizardSubmitText, cancelWizard, wizardProviderItems, renderWizard, pushLine, cleanup } = ctx
+  const { agent, state, render, popPicker, renderPickerLines, handleSlash, handleTab, submit, pasteClipboardImage, wizardChooseProvider, wizardSubmitText, cancelWizard, wizardProviderItems, renderWizard, pushLine, cleanup } = ctx
 
   return function onKeypress(str, key = {}) {
     // permission confirm state: y approve / n deny / a approve + turn ON AUTO (no further prompts)
@@ -104,6 +105,11 @@ export function createKeyHandler(ctx) {
     }
 
     if (key.ctrl && key.name === "c") {
+      // picker 打开时 Ctrl+C = 取消当前 picker（等同 Esc），不杀进程
+      if (state.picker) {
+        popPicker(null)
+        return
+      }
       if (state.processing && state.controller) {
         state.controller.abort()
         pushLine("[Aborting…]", C.warn)
@@ -111,7 +117,9 @@ export function createKeyHandler(ctx) {
         return
       }
       cleanup()
-      setTimeout(() => process.exit(0), 100)
+      // 延迟退出可注入（测试传大值并清理定时器，避免定时器在 mock 恢复后调到真 process.exit）
+      ctx.exitTimer = setTimeout(() => process.exit(0), ctx.exitDelay ?? 100)
+      ctx.exitTimer.unref?.()
     }
 
     // Ctrl+I (or Tab during processing): interrupt and inject a message
@@ -132,8 +140,14 @@ export function createKeyHandler(ctx) {
         const msg = (state.interruptPrompt.text ?? "").trim()
         state.interruptPrompt = null
         if (msg) {
-          pushLine(`  [inject] ${msg}`, C.warn)
-          state.controller.abort({ interrupt: true, message: msg })
+          // Guard: if the turn already finished while the user was typing, the controller
+          // may have been replaced or already aborted — don't abort a live turn by mistake.
+          if (state.processing && state.controller && !state.controller.signal.aborted) {
+            pushLine(`  [inject] ${msg}`, C.warn)
+            state.controller.abort({ interrupt: true, message: msg })
+          } else {
+            pushLine(`  [inject — turn ended, message queued] ${msg}`, C.dim)
+          }
           render()
         }
       } else if (key.name === "backspace") {
@@ -146,25 +160,47 @@ export function createKeyHandler(ctx) {
       return
     }
 
-    // generic list picker: ↑↓ move, Enter confirm, Esc cancel
+    // generic list picker: ↑↓/PgUp/PgDn/Home/End 导航，输入即过滤，Enter 选中，Esc 取消
     if (state.picker) {
-      const items = state.picker?.entries.filter((e) => e.type === "item") ?? []
+      const p = state.picker
+      const items = p.filteredItems ?? p.entries.filter((e) => e.type === "item")
+      // 可视窗高度：直接取 layout 算出的实际 picker 面板高（含小终端 pickerFinalH 压缩），减标题行。
+      // 单一数据源，避免与 layout.mjs 公式漂移
+      const winH = Math.max(1, (computeLayout(state, { cols: process.stdout.columns || 80, rows: process.stdout.rows || 24 }).panels.picker?.h ?? p.lines.length + 1) - 1)
+      const applyFilter = (f) => {
+        p.filter = f
+        p.index = 0
+        p.scroll = 0
+        renderPickerLines()
+      }
       if (key.name === "escape") {
-        closePicker()
+        popPicker(null)
       } else if (key.name === "up" && items.length) {
-        state.picker.index = (state.picker.index - 1 + items.length) % items.length
+        p.index = (p.index - 1 + items.length) % items.length
         renderPickerLines()
       } else if (key.name === "down" && items.length) {
-        state.picker.index = (state.picker.index + 1) % items.length
+        p.index = (p.index + 1) % items.length
+        renderPickerLines()
+      } else if (key.name === "pageup" && items.length) {
+        p.index = Math.max(0, p.index - winH)
         renderPickerLines()
-      } else if (key.name === "return" && items.length) {
-        const selected = items[state.picker.index]
-        const handler = state.picker.onSelect
-        state.picker = null // close picker first, avoid picker still being present during onSelect render
-        // onSelect is async (e.g. removing a provider writes file), catch errors so they aren't swallowed
-        Promise.resolve(handler?.(selected)).catch((err) => {
-          pushLine(`[error] ${err.message}`, C.error)
-        }).finally(() => render())
+      } else if (key.name === "pagedown" && items.length) {
+        p.index = Math.min(items.length - 1, p.index + winH)
+        renderPickerLines()
+      } else if (key.name === "home" && items.length) {
+        p.index = 0
+        renderPickerLines()
+      } else if (key.name === "end" && items.length) {
+        p.index = items.length - 1
+        renderPickerLines()
+      } else if (key.name === "backspace") {
+        if (p.filter) applyFilter(p.filter.slice(0, -1))
+      } else if ((key.name === "return" || key.name === "enter" || str === "\r") && items.length) {
+        popPicker(items[p.index]) // 选中即关闭
+      } else if (str && !key.ctrl && !key.meta) {
+        // 输入即过滤；粘贴的多行文本先去换行（与输入框清洗口径一致），仍含控制字符则整段丢弃
+        const text = str.replace(/[\r\n]+/g, "")
+        if (text && !/[\x00-\x1f\x7f]/.test(text)) applyFilter(p.filter + text)
       }
       return
     }
@@ -184,7 +220,7 @@ export function createKeyHandler(ctx) {
         } else if (key.name === "down" && items.length) {
           w.index = (w.index + 1) % items.length
           renderWizard()
-        } else if (key.name === "return" && items.length) {
+        } else if ((key.name === "return" || key.name === "enter" || str === "\r") && items.length) {
           wizardChooseProvider(items[w.index])
         }
         return
@@ -300,7 +336,7 @@ export function createKeyHandler(ctx) {
       }
       return
     }
-    if (key.name === "return") {
+    if (key.name === "return" || key.name === "enter" || str === "\r") {
       submit().catch((e) => pushLine(`[error] ${e.message}`, C.error))
       return
     }

package/src/tui/layout.mjs

@@ -70,7 +70,7 @@ export function computeLayout(state, { cols, rows }) {
     : 0
 
   // Tool output panels: max 8 lines per panel, capped at reasonable total
-  const panels = Object.values(state.outputPanels).filter((p) => !p.done)
+  const panels = Object.values(state.outputPanels).filter((p) => !p.done || p._pendingDone)
   const outputPanelsH = panels.length > 0 ? Math.min(panels.length * 8, rows - 10) : 0
 
   // Permission preview (height depends on wrapped content)
@@ -92,7 +92,17 @@ export function computeLayout(state, { cols, rows }) {
 
   // --- elastic panel: conversation takes remaining space ---
   const fixedH = headerH + inputBoxH + statusH + pickerH + taskPanelH + subPanelH + outputPanelsH + permPreviewH + queueH
-  const convH = Math.max(1, rows - fixedH)
+  let convH = Math.max(1, rows - fixedH)
+
+  // 小终端高度补偿（best-effort，不保证总行数 ≤ rows）：先压 conversation 到最小 1 行，
+  // 仍超出再压 picker 到最小 3 行。极端情况（permission preview + tasks 等同屏）补偿后仍可能
+  // 溢出 —— 其余面板不强行裁剪，由渲染层自行截断
+  let pickerFinalH = pickerH
+  const overflow = fixedH + convH - rows
+  if (overflow > 0 && pickerH > 0) {
+    pickerFinalH = Math.max(Math.min(3, pickerH), pickerH - overflow)
+    convH = Math.max(1, rows - (fixedH - pickerH + pickerFinalH))
+  }
 
   // --- Y coordinates (0-indexed, +1 when used with ANSI) ---
   let y = 0
@@ -101,7 +111,7 @@ export function computeLayout(state, { cols, rows }) {
   const subagent = subPanelH > 0 ? { y, h: subPanelH } : null; y += subPanelH
   const output = outputPanelsH > 0 ? { y, h: outputPanelsH } : null; y += outputPanelsH
   const todo = taskPanelH > 0 ? { y, h: taskPanelH } : null; y += taskPanelH
-  const picker = pickerH > 0 ? { y, h: pickerH } : null; y += pickerH
+  const picker = pickerFinalH > 0 ? { y, h: pickerFinalH } : null; y += pickerFinalH
   const permission = permPreviewH > 0 ? { y, h: permPreviewH } : null; y += permPreviewH
   const queue = queueH > 0 ? { y, h: queueH } : null; y += queueH
   const inputBox = { y, h: inputBoxH }; y += inputBoxH

package/src/tui/pickers.mjs

@@ -1,144 +1,154 @@
 import { sliceByWidth } from "./render.mjs"
 import { PROVIDER_PRESETS as PRESETS } from "../config.mjs"
 
-/** Generic list picker + unified model/provider management picker.
- *  Receives closure dependencies via createPickers(ctx),
- *  returns { openPicker, closePicker, renderPickerLines, openModelPicker, setProviderKey }. */
+/** Generic list picker + model/provider management.
+ *  单一 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 重开。 */
 export function createPickers(ctx) {
   const { agent, state, render, ansi, C, pushLine, persistRaw, askQuestion, maskKey } = ctx
 
-  const pickerItems = () => state.picker?.entries.filter((e) => e.type === "item") ?? []
+  state.pickerStack ??= []
 
-  /** Open a generic list picker. entries contain { type: "header"|"item", text, note?, ...extra },
-   *  onSelect receives the selected entry (with extra fields forwarded), onCancel called on Esc. */
-  function openPicker({ title, entries, onSelect, onCancel, defaultIndex = 0 }) {
-    state.picker = { title, entries, lines: [], index: defaultIndex, scroll: 0, selectedLine: 0, onSelect, onCancel }
-    renderPickerLines()
+  /** 当前 picker 过滤后的 item 列表（filter 大小写不敏感子串匹配，header 不参与） */
+  function pickerItems(p) {
+    const f = (p.filter ?? "").toLowerCase()
+    return p.entries.filter((e) => e.type === "item" && (!f || e.text.toLowerCase().includes(f)))
   }
 
+  /** 弹出栈顶 picker 并 resolve 其 Promise。返回是否有 picker 被弹出。 */
+  function popPicker(value) {
+    const p = state.pickerStack.pop()
+    if (!p) return false
+    state.picker = state.pickerStack.at(-1) ?? null
+    if (state.picker) rebuildLines()
+    else render()
+    p.resolve(value)
+    return true
+  }
+
+  /** 关闭所有 picker：清空栈，挂起者全部 resolve(null)。 */
   function closePicker() {
-    state.picker?.onCancel?.()
-    state.picker = null
-    render()
+    while (state.pickerStack.length) popPicker(null)
   }
 
-  /** Rebuild display lines from entries and refresh */
-  function renderPickerLines() {
+  /** 打开 picker，返回选中 entry（Esc/取消 → null）。
+   *  互斥保护：入栈前把现有挂起 picker 全部 resolve(null)，消除 Promise 悬挂。
+   *  （正常嵌套是先 await 上一层返回再开新的，栈深通常为 1。） */
+  function showPicker(title, entries, { defaultIndex = 0 } = {}) {
+    closePicker()
+    return new Promise((resolve) => {
+      const itemCount = entries.filter((e) => e.type === "item").length
+      const index = Math.max(0, Math.min(defaultIndex, Math.max(0, itemCount - 1)))
+      state.picker = { title, entries, lines: [], index, scroll: 0, selectedLine: 0, filter: "", resolve }
+      state.pickerStack.push(state.picker)
+      rebuildLines()
+    })
+  }
+
+  function rebuildLines() {
     const p = state.picker
     if (!p) return
+    const items = pickerItems(p)
+    p.filteredItems = items
+    if (p.index >= items.length) p.index = Math.max(0, items.length - 1)
     const lines = []
-    let row = 0
-    let selectedLine = 0
+    let row = 0, selLine = 0
     for (const e of p.entries) {
       if (e.type === "header") {
         lines.push({ text: ` ${e.text}${e.note ? `  ${e.note}` : ""}`, color: ansi.bold + C.tool })
       } else {
-        const selected = row === p.index
-        if (selected) selectedLine = lines.length
+        if (!items.includes(e)) continue // 被 filter 滤掉
+        const sel = row === p.index
+        if (sel) selLine = lines.length
         const marker = e.marker ? `  ${e.marker}` : ""
-        lines.push({
-          text: `${selected ? " ▸ " : "   "}${e.text}${marker}`,
-          color: selected ? ansi.bold + C.text : C.dim,
-        })
+        lines.push({ text: `${sel ? " ▸ " : "   "}${e.text}${marker}`, color: sel ? ansi.bold + C.text : C.dim })
         row++
       }
     }
+    if (p.filter && items.length === 0) lines.push({ text: "   (no match)", color: C.dim })
     p.lines = lines
-    p.selectedLine = selectedLine
+    p.selectedLine = selLine
     render()
   }
 
-  // ========== unified picker: model switch + provider management ==========
+  function renderPickerLines() { rebuildLines() }
+
+  // === model picker ===
+
+  /** entry 唯一标识：异步更新 entries 后按它恢复选中项 */
+  function entryKey(e) {
+    if (!e) return null
+    return e.action === "switch" ? `switch:${e.provider}:${e.model}` : `action:${e.action}`
+  }
 
   async function openModelPicker() {
-    const entries = buildModelEntries()
-    const onSelect = async (e) => {
+    // 菜单循环：选中即关闭，子流程结束后重开主菜单；Esc 退出
+    for (;;) {
+      const entries = buildModelEntries()
+      const items = entries.filter((e) => e.type === "item")
+      const current = items.findIndex(
+        (e) => e.action === "switch" && e.provider === agent.activeProvider && e.model === agent.provider.model)
+      const picked = showPicker("Models & Providers", entries, { defaultIndex: Math.max(0, current) })
+      // 后台异步拉取各 provider 模型列表，原地更新 entries（不 await，错误仅提示）
+      fetchModels(entries).catch((err) => pushLine(`[model] fetch models failed: ${err.message}`, C.error))
+      const e = await picked
+      if (!e) return
       if (e.action === "switch") {
         await selectModel(e).catch((err) => pushLine(`[error] ${err.message}`, C.error))
-      } else if (e.action === "add") {
-        await addProviderFlow()
-      } else if (e.action === "remove") {
-        await removeProviderFlow()
-      } else if (e.action === "key") {
-        await setKeyFlow()
+        return
       }
+      if (e.action === "add") await addProviderFlow()
+      else if (e.action === "remove") await removeProviderFlow()
+      else if (e.action === "key") await setKeyFlow()
     }
-    openPicker({ title: "Models & Providers", entries, onSelect })
-    // default select the currently active model
-    const current = pickerItems().findIndex(
-      (e) => e.action === "switch" && e.provider === agent.activeProvider && e.model === agent.provider.model,
-    )
-    if (current >= 0) state.picker.index = current
-    renderPickerLines()
+  }
 
-    // async fetch remote model list, append under each provider
+  /** 后台拉取模型列表并 splice 进 entries；更新时按 entryKey 恢复用户光标下的选中项 */
+  async function fetchModels(entries) {
     const { listModels } = await import("../provider/index.mjs")
-    await Promise.all(
-      agent.providers.map(async (p) => {
-        try {
-          const envKey = { deepseek: "DEEPSEEK_API_KEY", openai: "OPENAI_API_KEY" }[p.name]
-          let apiKey = p.apiKey
-          if (!apiKey && envKey && process.env[envKey]) apiKey = process.env[envKey]
-          if (!apiKey) apiKey = process.env.THINCODER_API_KEY
-          const models = await listModels(
-            { baseURL: p.baseURL, apiKey: apiKey ?? "" },
-            { signal: AbortSignal.timeout(10000) },
-          )
-          // find the model item position for this provider in entries, insert new models after it
-          const at = entries.findLastIndex(
-            (e) => e.type === "item" && e.action === "switch" && e.provider === p.name,
-          )
-          if (at >= 0) {
-            entries.splice(
-              at + 1,
-              0,
-              ...models
-                .filter((m) => m !== p.model)
-                .map((m) => ({ type: "item", text: m, action: "switch", provider: p.name, model: m })),
-            )
-          }
-          // update header note to remove "loading..."
-          const header = entries.find((e) => e.type === "header" && e.text === p.name)
-          if (header) header.note = `${p.baseURL}${p.apiKey ? "" : " (no key)"}`
-        } catch (error) {
-          const header = entries.find((e) => e.type === "header" && e.text === p.name)
-          if (header) header.note = `${p.baseURL}${p.apiKey ? "" : " (no key)"}  (fetch failed: ${sliceByWidth(error.message, 40)})`
-        }
-        if (state.picker?.entries === entries) renderPickerLines()
-      }),
-    )
+    await Promise.all(agent.providers.map(async (p) => {
+      let selKey = null
+      try {
+        const envKey = { deepseek: "DEEPSEEK_API_KEY", openai: "OPENAI_API_KEY" }[p.name]
+        let apiKey = p.apiKey
+        if (!apiKey && envKey && process.env[envKey]) apiKey = process.env[envKey]
+        if (!apiKey) apiKey = process.env.THINCODER_API_KEY
+        const models = await listModels({ baseURL: p.baseURL, apiKey: apiKey ?? "" }, { signal: AbortSignal.timeout(10000) })
+        if (state.picker?.entries !== entries) return // picker 已关或已换，不再更新
+        selKey = entryKey(pickerItems(state.picker)[state.picker.index])
+        const at = entries.findLastIndex((e) => e.type === "item" && e.action === "switch" && e.provider === p.name)
+        if (at >= 0) entries.splice(at + 1, 0, ...models.filter((m) => m !== p.model).map((m) => ({ type: "item", text: m, action: "switch", provider: p.name, model: m })))
+        const header = entries.find((e) => e.type === "header" && e.text === p.name)
+        if (header) header.note = `${p.baseURL}${p.apiKey ? "" : " (no key)"}`
+      } catch (error) {
+        if (state.picker?.entries !== entries) return
+        const header = entries.find((e) => e.type === "header" && e.text === p.name)
+        if (header) header.note = `${p.baseURL}${p.apiKey ? "" : " (no key)"}  (fetch failed: ${sliceByWidth(error.message, 40)})`
+      }
+      // 异步 splice 会改变光标下的项：按 entry 标识恢复选中，找不到则 clamp 到合法范围
+      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()
+    }))
   }
 
-  /** Build picker entries: each provider gets a header + model list, management actions at the bottom */
   function buildModelEntries() {
     const entries = []
     for (const p of agent.providers) {
       const active = p.name === agent.activeProvider
-      entries.push({
-        type: "header",
-        text: p.name,
-        note: `${p.baseURL}${p.apiKey ? "" : " (no key)"}${active ? " ← current" : ""}  loading...`,
-      })
-      entries.push({
-        type: "item",
-        text: p.model,
-        action: "switch",
-        provider: p.name,
-        model: p.model,
-        marker: active ? "●" : "",
-      })
+      entries.push({ type: "header", text: p.name, note: `${p.baseURL}${p.apiKey ? "" : " (no key)"}${active ? " ← current" : ""}  loading...` })
+      entries.push({ type: "item", text: p.model, action: "switch", provider: p.name, model: p.model, marker: active ? "●" : "" })
     }
-    // management actions
     entries.push({ type: "header", text: "Provider Management" })
     entries.push({ type: "item", text: "Add provider…", action: "add" })
-    if (agent.providers.length > 1) {
-      entries.push({ type: "item", text: "Remove provider…", action: "remove" })
-    }
+    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" })
     return entries
   }
 
-  /** Switch provider + model, persist, threshold follows model */
   async function selectModel(item) {
     closePicker()
     const target = agent.providers.find((pp) => pp.name === item.provider)
@@ -153,11 +163,11 @@ export function createPickers(ctx) {
     if (!agent.provider.apiKey) agent.provider.apiKey = process.env.THINCODER_API_KEY
     if (agent.config?.agent?.compactThresholdAuto) {
       const { resolveCompactThreshold } = await import("../config.mjs")
-      const { value } = resolveCompactThreshold(null, item.model)
-      agent.config.agent.compactThreshold = value
+      agent.config.agent.compactThreshold = resolveCompactThreshold(null, item.model).value
     }
     await persistRaw((raw) => {
-      raw.providers = agent.providers
+      // 落盘前剥离运行时注入的 proxyUri（由 loadConfig + injectProxy 在加载时重建）
+      raw.providers = agent.providers.map(({ proxyUri: _, ...p }) => p)
       raw.activeProvider = item.provider
     })
     agent.config.activeProvider = item.provider
@@ -167,106 +177,65 @@ export function createPickers(ctx) {
     }
   }
 
-  /** Add provider: preset menu → input key → done, or custom step-by-step input */
   async function addProviderFlow() {
-    const presetEntries = [
+    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",
-        })),
+      ...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" },
     ]
-    openPicker({
-      title: "Add Provider",
-      entries: presetEntries,
-      onCancel: () => openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)),
-      onSelect: async (se) => {
-        if (se.kind === "custom") {
-          const name = await askQuestion("Enter provider name:")
-          if (!name) { openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)); return }
-          if (agent.providers.some((p) => p.name === name)) { openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)); return }
-          const baseURLRaw = await askQuestion("Enter baseURL (e.g. https://api.example.com/v1):")
-          if (!baseURLRaw) { openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)); return }
-          const baseURL = baseURLRaw.replace(/\/+$/, "")
-          if (!/^https?:\/\//.test(baseURL)) { openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)); return }
-          const model = await askQuestion("Enter model name:")
-          if (!model) { openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)); return }
-          agent.providers.push({ name, baseURL, model })
-          await persistRaw((raw) => { raw.providers = agent.providers })
-          const key = await askQuestion(`Enter API key for ${name} (leave empty to skip):`)
-          if (key) { await setProviderKey(name, key) }
-          openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error))
-          return
-        }
-        // preset
-        if (agent.providers.some((p) => p.name === se.name)) { openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)); return }
-        const preset = PRESETS[se.name]
-        const providerCfg = { name: se.name, baseURL: preset.baseURL, model: preset.model }
-        if (preset.thinking) providerCfg.thinking = preset.thinking
-        if (preset.reasoningEffort) providerCfg.reasoningEffort = preset.reasoningEffort
-        if (preset.maxTokens) providerCfg.maxTokens = preset.maxTokens
-        if (preset.chatPath) providerCfg.chatPath = preset.chatPath
-        if (preset.desc) providerCfg.desc = preset.desc
-        agent.providers.push(providerCfg)
-        await persistRaw((raw) => { raw.providers = agent.providers })
-        const presetKey = await askQuestion(`Enter API key for ${se.name} (leave empty to skip):`)
-        if (presetKey) await setProviderKey(se.name, presetKey)
-        openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error))
-      },
-    })
+    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
+      agent.providers.push({ name, baseURL, model })
+      await persistRaw((raw) => { raw.providers = agent.providers })
+      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
+    agent.providers.push(cfg)
+    await persistRaw((raw) => { raw.providers = agent.providers })
+    const key = await askQuestion(`Enter API key for ${se.name} (skip if none):`)
+    if (key) await setProviderKey(se.name, key)
   }
 
-  /** Remove provider (cannot remove the currently active one) */
   async function removeProviderFlow() {
     const candidates = agent.providers.filter((p) => p.name !== agent.activeProvider)
-    if (candidates.length === 0) { openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)); return }
-    const removeEntries = [
-      { type: "header", text: "Select provider to remove (current one cannot be removed)" },
+    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 })),
-    ]
-    openPicker({
-      title: "Remove Provider",
-      entries: removeEntries,
-      onCancel: () => openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)),
-      onSelect: async (se) => {
-        const at = agent.providers.findIndex((p) => p.name === se.name)
-        agent.providers.splice(at, 1)
-        await persistRaw((raw) => { raw.providers = agent.providers })
-        openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error))
-      },
-    })
+    ])
+    if (!se) return
+    agent.providers.splice(agent.providers.findIndex((p) => p.name === se.name), 1)
+    await persistRaw((raw) => { raw.providers = agent.providers })
   }
 
-  /** Set/change API key: select provider → enter key */
   async function setKeyFlow() {
-    const keyEntries = [
-      { type: "header", text: "Select provider to configure key" },
-      ...agent.providers.map((p) => ({
-        type: "item",
-        text: `${p.name} ${p.apiKey ? `(has key: ${maskKey(p.apiKey)})` : "(no key)"}`,
-        name: p.name,
-      })),
-    ]
-    openPicker({
-      title: "Configure API Key",
-      entries: keyEntries,
-      onCancel: () => openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)),
-      onSelect: async (se) => {
-        const key = await askQuestion(`Enter API key for ${se.name}:`)
-        if (!key) { openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error)); return }
-        await setProviderKey(se.name, key)
-        openModelPicker().catch((e) => pushLine(`[error] ${e.message}`, C.error))
-      },
-    })
+    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)
   }
 
-  /** Write key for a given provider (memory + config file); if it's the currently active one, sync runtime too */
   async function setProviderKey(name, key) {
     const target = agent.providers.find((p) => p.name === name)
     if (!target) return
@@ -275,5 +244,5 @@ export function createPickers(ctx) {
     await persistRaw((raw) => { raw.providers = agent.providers })
   }
 
-  return { openPicker, closePicker, renderPickerLines, openModelPicker, setProviderKey }
+  return { showPicker, closePicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey }
 }