thincoder 0.10.0 → 0.11.1

package/src/tui/cmd-advisor.mjs

@@ -1,68 +1,157 @@
-/** /advisor command: toggle advisor on/off, select model.
- *  ctx: { agent, openPicker, pushLine } */
+/** /advisor command: toggle advisor on/off, select model, configure thinking.
+ *  ctx: { agent, showPicker, pushLine, persistRaw } */
 import { C } from "./ansi.mjs"
 
 export async function handleAdvisorCommand(ctx) {
-  const { agent, openPicker, pushLine } = ctx
+  const { agent, showPicker, pushLine } = ctx
   const cfg = agent.config.advisor ??= {}
   const enabled = cfg.enabled === true
-  const curProvider = cfg.provider || agent.activeProvider
+  const curProvider = cfg.provider || "(main)"
   const curModel = cfg.model || agent.provider.model
+  const thinkInfo = cfg.thinking === null ? "off"
+    : cfg.thinking?.type === "disabled" ? "off"
+    : cfg.reasoningEffort ? `on (${cfg.reasoningEffort})`
+    : cfg.thinking ? `on (${cfg.thinking.type})` : "(main)"
 
   const entries = [
     { type: "item", text: `Advisor: ${enabled ? "ON" : "OFF"}`, action: "toggle" },
-    { type: "item", text: `Model: ${curProvider}/${curModel}`, action: "model" },
+    { type: "item", text: `Model: ${curModel}`, action: "model", note: `Provider: ${curProvider}` },
+    { type: "item", text: `Thinking: ${thinkInfo}`, action: "thinking" },
   ]
 
-  openPicker({
-    title: "Advisor",
-    entries,
-    onSelect: async (e) => {
-      if (e.action === "toggle") {
-        cfg.enabled = !cfg.enabled
-        agent._pendingReminders = agent._pendingReminders ?? []
-        if (cfg.enabled) {
-          agent._pendingReminders.push("[系统提醒: Advisor 审查已开启。每轮操作后，你的输出将被审查，观察结果可能作为系统提醒注入。请批判性参考——这是观察，不是命令。]")
-        } else {
-          agent._pendingReminders.push("[系统提醒: Advisor 审查已关闭。后续轮次不再自动审查。]")
-        }
-      } else if (e.action === "model") {
-        await openAdvisorModelPicker(ctx).catch(err => pushLine(`[error] ${err.message}`, C.error))
-      }
-    },
-  })
+  const e = await showPicker("Advisor", entries)
+  if (!e) return
+
+  const persist = async () => {
+    if (ctx.persistRaw) {
+      await ctx.persistRaw((raw) => {
+        raw.agent ??= {}
+        raw.agent.advisor = cfg
+      })
+    }
+  }
+
+  if (e.action === "toggle") {
+    cfg.enabled = !cfg.enabled
+    agent._pendingReminders = agent._pendingReminders ?? []
+    if (cfg.enabled) {
+      agent._pendingReminders.push("[System reminder: Advisor review is now ON. You can call the `advisor` tool to get an independent code review before finalising your work. The advisor is an independent read-only sub-agent that explores the codebase, runs git diff, reads files, and traces callers via grep/lsp.]")
+    } else {
+      agent._pendingReminders.push("[System reminder: Advisor review is now OFF. The `advisor` tool will not produce results.]")
+    }
+    await persist().catch(err => pushLine(`[error] Advisor toggle: ${err.message}`, C.error))
+  } else if (e.action === "model") {
+    await openAdvisorModelPicker(ctx, persist).catch(err => pushLine(`[error] ${err.message}`, C.error))
+  } else if (e.action === "thinking") {
+    await openAdvisorThinkingPicker(ctx, persist).catch(err => pushLine(`[error] ${err.message}`, C.error))
+  }
 }
 
-async function openAdvisorModelPicker(ctx) {
-  const { agent, openPicker, pushLine } = ctx
+async function openAdvisorModelPicker(ctx, persist) {
+  const { agent, showPicker, pushLine } = ctx
   const providers = agent.providers || []
+  const cfg = agent.config.advisor ??= {}
 
-  // Build flat list: each provider's name + a "use current model" entry
-  const entries = []
-  let idx = 0
+  const entries = [
+    { type: "item", text: "Use main model", action: "inherit", marker: !cfg.provider ? "●" : "" },
+  ]
   for (const p of providers) {
-    const mark = p.name === agent.activeProvider ? "* " : "  "
-    entries.push({ type: "item", text: `${mark}${p.name} — ${p.baseURL}`, action: "set_provider", provider: p.name, model: p.model })
-    idx++
+    entries.push({ type: "header", text: p.name, note: `${p.baseURL}${agent.activeProvider === p.name ? " ← active" : ""}  loading…` })
+    const mark = cfg.provider === p.name && cfg.model === p.model ? "● " : "  "
+    entries.push({ type: "item", text: `${mark}${p.model}`, action: "switch", provider: p.name, model: p.model })
   }
 
-  openPicker({
-    title: "Advisor Model",
-    entries,
-    onSelect: async (e) => {
-      if (e.action === "set_provider") {
-        const cfg = agent.config.advisor ??= {}
-        if (e.provider === agent.activeProvider && e.model === agent.provider.model) {
-          // Same as main — clear override (use main pool)
-          delete cfg.provider
-          delete cfg.model
-          pushLine(`Advisor: 使用主模型 (${agent.activeProvider}/${agent.provider.model})`, C.dim)
-        } else {
-          cfg.provider = e.provider
-          cfg.model = e.model
-          pushLine(`Advisor: ${e.provider}/${e.model}`, C.dim)
-        }
-      }
-    },
-  })
+  // Fetch models first, then show picker
+  await fetchAdvisorModels(entries, providers, agent)
+
+  const e = await showPicker("Advisor Model", entries)
+  if (!e) return
+
+  if (e.action === "inherit") {
+    delete cfg.provider
+    delete cfg.model
+    pushLine("Advisor: using main model", C.dim)
+  } else if (e.action === "switch") {
+    cfg.provider = e.provider
+    cfg.model = e.model
+    pushLine(`Advisor: ${e.provider}/${e.model}`, C.dim)
+  }
+  await persist()
+}
+
+async function fetchAdvisorModels(entries, providers, agent) {
+  const { listModels } = await import("../provider/index.mjs")
+  await Promise.all(providers.map(async (p) => {
+    try {
+      const envKey = { deepseek: "DEEPSEEK_API_KEY", openai: "OPENAI_API_KEY" }[p.name]
+      let apiKey = p.apiKey
+      if (!apiKey && envKey && process.env[envKey]) apiKey = process.env[envKey]
+      if (!apiKey) apiKey = process.env.THINCODER_API_KEY
+      const models = await listModels({ baseURL: p.baseURL, apiKey: apiKey ?? "" }, { signal: AbortSignal.timeout(10000) })
+      const at = entries.findLastIndex((e) => e.type === "header" && e.text === p.name)
+      if (at < 0) return
+      entries.splice(at + 2, 0, ...models
+        .filter((m) => m !== p.model)
+        .map((m) => ({ type: "item", text: `   ${m}`, action: "switch", provider: p.name, model: m })))
+      const header = entries[at]
+      header.note = `${p.baseURL}${p.apiKey ? "" : " (no key)"}${agent.activeProvider === p.name ? " ← active" : ""}`
+  } catch (err) {
+      const header = entries.find((e) => e.type === "header" && e.text === p.name)
+      if (header) header.note = `${p.baseURL}${p.apiKey ? "" : " (no key)"}${agent.activeProvider === p.name ? " ← active" : ""}  (fetch failed: ${err.message.slice(0, 40)})`
+    }
+  }))
+}
+
+async function openAdvisorThinkingPicker(ctx, persist) {
+  const { agent, showPicker, pushLine } = ctx
+  const { specForModel } = await import("../config.mjs")
+  const cfg = agent.config.advisor ??= {}
+
+  const providerForDefaults = cfg.provider
+    ? agent.providers?.find(p => p.name === cfg.provider) || agent.provider
+    : agent.provider
+  const effectiveModel = cfg.model || providerForDefaults.model
+  const spec = specForModel(effectiveModel)
+  const thinkOnValue = spec.thinkEnabledValue ?? "enabled"
+  const isCustomThink = thinkOnValue !== "enabled"
+  const isEffortOnly = spec.thinkApi === "effort"
+  const effortLevels = spec.reasoningEffortEnum ?? ["high", "max"]
+
+  const curEffort = cfg.reasoningEffort ?? providerForDefaults.reasoningEffort
+  const curThinking = cfg.thinking ?? providerForDefaults.thinking
+  const thinkingEnabled = curThinking?.type === thinkOnValue
+    || (curThinking?.type === undefined && !isCustomThink)
+
+  const entries = [
+    { type: "item", text: "Use main model settings", action: "inherit" },
+  ]
+  if (!isEffortOnly) {
+    entries.push({ type: "header", text: "Thinking mode" })
+    entries.push({ type: "item", text: `Enabled ${thinkingEnabled ? "← current" : ""}`, action: "think_on" })
+    entries.push({ type: "item", text: `Disabled ${curThinking?.type === "disabled" || curThinking === null ? "← current" : ""}`, action: "think_off" })
+  }
+  entries.push({ type: "header", text: "Reasoning effort" })
+  for (const level of effortLevels) {
+    entries.push({ type: "item", text: `${level} ${curEffort === level ? "← current" : ""}`, action: `effort_${level}` })
+  }
+
+  const e = await showPicker("Advisor Thinking", entries)
+  if (!e) return
+
+  if (e.action === "inherit") {
+    delete cfg.thinking
+    delete cfg.reasoningEffort
+    pushLine("Advisor: using main model thinking settings", C.dim)
+  } else if (e.action === "think_on") {
+    cfg.thinking = { type: thinkOnValue }
+    if (isEffortOnly) delete cfg.thinking
+    pushLine(`Advisor: thinking ON (${thinkOnValue})`, C.dim)
+  } else if (e.action === "think_off") {
+    cfg.thinking = isCustomThink ? null : { type: "disabled" }
+    pushLine("Advisor: thinking OFF", C.dim)
+  } else if (e.action.startsWith("effort_")) {
+    cfg.reasoningEffort = e.action.slice(7)
+    pushLine(`Advisor: reasoning effort = ${cfg.reasoningEffort}`, C.dim)
+  }
+  await persist()
 }

package/src/tui/cmd-clear.mjs

@@ -1,23 +1,17 @@
 /** /clear command: clear screen (confirm to prevent accidental trigger).
- *  ctx: { state, openPicker, render } */
+ *  ctx: { state, showPicker, render } */
 export async function handleClearCommand(ctx) {
-  const { state, openPicker, render } = ctx
+  const { state, showPicker, render } = ctx
   if (state.lines.length > 0) {
-    openPicker({
-      title: "Clear screen?",
-      entries: [
-        { type: "item", text: "Yes, clear all conversation output", action: "yes" },
-        { type: "item", text: "Cancel", action: "no" },
-      ],
-      defaultIndex: 1,
-      onSelect: (e) => {
-        if (e.action === "yes") {
-          state.lines = []
-          state.streaming = ""
-          render()
-        }
-      },
-    })
+    const e = await showPicker("Clear screen?", [
+      { type: "item", text: "Yes, clear all conversation output", action: "yes" },
+      { type: "item", text: "Cancel", action: "no" },
+    ], { defaultIndex: 1 })
+    if (e?.action === "yes") {
+      state.lines = []
+      state.streaming = ""
+      render()
+    }
     return
   }
   state.lines = []

package/src/tui/cmd-config.mjs

@@ -1,157 +1,241 @@
 import { existsSync, readFileSync } from "node:fs"
 import { ansi, C } from "./ansi.mjs"
 
-/** /config command: view and set agent/embedding config.
- *  Extracted from slash-commands.mjs.
- *  ctx: { agent, pushLine, pushLabel, openPicker, askQuestion, persistRaw, maskKey, ansi, C } */
-export async function handleConfigCommand(ctx) {
-  const { agent, pushLine, pushLabel, openPicker, askQuestion, persistRaw, maskKey } = ctx
+/** /config command: view and set agent/embedding/proxy config. */
+export async function handleConfigCommand(ctx, args = []) {
+  const { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw, maskKey } = ctx
   const { configPath } = await import("../config.mjs")
   const ac = agent.config?.agent ?? {}
   const ec = agent.config?.embedding ?? {}
 
-  function cfgSummary() {
-    const tn = `${ac.compactThreshold ?? 100000}${agent.config?.agent?.compactThresholdAuto ? " (auto)" : ""}`
-    const vg = ac.verifyGuard === true ? "on" : "off"
-    return `agent.maxTurns=${ac.maxTurns ?? 100} | compactThreshold=${tn} | verifyGuard=${vg} | embedding=${agent.memory?.embedder ? "on" : "off"}`
+  // agent.config.proxy 已被 loadConfig 归一化为 { uri, web, model } | undefined
+  function proxySummary() {
+    const pc = agent.config?.proxy
+    if (!pc) return "not configured"
+    return `${pc.uri} web:${pc.web ? "on" : "off"} model:${pc.model ? "on" : "off"}`
   }
 
-  const mainEntries = [
-    { type: "header", text: `Config: ${cfgSummary()}` },
-    { type: "item", text: `agent.maxTurns = ${ac.maxTurns ?? 100}`, action: "agent.maxTurns" },
-    { type: "item", text: `agent.subagentTurns = ${ac.subagentTurns ?? 100}`, action: "agent.subagentTurns" },
-    { type: "item", text: `agent.compactThreshold = ${ac.compactThreshold ?? 100000}${agent.config?.agent?.compactThresholdAuto ? " (auto)" : ""}`, action: "agent.compactThreshold" },
-    { type: "item", text: `agent.verifyGuard = ${ac.verifyGuard === true ? "on" : "off"}`, action: "agent.verifyGuard" },
-    { type: "item", text: "Set embedding API key", action: "embedkey" },
-    { type: "item", text: `embedding.model = ${ec.model ?? "BAAI/bge-m3"}`, action: "embedding.model" },
-    { type: "item", text: "View full config", action: "view" },
-  ]
-
-  openPicker({
-    title: "Config",
-    entries: mainEntries,
-    onSelect: async (e) => {
-      if (e.action === "view") {
-        const cp = configPath
-        pushLabel(`❯ Config`, ansi.bold + C.tool)
-        pushLine(`Active: ${agent.activeProvider} / ${agent.provider.model}`, C.dim)
-        pushLine(`Key:    ${maskKey(agent.provider.apiKey)}`, C.dim)
-        pushLine(`agent.maxTurns: ${ac.maxTurns ?? 100}`, C.dim)
-        pushLine(`agent.subagentTurns: ${ac.subagentTurns ?? 100}`, C.dim)
-        pushLine(`agent.compactThreshold: ${ac.compactThreshold ?? 100000}${agent.config?.agent?.compactThresholdAuto ? " (auto)" : ""}`, C.dim)
-        pushLine(`agent.verifyGuard: ${ac.verifyGuard === true ? "on" : "off"}`, C.dim)
-        pushLine(`embedding: ${agent.memory?.embedder ? `enabled (${ec.model ?? ""})` : "disabled (FTS only)"}`, C.dim)
-        pushLine(`Config file: ${cp}`, C.dim)
-        return
-      }
-      if (e.action === "embedkey") {
-        const embKey = await askQuestion("Enter embedding API key (default: SiliconFlow bge-m3):")
-        if (!embKey) return
-        agent.config.embedding ??= {}
-        agent.config.embedding.apiKey = embKey
-        await persistRaw((raw) => { raw.embedding = { ...(raw.embedding ?? {}), apiKey: embKey } })
-        if (agent.memory) {
-          const { createEmbedder } = await import("../embedding.mjs")
-          agent.memory.embedder = createEmbedder(agent.config.embedding)
+  async function setEmbedKey() {
+    const embKey = await askQuestion("Enter embedding API key (default: SiliconFlow bge-m3):")
+    if (!embKey) return false
+    agent.config.embedding ??= {}
+    agent.config.embedding.apiKey = embKey
+    await persistRaw((raw) => { raw.embedding = { ...(raw.embedding ?? {}), apiKey: embKey } })
+    if (agent.memory) {
+      const { createEmbedder } = await import("../embedding.mjs")
+      agent.memory.embedder = createEmbedder(agent.config.embedding)
+    }
+    pushLabel("❯ Config", ansi.bold + C.tool)
+    pushLine("Embedding key saved, vector search enabled", C.tool)
+    return true
+  }
+
+  /** 保存后的公共重载：loadConfig → injectProxy → 恢复 provider 选择。
+   *  运行时 /model 切过 provider（未落盘）时保持它，不回滚到磁盘值。 */
+  async function reloadConfig() {
+    const { loadConfig } = await import("../config.mjs")
+    const { injectProxy } = await import("../proxy.mjs")
+    const cfg = loadConfig()
+    injectProxy(cfg.providersList, cfg)
+    const runtimeName = agent.activeProvider
+    agent.providers = cfg.providersList
+    agent.config = cfg
+    agent.config.agent ??= {}
+    const keep = cfg.providersList.find((p) => p.name === runtimeName)
+    if (runtimeName && runtimeName !== cfg.activeProvider && keep) {
+      // 运行时选择在新配置里仍存在 → 保持（provider 为注入 proxyUri 后的新对象）
+      agent.activeProvider = runtimeName
+      agent.provider = { ...keep }
+    } else {
+      agent.activeProvider = cfg.activeProvider
+      agent.provider = cfg.provider
+      agent.provider.proxyUri = cfg.providersList.find((p) => p.name === cfg.activeProvider)?.proxyUri
+    }
+  }
+
+  /** 保存 config（mutate 改 raw）→ reloadConfig（provider 代理无需重启即生效） */
+  async function saveProxy(mutate) {
+    const raw = existsSync(configPath) ? JSON.parse(readFileSync(configPath, "utf8")) : {}
+    mutate(raw)
+    const { saveConfig } = await import("../config.mjs")
+    saveConfig(raw)
+    await reloadConfig()
+  }
+
+  // ── Proxy sub-menu loop：每轮重建 entries 显示最新状态，defaultIndex 记住上次位置 ──
+  async function proxyMenu() {
+    let proxyIdx = 0
+    for (;;) {
+      const pc = agent.config?.proxy // 已归一化 { uri, web, model } | undefined
+      const entries = [
+        { type: "header", text: `Proxy: ${pc?.uri || "(not set)"}` },
+        { type: "item", text: "Set proxy URI…", action: "seturi" },
+        { type: "item", text: `Web tools (fetch/websearch): ${!pc || pc.web ? "ON" : "OFF"}`, action: "toggleweb" },
+        { type: "item", text: `Model requests (providers with proxy:true): ${pc?.model ? "ON" : "OFF"}`, action: "togglemodel" },
+        { type: "item", text: "Test connection", action: "test" },
+        { type: "item", text: "Clear proxy", action: "clear" },
+      ]
+      const c = await showPicker("Proxy", entries, { defaultIndex: proxyIdx })
+      if (!c) return // Esc 返回主菜单
+      proxyIdx = Math.max(0, entries.filter((e) => e.type === "item").indexOf(c))
+
+      try {
+        if (c.action === "seturi") {
+          const newUri = await askQuestion("Proxy URI (e.g. http://127.0.0.1:7890):")
+          if (!newUri) continue // 空输入不改动
+          // web 默认 true、保留原 model 值（对象形态）；旧 string 形态升级为规范对象
+          await saveProxy((raw) => {
+            raw.proxy = raw.proxy && typeof raw.proxy === "object" && !Array.isArray(raw.proxy)
+              ? { ...raw.proxy, uri: newUri }
+              : { uri: newUri, web: true, model: false }
+          })
+          pushLabel("❯ Config", ansi.bold + C.tool)
+          pushLine(`proxy.uri = ${newUri}`, C.tool)
+        } else if (c.action === "toggleweb" || c.action === "togglemodel") {
+          if (!pc) { pushLine("Proxy URI not set — use Set proxy URI… first", C.error); continue }
+          const key = c.action === "toggleweb" ? "web" : "model"
+          await saveProxy((raw) => { raw.proxy = { ...pc, [key]: !pc[key] } })
+          pushLabel("❯ Config", ansi.bold + C.tool)
+          pushLine(`proxy.${key} = ${!pc[key] ? "on" : "off"}`, C.tool)
+        } else if (c.action === "test") {
+          const { proxyFetch, resolveWebProxy } = await import("../proxy.mjs")
+          const { UA } = await import("../tools/web.mjs")
+          const uri = resolveWebProxy({ agent })
+          pushLabel("❯ Config", ansi.bold + C.tool)
+          pushLine(`Testing ${uri ? `via proxy ${uri}` : "direct (no proxy)"}...`, C.dim)
+          try {
+            const res = await Promise.race([
+              proxyFetch("https://www.gstatic.com/generate_204", { headers: { "User-Agent": UA } }, uri),
+              new Promise((_, reject) => setTimeout(() => reject(new Error("timeout after 5s")), 5000)),
+            ])
+            if (res.ok) pushLine(`✓ OK (HTTP ${res.status})`, C.tool)
+            else pushLine(`✗ HTTP ${res.status}`, C.error)
+          } catch (error) {
+            pushLine(`✗ ${error.message}`, C.error)
+          }
+        } else if (c.action === "clear") {
+          await saveProxy((raw) => { delete raw.proxy })
+          pushLabel("❯ Config", ansi.bold + C.tool)
+          pushLine("Proxy cleared", C.tool)
         }
-        pushLabel(`❯ Config`, ansi.bold + C.tool)
-        pushLine(`Embedding key saved, vector search enabled`, C.tool)
-        return
-      }
-      // Boolean toggle: agent.verifyGuard
-      if (e.action === "agent.verifyGuard") {
-        const newVal = ac.verifyGuard !== true // toggle: undefined/false → true, true → false
-        try {
-          const raw = existsSync(configPath) ? JSON.parse(readFileSync(configPath, "utf8")) : {}
+      } catch (error) { pushLine(`Save failed: ${error.message}`, C.error) }
+    }
+  }
+
+  // Direct args: /config embedkey
+  const sub = args[0]?.toLowerCase()
+  if (sub === "embedkey") {
+    await setEmbedKey()
+    return
+  }
+  if (sub) { pushLine("Usage: /config [embedkey]", C.error); return }
+
+  // ── Main config loop ──
+  let running = true
+  let mainIdx = 0 // 记住上次选中位置，改完一项回主菜单时恢复
+  while (running) {
+    const mainEntries = [
+      { type: "header", text: `proxy=${proxySummary()} | maxTurns=${ac.maxTurns ?? 100} | compactThreshold=${ac.compactThreshold ?? 100000} | verifyGuard=${ac.verifyGuard === true ? "on" : "off"} | embedding=${agent.memory?.embedder ? "on" : "off"}` },
+      { type: "item", text: `agent.maxTurns = ${ac.maxTurns ?? 100}`, action: "agent.maxTurns" },
+      { type: "item", text: `agent.subagentTurns = ${ac.subagentTurns ?? 100}`, action: "agent.subagentTurns" },
+      { type: "item", text: `agent.compactThreshold = ${ac.compactThreshold ?? 100000}${agent.config?.agent?.compactThresholdAuto ? " (auto)" : ""}`, action: "agent.compactThreshold" },
+      { type: "item", text: `agent.verifyGuard = ${ac.verifyGuard === true ? "on" : "off"}`, action: "agent.verifyGuard" },
+      { type: "item", text: "Set embedding API key", action: "embedkey" },
+      { type: "item", text: `embedding.model = ${ec.model ?? "BAAI/bge-m3"}`, action: "embedding.model" },
+      { type: "item", text: `proxy = ${proxySummary()}`, action: "proxy" },
+      { type: "item", text: "View full config", action: "view" },
+    ]
+
+    const choice = await showPicker("Config", mainEntries, { defaultIndex: mainIdx })
+    if (!choice) { running = false; continue } // Esc
+    mainIdx = Math.max(0, mainEntries.filter((e) => e.type === "item").indexOf(choice))
+
+    if (choice.action === "view") {
+      pushLabel("❯ Config", ansi.bold + C.tool)
+      pushLine(`Active: ${agent.activeProvider} / ${agent.provider.model}`, C.dim)
+      pushLine(`Key:    ${maskKey(agent.provider.apiKey)}`, C.dim)
+      pushLine(`agent.maxTurns: ${ac.maxTurns ?? 100}`, C.dim)
+      pushLine(`agent.subagentTurns: ${ac.subagentTurns ?? 100}`, C.dim)
+      pushLine(`agent.compactThreshold: ${ac.compactThreshold ?? 100000}${agent.config?.agent?.compactThresholdAuto ? " (auto)" : ""}`, C.dim)
+      pushLine(`agent.verifyGuard: ${ac.verifyGuard === true ? "on" : "off"}`, C.dim)
+      pushLine(`embedding: ${agent.memory?.embedder ? `enabled (${ec.model ?? ""})` : "disabled (FTS only)"}`, C.dim)
+      pushLine(`proxy: ${proxySummary()}`, C.dim)
+      pushLine(`Config file: ${configPath}`, C.dim)
+      running = false
+      continue
+    }
+
+    if (choice.action === "proxy") {
+      await proxyMenu()
+      continue
+    }
+
+    if (choice.action === "embedkey") {
+      if (await setEmbedKey()) running = false
+      continue
+    }
+
+    if (choice.action === "agent.verifyGuard") {
+      const newVal = ac.verifyGuard !== true
+      try {
+        await saveProxy((raw) => {
           raw.agent ??= {}
           raw.agent.verifyGuard = newVal
-          const { saveConfig, loadConfig } = await import("../config.mjs")
-          saveConfig(raw)
-          const cfg = loadConfig()
-          agent.provider = cfg.provider
-          agent.providers = cfg.providersList
-          agent.activeProvider = cfg.activeProvider
-          agent.config = cfg
-          agent.config.agent ??= {}
-          pushLabel(`❯ Config`, ansi.bold + C.tool)
-          pushLine(`agent.verifyGuard = ${newVal ? "on" : "off"}`, C.tool)
-        } catch (error) {
-          pushLine(`Save failed: ${error.message}`, C.error)
-        }
-        return
-      }
-      // embedding.model picker
-      if (e.action === "embedding.model") {
-        const models = [
-          { label: "BAAI/bge-m3 (multilingual, 1024d)", value: "BAAI/bge-m3" },
-          { label: "BAAI/bge-large-zh-v1.5 (Chinese, 1024d)", value: "BAAI/bge-large-zh-v1.5" },
-          { label: "BAAI/bge-large-en-v1.5 (English, 1024d)", value: "BAAI/bge-large-en-v1.5" },
-          { label: "text-embedding-3-small (OpenAI, 1536d)", value: "text-embedding-3-small" },
-          { label: "text-embedding-3-large (OpenAI, 3072d)", value: "text-embedding-3-large" },
-        ]
-        const currentVal = ec.model ?? "BAAI/bge-m3"
-        openPicker({
-          title: `Embedding model (current: ${currentVal})`,
-          entries: [
-            { type: "header", text: `Current: ${currentVal}` },
-            ...models.map((m) => ({ type: "item", text: m.label, action: m.value })),
-          ],
-          onSelect: async (sel) => {
-            try {
-              const raw = existsSync(configPath) ? JSON.parse(readFileSync(configPath, "utf8")) : {}
-              raw.embedding ??= {}
-              raw.embedding.model = sel.action
-              const { saveConfig, loadConfig } = await import("../config.mjs")
-              saveConfig(raw)
-              const cfg = loadConfig()
-              agent.provider = cfg.provider
-              agent.providers = cfg.providersList
-              agent.activeProvider = cfg.activeProvider
-              agent.config = cfg
-              agent.config.agent ??= {}
-              pushLabel(`❯ Config`, ansi.bold + C.tool)
-              pushLine(`embedding.model = ${sel.action}`, C.tool)
-            } catch (error) {
-              pushLine(`Save failed: ${error.message}`, C.error)
-            }
-          },
         })
-        return
-      }
-      // Numeric config items: ask for value, parse as number
-      const isNumeric = e.action.startsWith("agent.")
-      const label = e.action
-      const current = e.action === "agent.maxTurns" ? (ac.maxTurns ?? 100)
-        : e.action === "agent.subagentTurns" ? (ac.subagentTurns ?? 100)
-        : e.action === "agent.compactThreshold" ? (ac.compactThreshold ?? 100000)
-        : ""
-      const prompt = `${label} (current: ${current}):`
-      const val = await askQuestion(prompt)
-      if (!val) return
+        pushLabel("❯ Config", ansi.bold + C.tool)
+        pushLine(`agent.verifyGuard = ${newVal ? "on" : "off"}`, C.tool)
+        running = false
+      } catch (error) { pushLine(`Save failed: ${error.message}`, C.error) }
+      continue
+    }
+
+    if (choice.action === "embedding.model") {
+      const models = [
+        { label: "BAAI/bge-m3 (multilingual, 1024d)", value: "BAAI/bge-m3" },
+        { label: "BAAI/bge-large-zh-v1.5 (Chinese, 1024d)", value: "BAAI/bge-large-zh-v1.5" },
+        { label: "BAAI/bge-large-en-v1.5 (English, 1024d)", value: "BAAI/bge-large-en-v1.5" },
+        { label: "text-embedding-3-small (OpenAI, 1536d)", value: "text-embedding-3-small" },
+        { label: "text-embedding-3-large (OpenAI, 3072d)", value: "text-embedding-3-large" },
+      ]
+      const currentVal = ec.model ?? "BAAI/bge-m3"
+      const modelChoice = await showPicker("Embedding Model", [
+        { type: "header", text: `Current: ${currentVal}` },
+        ...models.map(m => ({ type: "item", text: m.label, action: m.value })),
+      ])
+      if (!modelChoice) continue
       try {
-        const { configPath, loadConfig, saveConfig } = await import("../config.mjs")
-        const raw = existsSync(configPath) ? JSON.parse(readFileSync(configPath, "utf8")) : {}
-        if (isNumeric) {
-          const keys = label.split(".")
-          let obj = raw
-          for (let i = 0; i < keys.length - 1; i++) { obj[keys[i]] ??= {}; obj = obj[keys[i]] }
-          const num = Number(val)
-          if (isNaN(num)) { pushLine("Value must be a number", C.error); return }
-          obj[keys[keys.length - 1]] = num
-        }
-        saveConfig(raw)
-        const cfg = loadConfig()
-        agent.provider = cfg.provider
-        agent.providers = cfg.providersList
-        agent.activeProvider = cfg.activeProvider
-        agent.config = cfg
-        agent.config.agent ??= {}
-        pushLabel(`❯ Config`, ansi.bold + C.tool)
-        pushLine(`${label} = ${val}`, C.tool)
-        pushLine("(restart to apply to existing agent state)", C.dim)
-      } catch (error) {
-        pushLine(`Save failed: ${error.message}`, C.error)
-      }
-    },
-  })
+        await saveProxy((raw) => {
+          raw.embedding ??= {}
+          raw.embedding.model = modelChoice.action
+        })
+        pushLabel("❯ Config", ansi.bold + C.tool)
+        pushLine(`embedding.model = ${modelChoice.action}`, C.tool)
+        running = false
+      } catch (error) { pushLine(`Save failed: ${error.message}`, C.error) }
+      continue
+    }
+
+    // Numeric config items
+    const label = choice.action
+    const current = label === "agent.maxTurns" ? (ac.maxTurns ?? 100)
+      : label === "agent.subagentTurns" ? (ac.subagentTurns ?? 100)
+      : label === "agent.compactThreshold" ? (ac.compactThreshold ?? 100000)
+      : ""
+    const val = await askQuestion(`${label} (current: ${current}):`)
+    if (!val) continue
+    try {
+      const num = Number(val)
+      if (isNaN(num)) { pushLine("Value must be a number", C.error); continue }
+      await saveProxy((raw) => {
+        const keys = label.split(".")
+        let obj = raw
+        for (let i = 0; i < keys.length - 1; i++) { obj[keys[i]] ??= {}; obj = obj[keys[i]] }
+        obj[keys[keys.length - 1]] = num
+      })
+      pushLabel("❯ Config", ansi.bold + C.tool)
+      pushLine(`${label} = ${val}`, C.tool)
+      pushLine("(restart to apply)", C.dim)
+      running = false
+    } catch (error) { pushLine(`Save failed: ${error.message}`, C.error) }
+  }
 }

package/src/tui/cmd-extract.mjs

@@ -7,7 +7,7 @@ export async function handleExtractCommand(ctx) {
   pushLine("[extract] Analyzing session...", C.dim)
   const count = await runDistill()
   const msg = count > 0
-    ? `Knowledge extracted: ${count} candidate(s) saved to memory (use /skills to list, agent will recall via memory_search)`
+    ? `Knowledge extracted: ${count} candidate(s) saved to memory (agent will recall them via memory_search)`
     : "No new knowledge found in this session."
   pushLine(msg, count > 0 ? C.tool : C.dim)
 }