thincoder 0.12.3 → 0.12.4

package/src/tui/key-handler.mjs

@@ -69,6 +69,8 @@ export function createKeyHandler(ctx) {
         state.status = "Processing..."
         if (answer === "a" && !isContinue) {
           agent.autoApprove = true
+          agent._pendingReminders = agent._pendingReminders ?? []
+          agent._pendingReminders.push("[System reminder: AUTO mode is now ON. All tool calls are automatically approved. Use /auto to disable.]")
           pushLine(`  [auto] AUTO ON: tool calls no longer prompt for approval (/auto to disable)`, C.warn)
         }
         const approved = answer === "y" || (answer === "a" && !isContinue)
@@ -147,7 +149,7 @@ export function createKeyHandler(ctx) {
       return
     }
 
-    // Search mode: Ctrl+F to enter, Esc/n/N to navigate/exit
+    // 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 }
@@ -157,12 +159,14 @@ export function createKeyHandler(ctx) {
   }
 
   if (state.search) {
-    if (key.name === "escape") {
+    if (key.name === "escape" || (key.ctrl && key.name === "c")) {
       state.search = null
       render()
       return
     }
-    if (key.name === "n" || (key.ctrl && key.name === "g")) {
+    // 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
@@ -171,7 +175,7 @@ export function createKeyHandler(ctx) {
       render()
       return
     }
-    if (key.name === "p" || (key.ctrl && key.name === "r")) {
+    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
@@ -204,6 +208,9 @@ export function createKeyHandler(ctx) {
       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 (key.ctrl && key.name === "c") {
@@ -218,6 +225,17 @@ export function createKeyHandler(ctx) {
         render()
         return
       }
+      // 防误触：空闲态第一次 Ctrl+C 仅提示并武装，窗口内再按才真正退出
+      if (!state.exitArmed) {
+        state.exitArmed = true
+        if (ctx.exitArmTimer) clearTimeout(ctx.exitArmTimer)
+        ctx.exitArmTimer = setTimeout(() => { state.exitArmed = false }, ctx.exitArmDelay ?? 3000)
+        ctx.exitArmTimer.unref?.()
+        pushLine("[exit] Press Ctrl+C again within 3s to exit", C.warn)
+        render()
+        return
+      }
+      if (ctx.exitArmTimer) clearTimeout(ctx.exitArmTimer)
       cleanup()
       // 延迟退出可注入（测试传大值并清理定时器，避免定时器在 mock 恢复后调到真 process.exit）
       ctx.exitTimer = setTimeout(() => process.exit(0), ctx.exitDelay ?? 100)
@@ -227,10 +245,11 @@ export function createKeyHandler(ctx) {
     // F1: 显示快捷键帮助
     if (key.name === "f1" && !state.picker && !state.permission && !state.question) {
       showPicker("Keyboard Shortcuts", [
-        { type: "item", text: "Ctrl+C — Cancel/Abort current operation" },
+        { type: "item", text: "Ctrl+C — Cancel/Abort; idle: press twice to exit" },
         { type: "item", text: "Ctrl+I — Interrupt and inject message" },
         { type: "item", text: "Ctrl+F — Search conversation history" },
-        { type: "item", text: "Ctrl+L — Clear screen" },
+        { type: "item", text: "Shift+Enter / Ctrl+J — Insert newline (multiline input)" },
+        { type: "item", text: "Alt+V — Paste clipboard image" },
         { type: "item", text: "Ctrl+U — Clear input line" },
         { type: "item", text: "Esc — Cancel current input/picker" },
         { type: "item", text: "↑/↓ — Navigate input history" },
@@ -395,6 +414,11 @@ 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) {
+          state._draft = [...state.input]
+        }
         state.historyIndex = state.historyIndex === -1 ? state.history.length - 1 : Math.max(0, state.historyIndex - 1)
         state.input = [...state.history[state.historyIndex]]
         state.cursor = state.input.length
@@ -407,7 +431,9 @@ export function createKeyHandler(ctx) {
         state.historyIndex++
         if (state.historyIndex >= state.history.length) {
           state.historyIndex = -1
-          state.input = []
+          // Restore the stashed draft instead of wiping back to blank
+          state.input = state._draft ? [...state._draft] : []
+          state._draft = null
         } else {
           state.input = [...state.history[state.historyIndex]]
         }
@@ -456,9 +482,16 @@ export function createKeyHandler(ctx) {
       return
     }
     if (key.name === "return" || key.name === "enter" || str === "\r") {
-      if (key.shift) {
-        // Shift+Enter: insert newline for multiline input
-        state.input.splice(state.cursor, 0, '\n')
+      // Multiline newline — three entry points (docs/design/TUI-INPUT-BOX.md §1.5):
+      //  1. Alt+Enter: readline parses \x1b\r as meta+return (all terminals)
+      //  2. Shift+Enter: keyboard-enhanced terminals send \x1b[13;2u / \x1b[27;2;13~,
+      //     translateShiftEnter maps them to \x1b\r → also meta+return
+      //  3. Ctrl+J: sends \n (0x0A), readline parses as name:"enter" — the universal
+      //     fallback: \n and \r are distinct bytes in EVERY terminal, no protocol needed
+      //     (legacy conhost users: Shift+Enter is a bare \r there, physically
+      //     indistinguishable from Enter — Ctrl+J is their newline key)
+      if ((key.name === "return" && key.meta) || key.name === "enter") {
+        state.input.splice(state.cursor, 0, "\n")
         state.cursor++
         render()
       } else {
@@ -467,8 +500,10 @@ export function createKeyHandler(ctx) {
       return
     }
 
-    // Ctrl+V: paste clipboard text into the active text target
-    if (key.ctrl && !key.alt && key.name === "v") {
+    // Ctrl+V: paste clipboard text into the active text target.
+    // Exclude meta (ESC-prefix) so Ctrl+Alt+V — which readline reports as ctrl+meta —
+    // falls through to the image-paste branch below instead of being eaten here.
+    if (key.ctrl && !key.alt && !key.meta && key.name === "v") {
       ;(async () => {
         const text = await readClipboardText()
         if (text) {
@@ -479,8 +514,13 @@ export function createKeyHandler(ctx) {
       return
     }
 
-    // Ctrl+Alt+V (Windows) / Alt+V: paste clipboard image
-    const isPasteImage = key.name === "v" && key.alt
+    // Alt+V / Ctrl+Alt+V: paste clipboard image.
+    // NOTE: readline reports ESC-prefixed combos as key.meta, NOT key.alt (probe-verified:
+    // \x1b + char → { meta: true, alt: false }). Checking key.alt alone is a dead branch —
+    // the key fell through to the printable handler which ignores meta keys, so image paste
+    // silently did nothing. Accept meta (and alt, for terminals that set it); the text-paste
+    // branch above excludes meta so Ctrl+Alt+V reaches here.
+    const isPasteImage = key.name === "v" && (key.alt || key.meta)
     if (isPasteImage) {
       pasteClipboardImage(agent).catch((e) => pushLine(`[error] ${e.message}`, C.error))
       return

package/src/tui/markdown.mjs

@@ -0,0 +1,52 @@
+/**
+ * markdown.mjs — lightweight inline markdown rendering for the TUI display layer.
+ *
+ * Zero dependencies, display-only: turns raw markdown markers into ANSI styling so
+ * model replies stop showing literal `**`, `##`, backtick markers (IK5VW3).
+ *
+ * Design constraints:
+ * - Operates on ALREADY-WRAPPED single lines (call after wrapText): inserting ANSI
+ *   here cannot break width math, because wrapping already happened.
+ * - Uses narrow-scope SGR resets (22 = bold off, 27 = reverse off, 29 = strikethrough off)
+ *   instead of reset(0), so the line's base color (C.text etc.) survives.
+ * - Code spans are extracted FIRST: anything inside backticks is styled as code and
+ *   its `**`/`__` markers are NOT interpreted (markdown semantics).
+ * - Unclosed markers are left as-is (streaming safety: mid-token `**bo` renders literally).
+ */
+
+const BOLD = "\x1b[1m"
+const BOLD_OFF = "\x1b[22m"
+const REVERSE = "\x1b[7m"
+const REVERSE_OFF = "\x1b[27m"
+const STRIKE = "\x1b[9m"
+const STRIKE_OFF = "\x1b[29m"
+
+/** Render inline markers on a single text line: `code` spans, **bold**, __bold__, ~~strike~~. */
+export function renderMarkdownInline(line) {
+  if (!line || line.indexOf("*") === -1 && line.indexOf("`") === -1 && line.indexOf("_") === -1 && line.indexOf("~") === -1) {
+    return line
+  }
+
+  // Split on backticks: even indexes are plain text (bold/strike processed),
+  // odd indexes are code spans (styled as-is, markers inside untouched).
+  const parts = line.split("`")
+  let out = ""
+  for (let i = 0; i < parts.length; i++) {
+    if (i % 2 === 1) {
+      out += REVERSE + parts[i] + REVERSE_OFF
+    } else {
+      out += parts[i]
+        .replace(/\*\*([^*\n]+)\*\*/g, `${BOLD}$1${BOLD_OFF}`)
+        .replace(/__([^_\n]+)__/g, `${BOLD}$1${BOLD_OFF}`)
+        .replace(/~~([^~\n]+)~~/g, `${STRIKE}$1${STRIKE_OFF}`)
+    }
+  }
+  return out
+}
+
+/** Render a heading line: strip leading `#` markers and bold the whole line. Returns original when not a heading. */
+export function renderMarkdownHeading(line) {
+  const m = /^\s{0,3}(#{1,6})\s+(.*)$/.exec(line)
+  if (!m || !m[2]) return line
+  return `${BOLD}${m[2]}${BOLD_OFF}`
+}

package/src/tui/pickers.mjs

@@ -335,7 +335,11 @@ export function createPickers(ctx) {
       if (!baseURL) return
       const model = await askQuestion("Enter model name:")
       if (!model) return
-      agent.providers.push({ name, baseURL, model })
+      const format = (await askQuestion("API format [openai/anthropic/google] (default: openai):")).trim().toLowerCase()
+      const cfg = { name, baseURL, model }
+      if (format === "anthropic" || format === "google") cfg.format = format
+      else if (format && format !== "openai") return // unknown format → abort
+      agent.providers.push(cfg)
       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)
@@ -348,6 +352,7 @@ export function createPickers(ctx) {
     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
     agent.providers.push(cfg)
     await persistRaw((raw) => { raw.providers = agent.providers })
     const key = await askQuestion(`Enter API key for ${se.name} (skip if none):`)

package/src/tui/render-conversation.mjs

@@ -4,6 +4,7 @@
  */
 import { ansi, C } from "./ansi.mjs"
 import { formatTables, sanitizeDisplay, wrapText } from "./render.mjs"
+import { renderMarkdownInline, renderMarkdownHeading } from "./markdown.mjs"
 
 let _convCache = { key: "", cols: 0, lines: [] }
 
@@ -51,7 +52,9 @@ function buildConvLines(state, cols) {
 
     for (const line of formatTables(sanitizeDisplay(text), cols - 1)) {
       for (const wrapped of wrapText(line, cols - 1)) {
-        convLines.push({ text: wrapped, color: l.color, _foldId: l._foldId })
+        // Lightweight markdown display (IK5VW3): headings bold + inline markers styled.
+        // Runs AFTER wrapping so the ANSI it inserts never skews width math.
+        convLines.push({ text: renderMarkdownInline(renderMarkdownHeading(wrapped)), color: l.color, _foldId: l._foldId })
       }
     }
   }
@@ -78,7 +81,7 @@ function buildConvLines(state, cols) {
   if (state.streaming) {
     for (const line of formatTables(sanitizeDisplay(state.streaming), cols - 1)) {
       for (const wrapped of wrapText(line, cols - 1)) {
-        convLines.push({ text: wrapped, color: C.text })
+        convLines.push({ text: renderMarkdownInline(renderMarkdownHeading(wrapped)), color: C.text })
       }
     }
   }

package/src/tui/render-frame.mjs

@@ -196,6 +196,7 @@ export function renderInputBox(state, W, boxLines, cols, inputLayout, inputOffse
     if (title === " Input " || title === " Processing... ") parts.push(" Ctrl+U clear ")
     if (title === " Question ") parts.push(" Enter submit ")
     if (title === " Inject Message ") parts.push(" Enter send, Esc cancel ")
+    parts.push(" Shift+Enter / Ctrl+J newline ")
     parts.push(" Ctrl+V paste ")
     parts.push(" Ctrl+I inject ")
     const hint = parts.join("")
@@ -409,5 +410,5 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
   const ctxHint = ctxPct > 0
     ? ctxPct >= 80 ? ` │ ${ansi.reset}${C.warn}context ${ctxPct}%${ctxTokensHint}${ansi.reset}${ansi.dim}` : ` │ context ${ctxPct}%${ctxTokensHint}` : ""
   const queueHint = state.queue.length > 0 ? ` │ queue: ${state.queue.length}` : ""
-  return ` ${statusText}${taskHint}${turnHint}${tokenHint}${ctxHint}${queueHint}${scrollHint} │ Enter: send${state.processing ? " (queue)" : ""} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+I: inject │ Ctrl+C: exit`
+  return ` ${statusText}${taskHint}${turnHint}${tokenHint}${ctxHint}${queueHint}${scrollHint} │ Enter: send${state.processing ? " (queue)" : ""} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+I: inject │ Ctrl+C: exit (×2)`
 }

package/src/tui/render.mjs

@@ -130,18 +130,23 @@ function renderTable(block, width) {
   return out
 }
 
-/** Input area layout: wrap input buffer into lines, also compute cursor (row, col) position (display width) */
+/** Input area layout: wrap input buffer into lines, also compute cursor (row, col) position (display width).
+ *  Every line carries a 2-column prefix so all content left-edges align: first line gets the
+ *  `▸ ` prompt, continuation lines (wrap or explicit \n) get 2 spaces. Content width is
+ *  `width - 2` on every line. A trailing \n flushes an empty line so the cursor's row exists —
+ *  without it the box wouldn't grow for multiline input and the cursor row would be out of range. */
 export function layoutInput(chars, cursor, width) {
-  const PROMPT = "\u25b8 "
+  const PROMPT = "\u25b8 "  // first-line prefix (display width 2)
+  const CONT = "  "         // continuation prefix (width 2) — keeps left edge aligned
   const lines = []
   let cursorLine = 0
   let cursorCol = 0
   let cur = ""
   let col = 0
   let firstLine = true
-  const avail = () => (firstLine ? width - 2 : width)
+  const avail = () => width - 2 // every line reserves 2 cols for its prefix
   const flush = () => {
-    lines.push((firstLine ? PROMPT : "") + cur)
+    lines.push((firstLine ? PROMPT : CONT) + cur)
     firstLine = false
     cur = ""
     col = 0
@@ -153,19 +158,20 @@ export function layoutInput(chars, cursor, width) {
       if (col + w > avail()) flush()
       if (i === cursor) {
         cursorLine = lines.length
-        cursorCol = (firstLine ? 2 : 0) + col
+        cursorCol = 2 + col
       }
       cur += ch
       col += w
     } else {
       if (i === cursor) {
         cursorLine = lines.length
-        cursorCol = (firstLine ? 2 : 0) + col
+        cursorCol = 2 + col
       }
       if (ch === "\n") flush()
     }
   }
-  if (cur || lines.length === 0) flush()
+  const endsWithNewline = chars.length > 0 && chars[chars.length - 1] === "\n"
+  if (cur || lines.length === 0 || endsWithNewline) flush()
   return { lines, cursorLine, cursorCol }
 }