thincoder 0.12.52 → 0.12.53

package/src/tools/shared.mjs

@@ -447,10 +447,12 @@ export function htmlToText(html) {
     .trim()
 }
 
-/** Execute a git command. maxBuffer 10MB prevents large diff/log overflow; on overflow, returns truncated partial output rather than empty. */
-export function runGit(cwd, cmdArgs) {
+/** Execute a git command. maxBuffer 10MB prevents large diff/log overflow; on overflow, returns truncated partial output rather than empty.
+ *  config: optional array of `-c key=value` overrides (e.g. ["http.proxy=http://10.2.2.112:3128"]) —
+ *  inserted verbatim after `git`, so network actions (push/fetch/pull/ls-remote) can route through a proxy. */
+export function runGit(cwd, cmdArgs, config = []) {
   try {
-    return execFileSync("git", cmdArgs, { cwd, encoding: "utf8", maxBuffer: 10 * 1024 * 1024, stdio: ["ignore", "pipe", "ignore"] }).trim().replace(/\r/g, "")
+    return execFileSync("git", [...config, ...cmdArgs], { cwd, encoding: "utf8", maxBuffer: 10 * 1024 * 1024, stdio: ["ignore", "pipe", "ignore"] }).trim().replace(/\r/g, "")
   } catch (e) {
     // maxBuffer overflow: e.stdout contains partial collected output — return it
     // (callers show "(truncated)"-style tails). ALL OTHER errors (non-git repo,

package/src/tools/system.mjs

@@ -31,6 +31,22 @@ function applyLineFilter(output, filter) {
   return truncate(lines.join("\n"))
 }
 
+/** POSIX-only constructs that cmd.exe reads literally (and thus breaks). Detected
+ *  so the agent is told IMMEDIATELY instead of chasing a confusing failure — warning
+ *  only, never a block (the approval layer is the real gate, same as destructive-command policy). */
+function posixSyntaxHint(command) {
+  const hits = []
+  if (/\$\([^)]*\)/.test(command)) hits.push("$(...)")
+  if (command.includes("`")) hits.push("backtick")
+  if (/;\s+/.test(command)) hits.push("';' separators (cmd.exe needs && or newline)")
+  if (/2>\s*\/dev\/null|>\s*\/dev\/null|&>\s*\/dev\/null/.test(command)) hits.push("/dev/null (use NUL)")
+  if (/'.*'/.test(command)) hits.push("single quotes (cmd.exe doesn't group)")
+  if (/\$\{[A-Za-z_]/.test(command)) hits.push("${VAR} (use %VAR%)")
+  if (!hits.length) return ""
+  return "[hint: POSIX-only construct(s) detected — " + hits.join(", ") + ". Current shell is cmd.exe; these will NOT work. Use && / NUL / %VAR%, or use the execute tool (node) for complex logic]"
+}
+
+
 // ====================================================================
 // bash — command execution with safety gates
 // ====================================================================
@@ -259,7 +275,9 @@ export const bashTool = {
       shell: ctx.agent?.config?.shell ?? null,
     })
     const filtered = args.filter ? applyLineFilter(result, args.filter) : result
-    return guard ? `${guard.notice}\n\n${filtered}` : filtered
+    const hint = posixSyntaxHint(args.command)
+    const body = guard ? `${guard.notice}\n\n${filtered}` : filtered
+    return hint ? `${hint}\n${body}` : body
   },
 }
 

package/src/tools/web.mjs

@@ -1,6 +1,6 @@
 import { DESC, truncate, stripTags, htmlToText, isPrivateHost } from "./shared.mjs";
 import { URL } from "node:url";
-import { resolveWebProxy, proxyFetch } from "../proxy.mjs";
+import { proxyFetch } from "../proxy.mjs";
 
 export const UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36"
 const FETCH_TIMEOUT = 15_000
@@ -41,8 +41,9 @@ const ENGINES = [{ name: "bing", label: "Bing", url: bingUrl, extract: extractBi
 const ENGINE_NAMES = ENGINES.map(e => e.name)
 
 /** Structured search via Tavily (optional — config.websearch.apiKey). Returns
- *  { engine, results } or null to fall back to Bing HTML scraping. */
-async function fetchTavily(query, limit, ctx) {
+ *  { engine, results } or null to fall back to Bing HTML scraping.
+ *  proxyUri: explicit per-call proxy (args.proxy) — never the config.json one. */
+async function fetchTavily(query, limit, ctx, proxyUri) {
   const apiKey = ctx?.agent?.config?.websearch?.apiKey
   if (!apiKey) return null
   const ctrl = new AbortController()
@@ -53,7 +54,7 @@ async function fetchTavily(query, limit, ctx) {
       headers: { "Content-Type": "application/json", "Authorization": `Bearer ${apiKey}` },
       body: JSON.stringify({ query, search_depth: "basic", max_results: limit, include_answer: false, include_raw_content: false }),
       signal: ctrl.signal,
-    }, resolveWebProxy(ctx))
+    }, proxyUri)
     if (!response.ok) return null
     const data = await response.json()
     const results = (Array.isArray(data.results) ? data.results : []).map((r) => ({
@@ -64,14 +65,14 @@ async function fetchTavily(query, limit, ctx) {
   finally { clearTimeout(timer) }
 }
 
-async function fetchEngine(engine, query, page, ctx) {
+async function fetchEngine(engine, query, page, proxyUri) {
   const ctrl = new AbortController()
   const timer = setTimeout(() => ctrl.abort(), FETCH_TIMEOUT)
   try {
     const response = await proxyFetch(engine.url(query, page), {
       headers: { "User-Agent": engine.ua, "Accept-Language": "en-US,en;q=0.9,zh-CN;q=0.8" },
       signal: ctrl.signal,
-    }, resolveWebProxy(ctx))
+    }, proxyUri)
     if (!response.ok) return null
     const html = await response.text()
     const results = engine.extract(html)
@@ -90,6 +91,7 @@ export const websearchTool = {
       limit: { type: "number", description: "Max results (default 8, max 20)" },
       engine: { type: "string", enum: ENGINE_NAMES, description: "Specific engine — \"bing\" (Bing). Omit to search all engines concurrently." },
       page: { type: "number", description: "Page number for pagination (1-based, default 1). Only used when engine is specified." },
+      proxy: { type: "string", description: "http://host:port explicit proxy (optional) — use ONLY when passed; no proxy = direct. config.json proxy is NOT auto-applied (2026-08-31 ruling: fixed config breaks domestic sites)" },
     },
     required: ["query"],
   },
@@ -97,20 +99,23 @@ export const websearchTool = {
   async execute(args, ctx) {
     const limit = Math.min(args.limit ?? 8, 20)
     const page = Math.max(1, args.page ?? 1)
+    // 2026-08-31 ruling: proxy is a PER-CALL decision (args.proxy), never the config.json
+    // fixed configuration. Model picks by target: github/foreign → pass proxy; gitee/domestic → omit.
+    const proxyUri = args.proxy ?? null
     // Structured search first when a Tavily key is configured — stable, dated,
     // no HTML scraping. Falls back to Bing silently.
-    const tavily = await fetchTavily(args.query, limit, ctx)
+    const tavily = await fetchTavily(args.query, limit, ctx, proxyUri)
     if (tavily && tavily.results.length > 0) {
       return truncate(tavily.results.slice(0, limit).map((r, i) => `${i + 1}. [tavily] ${r.title}\n   ${r.href}\n   ${r.snippet}`).join("\n\n"))
     }
     if (args.engine) {
       const engine = ENGINES.find(e => e.name === args.engine)
       if (!engine) return `Unknown engine '${args.engine}'. Available: ${ENGINE_NAMES.join(", ")}`
-      const fetched = await fetchEngine(engine, args.query, page, ctx)
+      const fetched = await fetchEngine(engine, args.query, page, proxyUri)
       if (!fetched || fetched.results.length === 0) return "(no results)"
       return truncate(fetched.results.slice(0, limit).map((r, i) => `${i + 1}. [${engine.label}] ${r.title}\n   ${r.href}\n   ${r.snippet}`).join("\n\n"))
     }
-    const promises = ENGINES.map(e => fetchEngine(e, args.query, 1, ctx))
+    const promises = ENGINES.map(e => fetchEngine(e, args.query, 1, proxyUri))
     const fetched = (await Promise.all(promises)).filter(Boolean)
     if (fetched.length === 0) return "(no results)"
     const merged = [], indexes = fetched.map(() => 0)
@@ -156,16 +161,39 @@ export function resolveRedirectTarget(loc, baseUrl) {
   return { target }
 }
 
+/** Heuristic: a fetch result that is a near-empty shell or a region-block page hides
+ *  the real content. Flags the pattern so the model switches strategy instead of
+ *  re-fetching blind (2026-08-31: 21-char MiniMax SPA shell + "App unavailable in
+ *  region" Claude page both wasted an hour of round trips). */
+export function detectSparseHtml(html, text) {
+  if (text.length >= 300) return ""
+  if (/unavailable in (your )?region|not available in (your )?region|app-unavailable|enable.?javascript|just a moment|attention required|cf-browser-verification/i.test(html)) {
+    return "\n\n[fetch hint: page looks region-blocked or JS-gated (body <300 chars). Try a search MCP tool (configured provider) or the site's .md/raw/mirror endpoint]"
+  }
+  if (/<div[^>]+id="(app|root)"[^>]*>\s*<\/div>|id="app"|id="root"/i.test(html)) {
+    return "\n\n[fetch hint: page is a JS-rendered SPA shell (body <300 chars) — content loads client-side. Try a search MCP tool or the site's .md/API endpoint]"
+  }
+  return ""
+}
+
 export const fetchTool = {
   name: "fetch",
   description: DESC("fetch"),
-  parameters: { type: "object", properties: { url: { type: "string", description: "http/https URL" } }, required: ["url"] },
+  parameters: {
+    type: "object",
+    properties: {
+      url: { type: "string", description: "http/https URL" },
+      proxy: { type: "string", description: "http://host:port explicit proxy (optional) — use ONLY when passed; no proxy = direct. config.json proxy is NOT auto-applied (2026-08-31 ruling); pick per target (github/foreign sites need a proxy, gitee/domestic don't)" },
+    },
+    required: ["url"],
+  },
   readonly: true,
-  async execute(args, ctx) {
+  async execute(args, _ctx) {
     if (!/^https?:\/\//.test(args.url)) throw new Error("url must start with http:// or https://")
     if (isPrivateUrl(args.url)) throw new Error("fetch blocked: internal/private/metadata addresses are not allowed")
     try {
-      const proxyUri = resolveWebProxy(ctx)
+      // 2026-08-31 ruling: per-call decision — args.proxy when passed, direct otherwise.
+      const proxyUri = args.proxy ?? null
       const response = await proxyFetch(args.url, { headers: { "User-Agent": UA } }, proxyUri)
       if (!response.ok) {
         if ([301, 302, 307, 308].includes(response.status)) {
@@ -179,14 +207,16 @@ export const fetchTool = {
             if (!r2.ok) throw new Error(`fetch failed: HTTP ${r2.status}`)
             const ct2 = headerOf(r2, "content-type") ?? ""
             const b2 = await r2.text()
-            return ct2.includes("text/html") ? truncate(htmlToText(b2)) : truncate(b2)
+            if (ct2.includes("text/html")) { const t = htmlToText(b2); return truncate(t + detectSparseHtml(b2, t)) }
+            return truncate(b2)
           }
         }
         throw new Error(`fetch failed: HTTP ${response.status}`)
       }
       const ct = headerOf(response, "content-type") ?? ""
       const body = await response.text()
-      return ct.includes("text/html") ? truncate(htmlToText(body)) : truncate(body)
+      if (ct.includes("text/html")) { const t = htmlToText(body); return truncate(t + detectSparseHtml(body, t)) }
+      return truncate(body)
     } catch (e) { throw new Error(`fetch failed: ${e.cause?.code ?? e.message}`, { cause: e }) }
   },
 }

package/src/tools/websearch.md

@@ -5,9 +5,11 @@ Parameters:
 - limit: Max results (default 8, max 20)
 - engine: Specific engine to use — "bing" (Bing). Omit to search all engines concurrently.
 - page: Page number for pagination (1-based, default 1). Only used when engine is specified.
+- proxy: http://host:port explicit proxy (optional) — use ONLY when passed; no proxy = direct. config.json proxy is NOT auto-applied (2026-08-31 ruling); Bing/foreign sites usually need a proxy, domestic targets don't
 
 Notes:
 - Before searching the web, call `memory_search` first — you may already know the answer from a previous session. Only reach for websearch if memory comes up empty.
 - Use this for information that is NOT in the local codebase — current docs, error messages, API references
 - Follow up with `fetch` to read full pages from the results
-- Proxy support: set `"proxy": {"uri": "http://host:port", "web": true}` in config.json
+- **Weak engine warning**: Bing's index is noisy for technical queries — if a first websearch returns irrelevant/townhall-grade results, DO NOT retry the same query. Configure a search MCP tool (e.g. `glm-websearch` via the MCP config) for technical lookups; websearch is the fallback.
+- Proxy: NOT auto-applied from config.json (2026-08-31 ruling). Pass `proxy: "http://host:port"` explicitly when the target needs one; omit for domestic targets.

package/src/tui/fold-block.mjs

@@ -36,8 +36,31 @@ export function isExpanded(state, foldKey) {
 /** Bidirectional toggle (mouse click / future keyboard path share this). */
 export function toggleFoldBlock(state, foldKey) {
   state.expandedBlocks ??= new Set()
-  if (state.expandedBlocks.has(foldKey)) state.expandedBlocks.delete(foldKey)
-  else state.expandedBlocks.add(foldKey)
+  if (state.expandedBlocks.has(foldKey)) {
+    state.expandedBlocks.delete(foldKey)
+    state._foldScroll?.delete(foldKey) // 2026-08-31 会诊 kimi：收起清理块内滚动残留（防 Map 缓涨）
+  } else {
+    state.expandedBlocks.add(foldKey)
+  }
+}
+
+/** 块内滚动：展开态窗口起点（2026-08-31 用户需求——60% 封顶保留、块内可滚动读全文）。
+ *  存在 = state._foldScroll: Map<foldKey, offset>（渲染读、点击/滚轮写）。 */
+export function foldScrollOffset(state, foldKey) {
+  return state._foldScroll?.get(foldKey) ?? 0
+}
+
+/** 块内滚动步长：▲/▼ 控制行 = 一整窗（winH）；滚轮 = 3 行（与外部会话滚动节拍一致）。
+ *  dir=+1 向下（offset 增）、-1 向上；upper = 合法上限（total-winH），提供时写时钳制
+ *  （2026-08-31 会诊 glm：▲▼ 过冲原靠渲染 clamp 收敛→每次点击双重建缓存）。 */
+export function scrollFoldBlock(state, foldKey, dir, step, upper) {
+  state._foldScroll ??= new Map()
+  const prev = state._foldScroll.get(foldKey) ?? 0
+  let next = prev + dir * Math.max(1, Math.floor(step))
+  if (upper != null) next = Math.min(next, upper)
+  next = Math.max(0, next)
+  state._foldScroll.set(foldKey, next)
+  return next
 }
 
 /** Fold marker line: bold-cyan icon + "click to …" phrase underlined (clickable affordance).
@@ -191,18 +214,43 @@ export function renderExpandedBlock({ body, foldKey, state, maxRows, label, cols
   })
   const out = [blankLine(), foldHintLine(`▼ … ${label} — click to collapse`, foldKey)]
   const cap = foldCapRows(maxRows)
-  if (lined.length <= cap) {
+  if (lined.length <= cap - 5) {
+    // 2026-08-31 用户需求：整块（含控制行）≤ 60% 屏时全量显示
     out.push(...lined)
     return out
   }
-  // Reserve room for blank + top control + cap marker + bottom control.
-  const keep = Math.max(1, cap - 4)
-  out.push(...lined.slice(0, keep))
-  out.push({
-    text: `│ … ${body.length - keep} more lines — expansion capped at 60% of screen (collapse to re-expand)`,
-    color: C.dim,
-    _skipDimFold: true,
-  })
+  // 块高 60% 封顶保留（用户 2026-08-30 拍板），正文改窗口显示（2026-08-31）：
+  // 窗口 = cap 内可读行数（扣除 blank+顶部控制+▲+▼+底部收起 = 5 行开销）；
+  // ▲/▼ 控制行点击翻窗（_foldScrollUp/_foldScrollDown 标记，mouse.mjs 分派）——
+  // 滚动读全文、收起控制行永远在块尾。
+  const winH = Math.max(1, cap - 5)
+  const total = lined.length
+  const offset = Math.min(Math.max(0, foldScrollOffset(state, foldKey)), Math.max(0, total - winH))
+  // 2026-08-31：clamp 写回状态——否则 scrollFoldBlock 越界累积（渲染只看 clamped、事件判定
+  // 却看原值），handleWheel 会误判"未到边界"→ 永远命中块 → 穿不出块 → 会话顶/懒加载不可达
+  if (state._foldScroll?.get(foldKey) !== offset) {
+    state._foldScroll ??= new Map()
+    state._foldScroll.set(foldKey, offset)
+  }
+  const window = lined.slice(offset, offset + winH).map((l) => ({
+    ...l,
+    _foldBlock: foldKey, // 2026-08-31 滚轮命中标记：每行自描述所属块（mouse handleWheel 用——无需区间簿记）
+    _foldWindow: winH,
+    _foldTotal: total,
+  }))
+  if (offset > 0) {
+    out.push({
+      text: `▲ 上方还有 ${offset} 行（点击向上翻窗）`,
+      color: C.dim, _skipDimFold: true, _foldScrollUp: foldKey, _foldWindow: winH, _foldTotal: total,
+    })
+  }
+  out.push(...window)
+  if (offset + winH < total) {
+    out.push({
+      text: `▼ 下方还有 ${total - offset - winH} 行（点击向下翻窗）`,
+      color: C.dim, _skipDimFold: true, _foldScrollDown: foldKey, _foldWindow: winH, _foldTotal: total,
+    })
+  }
   out.push(foldHintLine(`▼ … ${label} — click to collapse`, foldKey))
   return out
 }

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,13 +218,24 @@ export async function startTUI(agent, opts = {}) {
       }
     }
 
-    // Scroll wheel: \x1b[<64;…M = scroll up, \x1b[<65;…M = scroll down (3 lines each)
+    // 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)) {
-      if (Number(m[1]) === 64) {
-        state.scroll += 3
-      } else if (Number(m[1]) === 65) {
-        state.scroll = Math.max(0, state.scroll - 3)
+    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 // 滚回底部恢复跟随
+          }
+        }
       }
     }
 
@@ -266,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 = () => {
@@ -341,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("/")) {
@@ -448,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))
@@ -298,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,8 +15,41 @@
  *   - 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) {
@@ -30,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
   }
 }
@@ -76,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).