thincoder 0.12.54 → 0.12.58

package/src/tui/pickers.mjs

@@ -1,5 +1,5 @@
 import { sliceByWidth } from "./render.mjs"
-import { PROVIDER_PRESETS as PRESETS } from "../config.mjs"
+import { PROVIDER_PRESETS as PRESETS, providerSpec } from "../config.mjs"
 import { computeLayout } from "./layout.mjs"
 
 /** Generic list picker + model/provider management.
@@ -121,6 +121,14 @@ export function createPickers(ctx) {
     return e.action === "switch" ? `switch:${e.provider}:${e.model}` : `action:${e.action}`
   }
 
+  /** 模型信息显示的 context 窗口（PROVIDER.md §15 D-C5）：K 单位形态跟随覆盖值
+   *  （config K 是二进制 K：128 → 128×1024 = 131072 → 显示 "128K"）；≥1M tokens 用 M 形态
+   *  （1_000_000 → "1M"），与 spec 值的大窗口惯例一致。 */
+  function fmtContextK(tokens) {
+    if (tokens >= 1_000_000) return `${Math.round(tokens / 1_048_576)}M`
+    return `${Math.round(tokens / 1024)}K`
+  }
+
   /** Get API key for a provider (config.json only — env vars are not a key source) */
   function getApiKey(providerName, providerConfig) {
     return providerConfig.apiKey
@@ -148,6 +156,8 @@ export function createPickers(ctx) {
         await removeProviderFlow()
       } else if (e.action === "key") {
         await setKeyFlow()
+      } else if (e.action === "context") {
+        await setContextFlow()
       }
     }
   }
@@ -188,9 +198,11 @@ export function createPickers(ctx) {
       const marker = active ? "●" : ""
       const note = active ? " ← current" : ""
       const keyStatus = p.apiKey ? "" : " (no key)"
+      // context 窗口显示（PROVIDER.md §15 D-C5/T-C6）：跟随 providers[].context 覆盖
+      const ctxTag = ` (ctx ${fmtContextK(providerSpec(p).context)})`
       entries.push({
         type: "item",
-        text: `${p.name.padEnd(12)} ${currentModel}${note}`,
+        text: `${p.name.padEnd(12)} ${currentModel}${ctxTag}${note}`,
         action: "open-models",
         provider: p.name,
         marker,
@@ -201,6 +213,7 @@ export function createPickers(ctx) {
     entries.push({ type: "item", text: "Add provider…", action: "add" })
     if (agent.providers.length > 1) entries.push({ type: "item", text: "Remove provider…", action: "remove" })
     entries.push({ type: "item", text: "Set / change API key…", action: "key" })
+    entries.push({ type: "item", text: "Set context window (K units)…", action: "context" })
     return entries
   }
 
@@ -294,7 +307,8 @@ export function createPickers(ctx) {
     agent.provider = { ...target }
     if (agent.config?.agent?.compactThresholdAuto) {
       const { resolveCompactThreshold } = await import("../config.mjs")
-      agent.config.agent.compactThreshold = resolveCompactThreshold(null, item.model).value
+      // provider 对象（非 model 字符串）——阈值跟随 providers[].context 覆盖（PROVIDER.md §15 T-C2）
+      agent.config.agent.compactThreshold = resolveCompactThreshold(null, target).value
     }
     await persistRaw((raw) => {
       // 落盘前剥离运行时注入的 proxyUri（由 loadConfig + injectProxy 在加载时重建）
@@ -382,6 +396,50 @@ export function createPickers(ctx) {
     await persistRaw((raw) => { raw.providers = agent.providers })
   }
 
+  /** /model provider 管理：context 窗口字段（K 单位，PROVIDER.md §15 D-C4/D-C5）——
+   *  picker 选 provider + 表单输入（复用 syncProviderField 的落盘模式：改 agent.providers 目标项
+   *  → persistRaw 全量写盘）；空输入清空（回 spec 值）；非法输入报错不落盘（D-C1 语义同 loadConfig）。 */
+  async function setContextFlow() {
+    const se = await showPicker("Set Context Window", [
+      { type: "header", text: "Select provider" },
+      ...agent.providers.map((p) => ({
+        type: "item",
+        text: `${p.name} (ctx ${fmtContextK(providerSpec(p).context)})`,
+        name: p.name,
+      })),
+    ])
+    if (!se?.name) return // Esc
+    const target = agent.providers.find((p) => p.name === se.name)
+    if (!target) return
+    const current = Number.isInteger(target.context) && target.context > 0 ? target.context : null
+    const val = (await askQuestion(
+      `Context window for ${se.name} in K units (current: ${current ? `${current}K` : "spec default"} — e.g. 128 = 128K; empty to clear):`
+    ))?.trim() ?? ""
+    if (val === "") {
+      delete target.context
+    } else {
+      const n = Number(val)
+      if (!Number.isInteger(n) || n <= 0) {
+        pushLine(`Invalid context: "${val}" — must be a positive integer in K units (e.g. 128 = 128K)`, C.error)
+        return
+      }
+      target.context = n
+    }
+    if (se.name === agent.activeProvider) {
+      // 运行时 provider 同步（同 setProviderKey 先例：只补 context，不重建对象以免丢 activeModel 覆盖）
+      if (target.context === undefined) delete agent.provider.context
+      else agent.provider.context = target.context
+      if (agent.config?.agent?.compactThresholdAuto) {
+        const { resolveCompactThreshold } = await import("../config.mjs")
+        agent.config.agent.compactThreshold = resolveCompactThreshold(null, agent.provider).value
+      }
+    }
+    await persistRaw((raw) => { raw.providers = agent.providers })
+    pushLine(target.context !== undefined
+      ? `ctx = ${target.context}K (${target.context * 1024} tokens)`
+      : `context cleared — using model spec (${fmtContextK(providerSpec(target).context)})`, C.tool)
+  }
+
 
   /** Slot-bound model picker: two-level provider → model selection that RETURNS
    *  { provider, model } instead of writing main-session state — used by /submodel
@@ -411,5 +469,5 @@ export function createPickers(ctx) {
     }
   }
 
-  return { showPicker, closePicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey, pickModelForSlot }
+  return { showPicker, closePicker, popPicker, renderPickerLines, openModelPicker, selectModel, setProviderKey, setContextFlow, pickModelForSlot }
 }

package/src/tui/render-frame.mjs

@@ -9,7 +9,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 { providerSpec } from "../config.mjs"
 import { computeLayout, subagentVisibleLines } from "./layout.mjs"
 import { basename } from "node:path"
 import { readFileSync } from "node:fs"
@@ -39,11 +39,15 @@ const SLASH_HINTS = {
 
 /** Header panel (always 1 line). */
 export function renderHeader(agent, cols) {
-  const model = agent.provider.model
-  const spec = specForModel(model)
+  // 2026-09-02 Q1（SESSION.md §8）：provider 可为 null（无效 provider 被清空后用户 Esc 取消重选）
+  // —— 可选链守卫，头部显示 "no provider" 占位
+  const model = agent.provider?.model ?? "no provider"
+  // providerSpec（PROVIDER.md §15）：模型信息显示跟随 provider 级 context 覆盖（D-C5）；
+  // provider 为 null 时返回默认 spec 且不产生 "no provider" 查表警告（specForModel("") 空串不告警）
+  const spec = providerSpec(agent.provider)
   const thinkOnValue = spec.thinkEnabledValue ?? "enabled"
-  const t = agent.provider.thinking
-  const effort = agent.provider.reasoningEffort
+  const t = agent.provider?.thinking
+  const effort = agent.provider?.reasoningEffort
   const thinkBadge = t?.type === "disabled" ? "│ think: off"
     : effort ? `│ think: ${effort}`
     : t?.type === thinkOnValue ? "│ think: on" : ""
@@ -288,7 +292,9 @@ function inputBoxStyle(state) {
     borderColor = C.tool; title = " Question "
   } else if (state.permission) {
     borderColor = C.warn
-    title = state.permission.name === "continue" ? " Continue? (y/n) " : ` Allow ${state.permission.name}? (y/n/a) `
+    title = state.permission.name === "continue" ? " Continue? (y/n) "
+      : state.permission.batch ? ` Allow ${state.permission.name}? (a/o/n) `
+      : ` Allow ${state.permission.name}? (y/n/a) `
   } else if (state.picker) {
     title = " Select "
   } else if (state.wizard) {
@@ -312,9 +318,9 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
       : " Type answer then Enter │ Esc: cancel"
   }
   if (state.permission) {
-    return state.permission.name === "continue"
-      ? " y: continue │ n: stop"
-      : " y: approve │ n: deny │ a: approve all (AUTO)"
+    if (state.permission.name === "continue") return " y: continue │ n: stop"
+    if (state.permission.batch) return " a: approve all │ o: one by one │ n: deny"
+    return " y: approve │ n: deny │ a: approve all (AUTO)"
   }
   if (state.picker) return " type: filter │ ↑↓/PgUp/PgDn: select │ Enter: confirm │ Esc: cancel"
   if (state.wizard) {
@@ -346,7 +352,9 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
   const elapsed = state.processing ? ` ${Math.floor((Date.now() - state.processingStarted) / 1000)}s` : ""
   const toolHint = state.currentTool ? ` ${state.currentTool}…` : ""
   const statusText = state.processing ? `${state.status}${toolHint}${elapsed}` : state.status
-  const modelContext = specForModel(agent.provider.model).context
+  // 2026-09-02 Q1（SESSION.md §8）：provider 可为 null —— providerSpec(null) 保守 128K 不抛错
+  // 2026-09-02 §15：context 窗口跟随 providers[].context 覆盖（T-C6——百分比基于覆盖后的窗口）
+  const modelContext = providerSpec(agent.provider).context
   const ctxPct = Math.round((state.ctxCache.tokens / modelContext) * 100)
   const ctxTokensHint = state.ctxCache.tokens > 0 ? ` ${fmtK(state.ctxCache.tokens)}` : ""
   const ctxHint = ctxPct > 0

package/src/tui/render.mjs

@@ -203,7 +203,7 @@ export function layoutInput(chars, cursor, width) {
  * Display-layer only — raw tool results the model sees are unchanged; dirty displays already in session
  * are also cleaned during replay.
  */
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
 const ANSI_SEQUENCE = /\x1b\[[0-9;?]*[a-zA-Z]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b[()][0-9A-B]|\x1b[=>#][0-9]?/
 // Global variant for replace()/split(); the non-global one keeps match.index for slicing
 const ANSI_SEQUENCE_RE = new RegExp(ANSI_SEQUENCE.source, "g")
@@ -212,7 +212,7 @@ export function sanitizeDisplay(s) {
     .replace(ANSI_SEQUENCE_RE, "")
     // §7.2 D5 fallback: an unparsed ⟦ev⟧ event token must never reach the grid —
     // strip the sentinel + its RS-wrapped payload (⟦ev⟧turn\x1e…\x1e / bare RS/GS chars).
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     .replace(/⟦ev⟧[^\x1e\x1d]*\x1e[^\x1e\x1d]*\x1e[^\x1e\x1d]*\x1e[^\x1e\x1d]*\x1e?/g, "")
     // GitHub-#4-class pitfall (2026-08-31): the residue strip used to be
     // /⟦ev⟧[^\x1e\x1d]*/ — "swallow to end of line/string", which ATE REAL
@@ -222,12 +222,12 @@ export function sanitizeDisplay(s) {
     // tokens start with a phase word (turn/approval); a bare sentinel with no
     // letters attached is not a live token. Strip only sentinel+letters.
     .replace(/⟦ev⟧[A-Za-z]*/g, "")
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     .replace(/[\x1d\x1e]/g, "")
     .replace(/\r\n/g, "\n")
     .replace(/\r/g, "\n")
     .replace(/\t/g, "    ")
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     .replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "")
     .replace(/\n+$/, "")
 }

package/src/tui/startup.mjs

@@ -140,12 +140,14 @@ export function showStartup(ctx) {
   const { agent, state, opts, pushLine, pushLabel, render, startWizard } = ctx
 
   // Startup screen
-  if (!agent.provider.apiKey) {
+  // 2026-09-02 Q1（SESSION.md §8 D-S2）：provider 可为 null（无效 provider 被清空后用户 Esc 取消重选）
+  // —— 可选链守卫；`!apiKey` 触发既有 wizard（其 provider 菜单列出已存在 providers，可选中恢复，F3）
+  if (!agent.provider?.apiKey) {
     pushLabel(`Welcome to ThinCoder!`, ansi.bold + C.tool)
     pushLine("No API key configured yet — entering initial setup (Esc to skip anytime)", C.text)
     startWizard()
   } else {
-    pushLine(`Welcome to ThinCoder. Provider: ${agent.activeProvider} / ${agent.provider.model}`, C.dim)
+    pushLine(`Welcome to ThinCoder. Provider: ${agent.activeProvider} / ${agent.provider?.model ?? "(none)"}`, C.dim)
   }
   pushLine(`Tools: ${agent.tools.map((t) => t.name).join(", ")}`, C.dim)
 

package/src/tui/subagent-blocks.mjs

@@ -16,9 +16,12 @@ import { describeToolArgs } from "./tool-args.mjs"
 
 /** `role#id/` prefix router — hyphen included since the eng-coder fix (2026-08-21). */
 export const SUB_PREFIX_RE = /^([\w-]+)#(\d+)\//
-/** ⟦ev⟧ event token parser (D1/D2): `⟦ev⟧<name>\x1e<n>\x1e<max>\x1e<phase>\x1e<detail>`. */
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
-export const SUB_EVENT_RE = /^⟦ev⟧(turn|approval)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e?([\s\S]*)$/
+/** ⟦ev⟧ event token parser (D1/D2): `⟦ev⟧<name>\x1e<n>\x1e<max>\x1e<phase>\x1e<detail>`.
+ *  phase "done" (§15 D-A3): async child finished — settle-time emits (each entry,
+ *  it so the child's block freezes (the spawn tool result is a status JSON and
+ *  must not freeze a still-running block). */
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+export const SUB_EVENT_RE = /^⟦ev⟧(turn|approval|done)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e([^\x1e]*)\x1e?([\s\S]*)$/
 /** N2: per-child display-line ring buffer cap — oldest lines drop with a marker. */
 export const SUB_BLOCK_LINE_LIMIT = 500
 /** N1: render-layer throttle for child tool-output appends (generation relays verbatim). */
@@ -267,8 +270,21 @@ export function routeSubToken(state, t, scheduleRender) {
   if (!sub) return true // frozen tombstone — late token from an aborted child: drop
   const payload = t.slice(subMatch[0].length)
   // ⟦ev⟧ event token: turn/approval progress → header ONLY (never blocks,
-  // never the main stream — D1).
+  // never the main stream — D1). phase "done" (§15 D-A3): the async child
+  // finished — freeze its block (it stayed live through the background run).
   if (payload.startsWith("⟦ev⟧")) {
+    const ev = payload.match(SUB_EVENT_RE)
+    if (ev?.[1] === "done") {
+      sub.done = true
+      sub.doneAt = Date.now()
+      sub.currentTool = null
+      sub.approval = null
+      sub.blockEpoch = (sub.blockEpoch ?? 0) + 1
+      freezeSubTaskLines(state, sub)
+      delete state.subTasks[sub.key]
+      scheduleRender()
+      return true
+    }
     applySubEvent(sub, payload)
     scheduleRender()
     return true
@@ -329,3 +345,102 @@ export function routeSubToolOutput(state, name, part, scheduleRender) {
   throttleSubRender(scheduleRender)
   return true
 }
+
+// ─── Compression panel (CONTEXT-COMPACTION.md §7 D-C2) ─────────────────────
+// The compression session reuses the subagent block machinery — user ruling
+// "压缩会话像子agent 面板那样显示". While the summary call is in flight the panel
+// lives in state.subTasks (role "compress") and renders in the running subagent
+// panel (subagent-panel.mjs) — the existing 1s turn ticker (agent-turn.mjs
+// subRunning) makes the elapsed header tick; on completion/fallback it freezes
+// into the stream as a collapsible block via freezeSubTaskLines, exactly like a
+// finished child. The panel carries STATUS ONLY (D-C2): the summary body is a
+// machine artifact and never enters the blocks.
+
+let _compressSeq = 0
+
+/** Live compression panel (role "compress", not done) or null. */
+function liveCompressPanel(state) {
+  return Object.values(state.subTasks ?? {}).find((s) => s.role === "compress" && !s.done) ?? null
+}
+
+/**
+ * Open (or reset — retry) the compression panel. Fired by onCompressStart BEFORE
+ * the summary LLM call. info.messages = number of history messages being
+ * summarized ("summarizing N messages" stage label). Each attempt restarts the
+ * elapsed ticker (panel.started); the previous attempt's failure line stays in
+ * the block timeline so the retry history is visible.
+ */
+export function ensureCompressPanel(state, info = {}) {
+  state.subTasks ??= {}
+  let panel = liveCompressPanel(state)
+  if (!panel) {
+    panel = {
+      key: `compress#${++_compressSeq}`,
+      role: "compress",
+      model: undefined,
+      started: Date.now(), done: false, doneAt: null,
+      blocks: [], currentTool: null, toolArgs: null,
+      turn: 0, maxTurns: 0, approval: null,
+      lastError: null, dropped: 0,
+    }
+    state.subTasks[panel.key] = panel
+  }
+  // Per-attempt reset (D-C2 state machine): retries return to "Compressing…",
+  // the elapsed ticker restarts from this attempt's start.
+  panel.done = false
+  panel.doneAt = null
+  panel.lastError = null
+  panel.started = Date.now()
+  panel.currentTool = "compressing context…"
+  const messages = Number.isInteger(info.messages) && info.messages >= 0 ? info.messages : "?"
+  appendSubBlock(panel, "status", "Compressing context…\n", { fresh: true })
+  appendSubBlock(panel, "meta", `summarizing ${messages} messages\n`, { fresh: true })
+  return panel
+}
+
+/** Failure state (onCompressFail): error text ONLY — no degradation note. The
+ *  fallback note is bound to 3 CONSECUTIVE failures (markCompressFallback) and
+ *  must not appear on a single failure (D-C2 state machine). */
+export function markCompressFailed(state, error) {
+  const panel = liveCompressPanel(state)
+  if (!panel) return
+  const text = error?.message ? String(error.message) : String(error ?? "unknown error")
+  panel.lastError = text
+  appendSubBlock(panel, "err", `Compression failed: ${text}\n`, { fresh: true })
+}
+
+/** Freeze the compression panel into the stream (collapsible, subagent-style —
+ *  same carrier/fold-key as a finished child) and release the live entry. */
+function freezeCompressPanel(state, panel) {
+  freezeSubTaskLines(state, panel)
+  delete state.subTasks[panel.key]
+}
+
+/** Completion state (onCompress, LLM summary): "Compressed: N tokens freed →
+ *  summary (Xs)" — N = pre-compression estimate − post-compression estimate,
+ *  Xs = elapsed seconds. Block frozen + collapsible (T2). */
+export function markCompressDone(state, info = {}) {
+  const panel = liveCompressPanel(state)
+  if (!panel) return
+  const tokensFreed = Number.isFinite(info.tokensFreed) ? Math.max(0, Math.round(info.tokensFreed)) : 0
+  const seconds = Number.isFinite(info.elapsedMs) ? Math.max(0, Math.round(info.elapsedMs / 1000)) : 0
+  panel.done = true
+  panel.doneAt = Date.now()
+  panel.currentTool = null
+  appendSubBlock(panel, "status", `Compressed: ${tokensFreed} tokens freed → summary (${seconds}s)\n`, { fresh: true })
+  freezeCompressPanel(state, panel)
+}
+
+/** Fallback state (onCompress with mode:"fallback"): the 3-consecutive-failures
+ *  degradation note "Compression failed — fallback: truncated to N messages"
+ *  (N = tail messages retained). Frozen + collapsible (T3b). */
+export function markCompressFallback(state, info = {}) {
+  const panel = liveCompressPanel(state)
+  if (!panel) return
+  const tailMessages = Number.isFinite(info.tailMessages) ? Math.round(info.tailMessages) : "?"
+  panel.done = true
+  panel.doneAt = Date.now()
+  panel.currentTool = null
+  appendSubBlock(panel, "err", `Compression failed — fallback: truncated to ${tailMessages} messages\n`, { fresh: true })
+  freezeCompressPanel(state, panel)
+}

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,9 +419,33 @@ 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: