thincoder 0.12.53 → 0.12.58

package/src/tui/tool-events.mjs

@@ -19,6 +19,7 @@ import { ADVISOR_THINKING_PLACEHOLDER, resolveAdvisorProvider } from "../advisor
 import {
   SUBAGENT_ROLES, routeSubToken, routeSubReasoning, routeSubToolCall,
   routeSubToolOutput, finishSubTask, finishSubTasksByRole, finishSubTaskByModel, freezeDoneSubTasks,
+  ensureCompressPanel, markCompressFailed, markCompressDone, markCompressFallback,
 } from "./subagent-blocks.mjs"
 import { TURN_CAP_MARK } from "../agent/spawn-child.mjs"
 
@@ -106,6 +107,21 @@ function settleToolBlock(state, name, toolId, summary) {
   }
 }
 
+/** Async spawn detection (§15 D-A1): the subagent tool's async:true result is a
+ *  status JSON ({id, role, status: running|queued}), NOT a report — the child
+ *  keeps running, so its activity block must not be frozen at spawn time (it
+ *  freezes via the ⟦ev⟧done event emitted at settle time — §15 D-A3). A real blocking
+ *  report that happens to parse as this shape is a freak accident; the only
+ *  consequence would be a late block freeze at turn end (cosmetic). */
+function isAsyncSpawnResult(result) {
+  try {
+    const o = JSON.parse(result)
+    return Boolean(o && typeof o === "object" && typeof o.id !== "undefined" && (o.status === "running" || o.status === "queued"))
+  } catch {
+    return false
+  }
+}
+
 
 
 /** Find the live tool-block carrier for a tool event: exact id match when the
@@ -130,8 +146,7 @@ function findToolBlock(state, name, toolId) {
 /** Build the agent callbacks + the shared flushStream for one turn.
  *          askPermission, askQuestion, saveSessionImpl } */
 export function buildToolCallbacks(deps) {
-  const { agent, state, pushLine, render, scheduleRender, ensureAssistantLabel, askPermission, askQuestion, saveSessionImpl } = deps
-
+  const { agent, state, pushLine, render, scheduleRender, ensureAssistantLabel, askPermission, askBatchPermission, askQuestion, saveSessionImpl } = deps
   // NOTE: advisor buffers (_advisorThink/advisorStreaming) are cleared here too.
   // Timing safety: onToolResult flushes _advisorThink into history and empties
   // the buffers BEFORE onTurnEnd can call flushStream (tool result is
@@ -251,17 +266,23 @@ export function buildToolCallbacks(deps) {
         // carrier) and the turn sweep would mislabel it "(interrupted)" — every
         // successful subagent call showed that banner (consult P1, 2026-08-30).
         settleToolBlock(state, name, toolId, "completed")
-        finishSubTask(state, SUBAGENT_ROLES, result.includes(TURN_CAP_MARK) ? "turn cap reached — work may be partial" : null)
-        // Freeze the finished blocks into the conversation stream (user report
-        // 2026-08-30): a pinned tail section left every ✓ block stuck above the
-        // input box forever. As lines they scroll away, stay expandable via the
-        // dim auto-fold, and subTasks releases the entry.
-        freezeDoneSubTasks(state)
-        // Subagent report preview (max 8 lines) displayed directly in conversation
-        const lines = result.split("\n")
-        const preview = lines.slice(0, SUBAGENT_PREVIEW_LINES).map((l) => l.slice(0, PREVIEW_LINE_CHARS)).join("\n")
-        if (preview) pushLine(preview, C.dim)
-        if (lines.length > SUBAGENT_PREVIEW_LINES) pushLine(`  ... (${lines.length - SUBAGENT_PREVIEW_LINES} more lines)`, C.dim)
+        // Async spawn (§15 D-A1): the result is a status JSON, not a report — the
+        // child KEEPS running; skip the freeze (it would tombstone a live block
+        // and drop its relay stream). The block freezes on the ⟦ev⟧done event
+        // emitted at turn-end collection.
+        if (!isAsyncSpawnResult(result)) {
+          finishSubTask(state, SUBAGENT_ROLES, result.includes(TURN_CAP_MARK) ? "turn cap reached — work may be partial" : null)
+          // Freeze the finished blocks into the conversation stream (user report
+          // 2026-08-30): a pinned tail section left every ✓ block stuck above the
+          // input box forever. As lines they scroll away, stay expandable via the
+          // dim auto-fold, and subTasks releases the entry.
+          freezeDoneSubTasks(state)
+          // Subagent report preview (max 8 lines) displayed directly in conversation
+          const lines = result.split("\n")
+          const preview = lines.slice(0, SUBAGENT_PREVIEW_LINES).map((l) => l.slice(0, PREVIEW_LINE_CHARS)).join("\n")
+          if (preview) pushLine(preview, C.dim)
+          if (lines.length > SUBAGENT_PREVIEW_LINES) pushLine(`  ... (${lines.length - SUBAGENT_PREVIEW_LINES} more lines)`, C.dim)
+        }
       } else if (name === "escalate") {
         // 飞刀 post-op report landed → freeze its block into the conversation too.
         settleToolBlock(state, name, toolId, "completed")
@@ -398,15 +419,39 @@ export function buildToolCallbacks(deps) {
       scheduleRender()
     },
     onPermissionRequest: (name, args) => askPermission(name, args),
+    // Merged batch ask (§16 D-B1): one confirmation for N non-readonly tools in
+    // the same response — "approve all / one by one / deny" (key-handler resolves
+    // the verdict string; approveAll is batch-scope only, never the AUTO flag).
+    onBatchPermissionRequest: (req) => askBatchPermission(req),
     onQuestion: (text, options) => askQuestion(text, options),
-    onCompress: () => {
-      pushLine("  [context] Context too long, auto-compacted (early conversation summarized by LLM, task state preserved)", C.warn)
+    // Compression lifecycle (CONTEXT-COMPACTION.md §7 D-C2): the compression session renders
+    // as a subagent-style panel block — start → running panel ("Compressing context…" +
+    // "summarizing N messages" + elapsed ticker), fail → error text ONLY (no degradation note —
+    // that belongs to the 3-consecutive-failures fallback), success → frozen "Compressed: N
+    // tokens freed → summary (Xs)" / fallback → "truncated to N messages". The summary BODY
+    // never enters the panel or the stream (the summary call is silent). Replaces the old
+    // one-line "[context] Context too long..." warn (user ruling: panel, not a status line).
+    onCompressStart: (info) => {
+      ensureCompressPanel(state, info)
+      scheduleRender()
+    },
+    onCompressFail: (error) => {
+      // Q3 (CONTEXT-COMPACTION §7 F3): failure is no longer silent — visible on the panel AND
+      // logged to stderr so the error is traceable (400/timeout/network).
+      console.error("[context] compression failed:", error?.message ?? error)
+      markCompressFailed(state, error)
+      scheduleRender()
+    },
+    onCompress: (info) => {
+      if (info?.mode === "fallback") markCompressFallback(state, info)
+      else markCompressDone(state, info)
+      scheduleRender()
     },
     // Async distillation landed (SEND-STALL-DISTILL §2.3): the machine line was replaced by
     // 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()
+  }
+}