thincoder 0.12.53 → 0.12.54

package/src/tui/render-frame.mjs

@@ -10,7 +10,7 @@ import { ansi, C, ESC } from "./ansi.mjs"
 import { convCacheKey, renderConversation, countConvLines } from "./render-conversation.mjs"
 import { sliceByWidth, stringWidth } from "./render.mjs"
 import { specForModel } from "../config.mjs"
-import { computeLayout } from "./layout.mjs"
+import { computeLayout, subagentVisibleLines } from "./layout.mjs"
 import { basename } from "node:path"
 import { readFileSync } from "node:fs"
 
@@ -89,8 +89,10 @@ export function renderPicker(state, cols, panel, overlay) {
   // 过滤提示：无filter时显示 "type to filter"，有filter时显示输入内容
   const filterHint = p ? (p.filter ? `│ ${p.filter}` : "│ type to filter") : ""
   const rawLeft = p ? ` ❯ ${p.title} ${filterHint} ` : " ❯ Setup "
-  const left = sliceByWidth(rawLeft, Math.max(1, cols - 2 - stringWidth(right)))
-  const titlePad = " ".repeat(Math.max(1, cols - 1 - stringWidth(left) - stringWidth(right)))
+  // 2026-08-31 会诊（advisor round1 🔵）：标题行与条目行一致留 8 格余量——Ambiguous 字符
+  // （❯/│ 等）在 CJK 终端渲染 2 格，余量不足时右侧 n/m 位置指示会被截。
+  const left = sliceByWidth(rawLeft, Math.max(1, cols - 8 - stringWidth(right)))
+  const titlePad = " ".repeat(Math.max(1, cols - 8 - stringWidth(left) - stringWidth(right)))
   out.push(`${ansi.bold}${C.tool}${left}${ansi.reset}${ansi.dim}${titlePad}${right}${ansi.reset}`)
   const hasMoreAbove = start > 0
   const hasMoreBelow = start + winH < total
@@ -100,10 +102,14 @@ export function renderPicker(state, cols, panel, overlay) {
     const moreAbove = i === 0 && hasMoreAbove
     const moreBelow = i === shown.length - 1 && hasMoreBelow
     const ind = moreAbove && moreBelow ? "↑↓ more" : moreAbove ? "↑ more" : moreBelow ? "↓ more" : ""
-    const maxW = cols - 1 - (ind ? stringWidth(ind) + 1 : 0)
+    // 2026-08-31 会诊：右边距留 8 格余量——Ambiguous 宽度字符（│/—/●/▸/…/↑↓ 等）在中文
+    // locale 终端渲染 2 格而 stringWidth 按 1 格算，/session 行最坏带 ~7 个（▸ 前缀 +
+    // │×3 + … + — + ●）→ 行宽低估 7+ 格 → 实际超宽 → 物理 wrap → 残影；8 格余量覆盖
+    // 常见低估，最坏残余由 DECAWM 关闭硬截断兜底（见 render-loop）。
+    const maxW = cols - 8 - (ind ? stringWidth(ind) + 1 : 0)
     // 超宽行截断并加省略号
     const text = stringWidth(l.text) > maxW ? sliceByWidth(l.text, Math.max(0, maxW - 1)) + "…" : l.text
-    const pad = ind ? " ".repeat(Math.max(1, cols - 1 - stringWidth(text) - stringWidth(ind))) : ""
+    const pad = ind ? " ".repeat(Math.max(1, cols - 8 - stringWidth(text) - stringWidth(ind))) : ""
     out.push(`${l.color}${text}${ansi.reset}${ind ? `${ansi.dim}${pad}${ind}${ansi.reset}` : ""}`)
   }
   for (let i = shown.length; i < winH; i++) out.push("")
@@ -221,7 +227,7 @@ export function renderRows(state, agent, opts) {
   const slashCommands = opts.slashCommands ?? []
 
   const layout = computeLayout(state, { cols, rows })
-  const { W, panels, inputLayout, inputOffset, boxLines, visibleTasks, permPreviewLines, overlay } = layout
+  const { W, panels, inputLayout, inputOffset, boxLines, visibleTasks, permPreviewLines, overlay, subagentLines } = layout
 
   const screen = new Array(rows).fill("")
   const put = (y, lines) => {
@@ -232,6 +238,16 @@ export function renderRows(state, agent, opts) {
 
   put(panels.header.y, [renderHeader(agent, cols)])
   put(panels.conversation.y, renderConversation(state, cols, panels.conversation.h, state.scroll, rows))
+  // §7.2.1 D2: running-subagent fixed panel (between conversation and todo) —
+  // lines precomputed by layout (subagent-panel.mjs, neutral module), put
+  // directly (no double render); absent when no block is running (F6). Lines
+  // are objects ({text, color, _foldToggle/_foldBlock…} — mouse hit-testing
+  // reads the same array), converted to ANSI strings here like renderTodo.
+  if (panels.subagent) {
+    // 评审 #4：部分压缩（h < 全长）时保底截断——分隔线 + 末尾区块行（最新活动
+    // 优先），与 mouse 命中映射同一几何契约（subagentVisibleLines / subagentLineIndex）。
+    put(panels.subagent.y, subagentVisibleLines(subagentLines, panels.subagent.h).map((l) => `${l.color ?? ""}${l.text}${ansi.reset}`))
+  }
   if (panels.todo) put(panels.todo.y, renderTodo(visibleTasks, cols))
   if (panels.picker) put(panels.picker.y, renderPicker(state, cols, panels.picker, overlay))
   if (panels.permission) put(panels.permission.y, renderPermission(permPreviewLines))

package/src/tui/render-loop.mjs

@@ -114,7 +114,7 @@ export function createRenderLoop(state, agent, ctx, pushLine, write = (s) => pro
       const hasOverlay = state.permission || state.question || state.picker || state.wizard?.step === "provider"
       const cursorSuffix = hasOverlay ? "" : `\x1b[${cursorRow};${cursorCol}H${ansi.hideCursor}`
 
-      if (out.length || cursorSuffix) write(ansi.syncUpdateStart + out.join("") + ansi.syncUpdateEnd + cursorSuffix)
+      if (out.length || cursorSuffix) write(ansi.wrapOff + ansi.syncUpdateStart + out.join("") + ansi.syncUpdateEnd + cursorSuffix + ansi.wrapOn)
     } catch (e) {
       // Don't let a render error crash the TUI
       if (process.env.THINCODER_DEBUG_RENDER) process.stderr.write(`[render-error] ${e?.stack ?? e}\n`)

package/src/tui/subagent-panel.mjs

@@ -0,0 +1,81 @@
+/**
+ * subagent-panel.mjs — 运行中子 agent 固定底部面板渲染（AGENT-LOOP.md §7.2.1 D1/D2）。
+ *
+ * 面板位于 conversation 与 todo 之间（布局顺序 header → conversation → 面板 →
+ * todo → picker → permission → queue → input → status），高度完全自适应 = 全部
+ * 运行中区块的渲染行数（F2，会话区被挤小）；无运行中区块 → 返回 []（F6 空态，
+ * 无悬空分隔线）。子 agent 完成后立即冻结进会话流（subagent-blocks.mjs
+ * freezeSubTaskLines，✓ 头 + 可展开，§7.2 D4 现状不变），面板下一帧自然移除
+ * 该区块（F5）——本模块只渲染 `!done` 条目。
+ *
+ * 中立模块（D1 评审 #6）：layout.mjs 调 renderSubagentPanel 预计算面板高度
+ * （subagentLines → subagentH），render-frame.mjs 直接 put 预计算行（不重复
+ * 渲染）——若本函数放 render-frame 会引入 layout↔render-frame 循环依赖。
+ *
+ * 区块渲染逻辑自 render-conversation.mjs buildConvLines runningSubs 段迁移
+ * （§7.2.1 D2）：折叠头 `[▶/⏸ key · model · elapsed · turn] state`（⏸ = 等待
+ * 审批态图标，sub.approval 非空时显示）+ tail 3；展开态经 fold-block.mjs 公共
+ * 组件（renderBlockTimeline + renderExpandedBlock，60% 封顶 + 块内滚动）。
+ * 折叠状态 key = `sub-${key}` 跨 turn 保持（D5，与冻结区块同一 key——冻结边界
+ * 无缝衔接）。
+ */
+import { C } from "./ansi.mjs"
+import { sliceByWidth, stringWidth } from "./render.mjs"
+import { isExpanded, renderBlockTimeline, renderExpandedBlock, foldTailLines } from "./fold-block.mjs"
+
+/**
+ * 面板行构建（纯函数）：顶部分隔线 `─` + 各运行中区块（折叠头 + tail 3 /
+ * 展开全量）。maxRows = 终端行数（展开态 60% 封顶窗口化）；省略 = 不封顶
+ * （单测/无终端环境）。
+ * @returns {Array<{text: string, color: string, ...}>}
+ */
+export function renderSubagentPanel(state, cols, maxRows) {
+  const runningSubs = Object.values(state.subTasks ?? {}).filter((s) => !s.done)
+  if (runningSubs.length === 0) return []
+  const out = []
+  // 面板顶部边界线（现状分隔线语义迁移，§7.2.1 D2/NF2）——面板存在即画线，
+  // 无运行区块时面板整体不渲染（F6：无悬空线）。
+  out.push({ text: "─".repeat(Math.max(1, cols - 1)), color: C.dim, _skipDimFold: true })
+  for (const sub of runningSubs) {
+    const foldKey = `sub-${sub.key}`
+    // 头部摘要：`[▶ coder#1 · glm-5.3 · 45s · turn 12/100] bash — npm test`
+    // ⏸ = 等待审批态（sub.approval 非空，评审 #5 定义）；图标在括号内，
+    // 与冻结头 `[✓ …]` 格式统一（任务简报 UI 决策）。
+    const icon = sub.approval ? "⏸" : "▶"
+    const elapsed = Math.floor((Date.now() - sub.started) / 1000)
+    // 评审 #1 宽度预算：模型名先单独按显示宽度截断（[model] token 原样记录可长
+    // 20-30+ 字符，不截断则括号前缀宽度不可预算、状态区被挤出终端右边距）；
+    // 再量括号前缀实际显示宽度，状态区按 cols - bracketWidth - 2 截断——整行
+    // ≤ cols 铁律（TUI 布局纪律：任何写入帧的行 ≤ cols）。极端窄终端下括号
+    // 前缀自身也按 cols-2 截断兜底（状态区宁可让位也不撑破帧）。
+    const modelPart = sub.model
+      ? ` · ${sliceByWidth(sub.model, Math.max(8, Math.floor(cols / 3)))}`
+      : ""
+    const turnPart = sub.maxTurns > 0 ? ` · turn ${sub.turn}/${sub.maxTurns}` : ""
+    const bracket = sliceByWidth(`[${icon} ${sub.key}${modelPart} · ${elapsed}s${turnPart}]`, Math.max(1, cols - 2))
+    const bracketWidth = stringWidth(bracket)
+    let statePart
+    if (sub.approval) statePart = `等待审批: ${sub.approval}`
+    else if (sub.currentTool) statePart = sub.currentTool
+    else statePart = "thinking..."
+    const argSummary = sub.currentTool && sub.toolArgs?.command
+      ? ` — ${String(sub.toolArgs.command).replace(/\s+/g, " ").trim().slice(0, 60)}`
+      : ""
+    out.push({
+      text: `${bracket} ${sliceByWidth(statePart + argSummary, Math.max(0, cols - 2 - bracketWidth))}`,
+      color: C.tool,
+      _foldToggle: foldKey,
+    })
+    if (isExpanded(state, foldKey)) {
+      // 展开态：全量活动时间线（per-kind 着色，60% 屏封顶 + 块内滚动——公共组件）。
+      const body = renderBlockTimeline(sub.blocks, cols)
+      out.push(...renderExpandedBlock({ body, foldKey, state, maxRows, cols, label: "subagent activity" }))
+    } else {
+      // 折叠态：tail 3 非空 block 行（最近活动），dim。
+      for (const line of foldTailLines(sub.blocks)) {
+        out.push({ text: `│ ${sliceByWidth(line, cols - 4)}`, color: C.dim })
+      }
+    }
+  }
+  return out
+}

package/src/tui/tool-events.mjs

@@ -406,7 +406,7 @@ export function buildToolCallbacks(deps) {
     // the compressed version — persist it so the session file ends up compressed. Silent:
     // a save failure must never surface after the turn already returned.
     onDistilled: () => {
-      try { saveSessionImpl(agent, state.lines) } catch { /* 静默 */ }
+      try { saveSessionImpl(agent, state.lines) } catch (e) { console.error(`[session] distilled save failed: ${e.message}`) }
     },
     onUsage: (usage) => {
       state.tokens.prompt += usage.prompt_tokens ?? 0

package/src/tui/tui-lifecycle.mjs

@@ -0,0 +1,45 @@
+/**
+ * tui-lifecycle.mjs — TUI 生命周期终端序列（2026-08-31 advisor round1 🔴：index.mjs
+ * 超 500 行硬限拆分——启动序列、退出清理序列与退出闭包从 index.mjs 移入本模块）。
+ */
+
+import { ansi } from "./ansi.mjs"
+
+/** TUI 启动序列：alt buffer + 隐藏光标 + 鼠标/粘贴/键盘增强 + 禁环绕。
+ *  wrapOff（DECRST 7）为 2026-08-31 会诊的最终防线：Ambiguous 宽度字符（│/—/●/▸/…/↑↓）
+ *  在中文 locale 终端渲染 2 格而 stringWidth 按 1 格算 → 行实际超宽 → 物理 wrap 污染
+ *  下一行 + \x1b[K 清错行 → picker 残影；禁环绕后超宽行硬截断在边距，不可能跨行污染。
+ *  每帧 write 再包 wrapOff/wrapOn（render-loop），退出经 writeCleanupSequence 恢复。 */
+export function writeStartupSequence(write = (s) => process.stdout.write(s)) {
+  write(ansi.altBuffer + ansi.hideCursor + ansi.mouseOn + ansi.bracketedPasteOn + ansi.keyboardPush + ansi.modifyOtherKeysOn + ansi.wrapOff)
+}
+
+/** TUI 清理序列：清屏 + 关闭鼠标/粘贴/键盘增强 + 退出 alt buffer + 显示光标 + 恢复环绕。 */
+export function writeCleanupSequence(write = (s) => process.stdout.write(s)) {
+  write(ansi.clearScreen + ansi.mouseOff + ansi.bracketedPasteOff + ansi.keyboardPop + ansi.modifyOtherKeysOff + ansi.mainBuffer + ansi.showCursor + ansi.reset + ansi.wrapOn)
+}
+
+/** 退出清理闭包：保存会话（同步）+ 关闭 MCP 子进程 + 恢复终端。幂等（cleanedUp 守卫）。 */
+export function createExitCleanup({ agent, saveSession, closeAllMcp }) {
+  let cleanedUp = false
+  return () => {
+    if (cleanedUp) return
+    cleanedUp = true
+    // Save session before exit (synchronous write).
+    // Archiving to a slot is handled by /new and /session switch — not on every exit,
+    // otherwise simply opening and closing the TUI repeatedly would fill all slots with duplicates.
+    try {
+      saveSession(agent)
+    } catch {
+      // Save failure shouldn't block exit
+    }
+    // Kill MCP stdio subprocesses, don't leave orphans
+    try {
+      closeAllMcp(agent)
+    } catch {
+      // Can't close? fine, process is exiting anyway
+    }
+    process.stdin.setRawMode(false)
+    writeCleanupSequence()
+  }
+}