thincoder 0.12.59 → 0.12.60

package/src/tui/tool-args.mjs

@@ -53,9 +53,9 @@ export function describeToolArgs(name, args) {
       const action = String(a.action ?? "")
       if (action === "put") return String(a.title ?? "")
       if (action === "search") return String(a.query ?? "")
-      if (action === "list") return [a.scope && `scope ${a.scope}`, a.type && `type ${a.type}`, a.keyword && `kw ${a.keyword}`].filter(Boolean).join(" ")
-      if (action === "delete") return a.id ? `id ${a.id} (${a.scope ?? ""})` : `batch ${a.scope ?? ""} ${a.type ? `type ${a.type} ` : ""}${a.keyword ? `kw ${a.keyword}` : ""}`.trim()
-      if (action === "clear") return `clear ${a.scope ?? ""}`
+      if (action === "list") return [a.layer && `layer ${a.layer}`, a.type && `type ${a.type}`, a.keyword && `kw ${a.keyword}`].filter(Boolean).join(" ")
+      if (action === "delete") return a.id ? `id ${a.id}${a.layer ? ` (layer ${a.layer})` : ""}` : `batch ${a.layer ?? ""} ${a.type ? `type ${a.type} ` : ""}${a.keyword ? `kw ${a.keyword}` : ""}`.trim()
+      if (action === "clear") return `clear ${a.layer ?? ""}`
       return action || JSON.stringify(a)
     }
     case "lsp": return [a.subcommand, a.uri].filter(Boolean).map(String).join(" ")

package/src/tui/tool-display.mjs

@@ -0,0 +1,142 @@
+/**
+ * tool-display.mjs — 工具块显示/计时/清扫 helper 族（2026-09-05 module-split：
+ * tool-events.mjs 537 > 500 硬限——28-162 区（ticks/subActions maps、sweep/slim/
+ * settle/async 探测/find）verbatim 迁入，语义零变；tool-events.mjs import 回
+ * （buildToolCallbacks 调用点零改）+ re-export sweepToolBlocks（agent-turn 消费面）。
+ * 注意：_subActions/_subActionQ/_toolTicks 为模块级**可变对象**导出——ESM 只读绑定
+ * 不禁内容变更（.set/.delete/.push），调用方行为与同模块时代一致。
+ */
+
+// Tool execution start timestamps (performance.now ms). Keyed by tool_call id
+// when available (parallel same-name tools each get their own tick — the
+// P0-3 fix, 2026-08-30), falling back to a per-name FIFO queue for callers
+// without ids (subagent relay). FIFO shift assumes near-call-order completion;
+// a parallel same-name batch finishing out of order swaps durations between
+// siblings — same magnitude, both keep an elapsed (display-level, acceptable).
+
+// Named caps (consult P2, 2026-08-30): inline 200/8/120/3/5 were magic numbers.
+export const TOOL_OUTPUT_LINE_CAP = 200     // per-call streaming output ring buffer
+export const SUBAGENT_PREVIEW_LINES = 8     // report preview rows in the conversation
+export const PREVIEW_LINE_CHARS = 120       // per-line preview slice
+export const REMINDER_CAP = 3               // max pending reminders shown on turn end
+export const REMINDER_PERSIST_TURNS = 5     // persist reminders every N turns
+
+export const _toolTicks = new Map()
+// §19 action registry: tool_call id → subagent action (non-spawn only — spawn is
+// the default when no record exists). onToolCall sees the args, onToolResult only
+// the name; without the record every subagent result would route as a spawn.
+export const _subActions = new Map()
+export const _subActionQ = [] // FIFO for subagent calls without a tool id (same fallback as tick queue)
+
+export function tickStart(name, toolId) {
+  const key = toolId ?? name
+  if (toolId) { _toolTicks.set(key, performance.now()); return }
+  const q = _toolTicks.get(key) ?? []
+  q.push(performance.now())
+  _toolTicks.set(key, q)
+}
+
+/** Settle one pending tick: by tool_call id, or per-name FIFO. Returns start or null. */
+export function tickTake(name, toolId) {
+  const key = toolId ?? name
+  const v = _toolTicks.get(key)
+  if (v === undefined) return null
+  if (toolId) { _toolTicks.delete(key); return v }
+  if (v.length === 0) { _toolTicks.delete(key); return null }
+  const started = v.shift()
+  if (v.length === 0) _toolTicks.delete(key)
+  return started
+}
+
+/** P0-2 sweep (2026-08-30 consult): an interrupted turn (Ctrl+C / error) leaves
+ *  running tool-block carriers without an onToolResult — their header would say
+ *  "running" forever. runAgentTurn's finally calls this: mark them done with an
+ *  "(interrupted)" status and clear the tick table so no stale start time leaks
+ *  into the next turn. Mirrors freezeAllSubTasks for the tool-block family. */
+export function sweepToolBlocks(state) {
+  for (const l of state.lines ?? []) {
+    const b = l._toolBlock
+    if (b && !b.done) {
+      b.done = true
+      b.summary = "(interrupted)"
+      b.interrupted = true
+    }
+  }
+  _toolTicks.clear()
+  _subActions.clear()
+  _subActionQ.length = 0
+}
+
+/** Shared display guard for tool results — LIVE and RESTORE use the same
+ *  function (P1, 2026-08-30 consult: restore lacked the live path's guards).
+ *  1) Multimodal results (read_image) embed FULL base64 images in the JSON —
+ *     the human needs only the text part (model gets images via the multimodal
+ *     channel); 2) results beyond maxRows are truncated in the block (full
+ *     text always lives in history for the model). Returns row array. */
+export function slimToolResultForDisplay(result, maxRows = 400) {
+  let displayResult = result
+  try {
+    const parsed = JSON.parse(result)
+    if (parsed?.images?.length) displayResult = parsed.text ?? result
+  } catch { /* not JSON — show as-is */ }
+  const rows = String(displayResult).split("\n").filter((l) => l.trim())
+  return rows.length > maxRows
+    ? [...rows.slice(0, maxRows), `… (result truncated at ${maxRows} rows — full text in history)`]
+    : rows
+}
+/** Mark the dispatch-level tool carrier done when its result is consumed by a
+ *  dedicated branch (subagent/escalate/advisor blocks) — without this the turn
+ *  sweep mislabels successful calls as "(interrupted)" (consult P1, 2026-08-30). */
+export function settleToolBlock(state, name, toolId, summary) {
+  const block = findToolBlock(state, name, toolId)
+  if (block) {
+    block.done = true
+    block.summary = summary
+    const started = tickTake(name, toolId)
+    block.elapsed = started !== null ? Math.round(performance.now() - started) : null
+  }
+}
+
+/** 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 at settle — §15 D-A3). */
+export 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
+  }
+}
+
+/** §7.2.3 spawn 门拒错误探测（T-F5）：subagent spawn 的机械拒绝以 {status:"error"}
+ *  JSON 返回（例：manual auto-turn digest spawn 门——digest 语义 organize-only）——
+ *  错误路径不得触发完成冻结（round1 #1——错误路径不冻结任何 running 块）。该形态只
+ *  出现在无 subKey 的拒绝路径（成功路径恒带 dispatch 传的 ctx._subagentKey）。 */
+export function isSpawnErrorResult(result) {
+  try {
+    const o = JSON.parse(result)
+    return Boolean(o && typeof o === "object" && o.status === "error")
+  } catch {
+    return false
+  }
+}
+
+/** Find the live tool-block carrier for a tool event: exact id match when the
+ *  callback carries one (P0-3 — parallel same-name tools route to their own
+ *  block); falls back to the last unfinished block of that name. */
+export function findToolBlock(state, name, toolId) {
+  const lines = state.lines ?? []
+  if (toolId !== undefined && toolId !== null) {
+    for (let i = lines.length - 1; i >= 0; i--) {
+      if (lines[i]._toolBlock?.id === toolId) return lines[i]._toolBlock
+    }
+    return null
+  }
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const b = lines[i]._toolBlock
+    if (b && b.name === name && !b.done) return b
+  }
+  return null
+}

package/src/tui/tool-events.mjs

@@ -10,9 +10,10 @@
  *  - 其余                 : usage 累计、等待提示、task 面板、回合末增量落盘
  *
  * flushStream 同时返回给调用方（回合循环 / onTurnEnd 共用）。纯回调装配，无终端副作用
- * （除经 deps 注入的 pushLine/render）。§19: subagent_check/escalate 工具退役后，
- * subagent 家族全部调用以工具名 "subagent" + action 到达——完成路由按 onToolCall 时
- * 记录的 action 分流（spawn 区块 / escalate 区块 / check·status 普通工具块）。
+ * （除经 deps 注入的 pushLine/render）。§19: subagent_check/escalate 工具退役后
+ * （§19.8——check 动作已删），subagent 家族全部调用以工具名 "subagent" +
+ * action 到达——完成路由按 onToolCall 时记录的 action 分流（spawn 区块 / escalate
+ * 区块 / status/observe/send 普通工具块——observe/send 不建子代理区块）。
  */
 import { C } from "./ansi.mjs"
 import { formatToolSummary } from "./tool-summaries.mjs"
@@ -20,147 +21,19 @@ import { describeToolArgs, toolArgsLines } from "./tool-args.mjs"
 import { ADVISOR_THINKING_PLACEHOLDER, resolveAdvisorProvider } from "../advisor/run.mjs"
 import {
   SUB_PREFIX_RE, SUBAGENT_ROLES, routeSubToken, routeSubReasoning, routeSubToolCall,
-  routeSubToolOutput, finishSubTask, finishSubTaskKey, finishSubTasksByRole, finishSubTaskByModel, freezeDoneSubTasks,
+  routeSubToolOutput, finishSubTask, finishSubTaskKey, finishSubTasksByRole, freezeDoneSubTasks,
   ensureCompressPanel, markCompressFailed, markCompressDone, markCompressFallback,
 } from "./subagent-blocks.mjs"
 import { TURN_CAP_MARK } from "../agent/spawn-child.mjs"
-
-/** Tool execution start timestamps (performance.now ms). Keyed by tool_call id
- *  when available (parallel same-name tools each get their own tick — the
- *  P0-3 fix, 2026-08-30), falling back to a per-name FIFO queue for callers
- *  without ids (subagent relay). FIFO shift assumes near-call-order completion;
- *  a parallel same-name batch finishing out of order swaps durations between
- *  siblings — same magnitude, both keep an elapsed (display-level, acceptable). */
-
-// Named caps (consult P2, 2026-08-30): inline 200/8/120/3/5 were magic numbers.
-const TOOL_OUTPUT_LINE_CAP = 200          // per-call streaming output ring buffer
-const SUBAGENT_PREVIEW_LINES = 8          // report preview rows in the conversation
-const PREVIEW_LINE_CHARS = 120            // per-line preview slice
-const REMINDER_CAP = 3                    // max pending reminders shown on turn end
-const REMINDER_PERSIST_TURNS = 5          // persist reminders every N turns
-
-const _toolTicks = new Map()
-// §19 action registry: tool_call id → subagent action (non-spawn only — spawn is
-// the default when no record exists). onToolCall sees the args, onToolResult only
-// the name; without the record every subagent result would route as a spawn.
-const _subActions = new Map()
-const _subActionQ = [] // FIFO for subagent calls without a tool id (same fallback as tick queue)
-
-function tickStart(name, toolId) {
-  const key = toolId ?? name
-  if (toolId) { _toolTicks.set(key, performance.now()); return }
-  const q = _toolTicks.get(key) ?? []
-  q.push(performance.now())
-  _toolTicks.set(key, q)
-}
-
-/** Settle one pending tick: by tool_call id, or per-name FIFO. Returns start or null. */
-function tickTake(name, toolId) {
-  const key = toolId ?? name
-  const v = _toolTicks.get(key)
-  if (v === undefined) return null
-  if (toolId) { _toolTicks.delete(key); return v }
-  if (v.length === 0) { _toolTicks.delete(key); return null }
-  const started = v.shift()
-  if (v.length === 0) _toolTicks.delete(key)
-  return started
-}
-
-/** P0-2 sweep (2026-08-30 consult): an interrupted turn (Ctrl+C / error) leaves
- *  running tool-block carriers without an onToolResult — their header would say
- *  "running" forever. runAgentTurn's finally calls this: mark them done with an
- *  "(interrupted)" status and clear the tick table so no stale start time leaks
- *  into the next turn. Mirrors freezeAllSubTasks for the tool-block family. */
-export function sweepToolBlocks(state) {
-  for (const l of state.lines ?? []) {
-    const b = l._toolBlock
-    if (b && !b.done) {
-      b.done = true
-      b.summary = "(interrupted)"
-      b.interrupted = true
-    }
-  }
-  _toolTicks.clear()
-  _subActions.clear()
-  _subActionQ.length = 0
-}
-
-/** Shared display guard for tool results — LIVE and RESTORE use the same
- *  function (P1, 2026-08-30 consult: restore lacked the live path's guards).
- *  1) Multimodal results (read_image) embed FULL base64 images in the JSON —
- *     the human needs only the text part (model gets images via the multimodal
- *     channel); 2) results beyond maxRows are truncated in the block (full
- *     text always lives in history for the model). Returns row array. */
-export function slimToolResultForDisplay(result, maxRows = 400) {
-  let displayResult = result
-  try {
-    const parsed = JSON.parse(result)
-    if (parsed?.images?.length) displayResult = parsed.text ?? result
-  } catch { /* not JSON — show as-is */ }
-  const rows = String(displayResult).split("\n").filter((l) => l.trim())
-  return rows.length > maxRows
-    ? [...rows.slice(0, maxRows), `… (result truncated at ${maxRows} rows — full text in history)`]
-    : rows
-}
-/** Mark the dispatch-level tool carrier done when its result is consumed by a
- *  dedicated branch (subagent/escalate/advisor blocks) — without this the turn
- *  sweep mislabels successful calls as "(interrupted)" (consult P1, 2026-08-30). */
-function settleToolBlock(state, name, toolId, summary) {
-  const block = findToolBlock(state, name, toolId)
-  if (block) {
-    block.done = true
-    block.summary = summary
-    const started = tickTake(name, toolId)
-    block.elapsed = started !== null ? Math.round(performance.now() - started) : null
-  }
-}
-
-/** 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 at settle — §15 D-A3). */
-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
-  }
-}
-
-/** §7.2.3 spawn 门拒错误探测（T-F5）：subagent spawn 的机械拒绝以 {status:"error"}
- *  JSON 返回（例：manual auto-turn digest spawn 门——digest 语义 organize-only）——
- *  错误路径不得触发完成冻结（round1 #1——错误路径不冻结任何 running 块）。该形态只
- *  出现在无 subKey 的拒绝路径（成功路径恒带 dispatch 传的 ctx._subagentKey）。 */
-function isSpawnErrorResult(result) {
-  try {
-    const o = JSON.parse(result)
-    return Boolean(o && typeof o === "object" && o.status === "error")
-  } catch {
-    return false
-  }
-}
-
-
-
-/** Find the live tool-block carrier for a tool event: exact id match when the
- *  callback carries one (P0-3 — parallel same-name tools route to their own
- *  block); falls back to the last unfinished block of that name. */
-function findToolBlock(state, name, toolId) {
-  const lines = state.lines ?? []
-  if (toolId !== undefined && toolId !== null) {
-    for (let i = lines.length - 1; i >= 0; i--) {
-      if (lines[i]._toolBlock?.id === toolId) return lines[i]._toolBlock
-    }
-    return null
-  }
-  for (let i = lines.length - 1; i >= 0; i--) {
-    const b = lines[i]._toolBlock
-    if (b && b.name === name && !b.done) return b
-  }
-  return null
-}
-
+// 2026-09-05 module-split：ticks/maps/sweep/slim/settle/探测/find 族迁 tool-display.mjs——
+// buildToolCallbacks 内部引用用本地 import；sweepToolBlocks re-export（agent-turn 消费面）
+import {
+  TOOL_OUTPUT_LINE_CAP, SUBAGENT_PREVIEW_LINES, PREVIEW_LINE_CHARS, REMINDER_CAP, REMINDER_PERSIST_TURNS,
+  _toolTicks, _subActions, _subActionQ,
+  tickStart, tickTake, settleToolBlock, isAsyncSpawnResult, isSpawnErrorResult,
+  findToolBlock, slimToolResultForDisplay, sweepToolBlocks,
+} from "./tool-display.mjs"
+export { sweepToolBlocks, slimToolResultForDisplay } from "./tool-display.mjs"
 
 /** Build the agent callbacks + the shared flushStream for one turn.
  *          askPermission, askQuestion, saveSessionImpl } */
@@ -278,7 +151,7 @@ export function buildToolCallbacks(deps) {
           : _subActionQ.shift() ?? null
         if (toolId !== undefined && toolId !== null) _subActions.delete(toolId)
       }
-      const isSubagent = name === "subagent" && subAction !== "check" && subAction !== "status" && subAction !== "escalate" && subAction !== "cancel" && subAction !== "panel"
+      const isSubagent = name === "subagent" && subAction !== "status" && subAction !== "escalate" && subAction !== "cancel" && subAction !== "panel" && subAction !== "observe" && subAction !== "send"
       const isEscalate = name === "subagent" && subAction === "escalate"
       // Subagent complete: mark the earliest running child as done — the block
       // persists (✓ frozen elapsed header, expandable) as the ONLY carrier of the
@@ -321,38 +194,29 @@ export function buildToolCallbacks(deps) {
         // 飞刀 post-op report landed under the subagent tool name — freeze the
         // escalate#N activity block (no preview; legacy surface).
         settleToolBlock(state, name, toolId, "completed")
-        // §7.2.3（round1 #2）：escalate 成功返回带 subKey（escalate#N）→ 精确冻；
-        // 失败/老回调无 subKey → escalate 角色启发式兜底（escalate 串行 + 角色限定——
-        // 既有行为）。
-        const lastError = result.includes(TURN_CAP_MARK) ? "turn cap reached — work may be partial" : null
-        if (subKey !== undefined && subKey !== null && subKey !== "") {
-          finishSubTaskKey(state, String(subKey), lastError)
-        } else {
-          finishSubTask(state, ["escalate"], lastError)
-        }
-        freezeDoneSubTasks(state)
-      } else if (name === "consult_check" || name === "consult_stop") {
-        // Consult session-level settle (2026-08-30 consult review): a session spawns
-        // N parallel children, so completion must settle ALL of them (single-shot
-        // finishSubTask froze only the earliest — N-1 stayed "running" then got
-        // mislabeled "interrupted").
-        //   - individual reply (done:false): settle precisely by r.model.
-        //   - done:true / stopped: settle every remaining consult block.
-        try {
-          const r = JSON.parse(result)
-          if (r?.done || r?.stopped !== undefined) {
-            finishSubTasksByRole(state, ["consult"], null)
-            freezeDoneSubTasks(state)
-          } else if (r?.model) {
-            finishSubTaskByModel(state, "consult", r.model)
-            freezeDoneSubTasks(state)
-          }
-        } catch {
-          if (name === "consult_stop") {
-            finishSubTasksByRole(state, ["consult"], null)
-            freezeDoneSubTasks(state)
+        // §25 D-R17b (R17): async escalate ack ({id, role:"escalate", status:
+        // running|queued}) — the child KEEPS running — skip the freeze like the
+        // async spawn path (the block freezes on the ⟦ev⟧done/stopped settle
+        // event at flight end). Sync results (async:false) freeze below.
+        if (!isAsyncSpawnResult(result)) {
+          // §7.2.3（round1 #2）：escalate 成功返回带 subKey（escalate#N）→ 精确冻；
+          // 失败/老回调无 subKey → escalate 角色启发式兜底（escalate 串行 + 角色限定——
+          // 既有行为）。
+          const lastError = result.includes(TURN_CAP_MARK) ? "turn cap reached — work may be partial" : null
+          if (subKey !== undefined && subKey !== null && subKey !== "") {
+            finishSubTaskKey(state, String(subKey), lastError)
+          } else {
+            finishSubTask(state, ["escalate"], lastError)
           }
-        } /* non-JSON result — leave blocks as-is */
+          freezeDoneSubTasks(state)
+        }
+      } else if (name === "consult_stop") {
+        // R17（§25 D-R17a——check 已删）：consult_stop = 取消指定会诊会话。被 abort 的
+        // children 各自 settle（settleChild）时发 ⟦ev⟧done 冻结自己的卡——此处**不做按
+        // 角色整组清扫**（会诊会话可并发——按角色会误冻其他仍在运行的会话的卡，冻结即
+        // 截断其活动流——tool-events advisor 复评 🟡1 修正）；取消的即时可见性由 abort
+        // settle 事件承担（abort 解绕通常在同回合内完成——卡片在其 child settle 即冻结）。
+        // 仅结果本身落本工具调用自己的载体块（下方通用分支）。
       }
       if (!isSubagent && !isEscalate && name !== "advisor") {
         // Result lands INSIDE the block (restore parity — the restored carrier

package/src/tui/tui-lifecycle.mjs

@@ -3,6 +3,7 @@
  * 超 500 行硬限拆分——启动序列、退出清理序列与退出闭包从 index.mjs 移入本模块）。
  */
 
+import { appendFileSync } from "node:fs"
 import { ansi } from "./ansi.mjs"
 
 /** TUI 启动序列：alt buffer + 隐藏光标 + 鼠标/粘贴/键盘增强 + 禁环绕。
@@ -19,6 +20,33 @@ 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)
 }
 
+// R25（ARCHITECTURE.md §R25 F-R25a——复审 #1）：TUI 活动态标志——index.mjs 在终端接管
+// 处（writeStartupSequence 之后）经 setTuiActive(true) 置位，createExitCleanup 清理后清
+// false；bin/thincoder.mjs 崩溃钩子经 restoreTerminalAfterCrash 读同一标志——chat 模式
+// stdout 管道不得收 ANSI（误判即污染输出）。默认 false = 未启动（生产零变化——测试缝同源：
+// T-R25a.2 注入 mock 走同一 setter）。
+let tuiActive = false
+
+/** 置/清 TUI 活动态（TUI 启动接管处与退出清理处调用；测试 env 门注入同走此 setter）。 */
+export function setTuiActive(active) {
+  tuiActive = active === true
+}
+
+/** R25 崩溃恢复：仅 TUI 活动态执行 writeCleanupSequence（复用本模块清理序列——符号锚）。
+ *  测试缝（T-R25a.2——env 门注入）：THINCODER_TEST_CLEANUP_OUT 指向文件时序列写入该文件
+ *  （观察恢复被调 + stdout 管道零 ANSI）——生产不设该 env → 恒 stdout（零变化）。
+ *  @returns {boolean} 是否执行了恢复（false = TUI 未启动——调用方无需处理） */
+export function restoreTerminalAfterCrash() {
+  if (!tuiActive) return false
+  const seamOut = process.env.THINCODER_TEST_CLEANUP_OUT
+  if (seamOut) {
+    writeCleanupSequence((s) => appendFileSync(seamOut, s, "utf8"))
+  } else {
+    writeCleanupSequence()
+  }
+  return true
+}
+
 /** 退出清理闭包：保存会话（同步）+ 关闭 MCP 子进程 + 恢复终端。幂等（cleanedUp 守卫）。 */
 export function createExitCleanup({ agent, saveSession, closeAllMcp }) {
   let cleanedUp = false
@@ -41,5 +69,6 @@ export function createExitCleanup({ agent, saveSession, closeAllMcp }) {
     }
     process.stdin.setRawMode(false)
     writeCleanupSequence()
+    setTuiActive(false) // R25：清理完成即清活动态（崩溃钩子不再收到误判）
   }
 }

package/src/tui/update-notice.mjs

@@ -37,9 +37,13 @@ export function createUpdateNotice(ctx) {
     const { exec } = await import("node:child_process")
     const cp = exec("npm install -g thincoder@latest", { windowsHide: true })
     let stdout = ""
+    let done = false
     cp.stdout?.on("data", (d) => { stdout += d })
     cp.stderr?.on("data", (d) => { stdout += d })
+    cp.on("error", (e) => { if (done) return; done = true; pushLine(`✗ Upgrade failed (${e.message}). Run \`thincoder upgrade\` manually.`, C.error); render() })
     cp.on("close", (code) => {
+      if (done) return
+      done = true
       if (code === 0) {
         pushLine(`✓ Upgraded to ${result.latest}. Restart to apply.`, C.tool)
       } else {

package/src/tui/wizard.mjs

@@ -161,6 +161,16 @@ export function createWizard(ctx) {
     for (const k of ["thinking", "reasoningEffort", "maxTokens", "chatPath"]) {
       if (f[k]) providerRec[k] = f[k]
     }
+    // D-F5a（wizard finishWizard——清单外同型写回补正）先盘后存：磁盘 fresh raw 单操作
+    // （upsert 目标项 + active 指针）——冲突放弃不留下内存 ghost（F5 约定）
+    await persistRaw((raw) => {
+      raw.providers ??= []
+      const existing = raw.providers.find((p) => p?.name === f.name)
+      if (existing) Object.assign(existing, providerRec)
+      else raw.providers.push(providerRec)
+      raw.activeProvider = f.name
+      raw.activeModel = undefined  // reset to default model
+    })
     const existing = agent.providers.find((p) => p.name === f.name)
     if (existing) Object.assign(existing, providerRec)
     else agent.providers.push(providerRec)
@@ -171,20 +181,16 @@ export function createWizard(ctx) {
       const { resolveCompactThreshold } = await import("../config.mjs")
       agent.config.agent.compactThreshold = resolveCompactThreshold(null, f.model).value
     }
-    await persistRaw((raw) => {
-      raw.providers = agent.providers
-      raw.activeProvider = f.name
-      raw.activeModel = undefined  // reset to default model
-    })
     agent.config.activeProvider = f.name
     agent.config.activeModel = null
     pushLabel(`❯ Setup`, ansi.bold + C.tool)
     pushLine(`Setup complete: ${f.name} / ${f.model} (saved to config)`, C.tool)
     // embedding key: if provided, enable vector search; if not, show how to enable later
     if (f.embedkey) {
+      // D-F5b 语义先盘后存（embedding 单键补丁——冲突放弃不留 ghost）
+      await persistRaw((raw) => { raw.embedding = { ...(raw.embedding ?? {}), apiKey: f.embedkey } })
       agent.config.embedding ??= {}
       agent.config.embedding.apiKey = f.embedkey
-      await persistRaw((raw) => { raw.embedding = { ...(raw.embedding ?? {}), apiKey: f.embedkey } })
       if (agent.memory && !agent.memory.embedder) {
         const { createEmbedder } = await import("../embedding.mjs")
         agent.memory.embedder = createEmbedder(agent.config.embedding)