thincoder 0.12.58 → 0.12.60

package/src/tui/key-modes.mjs

@@ -0,0 +1,215 @@
+/**
+ * key-modes.mjs — 按键模态层（2026-09-03 D-S4 自 key-handler.mjs 拆出）：
+ * permission / question / interruptPrompt 三种独占模态分支。每个 handler 在模态激活时
+ * 消费全部按键（返回 true——含未匹配键，与拆出前无条件 return 语义一致），未激活返回 false。
+ * ctx: { state, agent, pushLine, render }（各 handler 按需取用）。
+ * 搜索模态另居 key-handler-search.mjs（既有拆分，本批不动）。
+ */
+import { C } from "./ansi.mjs"
+import { readClipboardText, insertPastedText } from "./clipboard.mjs"
+import { QUESTION_CUSTOM } from "./interaction.mjs"
+
+/** permission 确认模态：y/n/a（a = approve + AUTO ON）；batch（§16 D-B1）：a/o/n（Esc = deny）。
+ *  consume：valid 键或 Esc 走 resolve 分支；其余键静默吞掉（模态独占）。 */
+export function handlePermissionMode(str, key, ctx) {
+  const { state, agent, pushLine, render } = ctx
+  if (!state.permission) return false
+  const answer = (str || "").toLowerCase()
+  const isContinue = state.permission.name === "continue"
+  const isBatch = Boolean(state.permission.batch)
+  const validKeys = isContinue ? ["y", "n"] : isBatch ? ["a", "o", "n"] : ["y", "n", "a"]
+  if (validKeys.includes(answer) || key.name === "escape") {
+    const { resolve, name } = state.permission
+    state.permission = null
+    state.permissionPreview = []
+    state.status = "Processing..."
+    if (isBatch) {
+      // Merged batch ask: resolve the verdict string; dispatch applies it
+      // (approveAll = batch-scope allowance only, NOT the persistent AUTO flag).
+      const verdict = answer === "a" ? "approveAll" : answer === "o" ? "oneByOne" : "deny"
+      const tone = verdict === "approveAll" ? C.dim : C.error
+      pushLine(`  [${verdict === "approveAll" ? "approved" : verdict === "deny" ? "denied" : "one by one"}] ${name}`, tone)
+      resolve(verdict)
+      render()
+      return true
+    }
+    if (answer === "a" && !isContinue) {
+      agent.autoApprove = true
+      agent._pendingReminders = agent._pendingReminders ?? []
+      agent._pendingReminders.push("[System reminder: AUTO mode is now ON. All tool calls are automatically approved. Use /auto to disable.]")
+      pushLine(`  [auto] AUTO ON: tool calls no longer prompt for approval (/auto to disable)`, C.warn)
+    }
+    const approved = answer === "y" || (answer === "a" && !isContinue)
+    // leave trail: record approval/denial in conversation (continue prompt has its own output, don't duplicate)
+    if (!isContinue) {
+      pushLine(`  [${approved ? "approved" : "denied"}] ${name}`, approved ? C.dim : C.error)
+    }
+    resolve(approved)
+    render()
+  }
+  return true
+}
+
+/** question 工具回调模态：自由文本（type answer, Enter submit, Esc cancel）或选项
+ *  （↑↓ select, Enter confirm, Esc cancel——QUESTION_CUSTOM 项切自由文本模式）。
+ *  自由文本态编辑键契约见 TUI-INPUT-BOX.md §7.2（←→/Home/End/Ctrl+U/Backspace/中段插入/
+ *  Ctrl+V 落 cursor/\n→空格/Ctrl+J no-op/未列键吞——无 fall-through）；Esc 语义 round2 #5：
+ *  有 options（Custom 进入）→ 回 options 态；无 options → 中止 question。
+ *  consume：模态激活时全部按键独占（含未匹配键——拆出前 onKeypress 尾 return）。 */
+export function handleQuestionMode(str, key, ctx) {
+  const { state, pushLine, render } = ctx
+  if (!state.question) return false
+  const q = state.question
+  if (q.options.length > 0) {
+    // options mode: ↑↓ select, Enter confirm, Esc cancel
+    if (key.name === "escape") {
+      q.resolve("")
+      state.question = null
+      state.status = "Processing..."
+      render()
+    } else if (key.name === "up") {
+      q.selected = Math.max(0, (q.selected ?? 0) - 1)
+      render()
+    } else if (key.name === "down") {
+      q.selected = Math.min(q.options.length - 1, (q.selected ?? 0) + 1)
+      render()
+    } else if (key.name === "return") {
+      const answer = q.options[q.selected ?? 0]
+      if (answer === QUESTION_CUSTOM) {
+        // Switch to free-text mode — the user wants to type their own answer.
+        // options 列表备份（_backOptions）——自由文本态 Esc 可回 options 态（round2 #5 逃生口）；
+        // answer/cursor 按 §7.2 初始化（codepoint 数组 + cursor = answer.length）。
+        q._backOptions = { options: q.options, selected: q.selected }
+        q.options = []
+        q.selected = undefined
+        q.answer = []
+        q.cursor = 0
+        state.status = "Waiting for answer..."
+        render()
+        return true
+      }
+      q.resolve(answer)
+      state.question = null
+      state.status = "Processing..."
+      pushLine(`  → ${answer}`, C.tool)
+      render()
+    }
+  } else {
+    // free text: codepoint-array answer + cursor editing (TUI-INPUT-BOX.md §7.2)
+    if (!Array.isArray(q.answer)) q.answer = q.answer ? [...q.answer] : []
+    q.cursor = Math.max(0, Math.min(q.cursor ?? q.answer.length, q.answer.length))
+    const len = q.answer.length
+    if (key.name === "escape") {
+      // round2 #5：有 options（Custom 进入）→ 回 options 态（误触 Custom 有逃生口——
+      // 选择列表与选中位恢复）；无 options → 中止 question（原语义）。
+      if (q._backOptions) {
+        q.options = q._backOptions.options
+        q.selected = q._backOptions.selected
+        delete q._backOptions
+        delete q.answer
+        delete q.cursor
+        state.status = "Waiting for choice..."
+        render()
+      } else {
+        q.resolve("")
+        state.question = null
+        state.status = "Processing..."
+        render()
+      }
+    } else if (key.name === "return") {
+      if (q._pasting) return true // block Enter while paste is in flight
+      const answer = q.answer.join("").trim()
+      q.resolve(answer || "")
+      state.question = null
+      state.status = "Processing..."
+      pushLine(`  → ${answer || "(empty)"}`, C.tool)
+      render()
+    } else if (key.name === "enter") {
+      // Ctrl+J（\n → name "enter"）= no-op 吞——不插换行无 fall-through（round2 #2）
+    } else if (key.name === "left") {
+      q.cursor = Math.max(0, q.cursor - 1)
+      render()
+    } else if (key.name === "right") {
+      q.cursor = Math.min(len, q.cursor + 1)
+      render()
+    } else if (key.name === "home") {
+      q.cursor = 0
+      render()
+    } else if (key.name === "end") {
+      q.cursor = len
+      render()
+    } else if (key.ctrl && !key.alt && key.name === "u") {
+      q.answer = []
+      q.cursor = 0
+      render()
+    } else if (key.name === "backspace") {
+      if (q.cursor > 0) {
+        q.answer.splice(q.cursor - 1, 1) // codepoint 元素删除——emoji 不劈半（round2 #1）
+        q.cursor--
+        render()
+      }
+    } else if (key.ctrl && !key.alt && !key.meta && key.name === "v") {
+      // Ctrl+V paste: read clipboard text (fires when the terminal passes Ctrl+V through
+      // as a key event; bracketed-paste terminals are handled upstream in the stdin handler).
+      // 两路径同归 insertPastedText——落 cursor 位置、\n→空格（clipboard.mjs 单行守卫）。
+      if (q._pasting) return true
+      q._pasting = true
+      readClipboardText().then((text) => {
+        q._pasting = false
+        if (text) {
+          // activeQuestion 守卫：粘贴在途用户 Esc 中止/Enter 提交后，本回调不得把
+          // 剪贴板内容落进主输入框（审计 F1——insertPastedText 见 stale 即丢）。
+          insertPastedText(state, text, q)
+          render()
+        }
+      }).catch((e) => {
+        q._pasting = false
+        console.error(`[tui] clipboard paste failed: ${e.message}`)
+      })
+    } else if (str && !key.ctrl && !key.meta && key.name !== "tab" && key.name !== "enter") {
+      // 可打印字符插入光标位置（codepoint 拆字）；\r\n 剥离 + \t→2 空格（单行不变式同主输入清洗口径）
+      const chars = [...str.replace(/[\r\n]+/g, "").replace(/\t/g, "  ")]
+      if (chars.length) {
+        q.answer.splice(q.cursor, 0, ...chars)
+        q.cursor += chars.length
+        render()
+      }
+    }
+    // 未列键（↑↓/PgUp/PgDn/Delete/F1/…）一律消费 return——无 fall-through 到正常编辑
+    // （search 穿透教训——TUI-INPUT-BOX.md §3.2 BUG-2）
+  }
+  return true
+}
+
+/** interruptPrompt 模态（Ctrl+I 后输入注入消息）：Enter 提交 → controller.abort
+ *  { interrupt: true, message }；Esc 取消；字符进 prompt；其余键静默吞（模态独占）。
+ *  返回 false 当模态未激活（key-handler 先检 state.interruptPrompt 入口再调）。 */
+export function handleInterruptMode(str, key, ctx) {
+  const { state, pushLine, render } = ctx
+  if (!state.interruptPrompt) return false
+  if (key.name === "escape") {
+    state.interruptPrompt = null
+    render()
+  } else if (key.name === "return") {
+    const msg = (state.interruptPrompt.text ?? "").trim()
+    state.interruptPrompt = null
+    if (msg) {
+      // Guard: if the turn already finished while the user was typing, the controller
+      // may have been replaced or already aborted — don't abort a live turn by mistake.
+      if (state.processing && state.controller && !state.controller.signal.aborted) {
+        pushLine(`  [inject] ${msg}`, C.warn)
+        state.controller.abort({ interrupt: true, message: msg })
+      } else {
+        pushLine(`  [inject — turn ended, message queued] ${msg}`, C.dim)
+      }
+      render()
+    }
+  } else if (key.name === "backspace") {
+    state.interruptPrompt.text = state.interruptPrompt.text.slice(0, -1)
+    render()
+  } else if (str && !key.ctrl && !key.meta) {
+    state.interruptPrompt.text += str.replace(/[\r\n]+/g, "")
+    render()
+  }
+  return true
+}

package/src/tui/layout.mjs

@@ -26,6 +26,14 @@ const MAX_INPUT_LINES = 5
 const MAX_TASK_LINES = 5
 const QWIN = 5
 
+/** question 自由文本态渲染布局：与主输入框同实现（TUI-INPUT-BOX.md §7.2 round2 #1/#6）——
+ *  折行展开（`▸ ` 首行 + 续行 2 空格缩进）+ 光标行列；answer 单行不变式（无 \n 字符）由
+ *  输入侧硬守卫（Ctrl+J no-op / 粘贴 \n→空格），此处只复用 layoutInput 的折行/光标语义，
+ *  cap/滚动由 computeLayout 以 MAX_INPUT_LINES + questionOffset 承担（同主输入 inputOffset）。 */
+export function layoutAnswer(chars, cursor, width) {
+  return layoutInput(chars, cursor, width)
+}
+
 /**
  * Computes layout. Returns panel coordinates + precomputed content (height-affecting parts).
  * Pure function: does not modify state.
@@ -43,6 +51,11 @@ export function computeLayout(state, { cols, rows }) {
   }
   const inputLines = inputLayout.lines.slice(inputOffset, inputOffset + MAX_INPUT_LINES)
   let boxLines = inputLines
+  // question 自由文本态（无 options）：boxLines = layoutAnswer 行（同主输入 cap + offset 滚动——
+  // 光标随行；长答案不挤压会话面板到零行——TUI-INPUT-BOX.md §7.2 round2 #6）。questionLayout/
+  // questionOffset 供 render-frame 反显光标与硬件定位（hasOverlay 例外细化同 §7.2）。
+  let questionLayout = null
+  let questionOffset = 0
   if (state.question) {
     const q = state.question
     if (q.options.length > 0) {
@@ -51,7 +64,13 @@ export function computeLayout(state, { cols, rows }) {
       boxLines = q.options.slice(start, start + QWIN).map((opt, i) =>
         (start + i === sel ? "▸ " : "  ") + (opt === QUESTION_CUSTOM ? "✍ Custom answer…" : optText(opt)))
     } else {
-      boxLines = ["▸ " + (q.answer ?? "")]
+      const answerChars = Array.isArray(q.answer) ? q.answer : q.answer ? [...q.answer] : []
+      const qCursor = Math.max(0, Math.min(q.cursor ?? answerChars.length, answerChars.length))
+      questionLayout = layoutAnswer(answerChars, qCursor, W - 4)
+      if (questionLayout.lines.length > MAX_INPUT_LINES) {
+        questionOffset = Math.min(questionLayout.cursorLine, questionLayout.lines.length - MAX_INPUT_LINES)
+      }
+      boxLines = questionLayout.lines.slice(questionOffset, questionOffset + MAX_INPUT_LINES)
     }
   }
   const inputBoxH = boxLines.length + 2
@@ -174,6 +193,8 @@ export function computeLayout(state, { cols, rows }) {
     // precomputed content (affects height, reused during render)
     inputLayout,
     inputOffset,
+    questionLayout,
+    questionOffset,
     boxLines,
     visibleTasks,
     permPreviewLines,

package/src/tui/mouse.mjs

@@ -17,6 +17,9 @@
 import { computeLayout, subagentLineIndex } from "./layout.mjs"
 import { buildConvLines, convViewport } from "./render-conversation.mjs"
 import { toggleFoldBlock, scrollFoldBlock, foldScrollOffset } from "./fold-block.mjs"
+import { cancelAsyncSubagent } from "../agent-tools/subagent-async.mjs"
+import { cancelAsyncAdvisor } from "../agent-tools/advisor-async.mjs"
+import { C } from "./ansi.mjs"
 
 /** 2026-08-31 滚轮事件分派（用户需求"展开块能滚动阅读全文"）：坐标命中展开块内容行 →
  *  块内逐行滚动（scrollFoldBlock ±3）；未命中 → 会话滚动（调用方继续处理）。
@@ -125,6 +128,15 @@ export function handleMouseClick(ctx, col, row) {
     // 评审 #4：保底截断后可见行 ≠ 前 h 行——命中映射与 render-frame 同一几何契约
     // （subagentLineIndex：分隔线 + 末尾区块行优先）。
     const lineEl = layout.subagentLines[subagentLineIndex(layout.subagentLines, P.subagent.h, r - P.subagent.y)]
+    // §19.5 D-M7/D-M7b ⏹ 停止标记（round1 #6 + 用户裁定 B 形态）：列级命中——⏹ 列
+    // 点击 = cancel（定向该子代理——ctx.cancelSubagent 直连池 abort 路径，不经模型
+    // 回合），不触发折叠翻转；**仅 async 区块带 _stopSub 元数据**（sync 无 ⏹——
+    // 其右缘点击照常走折叠翻转——D-M7b ③）；⏹ 区外点击照常走折叠/翻窗。
+    if (lineEl?._stopSub && col >= (lineEl._stopCol ?? Infinity)) {
+      ctx.cancelSubagent?.(lineEl._stopSub)
+      render()
+      return true
+    }
     if (lineEl?._foldScrollUp || lineEl?._foldScrollDown) {
       // ▲/▼ 控制行点击翻窗（60% 封顶保留、窗口随翻滚动，全文可达）
       scrollFoldBlock(state, lineEl._foldScrollUp ?? lineEl._foldScrollDown,
@@ -164,3 +176,37 @@ export function handleMouseClick(ctx, col, row) {
 
   return false
 }
+
+/** 鼠标装配簇（2026-09-03 D-S1a 自 index.mjs 迁入）：index.mjs 只留装配调用。
+ *  ctx: { agent, state, pushLine, render, popPicker }；返回 { onMouseClick, mouseCtx }。
+ *  cancelSubagent（⏹ 停止标记，§19.5 D-M7）：UI 停止不经模型回合，直连池 abort——
+ *  与 action:"cancel" 同实现路径。block key "role#id" → 池条目 id。 */
+export function createMouseDispatch({ agent, state, pushLine, render, popPicker }) {
+  const cancelSubagent = (key) => {
+    try {
+      const id = key.slice(key.lastIndexOf("#") + 1)
+      const isAdvisorBlock = key.startsWith("advisor#")
+      // §24 D-24b (②-6b): ⏹ on an advisor block cancels the background review
+      // (directed abort → cancelled settle: no pending entry / no token).
+      const r = isAdvisorBlock
+        ? cancelAsyncAdvisor(agent, id)
+        : cancelAsyncSubagent(agent, id)
+      if (r?.status === "error") {
+        // 池内无此条目但区块仍 live（!done）→ 阻塞型（sync）spawn 中——无池条目可定向
+        // 中止（§19.5 cancel 只针对 async 后台子代理）；给出可操作指引而非神秘 unknown id
+        const liveBlock = state.subTasks?.[key] && !state.subTasks[key].done
+        pushLine(liveBlock
+          ? `[subagent stop] ${key} is a blocking (sync) child mid-call — targeted stop is not available; use Ctrl+C to interrupt the turn`
+          : `[subagent stop] ${r.error}`, C.error)
+      } else {
+        pushLine(`[subagent ${key} stop requested]`, C.warn)
+      }
+    } catch (e) {
+      pushLine(`[subagent stop] ${e?.message ?? String(e)}`, C.error)
+    }
+    render()
+  }
+  const onMouseClick = (col, row) => handleMouseClick({ state, render, popPicker, cancelSubagent }, col, row)
+  const mouseCtx = () => ({ state, render })
+  return { onMouseClick, mouseCtx }
+}

package/src/tui/pickers.mjs

@@ -300,22 +300,24 @@ export function createPickers(ctx) {
     const target = agent.providers.find((pp) => pp.name === item.provider)
     if (!target) return
     const providerDefault = target.model
+    const nextActiveModel = item.model !== providerDefault ? item.model : null // default model → clear activeModel
+    // D-F5a（selectModel——清单外同型写回补正）先盘后存：磁盘 fresh raw 单操作（model + active 指针）——冲突放弃不留 ghost
+    await persistRaw((raw) => {
+      raw.providers ??= []
+      const t = raw.providers.find((p) => p?.name === item.provider)
+      if (t) t.model = item.model
+      raw.activeProvider = item.provider
+      raw.activeModel = nextActiveModel || undefined  // null → omit from config
+    })
     target.model = item.model
     agent.activeProvider = item.provider
-    // If selecting the provider's default model, clear activeModel; otherwise set it
-    agent.activeModel = item.model !== providerDefault ? item.model : null
+    agent.activeModel = nextActiveModel
     agent.provider = { ...target }
     if (agent.config?.agent?.compactThresholdAuto) {
       const { resolveCompactThreshold } = await import("../config.mjs")
       // provider 对象（非 model 字符串）——阈值跟随 providers[].context 覆盖（PROVIDER.md §15 T-C2）
       agent.config.agent.compactThreshold = resolveCompactThreshold(null, target).value
     }
-    await persistRaw((raw) => {
-      // 落盘前剥离运行时注入的 proxyUri（由 loadConfig + injectProxy 在加载时重建）
-      raw.providers = agent.providers.map(({ proxyUri: _, ...p }) => p)
-      raw.activeProvider = item.provider
-      raw.activeModel = agent.activeModel || undefined  // null → omit from config
-    })
     agent.config.activeProvider = item.provider
     agent.config.activeModel = agent.activeModel
     if (!agent.provider.apiKey) {
@@ -342,12 +344,20 @@ export function createPickers(ctx) {
       if (!baseURL) return
       const model = await askQuestion("Enter model name:")
       if (!model) return
-      const format = (await askQuestion("API format [openai/anthropic/google] (default: openai):")).trim().toLowerCase()
+      // D-C1（TUI.md §10.6D）：API format 改 picker 选择（openai/anthropic/google——默认 index=0
+      // openai）——固定枚举不再手输；Esc/取消 = 中止整个 Add Provider 流程（cfg 尚未落盘——
+      // 无半配置，与旧手输非法 abort 同语义）。与 preset 选择器同形态——零新机制。
+      const format = await showPicker("API format", [
+        { type: "item", text: "openai", name: "openai" },
+        { type: "item", text: "anthropic", name: "anthropic" },
+        { type: "item", text: "google", name: "google" },
+      ])
+      if (!format) return // Esc/取消 → 中止流程
       const cfg = { name, baseURL, model }
-      if (format === "anthropic" || format === "google") cfg.format = format
-      else if (format && format !== "openai") return // unknown format → abort
+      if (format.name === "anthropic" || format.name === "google") cfg.format = format.name
+      else if (format.name !== "openai") return // 防御：未知格式（理论不可达——picker 枚举）
+      await persistRaw((raw) => { raw.providers ??= []; raw.providers.push(cfg) }) // D-F5a（#3）先盘后存
       agent.providers.push(cfg)
-      await persistRaw((raw) => { raw.providers = agent.providers })
       const key = await askQuestion(`Enter API key for ${name} (skip if none):`)
       if (key) await setProviderKey(name, key)
       return
@@ -360,8 +370,8 @@ export function createPickers(ctx) {
     if (preset.maxTokens) cfg.maxTokens = preset.maxTokens
     if (preset.chatPath) cfg.chatPath = preset.chatPath
     if (preset.format) cfg.format = preset.format
+    await persistRaw((raw) => { raw.providers ??= []; raw.providers.push(cfg) }) // D-F5a（#2）先盘后存
     agent.providers.push(cfg)
-    await persistRaw((raw) => { raw.providers = agent.providers })
     const key = await askQuestion(`Enter API key for ${se.name} (skip if none):`)
     if (key) await setProviderKey(se.name, key)
   }
@@ -374,8 +384,13 @@ export function createPickers(ctx) {
       ...candidates.map((p) => ({ type: "item", text: `${p.name} (${p.model})`, name: p.name })),
     ])
     if (!se) return
+    // D-F5a（#4）先盘后存：磁盘 fresh raw 上 splice；冲突放弃不留下内存 ghost
+    await persistRaw((raw) => {
+      raw.providers ??= []
+      const idx = raw.providers.findIndex((p) => p?.name === se.name)
+      if (idx !== -1) raw.providers.splice(idx, 1)
+    })
     agent.providers.splice(agent.providers.findIndex((p) => p.name === se.name), 1)
-    await persistRaw((raw) => { raw.providers = agent.providers })
   }
 
   async function setKeyFlow() {
@@ -391,14 +406,18 @@ export function createPickers(ctx) {
   async function setProviderKey(name, key) {
     const target = agent.providers.find((p) => p.name === name)
     if (!target) return
+    // D-F5a（#5）先盘后存：磁盘 fresh raw 上改目标项 apiKey；冲突放弃不留下内存 ghost
+    await persistRaw((raw) => {
+      raw.providers ??= []
+      const t = raw.providers.find((p) => p?.name === name)
+      if (t) t.apiKey = key
+    })
     target.apiKey = key
     if (name === agent.activeProvider) agent.provider.apiKey = key
-    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）。 */
+  /** /model provider 管理：context 窗口字段（K 单位，PROVIDER.md §15 D-C4/D-C5）——picker 选
+   *  provider + 表单输入；空清空/非法不落盘（D-C1）；落盘 = D-F5a（#6）fresh 单字段补丁——先盘后存。 */
   async function setContextFlow() {
     const se = await showPicker("Set Context Window", [
       { type: "header", text: "Select provider" },
@@ -415,26 +434,33 @@ export function createPickers(ctx) {
     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 {
+    let newCtx // undefined = 清空（回 spec 值）
+    if (val !== "") {
       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
+      newCtx = n
     }
+    await persistRaw((raw) => {
+      raw.providers ??= []
+      const t = raw.providers.find((p) => p?.name === se.name)
+      if (!t) return
+      if (newCtx === undefined) delete t.context
+      else t.context = newCtx
+    })
+    if (newCtx === undefined) delete target.context
+    else target.context = newCtx
     if (se.name === agent.activeProvider) {
       // 运行时 provider 同步（同 setProviderKey 先例：只补 context，不重建对象以免丢 activeModel 覆盖）
-      if (target.context === undefined) delete agent.provider.context
-      else agent.provider.context = target.context
+      if (newCtx === undefined) delete agent.provider.context
+      else agent.provider.context = newCtx
       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)