thincoder 0.10.0 → 0.11.0

package/src/tui/cmd-undo.mjs

@@ -41,7 +41,7 @@ export function snapshotForUndo(agent, toolName, args, cwd) {
 }
 
 export async function handleUndoCommand(ctx) {
-  const { agent, pushLine, openPicker } = ctx
+  const { agent, pushLine, showPicker } = ctx
   const stack = agent._undoStack ?? []
 
   if (stack.length === 0) {
@@ -65,27 +65,23 @@ export async function handleUndoCommand(ctx) {
     }),
   ]
 
-  openPicker({
-    title: "Undo",
-    entries,
-    onSelect: async (e) => {
-      const item = stack[e.idx]
-      const abs = join(agent.cwd, ...item.path.split("/"))
+  const e = await showPicker("Undo", entries)
+  if (!e) return
+  const item = stack[e.idx]
+  const abs = join(agent.cwd, ...item.path.split("/"))
 
-      try {
-        if (item.backup === null) {
-          // File was created — undo deletes it
-          if (existsSync(abs)) unlinkSync(abs)
-        } else {
-          // File was modified — undo restores original
-          writeFileSync(abs, item.backup, "utf8")
-        }
-        // Remove this and all newer entries (can't undo out of order)
-        stack.splice(e.idx)
-        pushLine(`[undo] Reverted: ${item.tool} ${item.path}`, C.tool)
-      } catch (err) {
-        pushLine(`[undo] Failed to revert ${item.path}: ${err.message}`, C.error)
-      }
-    },
-  })
+  try {
+    if (item.backup === null) {
+      // File was created — undo deletes it
+      if (existsSync(abs)) unlinkSync(abs)
+    } else {
+      // File was modified — undo restores original
+      writeFileSync(abs, item.backup, "utf8")
+    }
+    // Remove this and all newer entries (can't undo out of order)
+    stack.splice(e.idx)
+    pushLine(`[undo] Reverted: ${item.tool} ${item.path}`, C.tool)
+  } catch (err) {
+    pushLine(`[undo] Failed to revert ${item.path}: ${err.message}`, C.error)
+  }
 }

package/src/tui/cmd-upgrade.mjs

@@ -1,7 +1,9 @@
+import { ansi, C } from "./ansi.mjs"
+
 /** /upgrade command: check for updates and optionally upgrade.
- *  ctx: { agent, pushLine, pushLabel, openPicker, ansi, C } */
+ *  ctx: { agent, pushLine, pushLabel, showPicker } */
 export async function handleUpgradeCommand(ctx) {
-  const { pushLine, pushLabel, openPicker, ansi, C } = ctx
+  const { pushLine, pushLabel, showPicker } = ctx
   const { checkForUpdate } = await import("../upgrade.mjs")
   const { readFileSync } = await import("node:fs")
 
@@ -19,29 +21,23 @@ export async function handleUpgradeCommand(ctx) {
     return
   }
   pushLine(`thincoder ${result.latest} is available (current: ${result.local}).`, C.tool)
-  openPicker({
-    title: `Update: ${result.local} → ${result.latest}`,
-    entries: [
-      { type: "header", text: `New version: ${result.latest}` },
-      { type: "item", text: "Upgrade now", action: "upgrade" },
-      { type: "item", text: "Later", action: "later" },
-    ],
-    onSelect: async (sel) => {
-      if (sel.action === "upgrade") {
-        pushLabel(`❯ Upgrade`, ansi.bold + C.tool)
-        pushLine(`Upgrading to ${result.latest}...`, C.tool)
-        const { exec } = await import("node:child_process")
-        const cp = exec("npm install -g thincoder@latest", { windowsHide: true })
-        cp.stdout?.on("data", () => {})
-        cp.stderr?.on("data", () => {})
-        cp.on("close", (code) => {
-          if (code === 0) {
-            pushLine(`✓ Upgraded to ${result.latest}. Restart to apply.`, C.tool)
-          } else {
-            pushLine(`✗ Upgrade failed (exit ${code}). Run \`thincoder upgrade\` manually.`, C.error)
-          }
-        })
-      }
-    },
+  const sel = await showPicker(`Update: ${result.local} → ${result.latest}`, [
+    { type: "header", text: `New version: ${result.latest}` },
+    { type: "item", text: "Upgrade now", action: "upgrade" },
+    { type: "item", text: "Later", action: "later" },
+  ])
+  if (sel?.action !== "upgrade") return
+  pushLabel(`❯ Upgrade`, ansi.bold + C.tool)
+  pushLine(`Upgrading to ${result.latest}...`, C.tool)
+  const { exec } = await import("node:child_process")
+  const cp = exec("npm install -g thincoder@latest", { windowsHide: true })
+  cp.stdout?.on("data", () => {})
+  cp.stderr?.on("data", () => {})
+  cp.on("close", (code) => {
+    if (code === 0) {
+      pushLine(`✓ Upgraded to ${result.latest}. Restart to apply.`, C.tool)
+    } else {
+      pushLine(`✗ Upgrade failed (exit ${code}). Run \`thincoder upgrade\` manually.`, C.error)
+    }
   })
 }

package/src/tui/index.mjs

@@ -29,7 +29,7 @@ import {
   renderInputBox, renderStatus,
 } from "./render-frame.mjs"
 import { computeLayout } from "./layout.mjs"
-import { SLASH_COMMANDS, createSlashCommands } from "./slash-commands.mjs"
+import { SLASH_COMMANDS, SLASH_ALIASES, createSlashCommands } from "./slash-commands.mjs"
 import { createWizard } from "./wizard.mjs"
 import { createPickers } from "./pickers.mjs"
 import { runDistill as runDistillImpl } from "./distill-cmd.mjs"
@@ -40,6 +40,17 @@ import { createKeyHandler } from "./key-handler.mjs"
 import { showStartup, backgroundIndex } from "./startup.mjs"
 import { createConfigHelpers } from "./config-helpers.mjs"
 
+/** 升级失败提示文案：附 npm 输出尾部（最多 3 行），方便定位失败原因。 */
+export function upgradeFailureText(code, output) {
+  const tail = (output ?? "").trimEnd().split("\n").slice(-3).join("\n")
+  return `✗ Upgrade failed (exit ${code}). Run \`thincoder upgrade\` manually.${tail ? `\n${tail}` : ""}`
+}
+
+/** 后台更新提示可弹出的条件：无任何交互弹层（picker/permission/question）激活。 */
+export function pendingNoticeReady(state) {
+  return Boolean(state.pendingNotice && !state.picker && !state.permission && !state.question)
+}
+
 /**
  * Start the TUI, taking over the terminal until exit.
  * agent: return value of createAgent
@@ -65,7 +76,9 @@ export async function startTUI(agent, opts = {}) {
     permission: null, // { name, args, resolve }
     permissionPreview: [], // content preview lines for permission approval (rendered above input box, without separation)
     question: null, // { text, options, resolve } — agent question tool callback
-    picker: null, // model picker { entries, lines, index, scroll, selectedLine }
+    picker: null, // active picker (stack top) { title, entries, lines, index, scroll, selectedLine, filter }
+    pickerStack: [], // picker 栈：showPicker push，Enter/Esc pop；state.picker 始终指向栈顶
+    pendingNotice: null, // 后台更新提示：有 picker 打开时挂起，picker 全部关闭后再弹
     wizard: null, // first-launch config wizard { step, index, scroll, selectedLine, fields, error, lines }
     tasks: agent.tasks ?? [], // task list from task tool (progress shown in status bar); carried over on session restore, auto-collapsed when all done
     tokens: { prompt: 0, completion: 0, cacheHit: 0, cacheMiss: 0, reasoningTokens: 0 }, // cumulative token usage (shown in status bar)
@@ -95,6 +108,11 @@ export async function startTUI(agent, opts = {}) {
   const keyStream = new PassThrough()
   let mousePending = "" // incomplete mouse sequence tail spanning chunks
   let lastRenderedScroll = 0
+  // Capture terminal dimensions before raw mode & alt buffer switch.
+  // On Windows, process.stdout.columns/rows can briefly return falsy after the mode switch
+  // (ConPTY buffer transition), causing the ||80/||24 fallback to produce a cramped initial layout.
+  const startupCols = process.stdout.columns || 80
+  const startupRows = process.stdout.rows || 24
   emitKeypressEvents(keyStream)
   process.stdin.setRawMode(true)
   process.stdout.write(ansi.altBuffer + ansi.hideCursor + ansi.mouseOn + ansi.bracketedPasteOn)
@@ -292,7 +310,7 @@ export async function startTUI(agent, opts = {}) {
 
   function doRender() {
     try {
-      const dims = { cols: process.stdout.columns || 80, rows: process.stdout.rows || 24 }
+      const dims = { cols: process.stdout.columns || startupCols, rows: process.stdout.rows || startupRows }
       const layout = computeLayout(state, dims)
       const { W, panels, inputLayout, inputOffset, boxLines, visibleTasks, allSubs, permPreviewLines, overlay } = layout
 
@@ -308,6 +326,14 @@ export async function startTUI(agent, opts = {}) {
         state.ctxCache = { len: agent.history.length, tokens: estimateTokens(agent.history) }
       }
 
+      // 后台更新提示：等 picker/权限确认/提问弹层全部关闭后再弹，不硬抢
+      // （key-handler 分支顺序 permission → question → picker，任一激活时弹了也摸不到）
+      if (pendingNoticeReady(state)) {
+        const notice = state.pendingNotice
+        state.pendingNotice = null
+        showUpdateNotice(notice).catch((e) => pushLine(`[error] ${e.message}`, C.error))
+      }
+
       // Terminal resize or panel layout shift → full redraw (using legacy renderFrame).
       // Don't clear panelCache — update positions so the next incremental check
       // sees correct Y/h. Content keys will be stale, forcing a one-time rewrite
@@ -325,6 +351,7 @@ export async function startTUI(agent, opts = {}) {
         // Content + cursor in a single write. Hardware cursor stays hidden —
         // the visual cursor is drawn in the input box as SGR reverse video.
         // Position for IME, hide for visual (matching pi-tui).
+        const { frame, cursorRow, cursorCol } = renderFrame(state, agent, { cols: dims.cols, rows: dims.rows, slashCommands: SLASH_COMMANDS })
         if (isStreaming) {
           process.stdout.write(ansi.syncUpdateStart + ansi.home + frame + ansi.clearToEnd + ansi.syncUpdateEnd + `\x1b[${cursorRow};${cursorCol}H${ansi.hideCursor}`)
         } else if (isWizard) {
@@ -417,11 +444,10 @@ export async function startTUI(agent, opts = {}) {
     // Slash commands: handled locally, don't enter agent loop
     if (text.startsWith("/")) {
       if (state.processing) {
-        // While processing: read-only commands (switch/view/help) execute directly;
-        // side-effect commands (clear/new/reindex/extract) are queued
-        const cmd0 = text.split(/\s+/)[0]
-        const ALIASES = { "/h": "/help", "/x": "/exit", "/m": "/model", "/p": "/plan", "/t": "/think", "/c": "/clear", "/n": "/new" }
-        const resolved0 = ALIASES[cmd0] ?? cmd0
+        // While processing: allowlisted commands execute directly (they only touch
+        // local TUI/agent config, never the in-flight turn); the rest are queued
+        const cmd0 = text.split(/\s+/)[0].toLowerCase()
+        const resolved0 = SLASH_ALIASES[cmd0] ?? cmd0
         const safeDuringProcessing = new Set(["/help", "/exit", "/model", "/think", "/config", "/skills", "/mcp", "/goal", "/session"])
         if (safeDuringProcessing.has(resolved0)) {
           await handleSlash(text)
@@ -472,7 +498,7 @@ export async function startTUI(agent, opts = {}) {
   const { persistRaw, syncProviderField, maskKey } = createConfigHelpers(agent)
 
   // Model picker + generic picker: implemented in pickers.mjs
-  const { openPicker, closePicker, renderPickerLines, openModelPicker, setProviderKey } = createPickers({
+  const { closePicker, showPicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey } = createPickers({
     agent, state, render, ansi, C, pushLine, pushLabel, persistRaw, askQuestion, maskKey,
   })
 
@@ -489,9 +515,10 @@ export async function startTUI(agent, opts = {}) {
   const { handleSlash, completions, handleTab } = createSlashCommands({
     agent, state, distillOpts,
     pushLine, pushLabel, render,
-    openPicker, askQuestion, askPermission,
+    showPicker, closePicker, askQuestion, askPermission,
     persistRaw, syncProviderField, maskKey,
     openModelPicker: () => openModelPicker(),
+    selectModel,
     setProviderKey,
     runDistill,
     exit: () => { cleanup(); setTimeout(() => process.exit(0), 100) },
@@ -503,7 +530,7 @@ export async function startTUI(agent, opts = {}) {
 
   // keypress is attached to filtered keyStream: mouse sequences already intercepted and stripped upstream
   const onKeypress = createKeyHandler({
-    agent, state, render, closePicker, renderPickerLines,
+    agent, state, render, popPicker, renderPickerLines,
     handleSlash, handleTab, submit, pasteClipboardImage,
     wizardChooseProvider, wizardSubmitText, cancelWizard, wizardProviderItems,
     renderWizard, pushLine, cleanup,
@@ -523,6 +550,30 @@ export async function startTUI(agent, opts = {}) {
   backgroundIndex({ agent, state, render })
 
   // Check for updates (non-blocking, after startup screen)
+  // 有 picker 打开时不硬抢：挂到 state.pendingNotice，picker 全部关闭后由 doRender 弹出
+  const showUpdateNotice = async (result) => {
+    const sel = await showPicker(`Update available: ${result.local} → ${result.latest}`, [
+      { type: "header", text: `thincoder ${result.latest} is available (current: ${result.local})` },
+      { type: "item", text: "Upgrade now", action: "upgrade" },
+      { type: "item", text: "Later", action: "later" },
+    ])
+    if (sel?.action !== "upgrade") return
+    pushLabel(`❯ Upgrade`, ansi.bold + C.tool)
+    pushLine(`Upgrading to ${result.latest}...`, C.tool)
+    const { exec } = await import("node:child_process")
+    const cp = exec("npm install -g thincoder@latest", { windowsHide: true })
+    let stdout = ""
+    cp.stdout?.on("data", (d) => { stdout += d })
+    cp.stderr?.on("data", (d) => { stdout += d })
+    cp.on("close", (code) => {
+      if (code === 0) {
+        pushLine(`✓ Upgraded to ${result.latest}. Restart to apply.`, C.tool)
+      } else {
+        pushLine(upgradeFailureText(code, stdout), C.error)
+      }
+      render()
+    })
+  }
   ;(async () => {
     try {
       const { readFileSync } = await import("node:fs")
@@ -535,33 +586,8 @@ export async function startTUI(agent, opts = {}) {
           pushLine(`Tip: thincoder ${result.latest} is available (run /upgrade later or restart)`, C.dim)
           render()
         } else {
-          openPicker({
-            title: `Update available: ${result.local} → ${result.latest}`,
-            entries: [
-              { type: "header", text: `thincoder ${result.latest} is available (current: ${result.local})` },
-              { type: "item", text: "Upgrade now", action: "upgrade" },
-              { type: "item", text: "Later", action: "later" },
-            ],
-            onSelect: async (sel) => {
-              if (sel.action === "upgrade") {
-                pushLabel(`❯ Upgrade`, ansi.bold + C.tool)
-                pushLine(`Upgrading to ${result.latest}...`, C.tool)
-                const { exec } = await import("node:child_process")
-                const cp = exec("npm install -g thincoder@latest", { windowsHide: true })
-                let stdout = ""
-                cp.stdout?.on("data", (d) => { stdout += d })
-                cp.stderr?.on("data", (d) => { stdout += d })
-                cp.on("close", (code) => {
-                  if (code === 0) {
-                    pushLine(`✓ Upgraded to ${result.latest}. Restart to apply.`, C.tool)
-                  } else {
-                    pushLine(`✗ Upgrade failed (exit ${code}). Run \`thincoder upgrade\` manually.`, C.error)
-                  }
-                  render()
-                })
-              }
-            },
-          })
+          state.pendingNotice = result
+          render()
         }
       }
     } catch { /* network error or timeout — silently skip */ }

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
@@ -146,25 +154,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 +214,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 +330,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

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