thincoder 0.12.12 → 0.12.14

package/src/tui/index.mjs

@@ -27,7 +27,7 @@ import { createWizard } from "./wizard.mjs"
 import { createPickers } from "./pickers.mjs"
 import { runDistill as runDistillImpl } from "./distill-cmd.mjs"
 import { createInteraction } from "./interaction.mjs"
-import { pasteClipboardImage as pasteClipboardImageImpl, insertPastedText, translateShiftEnter } from "./clipboard.mjs"
+import { pasteClipboardImage as pasteClipboardImageImpl, insertPastedText, translateShiftEnter, stripKeyboardProtocol } from "./clipboard.mjs"
 import { parseMouseClicks, handleMouseClick } from "./mouse.mjs"
 import { runAgentTurn } from "./agent-turn.mjs"
 import { createKeyHandler } from "./key-handler.mjs"
@@ -201,6 +201,7 @@ export async function startTUI(agent, opts = {}) {
 
     // Shift+Enter (keyboard-enhanced terminals) → Alt+Enter path (\x1b\r = meta+return)
     text = translateShiftEnter(text)
+    text = stripKeyboardProtocol(text)
 
     if (state.scroll !== lastRenderedScroll) {
       lastRenderedScroll = state.scroll
@@ -280,8 +281,10 @@ export async function startTUI(agent, opts = {}) {
     state.input = []
     state.cursor = 0
     state.history.push(text)
+    const wasInHistory = state.historyIndex !== -1
+    state.history.push(text)
     state.historyIndex = -1
-    state._draft = null // submitted — the draft is now history
+    if (!wasInHistory) state._draft = null // submitted — the draft is now history. Keep draft when submitting from history mode (↓ can recover)
     state.scroll = 0
 
     // Slash commands: handled locally, don't enter agent loop

package/src/tui/interaction.mjs

@@ -8,12 +8,12 @@ export function createInteraction(ctx) {
 
   /** Key info for permission request (customized by tool), returns array of lines. name may have subagent prefix ("coder/bash"), use base name to match */
   function formatPermission(name, args) {
-    const cap = (s, n = 1000) => (s.length > n ? `${s.slice(0, n)}…(${s.length} chars total)` : s)
+    const cap = (s, n = 3000) => (s.length > n ? `${s.slice(0, n)}…(${s.length} chars total)` : s)
     const base = name.includes("/") ? name.split("/").pop() : name
     if (base === "bash") return cap(args.command ?? "").split("\n")
     if (base === "write") {
       // approving file writes must show what's being written: path + content preview
-      return [`${args.path} (write ${(args.content ?? "").length} chars)`, ...cap(args.content ?? "", 1000).split("\n")]
+      return [`${args.path} (write ${(args.content ?? "").length} chars)`, ...cap(args.content ?? "", 3000).split("\n")]
     }
     if (base === "edit") {
       // simple diff: - old content / + new content

package/src/tui/key-handler-search.mjs

@@ -0,0 +1,113 @@
+/** Perform search on state.lines, update state.search.matches and clamp index */
+export function performSearch(state) {
+  if (!state.search) return
+  const query = state.search.query.toLowerCase()
+  state.search.matches = []
+  // Clear old highlights
+  state.lines.forEach(l => delete l._searchMatches)
+
+  if (!query) { state.search.index = 0; return }
+
+  state.lines.forEach((line, lineIndex) => {
+    const text = (line.text || "").toLowerCase()
+    let charIndex = text.indexOf(query)
+    if (charIndex !== -1) {
+      line._searchMatches = []
+    }
+    while (charIndex !== -1) {
+      state.search.matches.push({ lineIndex, charIndex })
+      line._searchMatches.push(charIndex)
+      charIndex = text.indexOf(query, charIndex + 1)
+    }
+  })
+
+  if (state.search.matches.length === 0) {
+    state.search.index = 0
+  } else {
+    state.search.index = Math.min(state.search.index, state.search.matches.length - 1)
+  }
+}
+
+/** Estimate scroll position to make a line visible (simplified) */
+export function scrollToMatch(state, lineIndex) {
+  if (lineIndex == null) return
+  // Rough estimate: each state.line takes 1-2 rendered lines
+  let estimatedLine = 0
+  for (let i = 0; i < lineIndex && i < state.lines.length; i++) {
+    estimatedLine += Math.max(1, Math.ceil((state.lines[i].text?.length || 0) / 80))
+  }
+  const rows = process.stdout.rows || 24
+  const visibleH = Math.max(5, rows - 10) // reserve space for header, input, status, etc.
+  // scroll is number of lines hidden above viewport
+  // We want estimatedLine to be near the bottom of the viewport
+  state.scroll = Math.max(0, state.lines.length - estimatedLine - visibleH + 3)
+}
+
+/** Handle search-mode keyboard events.
+ *  Returns true if the key was consumed (search mode handled it).
+ *  Call before other handlers so search mode has priority. */
+export function handleSearchKey(str, key, state, render) {
+  // Ctrl+F toggles search mode ON
+  if (key.ctrl && key.name === "f" && !state.permission && !state.question) {
+    if (!state.search) {
+      state.search = { query: "", matches: [], index: 0 }
+    }
+    render()
+    return true
+  }
+
+  if (!state.search) return false
+
+  if (key.name === "escape" || (key.ctrl && key.name === "c")) {
+    state.search = null
+    render()
+    return true
+  }
+  // Navigation requires Ctrl — bare n/p are query characters (regression fix: bare n/p
+  // used to hijack typing, making it impossible to type those letters into the query)
+  if ((key.ctrl && key.name === "n") || (key.ctrl && key.name === "g")) {
+    // Next match
+    if (state.search.matches.length > 0) {
+      state.search.index = (state.search.index + 1) % state.search.matches.length
+      scrollToMatch(state, state.search.matches[state.search.index].lineIndex)
+    }
+    render()
+    return true
+  }
+  if ((key.ctrl && key.name === "p") || (key.ctrl && key.name === "r")) {
+    // Previous match
+    if (state.search.matches.length > 0) {
+      state.search.index = (state.search.index - 1 + state.search.matches.length) % state.search.matches.length
+      scrollToMatch(state, state.search.matches[state.search.index].lineIndex)
+    }
+    render()
+    return true
+  }
+  if (key.name === "return") {
+    // Exit search mode but keep highlighting until next Ctrl+F
+    state.search = null
+    render()
+    return true
+  }
+  if (key.name === "backspace") {
+    if (state.search.query.length > 0) {
+      state.search.query = state.search.query.slice(0, -1)
+      performSearch(state)
+      render()
+    }
+    return true
+  }
+  // Regular character input
+  if (str && str.length === 1 && !key.ctrl && !key.alt && !key.meta) {
+    state.search.query += str
+    performSearch(state)
+    if (state.search.matches.length > 0) {
+      scrollToMatch(state, state.search.matches[state.search.index].lineIndex)
+    }
+    render()
+    return true
+  }
+  // Swallow every other key (arrows/Tab/Delete/…) — without this they fall through
+  // to normal input handling and edit the HIDDEN state.input instead of the search box
+  return true
+}

package/src/tui/key-handler.mjs

@@ -1,51 +1,7 @@
 import { ansi, C } from "./ansi.mjs"
 import { readClipboardText, insertPastedText } from "./clipboard.mjs"
 import { computeLayout } from "./layout.mjs"
-
-/** Perform search on state.lines, update state.search.matches and clamp index */
-function performSearch(state) {
-  if (!state.search) return
-  const query = state.search.query.toLowerCase()
-  state.search.matches = []
-  // Clear old highlights
-  state.lines.forEach(l => delete l._searchMatches)
-
-  if (!query) { state.search.index = 0; return }
-
-  state.lines.forEach((line, lineIndex) => {
-    const text = (line.text || "").toLowerCase()
-    let charIndex = text.indexOf(query)
-    if (charIndex !== -1) {
-      line._searchMatches = []
-    }
-    while (charIndex !== -1) {
-      state.search.matches.push({ lineIndex, charIndex })
-      line._searchMatches.push(charIndex)
-      charIndex = text.indexOf(query, charIndex + 1)
-    }
-  })
-
-  if (state.search.matches.length === 0) {
-    state.search.index = 0
-  } else {
-    state.search.index = Math.min(state.search.index, state.search.matches.length - 1)
-  }
-}
-
-/** Estimate scroll position to make a line visible (simplified) */
-function scrollToMatch(state, lineIndex) {
-  if (lineIndex == null) return
-  // Rough estimate: each state.line takes 1-2 rendered lines
-  let estimatedLine = 0
-  for (let i = 0; i < lineIndex && i < state.lines.length; i++) {
-    estimatedLine += Math.max(1, Math.ceil((state.lines[i].text?.length || 0) / 80))
-  }
-  const rows = process.stdout.rows || 24
-  const visibleH = Math.max(5, rows - 10) // reserve space for header, input, status, etc.
-  // scroll is number of lines hidden above viewport
-  // We want estimatedLine to be near the bottom of the viewport
-  state.scroll = Math.max(0, state.lines.length - estimatedLine - visibleH + 3)
-}
+import { handleSearchKey } from "./key-handler-search.mjs"
 
 /** Keyboard event dispatch: permission confirm / question / picker / wizard / edit / scroll / history / paste.
  *  Extracted from index.mjs.
@@ -150,68 +106,7 @@ export function createKeyHandler(ctx) {
     }
 
     // Search mode: Ctrl+F to enter, Ctrl+N/Ctrl+P (or Ctrl+G/Ctrl+R) navigate, Esc exit
-  if (key.ctrl && key.name === "f" && !state.permission && !state.question) {
-    if (!state.search) {
-      state.search = { query: "", matches: [], index: 0 }
-    }
-    render()
-    return
-  }
-
-  if (state.search) {
-    if (key.name === "escape" || (key.ctrl && key.name === "c")) {
-      state.search = null
-      render()
-      return
-    }
-    // Navigation requires Ctrl — bare n/p are query characters (regression fix: bare n/p
-    // used to hijack typing, making it impossible to type those letters into the query)
-    if ((key.ctrl && key.name === "n") || (key.ctrl && key.name === "g")) {
-      // Next match
-      if (state.search.matches.length > 0) {
-        state.search.index = (state.search.index + 1) % state.search.matches.length
-        scrollToMatch(state, state.search.matches[state.search.index].lineIndex)
-      }
-      render()
-      return
-    }
-    if ((key.ctrl && key.name === "p") || (key.ctrl && key.name === "r")) {
-      // Previous match
-      if (state.search.matches.length > 0) {
-        state.search.index = (state.search.index - 1 + state.search.matches.length) % state.search.matches.length
-        scrollToMatch(state, state.search.matches[state.search.index].lineIndex)
-      }
-      render()
-      return
-    }
-    if (key.name === "return") {
-      // Exit search mode but keep highlighting until next Ctrl+F
-      state.search = null
-      render()
-      return
-    }
-    if (key.name === "backspace") {
-      if (state.search.query.length > 0) {
-        state.search.query = state.search.query.slice(0, -1)
-        performSearch(state)
-        render()
-      }
-      return
-    }
-    // Regular character input
-    if (str && str.length === 1 && !key.ctrl && !key.alt && !key.meta) {
-      state.search.query += str
-      performSearch(state)
-      if (state.search.matches.length > 0) {
-        scrollToMatch(state, state.search.matches[state.search.index].lineIndex)
-      }
-      render()
-      return
-    }
-    // Swallow every other key (arrows/Tab/Delete/…) — without this they fall through
-    // to normal input handling and edit the HIDDEN state.input instead of the search box
-    return
-  }
+    if (handleSearchKey(str, key, state, render)) return
 
   if (key.ctrl && key.name === "c") {
       // picker 打开时 Ctrl+C = 取消当前 picker（等同 Esc），不杀进程
@@ -405,6 +300,7 @@ export function createKeyHandler(ctx) {
 
     // Ctrl+U: clear entire input box
     if ((key.name === "u" && key.ctrl) || str === "\x15") {
+      if (state.historyIndex !== -1) state._draft = [...state.input]
       state.input = []
       state.cursor = 0
       render()
@@ -414,9 +310,9 @@ export function createKeyHandler(ctx) {
     // input history
     if (key.name === "up") {
       if (state.history.length) {
-        // Draft protection: entering history navigation with unsent input stashes it,
-        // so navigating back down past the newest entry restores what was being typed.
-        if (state.historyIndex === -1 && state.input.length > 0) {
+        // Save current input as draft when entering history mode (historyIndex === -1).
+        // Subsequent edits while in history mode are saved separately (see printable/editing handlers).
+        if (state.historyIndex === -1) {
           state._draft = [...state.input]
         }
         state.historyIndex = state.historyIndex === -1 ? state.history.length - 1 : Math.max(0, state.historyIndex - 1)
@@ -470,6 +366,7 @@ export function createKeyHandler(ctx) {
       if (state.cursor > 0) {
         state.input.splice(state.cursor - 1, 1)
         state.cursor--
+        if (state.historyIndex !== -1) state._draft = [...state.input]
         render()
       }
       return
@@ -477,6 +374,7 @@ export function createKeyHandler(ctx) {
     if (key.name === "delete") {
       if (state.cursor < state.input.length) {
         state.input.splice(state.cursor, 1)
+        if (state.historyIndex !== -1) state._draft = [...state.input]
         render()
       }
       return
@@ -532,6 +430,7 @@ export function createKeyHandler(ctx) {
       const chars = [...str.replace(/[\r\n]+/g, "").replace(/\t/g, "  ")]
       state.input.splice(state.cursor, 0, ...chars)
       state.cursor += chars.length
+      if (state.historyIndex !== -1) state._draft = [...state.input]
       render()
     }
   }

package/src/tui/layout.mjs

@@ -78,7 +78,7 @@ export function computeLayout(state, { cols, rows }) {
   let permPreviewLines = []
   let permPreviewH = 0
   if (state.permission) {
-    const maxLines = Math.max(1, rows - 8)
+    const maxLines = Math.min(8, Math.max(1, rows - 10))
     outer: for (const l of state.permissionPreview) {
       for (const wrapped of wrapText(`  ${l}`, W - 1)) {
         if (permPreviewLines.length >= maxLines) break outer
@@ -95,14 +95,22 @@ export function computeLayout(state, { cols, rows }) {
   const fixedH = headerH + inputBoxH + statusH + pickerH + taskPanelH + subPanelH + outputPanelsH + permPreviewH + queueH
   let convH = Math.max(1, rows - fixedH)
 
-  // 小终端高度补偿（best-effort，不保证总行数 ≤ rows）：先压 conversation 到最小 1 行，
-  // 仍超出再压 picker 到最小 3 行。极端情况（permission preview + tasks 等同屏）补偿后仍可能
-  // 溢出 —— 其余面板不强行裁剪，由渲染层自行截断
+  // 小终端高度补偿：先压 conversation 到最小 1 行，再压 picker 到最小 3 行，
+  // 仍溢出再压 permission preview 到最小 1 行（仅标题）。
   let pickerFinalH = pickerH
+  let permFinalH = permPreviewH
   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))
+  if (overflow > 0) {
+    if (pickerH > 0) {
+      pickerFinalH = Math.max(Math.min(3, pickerH), pickerH - overflow)
+    }
+    const afterPicker = fixedH - pickerH + pickerFinalH
+    convH = Math.max(1, rows - afterPicker)
+    const remaining = afterPicker + convH - rows
+    if (remaining > 0 && permPreviewH > 0) {
+      permFinalH = Math.max(1, permPreviewH - remaining)
+      convH = Math.max(1, rows - (afterPicker - permPreviewH + permFinalH))
+    }
   }
 
   // --- Y coordinates (0-indexed, +1 when used with ANSI) ---
@@ -113,7 +121,7 @@ export function computeLayout(state, { cols, rows }) {
   const output = outputPanelsH > 0 ? { y, h: outputPanelsH } : null; y += outputPanelsH
   const todo = taskPanelH > 0 ? { y, h: taskPanelH } : null; y += taskPanelH
   const picker = pickerFinalH > 0 ? { y, h: pickerFinalH } : null; y += pickerFinalH
-  const permission = permPreviewH > 0 ? { y, h: permPreviewH } : null; y += permPreviewH
+  const permission = permFinalH > 0 ? { y, h: permFinalH } : null; y += permFinalH
   const queue = queueH > 0 ? { y, h: queueH } : null; y += queueH
   const inputBox = { y, h: inputBoxH }; y += inputBoxH
   const status = { y, h: statusH }