thincoder 0.12.51 → 0.12.53

package/src/tui/index.mjs

@@ -29,9 +29,9 @@ import { createPickers } from "./pickers.mjs"
 import { runDistill as runDistillImpl } from "./distill-cmd.mjs"
 import { createInteraction } from "./interaction.mjs"
 import { pasteClipboardImage as pasteClipboardImageImpl, insertPastedText, translateShiftEnter, stripKeyboardProtocol } from "./clipboard.mjs"
-import { parseMouseClicks, handleMouseClick } from "./mouse.mjs"
+import { parseMouseClicks, handleMouseClick, handleWheel } from "./mouse.mjs"
 import { runAgentTurn } from "./agent-turn.mjs"
-import { createKeyHandler } from "./key-handler.mjs"
+import { createKeyHandler, convMaxScroll } from "./key-handler.mjs"
 import { showStartup, backgroundIndex, historyToLines, HISTORY_PAGE_MESSAGES } from "./startup.mjs"
 import { countConvLines } from "./render-conversation.mjs"
 import { createConfigHelpers } from "./config-helpers.mjs"
@@ -77,6 +77,8 @@ export async function startTUI(agent, opts = {}) {
     historyIndex: -1,
     _draft: null, // stashed unsent input while navigating history (restored on down past newest)
     scroll: 0, // scroll lines from bottom upward
+    _foldScroll: new Map(), // 2026-08-31 块内滚动：foldKey → 窗口 offset（展开块 ▲▼ 翻窗）
+    _followTail: true, // 2026-08-31 流式跟随：渲染前 scroll=0；用户上滚暂停、到底/新消息恢复
     processing: false,
     controller: null, // AbortController for current agent run
     permission: null, // { name, args, resolve }
@@ -134,8 +136,41 @@ export async function startTUI(agent, opts = {}) {
   let pasteMode = false
   let pasteAccum = ""
 
+  /** 懒加载更早历史（2026-08-31 用户约定："滚动到头自动加载"——滚轮/PgUp 到顶皆触发；
+   *  2026-08-31 前只挂 PgUp 键 = 违约，滚轮到头无反应）。加载后滚动补偿保持锚定。
+   *  外层作用域：data 回调（滚轮分支）与 createKeyHandler ctx（PgUp 分支）共用。 */
+  const loadOlder = () => {
+    if (!state._hasOlder) return
+    const full = agent._fullHistory ?? []
+    const loaded = state._historyLoaded
+    const start = Math.max(0, full.length - loaded - HISTORY_PAGE_MESSAGES)
+    const end = full.length - loaded
+    if (start >= end) return
+
+    const d = state.dims ? state.dims.get() : {}
+    const cols = d.cols ?? ((state.dims?.get() ?? {}).cols ?? (process.stdout.columns || 80))
+    const before = countConvLines(state, cols, d.rows ?? (process.stdout.rows || 24))
+
+    if (state.lines[0]?.text?.startsWith("… ")) state.lines.shift()
+    state._lineIdCounter = state._lineIdCounter ?? 0
+    const older = historyToLines(full, start, end)
+    for (const l of older) l._lineId = ++state._lineIdCounter
+    state.lines.unshift(...older)
+    state._historyLoaded += end - start
+    state._hasOlder = start > 0
+    if (state._hasOlder) {
+      state.lines.unshift({ text: `… ${start} more earlier messages (scroll to top to load)`, color: C.dim })
+    }
+
+    const after = countConvLines(state, cols, (state.dims?.get() ?? {}).rows ?? (process.stdout.rows || 24))
+    state.scroll += Math.max(0, after - before)
+    render()
+  }
+
+
   process.stdin.on("data", (chunk) => {
     try {
+
       let text = mousePending + utf8Decoder.decode(chunk, { stream: true })
       mousePending = ""
 
@@ -183,12 +218,24 @@ export async function startTUI(agent, opts = {}) {
       }
     }
 
-    // Scroll wheel: \x1b[<64;…M = scroll up, \x1b[<65;…M = scroll down (3 lines each)
-    for (const m of text.matchAll(/\x1b\[<(\d+);\d+;\d+([Mm])/g)) {
-      if (Number(m[1]) === 64) {
-        state.scroll += 3
-      } else if (Number(m[1]) === 65) {
-        state.scroll = Math.max(0, state.scroll - 3)
+    // Scroll wheel: \x1b[<64;col;rowM = up, \x1b[<65;col;rowM = down（3 lines each）
+    // 2026-08-31：坐标命中展开块内容行 → 块内滚动（handleWheel）；未命中 → 会话滚动（现状）
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+    for (const m of text.matchAll(/\x1b\[<(\d+);(\d+);(\d+)([Mm])/g)) {
+      const button = Number(m[1])
+      if (button === 64 || button === 65) {
+        const consumed = handleWheel(mouseCtx(), button, Number(m[2]), Number(m[3]))
+        if (!consumed) {
+          if (button === 64) {
+            state.scroll += 3
+            state._followTail = false // 2026-08-31：用户上滚 = 暂停流式跟随（不抢视角）
+            // 2026-08-31 用户约定修复：滚动到头自动加载（原来只挂 PgUp 键——违约）
+            if (state._hasOlder && state.scroll >= convMaxScroll(state)) loadOlder()
+          } else {
+            state.scroll = Math.max(0, state.scroll - 3)
+            if (state.scroll === 0) state._followTail = true // 滚回底部恢复跟随
+          }
+        }
       }
     }
 
@@ -203,7 +250,9 @@ export async function startTUI(agent, opts = {}) {
     }
 
     // Strip complete mouse sequences; keep incomplete tail for reassembly with next chunk
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     text = text.replace(/\x1b\[<\d+;\d+;\d+[Mm]/g, "")
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     const tail = text.match(/\x1b\[<[\d;]*$/)
     if (tail) {
       mousePending = tail[0]
@@ -263,43 +312,6 @@ export async function startTUI(agent, opts = {}) {
     render()
   }
 
-  /**
-   * Load the next earlier page of restored history (lazy, parity with VS Code
-   * loadOlder). Prepends earlier source lines and compensates scroll so the
-   * visible content does not jump. Called from key-handler when PgUp hits the top.
-   */
-  const loadOlder = () => {
-    if (!state._hasOlder) return
-    const full = agent._fullHistory ?? []
-    const loaded = state._historyLoaded
-    const start = Math.max(0, full.length - loaded - HISTORY_PAGE_MESSAGES)
-    const end = full.length - loaded
-    if (start >= end) return
-
-    const d = state.dims ? state.dims.get() : {}
-    const cols = d.cols ?? ((state.dims?.get() ?? {}).cols ?? (process.stdout.columns || 80))
-    const before = countConvLines(state, cols, d.rows ?? (process.stdout.rows || 24))
-
-    // Drop the old placeholder, prepend the older page, re-add the placeholder
-    // (with an updated count) only if more remain.
-    if (state.lines[0]?.text?.startsWith("… ")) state.lines.shift()
-    state._lineIdCounter = state._lineIdCounter ?? 0
-    const older = historyToLines(full, start, end)
-    for (const l of older) l._lineId = ++state._lineIdCounter
-    state.lines.unshift(...older)
-    state._historyLoaded += end - start
-    state._hasOlder = start > 0
-    if (state._hasOlder) {
-      state.lines.unshift({ text: `… ${start} more earlier messages (PgUp at top to load)`, color: C.dim })
-    }
-
-    // Scroll compensation: prepending N display rows must move scroll by N to
-    // keep the previously-visible bottom-anchored content in place.
-    const after = countConvLines(state, cols, (state.dims?.get() ?? {}).rows ?? (process.stdout.rows || 24))
-    state.scroll += Math.max(0, after - before)
-    render()
-  }
-
   // Only emit the assistant label once per turn (on first token or first tool call)
   let assistantLabeled = false
   const ensureAssistantLabel = () => {
@@ -317,38 +329,14 @@ export async function startTUI(agent, opts = {}) {
     pushLine)
   const { render, scheduleRender } = renderLoop
 
+  // Resize events are genuine dimension changes on every terminal (2026-08-31
+  // simplification: the earlier settle-timer/double-confirm machinery was built
+  // on the misdiagnosed ConPTY-stale hypothesis and even stalled drag-shrink).
+  // Any sane sample — larger or smaller — is accepted immediately; the cache
+  // self-corrects on the next real resize.
   process.stdout.on("resize", () => {
     try { state.dims.refresh(); render() } catch { /* resize error — ignore */ }
   })
-  // Startup convergence (2026-08-30 consult, residual fix): ConPTY can report
-  // a stale-small 80 at launch AND keep reporting it for a while — sawValid is
-  // useless as a stop condition there (80 passes the sanity gate), which let
-  // the session lock at 80 until the first turn's finally re-sampled. Run the
-  // FULL window (~4.5s): any growth is accepted immediately by the asymmetric
-  // rule and repaints; the window just bounds how long we keep looking.
-  let startupRetries = 0
-  const startupResampler = setInterval(() => {
-    try {
-      const before = state.dims.get()
-      const after = state.dims.refresh()
-      if (after.cols !== before.cols || after.rows !== before.rows) render()
-      if (++startupRetries >= 30) clearInterval(startupResampler)
-    } catch { /* ignore */ }
-  }, 150)
-  // Idle watchdog (2026-08-30 consult): the ONLY mid-session recovery channel.
-  // ConPTY reports stale-small sizes during output activity, so sampling is
-  // gated on idleness — skipped while processing/streaming or within 500ms of
-  // the last render (heavy output); a confirmed shrink also repaints.
-  const idleResampler = setInterval(() => {
-    try {
-      const recentRender = performance.now() - renderLoop.lastRenderAt < 500
-      if (state.processing || state.streaming || state.reasoning || recentRender) return
-      const before = state.dims.get()
-      const after = state.dims.refresh()
-      if (after.cols !== before.cols || after.rows !== before.rows) render()
-    } catch { /* ignore */ }
-  }, 2000)
-  idleResampler.unref?.()
 
   // ---------------------------------------------------------- Submit
 
@@ -362,6 +350,7 @@ export async function startTUI(agent, opts = {}) {
     state.historyIndex = -1
     if (!wasInHistory) state._draft = null // submitted — the draft is now history. Keep draft when submitting from history mode (↓ can recover)
     state.scroll = 0
+    state._followTail = true // 2026-08-31 会诊 deepseek：新消息恢复跟随（注释曾承诺、实现缺漏）
 
     // Slash commands: handled locally, don't enter agent loop
     if (text.startsWith("/")) {
@@ -408,7 +397,7 @@ export async function startTUI(agent, opts = {}) {
   // Agent loop: implemented in agent-turn.mjs
   const turnCtx = {
     agent, state, pushLine, pushLabel, render, scheduleRender: render, ensureAssistantLabel,
-    askPermission, askQuestion, handleSlash: null, summarize,
+    askPermission, askQuestion, handleSlash: null,
     get assistantLabeled() { return assistantLabeled },
     set assistantLabeled(v) { assistantLabeled = v },
   }
@@ -469,6 +458,7 @@ export async function startTUI(agent, opts = {}) {
 
   // Mouse clicks (SGR \x1b[<0;col;rowM) — picker selection + fold expansion.
   const onMouseClick = (col, row) => handleMouseClick({ state, render, popPicker }, col, row)
+  const mouseCtx = () => ({ state, render })
 
   // ---------------------------------------------------------- Startup screen + background indexing
 

package/src/tui/key-handler.mjs

@@ -6,7 +6,7 @@ import { countConvLines } from "./render-conversation.mjs"
 import { QUESTION_CUSTOM } from "./interaction.mjs"
 
 /** Current conversation max scroll offset (display lines beyond the visible panel). */
-function convMaxScroll(state) {
+export function convMaxScroll(state) {
   // Single source (Windows ConPTY instability, 2026-08-30) — cached dims.
   const d = state.dims ? state.dims.get() : {}
   const cols = d.cols ?? ((state.dims?.get() ?? {}).cols ?? (process.stdout.columns || 80))
@@ -255,6 +255,7 @@ export function createKeyHandler(ctx) {
       } else if (str && !key.ctrl && !key.meta) {
         // 输入即过滤；粘贴的多行文本先去换行（与输入框清洗口径一致），仍含控制字符则整段丢弃
         const text = str.replace(/[\r\n]+/g, "")
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
         if (text && !/[\x00-\x1f\x7f]/.test(text)) applyFilter(p.filter + text)
       }
       return
@@ -297,11 +298,13 @@ export function createKeyHandler(ctx) {
       } else {
         state.scroll += Math.max(1, ((state.dims?.get() ?? {}).rows ?? (process.stdout.rows || 24)) - 8)
       }
+      state._followTail = false // 2026-08-31：用户上滚 = 暂停流式跟随
       render()
       return
     }
     if (key.name === "pagedown") {
       state.scroll = Math.max(0, state.scroll - Math.max(1, ((state.dims?.get() ?? {}).rows ?? (process.stdout.rows || 24)) - 8))
+      if (state.scroll === 0) state._followTail = true // 滚回底部恢复跟随
       render()
       return
     }

package/src/tui/mouse.mjs

@@ -15,12 +15,46 @@
  *   - folded-block hint click = expand it
  */
 import { computeLayout } from "./layout.mjs"
-import { buildConvLines } from "./render-conversation.mjs"
-import { toggleFoldBlock } from "./fold-block.mjs"
+import { buildConvLines, convViewport } from "./render-conversation.mjs"
+import { toggleFoldBlock, scrollFoldBlock, foldScrollOffset } from "./fold-block.mjs"
+
+/** 2026-08-31 滚轮事件分派（用户需求"展开块能滚动阅读全文"）：坐标命中展开块内容行 →
+ *  块内逐行滚动（scrollFoldBlock ±3）；未命中 → 会话滚动（调用方继续处理）。
+ *  ctx: { state, render }；返回 true = 已消费（块内滚动），false = 调用方走会话滚动。 */
+export function handleWheel(ctx, button, col, row) {
+  const { state } = ctx
+  const dir = button === 64 ? -1 : 1 // 64=滚上（offset 减）、65=滚下
+  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 }
+  const layout = computeLayout(state, dims)
+  const P = layout.panels
+  if (r < P.conversation.y || r >= P.conversation.y + P.conversation.h) return false
+  const convLines = buildConvLines(state, dims.cols, dims.rows)
+  const gIdx = convGlobalIndex(convLines.length, P.conversation.h, state.scroll ?? 0)(r - P.conversation.y)
+  if (gIdx === null) return false
+  const lineEl = convLines[gIdx]
+  if (!lineEl?._foldBlock) return false
+  // 2026-08-31 会诊 glm：标记不完整（_foldTotal 缺失=退化路径）不消费——交还会话滚动
+  // （total=0 会让下方边界守卫短路 → 卡在块里回归）
+  if (!lineEl._foldTotal) return false
+  // 2026-08-31 穿出语义：块内已到边界（向上滚在顶 / 向下滚在底）→ 交还会话滚动——
+  // 否则滚轮永远被块吃掉，会话顶/懒加载不可达（用户实测路径"经过展开块滚不到顶"）
+  const before = foldScrollOffset(state, lineEl._foldBlock)
+  const winH = lineEl._foldWindow ?? 1
+  const total = lineEl._foldTotal
+  if (dir < 0 && before <= 0) return false // 块顶滚上 → 穿出（会话滚动 → 顶部自动加载）
+  if (dir > 0 && before >= total - winH) return false // 块底滚下 → 穿出
+  scrollFoldBlock(state, lineEl._foldBlock, dir, 3)
+  ctx.render?.()
+  return true
+}
+
 
 /** Extract left-click presses from a chunk. Returns [{ col, row }] (1-based). */
 export function parseMouseClicks(text) {
   const out = []
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
   for (const m of text.matchAll(/\x1b\[<0;(\d+);(\d+)M/g)) {
     out.push({ col: Number(m[1]), row: Number(m[2]) })
   }
@@ -29,13 +63,11 @@ export function parseMouseClicks(text) {
 
 /** Map a 0-based screen row to a conversation line index (same math as renderConversation). */
 export function convGlobalIndex(convLen, convH, scroll) {
-  const maxScroll = Math.max(0, convLen - convH)
-  const clamped = Math.min(scroll, maxScroll)
-  const end = convLen - clamped
-  const start = Math.max(0, end - convH) // content shorter than the panel: rows start at 0
+  const { start, pad } = convViewport(convLen, convH, scroll)
   return (localRow) => {
     if (localRow < 0 || localRow >= convH) return null
-    const idx = start + localRow
+    if (localRow < pad) return null // 顶部 pad 空行不是内容行（2026-08-31 会诊 kimi 缺陷 1）
+    const idx = start + localRow - pad
     return idx >= 0 && idx < convLen ? idx : null
   }
 }
@@ -75,6 +107,14 @@ export function handleMouseClick(ctx, col, row) {
     const gIdx = convGlobalIndex(convLines.length, P.conversation.h, state.scroll ?? 0)(r - P.conversation.y)
     if (gIdx === null) return false
     const lineEl = convLines[gIdx]
+    if (lineEl?._foldScrollUp || lineEl?._foldScrollDown) {
+      // 2026-08-31 块内滚动：▲/▼ 控制行点击翻窗（60% 封顶保留、窗口随翻滚动，全文可达）
+      scrollFoldBlock(state, lineEl._foldScrollUp ?? lineEl._foldScrollDown,
+        lineEl._foldScrollUp ? -1 : 1, lineEl._foldWindow ?? 1,
+        typeof lineEl._foldTotal === "number" ? Math.max(0, lineEl._foldTotal - (lineEl._foldWindow ?? 1)) : undefined)
+      render()
+      return true
+    }
     if (!lineEl?._foldToggle) return false
     // Bidirectional toggle — single source in fold-block.mjs (expand a folded
     // block, collapse an expanded one).