thincoder 0.10.0 → 0.11.0

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)
 }

package/src/tui/cmd-fold.mjs

@@ -3,10 +3,9 @@
  */
 import { C } from "./ansi.mjs"
 
-export async function handleFoldCommand(ctx) {
+export async function handleFoldCommand(ctx, args = []) {
   const { state } = ctx
-  const text = state.input.join("").trim()
-  const arg = text.split(/\s+/)[1]
+  const arg = args[0]?.toLowerCase()
   if (arg === "on") {
     state.foldEnabled = true
     ctx.pushLine("Folding: on (long tool results are collapsed)", C.dim)

package/src/tui/cmd-goal.mjs

@@ -1,8 +1,47 @@
+import { C } from "./ansi.mjs"
+
 /** /goal command: set/view/cancel long-term goal.
  *  Extracted from slash-commands.mjs.
- *  ctx: { agent, pushLine, pushLabel, openPicker, askQuestion } */
-export async function handleGoalCommand(ctx) {
-  const { agent, pushLine, pushLabel, openPicker, askQuestion } = ctx
+ *  ctx: { agent, pushLine, pushLabel, showPicker, askQuestion } */
+export async function handleGoalCommand(ctx, args = []) {
+  const { agent, pushLine, pushLabel, showPicker, askQuestion } = ctx
+
+  function setGoal(goalText) {
+    const semiIdx = goalText.indexOf("；") >= 0 ? goalText.indexOf("；") : goalText.indexOf(";")
+    const objective = semiIdx >= 0 ? goalText.slice(0, semiIdx).trim() : goalText.trim()
+    const criteria = semiIdx >= 0 ? goalText.slice(semiIdx + 1).trim() : ""
+    agent.goal = { objective, criteria, setAt: Date.now(), status: "active", turnsUsed: 0, _blockTally: null }
+  }
+
+  function viewGoal() {
+    const statusText = { active: "active", complete: "completed", blocked: "blocked" }[agent.goal.status] ?? agent.goal.status
+    pushLine(`Goal: ${agent.goal.objective}`, C.tool)
+    if (agent.goal.criteria) pushLine(`  Criteria: ${agent.goal.criteria}`, C.dim)
+    pushLine(`  Status: ${statusText} │ Turns used: ${agent.goal.turnsUsed ?? 0} │ Set at: ${new Date(agent.goal.setAt).toLocaleString()}`, C.dim)
+  }
+
+  // Direct args: /goal set <text> │ /goal cancel │ /goal view
+  const sub = args[0]?.toLowerCase()
+  if (sub === "set") {
+    const goalText = args.slice(1).join(" ")
+    if (!goalText) { pushLine("Usage: /goal set <objective>[; criteria]", C.error); return }
+    setGoal(goalText)
+    pushLine(`Goal set: ${agent.goal.objective}`, C.tool)
+    return
+  }
+  if (sub === "cancel") {
+    if (!agent.goal) { pushLine("No goal set", C.dim); return }
+    agent.goal = null
+    pushLine("Goal cancelled", C.tool)
+    return
+  }
+  if (sub === "view") {
+    if (!agent.goal) { pushLine("No goal set", C.dim); return }
+    viewGoal()
+    return
+  }
+  if (sub) { pushLine("Usage: /goal [set <text>|cancel|view]", C.error); return }
+
   const entries = [
     { type: "header", text: agent.goal ? `Current goal: ${agent.goal.objective.slice(0, 60)}` : "Actions" },
     { type: "item", text: "Set new goal", action: "set" },
@@ -11,28 +50,20 @@ export async function handleGoalCommand(ctx) {
     entries.push({ type: "item", text: "Cancel goal", action: "cancel" })
     entries.push({ type: "item", text: "View details", action: "view" })
   }
-  openPicker({
-    title: "Goal",
-    entries,
-    onSelect: async (e) => {
-      if (e.action === "view") {
-        const statusText = { active: "active", complete: "completed", blocked: "blocked" }[agent.goal.status] ?? agent.goal.status
-        pushLine(`Goal: ${agent.goal.objective}`, C.tool)
-        if (agent.goal.criteria) pushLine(`  Criteria: ${agent.goal.criteria}`, C.dim)
-        pushLine(`  Status: ${statusText} │ Turns used: ${agent.goal.turnsUsed ?? 0} │ Set at: ${new Date(agent.goal.setAt).toLocaleString()}`, C.dim)
-        return
-      }
-      if (e.action === "cancel") {
-        agent.goal = null
-        return
-      }
-      // set — requires entering goal text
-      const goalText = await askQuestion("Enter goal description (; separates criteria)")
-      if (!goalText) return
-      const semi = goalText.indexOf("；") >= 0 ? "；" : goalText.indexOf(";") >= 0 ? ";" : null
-      const objective = semi ? goalText.slice(0, semi).trim() : goalText.trim()
-      const criteria = semi ? goalText.slice(semi + 1).trim() : ""
-      agent.goal = { objective, criteria, setAt: Date.now(), status: "active", turnsUsed: 0, _blockTally: null }
-    },
-  })
+  // 先 await picker 返回（选中即关闭），再 askQuestion —— 两者不共存
+  const e = await showPicker("Goal", entries)
+  if (!e) return
+  if (e.action === "view") {
+    viewGoal()
+    return
+  }
+  if (e.action === "cancel") {
+    agent.goal = null
+    return
+  }
+  // set — requires entering goal text
+  const goalText = await askQuestion("Enter goal description (; separates criteria)")
+  if (!goalText) return
+  setGoal(goalText)
+  pushLine(`Goal set: ${agent.goal.objective}`, C.tool) // 与直参路径口径一致
 }

package/src/tui/cmd-help.mjs

@@ -1,10 +1,12 @@
 import { ansi, C } from "./ansi.mjs"
+import { SLASH_ALIASES } from "./slash-commands.mjs"
 
 /** /help command: list all slash commands and aliases.
  *  ctx: { pushLine, pushLabel, SLASH_COMMANDS } */
 export async function handleHelpCommand(ctx) {
   const { pushLine, pushLabel, SLASH_COMMANDS } = ctx
-  const aliasList = { "/help": "/h", "/exit": "/x", "/model": "/m", "/plan": "/p", "/think": "/t", "/clear": "/c", "/new": "/n" }
+  // reverse the shared alias table: command → alias
+  const aliasList = Object.fromEntries(Object.entries(SLASH_ALIASES).map(([alias, cmd]) => [cmd, alias]))
   const order = ["Agent", "Session", "Project", "System"]
   const byGroup = new Map()
   for (const c of SLASH_COMMANDS) {