thincoder 0.12.51 → 0.12.53

package/src/tools/git.mjs

@@ -22,9 +22,9 @@ function filterLines(output, filter) {
 /** Run git PRESERVING per-line leading whitespace. runGit trims the WHOLE output, which
  *  strips a porcelain line's leading " " (the unstaged marker) and misclassifies an
  *  unstaged-only first line as staged. status uses this so the staged/unstaged column survives. */
-function runGitRaw(cwd, cmdArgs) {
+function runGitRaw(cwd, cmdArgs, config = []) {
   try {
-    return execFileSync("git", cmdArgs, { cwd, encoding: "utf8", maxBuffer: 10 * 1024 * 1024, stdio: ["ignore", "pipe", "ignore"] }).replace(/\r/g, "").replace(/\n$/, "")
+    return execFileSync("git", [...config, ...cmdArgs], { cwd, encoding: "utf8", maxBuffer: 10 * 1024 * 1024, stdio: ["ignore", "pipe", "ignore"] }).replace(/\r/g, "").replace(/\n$/, "")
   } catch (e) {
     return String(e.stdout || "").replace(/\r/g, "")
   }
@@ -32,9 +32,9 @@ function runGitRaw(cwd, cmdArgs) {
 
 /** Run git and report failure (stderr + exit code) instead of swallowing it.
  *  Used by write ops (commit/push/rm) where a silent "" would masquerade as success. */
-function runGitStrict(cwd, cmdArgs) {
+function runGitStrict(cwd, cmdArgs, config = []) {
   try {
-    const out = execFileSync("git", cmdArgs, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }).trim().replace(/\r/g, "")
+    const out = execFileSync("git", [...config, ...cmdArgs], { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }).trim().replace(/\r/g, "")
     return { ok: true, out }
   } catch (e) {
     return { ok: false, out: String(e.stdout || "").trim(), err: String(e.stderr || e.message || "").trim() }
@@ -43,10 +43,23 @@ function runGitStrict(cwd, cmdArgs) {
 
 /** Validate a git ref / branch / tag / remote name (no option injection, no whitespace). */
 function validateRef(ref, what = "git ref") {
-  if (!/^[A-Za-z0-9._\/~^@][A-Za-z0-9._\/~^@{}\-]*$/.test(ref)) throw new Error(`Invalid ${what}: ${ref}`)
+  if (!/^[A-Za-z0-9._/~^@][A-Za-z0-9._/~^@{}-]*$/.test(ref)) throw new Error(`Invalid ${what}: ${ref}`)
   return ref
 }
 
+/** Normalize args.config into `-c key=value` pairs (git -c overrides, e.g. a proxy).
+ *  Values are execFileSync array args (no shell injection) — still reject newlines/empty. */
+function gitConfigArgs(config) {
+  if (config == null) return []
+  if (!Array.isArray(config)) throw new Error("config must be an array of \"key=value\" strings")
+  const out = []
+  for (const c of config) {
+    if (typeof c !== "string" || !c.trim() || c.includes("\n")) throw new Error(`invalid git -c config entry: ${String(c).slice(0, 60)}`)
+    out.push("-c", c)
+  }
+  return out
+}
+
 /** True when `abs` is inside `root` (handles `..` and cross-drive, which relative()
  *  returns as an absolute path on Windows). */
 function isInside(root, abs) {
@@ -83,7 +96,7 @@ export const gitTool = {
   parameters: {
     type: "object",
     properties: {
-      action: { type: "string", enum: ["diff", "status", "log", "show", "checkpoint", "add", "rm", "commit", "push", "tag", "branch", "checkout", "restore", "stash", "fetch", "pull", "reset", "revert", "merge", "cherry-pick"], description: "diff / status / log / show / checkpoint / add / rm / commit / push / tag / branch / checkout / restore / stash / fetch / pull / reset / revert / merge / cherry-pick" },
+      action: { type: "string", enum: ["diff", "status", "log", "show", "checkpoint", "add", "rm", "commit", "push", "tag", "branch", "checkout", "restore", "stash", "fetch", "pull", "reset", "revert", "merge", "cherry-pick", "ls-remote"], description: "diff / status / log / show / checkpoint / add / rm / commit / push / tag / branch / checkout / restore / stash / fetch / pull / reset / revert / merge / cherry-pick / ls-remote" },
       // diff/log params
       staged: { type: "boolean", description: "(diff) Show staged changes instead of working tree" },
       path: { type: "string", description: "(diff/log/add/commit/checkout/restore/checkpoint:cat/versions/rewind/rm) File or directory to scope to / stage / restore" },
@@ -96,6 +109,7 @@ export const gitTool = {
       name: { type: "string", description: "(branch/tag) The branch or tag name (create/delete/switch)" },
       remote: { type: "string", description: "(push/fetch/pull) Remote name (e.g. origin). Default: current upstream" },
       workdir: { type: "string", description: "Run git in this workspace subdirectory (monorepo / multi-repo). Confined to the workspace. Default: cwd" },
+      config: { type: "array", items: { type: "string" }, description: "(network actions: push/fetch/pull/ls-remote) git -c overrides, e.g. [\"http.proxy=http://10.2.2.112:3128\"] for blocked remotes" },
       tags: { type: "boolean", description: "(push) Also push all tags (--tags)" },
       mode: { type: "string", enum: ["soft", "mixed", "hard"], description: "(reset) reset mode — hard snapshots the tree first + needs confirmation" },
       tagAction: { type: "string", enum: ["list", "create", "delete"], description: "(tag) list tags / create one / delete one" },
@@ -112,10 +126,13 @@ export const gitTool = {
     // workdir: run git in a workspace subdirectory (monorepo / multi-repo). Shadow ctx.cwd so
     // every action + snapshotBefore + checkpoint resolves against the workdir, confined to the workspace.
     if (args.workdir) ctx = { ...ctx, cwd: resolveBaseDir(ctx.cwd, args.workdir) }
+    // git -c overrides (proxy etc.) — only network actions need them; passing to every
+    // action would be harmless but noisy. cfgArgs stays [] for local ops.
+    const cfgArgs = gitConfigArgs(args.config)
     switch (args.action) {
       case "diff": {
         const ref = args.ref ?? "HEAD"
-        if (!/^[A-Za-z0-9._\/~^@][A-Za-z0-9._\/~^@{}\-]*$/.test(ref)) throw new Error(`Invalid git ref: ${ref}`)
+        if (!/^[A-Za-z0-9._/~^@][A-Za-z0-9._/~^@{}-]*$/.test(ref)) throw new Error(`Invalid git ref: ${ref}`)
         const flags = args.staged ? ["--staged"] : []
         const paths = args.path ? [args.path] : []
         const out = runGit(ctx.cwd, ["diff", ...flags, ref, "--", ...paths])
@@ -169,7 +186,7 @@ export const gitTool = {
       }
       case "show": {
         const ref = args.ref ?? "HEAD"
-        if (!/^[A-Za-z0-9._\/~^@][A-Za-z0-9._\/~^@{}\-]*$/.test(ref)) throw new Error(`Invalid git ref: ${ref}`)
+        if (!/^[A-Za-z0-9._/~^@][A-Za-z0-9._/~^@{}-]*$/.test(ref)) throw new Error(`Invalid git ref: ${ref}`)
         const out = runGit(ctx.cwd, ["show", "--stat", ref])
         return truncate(out || "(no such commit)")
       }
@@ -195,9 +212,19 @@ export const gitTool = {
         if (args.remote) cmdArgs.push(validateRef(args.remote, "remote"))
         if (args.ref) for (const r of args.ref.split(/\s+/).filter(Boolean)) cmdArgs.push(validateRef(r, "ref"))
         if (args.tags) cmdArgs.push("--tags")
-        const r = runGitStrict(ctx.cwd, cmdArgs)
+        const r = runGitStrict(ctx.cwd, cmdArgs, cfgArgs)
         return r.ok ? truncate(r.out || "(push complete — no output)") : truncate(`git push failed: ${r.err || r.out || "(no output)"}`)
       }
+      case "ls-remote": {
+        // Lightweight remote-ref check (which refs a remote has) — network action,
+        // read-only, no snapshot. Config plumbing for blocked/gated remotes.
+        const cmdArgs = ["ls-remote"]
+        if (args.remote) cmdArgs.push(validateRef(args.remote, "remote"))
+        if (args.ref) for (const r of args.ref.split(/\s+/).filter(Boolean)) cmdArgs.push(validateRef(r, "ref"))
+        const out = runGit(ctx.cwd, cmdArgs, cfgArgs)
+        if (!out) return "(no refs / remote unreachable)"
+        return truncate(filterLines(out, args.filter))
+      }
       case "add": {
         // Granular staging: stage `path` when given, else all changes (add -A).
         const cmdArgs = args.path ? ["add", "--", args.path] : ["add", "-A"]
@@ -293,14 +320,14 @@ export const gitTool = {
         const cmdArgs = ["fetch"]
         if (args.remote) cmdArgs.push(validateRef(args.remote, "remote"))
         if (args.ref) cmdArgs.push(validateRef(args.ref, "ref"))
-        const r = runGitStrict(ctx.cwd, cmdArgs)
+        const r = runGitStrict(ctx.cwd, cmdArgs, cfgArgs)
         return r.ok ? truncate(r.out || "(fetch complete — no output)") : truncate(`git fetch failed: ${r.err || r.out}`)
       }
       case "pull": {
         const cmdArgs = ["pull"]
         if (args.remote) cmdArgs.push(validateRef(args.remote, "remote"))
         if (args.ref) cmdArgs.push(validateRef(args.ref, "ref"))
-        const r = runGitStrict(ctx.cwd, cmdArgs)
+        const r = runGitStrict(ctx.cwd, cmdArgs, cfgArgs)
         return r.ok ? truncate(r.out || "(pull complete — no output)") : truncate(`git pull failed: ${r.err || r.out}`)
       }
       case "reset": {

package/src/tools/shared.mjs

@@ -170,6 +170,7 @@ export function toOpenAISchema(tool) {
 /** Strip ANSI escape sequences */
 export function sanitizeOutput(s) {
   return s
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     .replace(/\x1b\[[0-9;?]*[\x40-\x7E]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b[()][0-9A-B]|\x1b[=>#][0-9]?/g, "")
     .replace(/\r\n/g, "\n")
     .replace(/\r/g, "\n")
@@ -446,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/agent-turn.mjs

@@ -26,7 +26,7 @@ const DISTILL_FLUSH_TIMEOUT_MS = 5000
  *         ensureAssistantLabel, askPermission, askQuestion,
  *         handleSlash, summarize } */
 export async function runAgentTurn(ctx, text) {
-  const { agent, state, pushLine, pushLabel, render, scheduleRender, ensureAssistantLabel, askPermission, askQuestion, handleSlash, summarize } = ctx
+  const { agent, state, pushLine, pushLabel, render, scheduleRender, ensureAssistantLabel, askPermission, askQuestion, handleSlash } = ctx
   // 可注入覆盖（测试用）；默认走真实实现
   const runAgentImpl = ctx.runAgent ?? runAgent
   const saveSessionImpl = ctx.saveSession ?? saveSession
@@ -47,10 +47,6 @@ export async function runAgentTurn(ctx, text) {
   state.currentTool = null
   state.processingStarted = Date.now()
   state.controller = new AbortController()
-  // Turn-start re-sample (2026-08-30): ConPTY may have recovered the true size
-  // since the last event hook — a growth is accepted immediately (asymmetric
-  // rule), so generation starts full-width instead of waiting for the finally.
-  state.dims?.refresh()
   state.interruptPrompt = null
   // Refresh status bar every second during processing; also refresh when any
   // subagent block is still running so its header elapsed ticks (§7.2 D4 —
@@ -63,7 +59,7 @@ export async function runAgentTurn(ctx, text) {
   render()
 
   const { callbacks, flushStream } = buildToolCallbacks({
-    agent, state, pushLine, render, scheduleRender, ensureAssistantLabel, askPermission, askQuestion, summarize, saveSessionImpl,
+    agent, state, pushLine, render, scheduleRender, ensureAssistantLabel, askPermission, askQuestion, saveSessionImpl,
   })
 
   // try/finally: every exit path — including an unexpected throw inside the catch
@@ -128,10 +124,6 @@ export async function runAgentTurn(ctx, text) {
     // an onToolResult their header would say "running" forever; ticks are cleared
     // so no stale start time leaks into the next turn.
     sweepToolBlocks(state)
-    // Output just stopped — the deterministic moment ConPTY's buffer info has
-    // recovered (stale-small only occurs DURING heavy output). Sample here:
-    // a growth is accepted immediately, a shrink still needs double-confirm.
-    state.dims?.refresh()
     state.controller = null
     state.status = "Ready"
     // FR1: status bar must recover immediately — the awaits below (title-gen, distill flush,

package/src/tui/clipboard.mjs

@@ -102,6 +102,7 @@ export function insertPastedText(state, rawText) {
  *  Terminals without enhancement send a bare \r for Shift+Enter — nothing to translate
  *  (degrades to a normal submit; Alt+Enter remains the fallback). */
 export function translateShiftEnter(text) {
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
   return text.replace(/\x1b\[13;2u/g, "\x1b\r").replace(/\x1b\[27;2;13~/g, "\x1b\r")
 }
 
@@ -110,6 +111,7 @@ export function translateShiftEnter(text) {
  *  modifyOtherKeys: \x1b[27;mod;key~  — function keys
  *  Call AFTER translateShiftEnter (which already handles Shift+Enter). */
 export function stripKeyboardProtocol(text) {
+  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
   return text.replace(/\x1b\[\d+;\d+u/g, "").replace(/\x1b\[27;\d+;\d+~/g, "")
 }
 
@@ -119,7 +121,7 @@ export function stripKeyboardProtocol(text) {
 export async function pasteClipboardImage(ctx) {
   const { agent, state, pushLine, render } = ctx
   const { execFile } = await import("node:child_process")
-  const { mkdir, stat, unlink } = await import("node:fs/promises")
+  const { stat, unlink } = await import("node:fs/promises")
   const { join } = await import("node:path")
 
   const run = (cmd, args) => new Promise((resolve, reject) => {

package/src/tui/dims.mjs

@@ -1,23 +1,21 @@
 /**
- * dims.mjs — terminal dimension single source (2026-08-30).
+ * dims.mjs — terminal dimension single source (2026-08-30; simplified 2026-08-31).
  *
- * Windows ConPTY bug (user report: streaming output crammed into a left-hand
- * sliver on a 2K screen, restored to full width after mouse interaction):
- * process.stdout.columns/rows are UNSTABLE — GetConsoleScreenBufferInfo lags
- * behind the real window (ConPTY async update). Reads return falsy at startup
- * (the old ||80 fallback cramped the whole session) and flip between stale
- * and fresh values across calls.
+ * One dimension source for every render/interaction path. Consumers read the
+ * CACHED dims via get() — never process.stdout.columns/rows directly.
+ * Sampling happens in event hooks only (startup seed, resize) — never in the
+ * render path (guard test enforces this).
  *
- * Rule: sample-and-hold with ASYMMETRIC acceptance (2026-08-30 consult).
- * Every consumer reads the CACHED dims here, NEVER process.stdout.columns
- * directly. Sampling happens only in event hooks (startup, delayed resample,
- * resize, agent-turn finally, idle watchdog) — never in the render path.
- *
- * Asymmetric acceptance: the failure mode is one-directional — ConPTY reports
- * a value SMALLER than reality (stale small buffer), never larger. So:
- *   - a LARGER sample is accepted immediately (real grow / recovery),
- *   - a SMALLER sample needs two consecutive confirmations before it is
- *     committed (real shrink), which absorbs the stale-shrink race.
+ * Terminal semantics (2026-08-31 simplification): the earlier ConPTY unstable-
+ * size hypothesis (sample-and-hold, asymmetric acceptance, double-confirm
+ * shrink with settle windows, idle watchdog) was built on a misdiagnosis —
+ * the real 2026-08-30 narrow-streaming bug was missing `cols` args at
+ * fold-block call sites (component default 80), and a resize event is a
+ * genuine dimension change on any terminal. The double-confirm rule even
+ * broke window drag-to-shrink (a drag ends with ONE final resize event).
+ * Remaining defense kept: sane-gate (cols>=40, rows>=10) drops falsy/unusable
+ * reads (headless / no TTY), and any sane sample — larger OR smaller — is
+ * accepted immediately. A later real resize corrects the cache naturally.
  */
 function defaultSample() {
   return {
@@ -31,44 +29,19 @@ export function makeDimsState(initial = {}, sampleFn = defaultSample, onChange =
     cols: Number(initial.cols) || 80,
     rows: Number(initial.rows) || 24,
   }
-  let sawValid = false
-  // Pending shrink confirmation: first sighting of a smaller sample parks it
-  // here; a second consecutive identical sighting commits it.
-  let pendingShrink = null
-
   return {
     /** Cached dims (what every render path must use). */
     get: () => dims,
-    /** True once a real terminal size has been observed (diagnostics / startup retry). */
-    get sawValid() { return sawValid },
-    /** Sample (event hooks only). See asymmetric-acceptance note above. */
+    /** Sample (event hooks only: startup seed, resize). Falsy/unusable → keep last good. */
     refresh: () => {
       const s = sampleFn()
       const c = Number(s.cols)
       const r = Number(s.rows)
       if (!(c >= 40 && r >= 10)) return dims // falsy/stale-unusable → keep last good
-      sawValid = true
-      if (c > dims.cols || r > dims.rows) {
-        // Growth (incl. recovery from a stale-small cache): accept immediately.
-        dims = { cols: c, rows: r }
-        pendingShrink = null
-        onChange?.(dims)
-        return dims
-      }
-      if (c < dims.cols || r < dims.rows) {
-        // Shrink: needs two consecutive identical sightings (ConPTY reports a
-        // stale-small buffer during output activity; one sighting proves nothing).
-        if (pendingShrink && pendingShrink.cols === c && pendingShrink.rows === r) {
-          dims = { cols: c, rows: r }
-          pendingShrink = null
-          onChange?.(dims)
-        } else {
-          pendingShrink = { cols: c, rows: r }
-        }
-        return dims
-      }
-      pendingShrink = null
+      if (c === dims.cols && r === dims.rows) return dims
+      dims = { cols: c, rows: r }
+      onChange?.(dims)
       return dims
     },
   }
-}
+}

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
 }