thincoder 0.12.53 → 0.12.58

package/src/tui/cmd-mcp.mjs

@@ -1,16 +1,28 @@
 import { ansi, C } from "./ansi.mjs"
+import { cloneEntry, fieldPicker, maskToken } from "./cmd-mcp-form.mjs"
 
-/** /mcp command handler: view/add/remove/reconnect MCP server.
- *  Extracted from slash-commands.mjs, includes /mcp-specific parseHeaders / addAndConnect helpers.
- *  ctx: { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw, ansi, C } */
+/** /mcp command handler: view/add/edit/remove/test/reconnect MCP server.
+ *  ctx: { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw, ansi, C }
+ *  MCP.md §5（2026-09-02，v2）：列表即菜单（F7/D-2）、edit/add 统一字段 picker 表单
+ *  （F3/F3b/D-1——表单机制在 cmd-mcp-form.mjs，本文件只调 fieldPicker）、保存前预览
+ *  +探活（F2：探活失败回同一 fieldPicker——AC2）、AI 降 transport picker 末位（F4）、
+ *  菜单打开边界磁盘重读 config.json（F5①/D-3，reloadMcpFromDisk in config.mjs）、
+ *  save&test 确认问句废除（§5 变更段 D-Q1：probe ✓ 直接保存、✗ 报错回表单零保存通道）。 */
 
-function parseHeaders(pairs) {
-  const headers = {}
-  for (const pair of pairs) {
-    const eq = pair.indexOf("=")
-    if (eq > 0) headers[pair.slice(0, eq)] = pair.slice(eq + 1).replace(/^["']|["']$/g, "")
-  }
-  return headers
+/** F7/D-2：主菜单行与子菜单 picker 行共用——●/○ 连接态 + (端点) + N tools。 */
+function serverLine(srv, connected, toolCount) {
+  const desc = srv.wsUrl ? srv.wsUrl : srv.url ? srv.url : `${srv.command} ${(srv.args ?? []).join(" ")}`
+  return `${connected ? "●" : "○"} ${srv.name} (${desc})${connected ? ` — ${toolCount} tools` : ""}`
+}
+
+/** persistRaw/edit 落盘的磁盘 entry 形态（name + 按 transport 的可选字段）——add 与
+ *  edit 共用，两处序列化不再漂移。 */
+function configEntry(srv) {
+  const entry = { name: srv.name }
+  if (srv.url) { entry.url = srv.url; if (srv.token) entry.token = srv.token; if (srv.headers) entry.headers = srv.headers }
+  else if (srv.wsUrl) { entry.wsUrl = srv.wsUrl; if (srv.token) entry.token = srv.token; if (srv.headers) entry.headers = srv.headers }
+  else { entry.command = srv.command; if (srv.args) entry.args = srv.args; if (srv.env) entry.env = srv.env }
+  return entry
 }
 
 /** /mcp shared helper: save config + connect (persistRaw obtained from ctx) */
@@ -18,11 +30,7 @@ async function addAndConnect(ctx, srv) {
   const { agent, pushLine, pushLabel, persistRaw } = ctx
   await persistRaw((raw) => {
     raw.mcp ??= { servers: [] }
-    const entry = { name: srv.name }
-    if (srv.url) { entry.url = srv.url; if (srv.headers) entry.headers = srv.headers }
-    else if (srv.wsUrl) { entry.wsUrl = srv.wsUrl; if (srv.headers) entry.headers = srv.headers }
-    else { entry.command = srv.command; if (srv.args) entry.args = srv.args; if (srv.env) entry.env = srv.env }
-    raw.mcp.servers.push(entry)
+    raw.mcp.servers.push(configEntry(srv))
   })
   agent.config ??= {}
   agent.config.mcp ??= { servers: [] }
@@ -45,6 +53,20 @@ export async function handleMcpCommand(ctx, args = []) {
   const { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw } = ctx
   // 每轮重读：原本无 mcp 配置时 `?? []` 会拿到游离数组，Add server 后快照过期
   const getServers = () => agent.config?.mcp?.servers ?? []
+  // D-3/T24：本菜单会话内最新一次磁盘重读是否失败（畸形 config.json → 内存态兜底）
+  let diskUnreadable = false
+  /** F5①/D-3：菜单打开边界统一走这里——磁盘→内存仅替换 mcp 段（config.mjs 的
+   *  reloadMcpFromDisk）。畸形磁盘配置回退内存态 + 提示行（T24）；persistRaw 落盘后
+   *  重读幂等（fingerprint 一致 → 无 ⚠ disk changed 标记，D-3 防环）。ctx.configPath
+   *  测试注入 tmp config 路径用（生产 undefined → 默认 ~/.thincoder）。 */
+  let changedNames = [] // 最近一次成功重读的对账结果（T23 ⚠ 标记）
+  async function reloadFromDisk() {
+    const { reloadMcpFromDisk } = await import("../config.mjs")
+    const r = reloadMcpFromDisk(agent, ctx.configPath)
+    diskUnreadable = !r.ok
+    if (r.ok) changedNames = r.changedNames
+    return r
+  }
 
   function listServers() {
     const servers = getServers()
@@ -54,17 +76,15 @@ export async function handleMcpCommand(ctx, args = []) {
     }
     for (const srv of servers) {
       const connected = agent.tools.some((t) => t._mcpName === srv.name)
-      const mark = connected ? "●" : "○"
-      const color = connected ? C.tool : C.dim
       const toolCount = agent.tools.filter((t) => t._mcpName === srv.name).length
-      const desc = srv.wsUrl ? srv.wsUrl : srv.url ? srv.url : `${srv.command} ${(srv.args ?? []).join(" ")}`
-      pushLine(`  ${mark} ${srv.name} (${desc})${connected ? ` — ${toolCount} tools` : ""}`, color)
+      pushLine(`  ${serverLine(srv, connected, toolCount)}`, connected ? C.tool : C.dim)
     }
   }
 
   async function removeServer(name) {
     agent.config.mcp.servers = getServers().filter((s) => s.name !== name)
-    await persistRaw((raw) => { raw.mcp.servers = agent.config.mcp.servers })
+    // 评审 #1：磁盘无 mcp 段时（T23 场景——mcp 段被整体删除而连接保留）raw.mcp 为 undefined → 先建段再写
+    await persistRaw((raw) => { raw.mcp ??= { servers: [] }; raw.mcp.servers = agent.config.mcp.servers })
     // Remove from tool list
     const { removeMcpTools } = await import("../mcp.mjs")
     removeMcpTools(agent, name)
@@ -86,17 +106,59 @@ export async function handleMcpCommand(ctx, args = []) {
     }
   }
 
-  async function addWithTransport(transport) {
-    if (transport === "ai") {
-      const description = await askQuestion("Describe the MCP server you want to add (e.g. 'a filesystem server that gives access to /tmp'):")
-      if (!description) return
-      pushLine("[mcp] Generating config from description...", C.dim)
-      try {
-        const { chat } = await import("../provider/index.mjs")
-        const res = await chat(agent.provider, {
-          messages: [{
-            role: "user",
-            content: `Generate an MCP server configuration JSON from this description. Return ONLY the JSON object, no explanation.
+  /** F2（D-1）：预览表——name/transport/端点/token 遮蔽 + headers/env 键列表；
+   *  probeLine 非空时拼在尾部（✓ C.tool 色 / ✗ C.error 色）——预览与探活报告同屏。 */
+  function showPreview(entry, probeLine) {
+    const endpoint = entry.wsUrl ?? entry.url ?? `${entry.command} ${(entry.args ?? []).join(" ")}`.trim()
+    const transport = entry.wsUrl ? "WebSocket" : entry.url ? "HTTP" : "stdio"
+    pushLine(`  name:      ${entry.name}`, C.tool)
+    pushLine(`  transport: ${transport}`, C.tool)
+    pushLine(`  endpoint:  ${endpoint}`, C.tool)
+    if (entry.token) pushLine(`  token:     ${maskToken(entry.token)}`, C.tool)
+    if (entry.headers) pushLine(`  headers:   ${Object.keys(entry.headers).join(", ")}`, C.tool)
+    if (entry.env) pushLine(`  env:       ${Object.keys(entry.env).join(", ")}`, C.tool)
+    if (probeLine) pushLine(`  ${probeLine}`, probeLine.startsWith("✓") ? C.tool : C.error)
+  }
+
+  /** F2：保存前探活——probeMcpServer（§4 资产，零副作用：不进 _sessions、不动
+   *  agent.tools、探完即关）。未保存的临时 entry 直接传 probe（§5 D-1）。 */
+  async function probeLineFor(entry) {
+    pushLine(`[mcp] Probing ${entry.name}...`, C.dim)
+    const { probeMcpServer } = await import("../mcp.mjs")
+    const r = await probeMcpServer(entry)
+    return r.ok ? `✓ ${r.toolCount} tools, ${r.latencyMs}ms` : `✗ ${r.error}`
+  }
+
+  /** F2 确认环（D-Q1，2026-09-02 变更段）：预览+探活 → probe ✓ 直接保存（返回
+   *  entry——无任何问句）；probe ✗ → 报错 + retryEntry 回 fieldPicker 改字段复 probe
+   *  （AC2：retryEntry 回调复用同一表单、已改值保留；save-anyway 整个废除——失败
+   *  配置零保存通道）。返回 entry / null（null = retryEntry 表单层 Esc 放弃）。 */
+  async function confirmLoop(entry, retryEntry) {
+    for (;;) {
+      pushLabel(`❯ MCP Preview`, ansi.bold + C.tool)
+      const probe = await probeLineFor(entry)
+      showPreview(entry, probe)
+      if (probe.startsWith("✓")) return entry // D-Q1：探活成功 → 直接保存（问句废除）
+      // D-Q1：探活失败 → 无保存通道——报错 + 回 fieldPicker 改字段复 probe（AC2）
+      pushLine(`[mcp] Probe failed: ${probe.slice(2)} — fix it in the form`, C.error)
+      const retried = await retryEntry(entry)
+      if (!retried) return null
+      entry = retried
+    }
+  }
+
+  /** F4：AI 生成配置（transport picker 末位——文案不再首推）。生成的 entry 同走
+   *  预览+探活+确认环（F2 语义一致——D-Q1：✓ 直接保存 / ✗ 回表单）。 */
+  async function addWithAI() {
+    const description = await askQuestion("Describe the MCP server you want to add (e.g. 'a filesystem server that gives access to /tmp'):")
+    if (!description) return
+    pushLine("[mcp] Generating config from description...", C.dim)
+    try {
+      const { chat } = await import("../provider/index.mjs")
+      const res = await chat(agent.provider, {
+        messages: [{
+          role: "user",
+          content: `Generate an MCP server configuration JSON from this description. Return ONLY the JSON object, no explanation.
 
 Description: "${description}"
 
@@ -109,130 +171,209 @@ Example HTTP: {"name":"filesystem","url":"https://example.com/mcp","headers":{"A
 Example stdio: {"name":"filesystem","command":"npx","args":["-y","@modelcontextprotocol/server-filesystem","/tmp"]}
 
 Return ONLY the JSON object:`,
-          }],
-          tools: [],
-          signal: AbortSignal.timeout(15_000),
+        }],
+        tools: [],
+        signal: AbortSignal.timeout(15_000),
+      })
+      const jsonMatch = (res.content ?? "").match(/\{[\s\S]*\}/)
+      if (!jsonMatch) { pushLine("[mcp] AI response not valid JSON", C.error); return }
+      const srv = JSON.parse(jsonMatch[0])
+      if (!srv.name) { pushLine("[mcp] AI response missing 'name' field", C.error); return }
+      // F2：同一预览+探活+确认环；探活失败回 fieldPicker 重输（AC2——AI 生成的 entry
+      // 字段不完整时可在表单里补齐/修正，mode add = name 可改）
+      const saved = await confirmLoop(srv, async (cur) => {
+        const r = await fieldPicker(ctx, {
+          title: `Fix MCP: ${cur.name ?? "ai"}`,
+          mode: "add",
+          entry: cur,
+          existingNames: getServers().map((s) => s.name),
         })
-        const jsonMatch = (res.content ?? "").match(/\{[\s\S]*\}/)
-        if (!jsonMatch) { pushLine("[mcp] AI response not valid JSON", C.error); return }
-        const srv = JSON.parse(jsonMatch[0])
-        if (!srv.name) { pushLine("[mcp] AI response missing 'name' field", C.error); return }
-        // Show preview and confirm
-        pushLine(`[mcp] Generated config: ${JSON.stringify(srv)}`, C.tool)
-        const confirm = await askQuestion("Add this server? (y/n):")
-        if (confirm?.toLowerCase() !== "y") { pushLine("[mcp] Cancelled", C.dim); return }
-        await addAndConnect(ctx, srv)
-      } catch (err) {
-        pushLine(`[mcp] AI generation failed: ${err.message}`, C.error)
-      }
-      return
+        return r.action === "save" ? r.entry : null
+      })
+      if (saved) await addAndConnect(ctx, saved)
+      else pushLine("[mcp] Cancelled", C.dim)
+    } catch (err) {
+      pushLine(`[mcp] AI generation failed: ${err.message}`, C.error)
     }
-    const name = await askQuestion("Server name:")
-    if (!name) return
-    const existing = (agent.config?.mcp?.servers ?? []).find((s) => s.name === name)
-    if (existing) { pushLine(`[mcp] "${name}" already exists`, C.error); return }
-    if (transport === "stdio") {
-      const cmd = await askQuestion("Command (e.g. npx, python):")
-      if (!cmd) return
-      const argsInput = await askQuestion("Arguments (space-separated, or leave empty):")
-      const cmdArgs = argsInput ? argsInput.split(/\s+/) : undefined
-      const envInput = await askQuestion("Environment variables (KEY=value, space-separated, or leave empty):")
-      const env = envInput ? parseHeaders(envInput.split(/\s+/)) : undefined
-      await addAndConnect(ctx, { name, command: cmd, args: cmdArgs, env })
-    } else {
-      const urlPrompt = transport === "ws" ? "WebSocket URL (ws://…):" : "HTTP URL (https://…):"
-      const url = await askQuestion(urlPrompt)
-      if (!url) return
-      const headersInput = await askQuestion("Headers (key=value, space-separated, or leave empty):")
-      const headers = headersInput ? parseHeaders(headersInput.split(/\s+/)) : undefined
-      const srv = transport === "ws"
-        ? { name, wsUrl: url, headers: Object.keys(headers ?? {}).length > 0 ? headers : undefined }
-        : { name, url, headers: Object.keys(headers ?? {}).length > 0 ? headers : undefined }
-      await addAndConnect(ctx, srv)
+  }
+
+  /** F1/F3b（D-1 v2）：add 流程——fieldPicker 空 entry 起（必填 (required) 标注、
+   *  只填所选字段、headers/env 不选即跳过）→ 预览+探活+确认环 → addAndConnect。 */
+  async function addWithTransport(transport) {
+    if (transport === "ai") { await addWithAI(); return }
+    const entry = {}
+    const existingNames = getServers().map((s) => s.name)
+    const formOpts = {
+      title: `Add MCP: ${transport === "ws" ? "WebSocket" : transport === "http" ? "HTTP" : "stdio"}`,
+      mode: "add",
+      transport,
+      existingNames,
     }
+    const first = await fieldPicker(ctx, { ...formOpts, entry })
+    if (first.action === "cancel") return
+    const saved = await confirmLoop(first.entry, async (cur) => {
+      const r = await fieldPicker(ctx, { ...formOpts, entry: cur })
+      return r.action === "save" ? r.entry : null
+    })
+    if (saved) await addAndConnect(ctx, saved)
+    else pushLine("[mcp] Cancelled", C.dim)
   }
 
+  /** F4：transport picker——HTTP / WebSocket / stdio / AI（末位，文案不再首推）。 */
   async function addFlow() {
-    // Pick transport type first, then ask name + URL/command
     const te = await showPicker("MCP Transport", [
-      { type: "header", text: "Select transport or use AI assist" },
-      { type: "item", text: "🤖 Describe with AI — natural language → config", action: "ai" },
+      { type: "header", text: "Select transport" },
       { type: "item", text: "HTTP (https://…)", action: "http" },
       { type: "item", text: "WebSocket (ws://…)", action: "ws" },
       { type: "item", text: "stdio (local command)", action: "stdio" },
+      { type: "item", text: "AI — describe in natural language", action: "ai" },
     ])
     if (te) await addWithTransport(te.action)
   }
 
-  /** remove/connect 的服务器选择 picker + 执行。返回 true = 已执行；false = Esc 取消。 */
-  async function pickAndRun(action) {
+  /** 服务器选择共用：带 name 直达（校验存在性）；无 name → picker。返回 srv / null。
+   *  NF1：带 name 的直达路径语义与旧实现逐字一致（空列表也报 no server named）。 */
+  async function resolveServer(nameArg, { title, headerText }) {
     const servers = getServers()
+    if (nameArg) {
+      const srv = servers.find((s) => s.name === nameArg) // NF1：与旧直达路径逐字一致（精确匹配）
+      if (!srv) {
+        pushLine(`[mcp] no server named "${nameArg}" (${servers.map((s) => s.name).join(", ") || "none configured"})`, C.error)
+        return null
+      }
+      return srv
+    }
     if (servers.length === 0) {
       pushLine("[mcp] no MCP server configured", C.error)
-      return true
+      return null
     }
-    const subEntries = [
-      { type: "header", text: action === "remove" ? "Select server to remove" : "Select server to reconnect" },
+    const se = await showPicker(title, [
+      { type: "header", text: headerText },
       ...servers.map((s) => ({ type: "item", text: `${s.name} (${s.wsUrl ?? s.url ?? s.command})`, name: s.name })),
-    ]
-    const se = await showPicker(action === "remove" ? "Remove MCP Server" : "Reconnect MCP", subEntries)
-    if (!se) return false // Esc 取消
-    if (action === "remove") await removeServer(se.name)
-    else await connectServer(se.name)
-    return true
+    ])
+    if (!se) return null // Esc 取消
+    return servers.find((s) => s.name === se.name) ?? null
   }
 
-  // Direct args: /mcp list │ /mcp add │ /mcp http|ws|stdio|ai │ /mcp remove [name] │ /mcp connect [name]
+  /** F4（§4 资产）：`/mcp test [name]`——probeMcpServer 一次性探活（零副作用）。 */
+  async function testServer(nameArg) {
+    const srv = await resolveServer(nameArg, { title: "Test MCP Server", headerText: "Select server to test" })
+    if (!srv) return
+    pushLine(`[mcp] Testing ${srv.name}...`, C.dim)
+    const r = await probeLineFor(srv)
+    pushLine(`[mcp] ${srv.name}: ${r}`, r.startsWith("✓") ? C.tool : C.error)
+  }
+
+  /** F3（D-1 v2）：edit = 字段 picker 表单——fieldPicker 列可编辑字段行（URL/Token/
+   *  Headers 或 Command/Args/Env；name 不可改——无 name 行）+ `✓ Save & test`；
+   *  收集完成走 confirmLoop（预览+探活——D-Q1：✓ 直接保存 / ✗ 回 fieldPicker
+   *  AC2/AC5）→ persistRaw 原位替换保数组序 → connectServer 自动重连。取消 → 零保存。 */
+  async function editServerWithConfirm(srv) {
+    const name = srv.name
+    const entry = cloneEntry(srv) // 工作副本——取消不污染原配置
+    const formOpts = { title: `Edit MCP: ${name}`, mode: "edit" }
+    const first = await fieldPicker(ctx, { ...formOpts, entry })
+    if (first.action === "cancel") { pushLine("[mcp] Edit cancelled — nothing saved", C.dim); return }
+    const saved = await confirmLoop(first.entry, async (cur) => {
+      const r = await fieldPicker(ctx, { ...formOpts, entry: cur })
+      return r.action === "save" ? r.entry : null
+    })
+    if (!saved) { pushLine("[mcp] Edit cancelled — nothing saved", C.dim); return }
+    await persistRaw((raw) => {
+      // 评审 #2：磁盘无 mcp 段时（T23 场景）先建段——否则静默 return 导致"updated"报错但磁盘零写入
+      raw.mcp ??= { servers: [] }
+      const servers = raw.mcp.servers
+      if (!Array.isArray(servers)) return
+      const idx = servers.findIndex((s) => s?.name === name)
+      if (idx === -1) return
+      servers[idx] = configEntry(saved) // 原位替换——数组序保持
+    })
+    agent.config.mcp.servers = getServers().map((s) => (s.name === name ? saved : s))
+    pushLine(`[mcp] ${name} updated`, C.tool)
+    await connectServer(name) // F3：自动重连
+  }
+
+  /** edit 入口：`/mcp edit [name]`——带 name 直达，否则 picker 选择。 */
+  async function editFlowWithConfirm(nameArg) {
+    const srv = await resolveServer(nameArg, { title: "Edit MCP Server", headerText: "Select server to edit" })
+    if (!srv) return
+    await editServerWithConfirm(srv)
+  }
+
+  // Direct args: /mcp list │ /mcp add │ /mcp http|ws|stdio|ai │ /mcp edit [name] │ /mcp test [name] │ /mcp remove [name] │ /mcp connect [name]
   const sub = args[0]?.toLowerCase()
   if (sub === "list") { listServers(); return }
   if (sub === "add") { await addFlow(); return }
   if (sub === "http" || sub === "ws" || sub === "stdio" || sub === "ai") { await addWithTransport(sub); return }
+  if (sub === "edit") { await editFlowWithConfirm(args[1]); return }
+  if (sub === "test") { await testServer(args[1]); return }
   if (sub === "remove" || sub === "connect") {
-    const name = args[1]
-    if (name) {
-      const servers = getServers()
-      if (!servers.some((s) => s.name === name)) {
-        pushLine(`[mcp] no server named "${name}" (${servers.map((s) => s.name).join(", ") || "none configured"})`, C.error)
-        return
-      }
-      if (sub === "remove") await removeServer(name)
-      else await connectServer(name)
-      return
-    }
-    // 已明确 remove/connect 意图但没带 name → 直接进服务器选择 picker，不落主菜单
-    await pickAndRun(sub)
+    const srv = await resolveServer(args[1], {
+      title: sub === "remove" ? "Remove MCP Server" : "Reconnect MCP",
+      headerText: sub === "remove" ? "Select server to remove" : "Select server to reconnect",
+    })
+    if (!srv) return
+    if (sub === "remove") await removeServer(srv.name)
+    else await connectServer(srv.name)
     return
   } else if (sub) {
-    pushLine("Usage: /mcp [list|add|http|ws|stdio|ai|remove [name]|connect [name]]", C.error)
+    pushLine("Usage: /mcp [list|add|edit [name]|test [name]|http|ws|stdio|ai|remove [name]|connect [name]]", C.error)
     return
   }
 
-  // 主菜单循环：选中即关闭，子菜单 Esc 返回主菜单，主菜单 Esc 退出
+  // F7/D-2 主菜单循环：列表即菜单（server 行 → per-server 子菜单；Esc 回主菜单），
+  // 顶部固定 agent 代配提示行（F5②）+ 每轮边界磁盘重读（F5①/D-3）。
+  // 主菜单 Esc 退出；Add/Refresh 动作后 continue（Refresh 显式重开菜单重读磁盘）。
+  // server 行 action 用 `@name:` 命名空间——与 add/refresh 保留动作永不撞名
+  //（server 可以叫 "add" 或 "refresh"）。
   for (;;) {
+    await reloadFromDisk()
     const servers = getServers()
+    const connected = (s) => agent.tools.some((t) => t._mcpName === s.name)
+    const toolCount = (s) => agent.tools.filter((t) => t._mcpName === s.name).length
     const entries = [
-      { type: "header", text: `${servers.length} MCP servers configured` },
-      { type: "item", text: "View list", action: "list" },
-      { type: "item", text: "Add server", action: "add" },
+      { type: "header", text: "Tip: complex configs — ask the agent to edit the mcp.servers section of ~/.thincoder/config.json directly, then Reconnect here" },
     ]
+    if (diskUnreadable) entries.push({ type: "header", text: "⚠ disk config unreadable — showing in-memory state" })
     if (servers.length > 0) {
+      // D-3/T23 对账：disk 删除/变更的已连接 server——连接不断，行尾 ⚠ disk changed
+      const drift = (s) => (changedNames.includes(s.name) ? " — ⚠ disk changed" : "")
       entries.push(
-        { type: "item", text: "Remove server", action: "remove" },
-        { type: "item", text: "Reconnect server", action: "connect" },
+        { type: "header", text: `${servers.length} MCP server${servers.length === 1 ? "" : "s"} configured` },
+        ...servers.map((s) => ({ type: "item", text: `${serverLine(s, connected(s), toolCount(s))}${drift(s)}`, action: `@${s.name}:` })),
       )
+    } else {
+      entries.push({ type: "header", text: "No MCP servers configured" })
     }
+    entries.push(
+      { type: "item", text: "+ Add server", action: "add" },
+      { type: "item", text: "↻ Refresh", action: "refresh" },
+    )
     const e = await showPicker("MCP", entries)
     if (!e) return // Esc 退出
-    if (e.action === "list") {
-      listServers()
-      return
-    }
-    if (e.action === "add") {
-      await addFlow()
-      continue
+    if (e.action === "add") { await addFlow(); continue }
+    if (e.action === "refresh") continue // 重开菜单即重读磁盘（reloadFromDisk 在循环顶部）
+    if (!e.action.startsWith("@")) continue // 未知动作防御——回主菜单
+    // 选中 server 行 → per-server 子菜单：Edit config / Test connection / Reconnect / Remove
+    const name = e.action.slice(1, -1)
+    const se = await showPicker(`MCP: ${name}`, [
+      { type: "header", text: "Server actions" },
+      { type: "item", text: "Edit config", action: "edit" },
+      { type: "item", text: "Test connection", action: "test" },
+      { type: "item", text: "Reconnect", action: "connect" },
+      { type: "item", text: "Remove", action: "remove" },
+    ])
+    if (!se) continue // 子菜单 Esc → 回主菜单
+    const srv = getServers().find((s) => s.name === name)
+    if (se.action === "edit") await editFlowWithConfirm(name)
+    else if (se.action === "test") await testServer(name)
+    else if (se.action === "connect") {
+      if (srv) await connectServer(name)
+      else pushLine(`[mcp] no server named "${name}"`, C.error)
+    } else if (se.action === "remove") {
+      if (srv) await removeServer(name)
+      else pushLine(`[mcp] no server named "${name}"`, C.error)
     }
-    const done = await pickAndRun(e.action)
-    if (!done) continue // 子菜单 Esc → 回主菜单
-    return
+    continue
   }
 }

package/src/tui/cmd-new.mjs

@@ -1,4 +1,4 @@
-import { newSession } from "../session.mjs"
+import { newSession, resetSessionState } from "../session.mjs"
 import { C } from "./ansi.mjs"
 
 /** /new command: start a new session in a fresh slot.
@@ -8,11 +8,11 @@ export async function handleNewCommand(ctx) {
 
   const doNewSession = () => {
     const slot = newSession(agent.cwd)
-    agent.history = []
-    agent.tasks = []
-    agent.planMode = false
-    agent.goal = null
-    agent._pendingReminders = []
+    // 2026-08-31 会诊 F3：resetSessionState 清全量会话态（_fullHistory/title/_sessionStart/
+    // _engDesignToken/压缩与验证计数等）——原实现只清 agent.history，新会话首次落盘把旧
+    // 会话完整人类线 + 旧标题写进新 slot（实锤 .19/.3 双副本）。_slot 更新为粘性新槽位。
+    resetSessionState(agent)
+    agent._slot = slot
     state.tasks = []
     state.lines = []
     state.streaming = ""

package/src/tui/cmd-restore.mjs

@@ -1,7 +1,8 @@
 import { ansi, C } from "./ansi.mjs"
 
-/** /restore command: list git checkpoints and roll back to selected snapshot.
- *  ctx: { agent, showPicker, pushLine, pushLabel } */
+/** /restore command: pick a snapshot, then pick ONE file from it to restore.
+ *  Full restore is disabled (v2) — this is the user-side per-file recovery entry
+ *  (CHECKPOINT.md D8). ctx: { agent, showPicker, pushLine, pushLabel } */
 export async function handleRestoreCommand(ctx) {
   const { agent, showPicker, pushLine, pushLabel } = ctx
   const { listCheckpoints, rewind, isGitRepo } = await import("../git/checkpoint.mjs")
@@ -9,25 +10,45 @@ export async function handleRestoreCommand(ctx) {
     pushLine("[rewind] not a git repository, checkpoints unavailable", C.error)
     return
   }
+  // F6 lazy fallback——与 git 工具 checkpoint list/create 入口一致（git-checkpoint.mjs）：外部
+  // git commit 后（HEAD 时间 > 最新快照）先清空过期快照，/restore 不列出 commit 前状态。
+  const { lazyClearIfCommitted } = await import("../tools/git-checkpoint.mjs")
+  await lazyClearIfCommitted(agent.cwd)
   const cps = await listCheckpoints(agent.cwd)
   if (cps.length === 0) {
     pushLine("(no checkpoints — created automatically before each task)", C.dim)
     return
   }
+  // Level 1: pick a snapshot (untracked shown as array length — CHECKPOINT.md D8).
   const entries = [
-    { type: "header", text: "Checkpoints (↑↓ select, Enter restore, Esc cancel)" },
+    { type: "header", text: "Checkpoints — 全量恢复已禁用，逐文件恢复 (↑↓ select, Enter next, Esc cancel)" },
     ...cps.slice(0, 12).map((cp) => ({
       type: "item",
-      text: `${cp.id}  ${new Date(cp.time).toLocaleString()}  (+${cp.untracked} untracked files)`,
+      text: `${cp.id}  ${new Date(cp.time).toLocaleString()}  (+${(cp.untracked ?? []).length} untracked files)`,
       id: cp.id,
     })),
   ]
   const e = await showPicker("Restore Checkpoint", entries)
   if (!e) return
+  const cp = cps.find((c) => c.id === e.id)
+  if (!cp) return
+  // Level 2: pick a file from the snapshot's tracked/untracked merged list.
+  const files = [...(cp.tracked ?? []), ...(cp.untracked ?? [])]
+  if (files.length === 0) {
+    pushLine("该快照无文件，无法逐文件恢复", C.dim)
+    return
+  }
+  const fileEntries = [
+    { type: "header", text: `Files in ${cp.id} (↑↓ select, Enter restore, Esc cancel)` },
+    ...files.map((f) => ({ type: "item", text: f, id: f })),
+  ]
+  const fe = await showPicker("Restore File", fileEntries)
+  if (!fe) return
   try {
-    const summary = await rewind(agent.cwd, e.id)
+    // v2 return: { path, type, restored } — rewind snapshots current state first (reversible).
+    const summary = await rewind(agent.cwd, cp.id, { path: fe.id })
     pushLabel(`❯ Rewind`, ansi.bold + C.warn)
-    pushLine(`Restored to ${e.id}: patch ${summary.patchApplied ? "applied" : "none"}, deleted ${summary.deleted} new files, restored ${summary.restored} file(s)`, C.tool)
+    pushLine(`Restored ${summary.type}: ${summary.path}${summary.restored ? "" : " — nothing restored (snapshot copy missing)"}`, C.tool)
     pushLine("(current state saved as new checkpoint; /restore again to go back)", C.dim)
   } catch (error) {
     pushLine(`[rewind] ${error.message}`, C.error)

package/src/tui/cmd-session.mjs

@@ -1,11 +1,14 @@
-import { listSlots, switchToSlot, applySession, renameSlot, activeSlot } from "../session.mjs"
+import { listSlots, switchToSlot, applySession, renameSlot, activeSlot, slotOccupancy } from "../session.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { restoreLines } from "./startup.mjs"
+import { stringWidth, sliceByWidth } from "./render.mjs"
 
 /** /rename <title> — rename the ACTIVE session (slot file + manifest, shared with VS Code). */
 export async function handleRenameCommand(ctx, args) {
   const { agent, pushLine, pushLabel, render } = ctx
-  const slot = activeSlot(agent.cwd)
+  // 2026-09-01 会诊 glm 🟡：用粘性槽而非 activeSlot（后者有认领副作用）——与 saveSession
+  // 的 _slot ??= activeSlot 语义一致：已钉槽直接重命名，未钉才认领。
+  const slot = agent._slot ?? activeSlot(agent.cwd)
   const current = agent.title || "(untitled)"
   const title = args.join(" ").trim()
   if (!title) {
@@ -38,11 +41,15 @@ export async function handleSessionCommand(ctx) {
     const dt = new Date(d)
     return `${dt.getMonth() + 1}/${dt.getDate()} ${String(dt.getHours()).padStart(2, "0")}:${String(dt.getMinutes()).padStart(2, "0")}`
   }
-  const truncate = (s, n) => s.length <= n ? s : s.slice(0, n - 1) + "…"
+  const truncate = (s, n) => (stringWidth(s) <= n ? s : sliceByWidth(s, Math.max(1, n - 1)) + "…")
   const entries = [
     { type: "header", text: `Sessions (● = active, ↑↓ select, Enter switch, Esc cancel; /rename <title> renames the active one)` },
     ...slots.map((s) => {
-      const label = s.title || (s.firstMessage ? `"${truncate(s.firstMessage, 40)}"` : "(empty)")
+      // 2026-08-31 会诊：行宽必须按显示宽度截断（原按 UTF-16 length 截 40 = 中文 80 格，
+      // 顶到右边距后叠加二义字符宽度低估（│/—/● 渲染 2 格算 1 格）→ 行实际超宽 → 物理
+      // wrap → 残影）；title 此前完全不截断（可任意长）也是超宽源，一并宽度截断。
+      const rawLabel = s.title || (s.firstMessage ? `"${s.firstMessage}"` : "(empty)")
+      const label = truncate(rawLabel, 36)
       const turns = s.turnCount > 0 ? `${s.turnCount} turns` : "0 turns"
       const when = shortDate(s.updatedAt)
       const model = s.activeProvider ? ` — ${s.activeProvider}` : ""
@@ -56,11 +63,17 @@ export async function handleSessionCommand(ctx) {
   ]
   const e = await showPicker("Sessions", entries)
   if (!e) return
+  // 2026-08-31 会诊 deepseek 🔴：目标槽被另一活进程占用时 switchToSlot 不认领（避免
+  // 劫持对方 active），本次会话仍读到数据，但下次保存会 fork 到新槽——提前提示。
+  const occ = slotOccupancy(agent.cwd, e.slot)
   const data = switchToSlot(agent.cwd, e.slot)
   if (!data) {
     pushLine(`Slot ${e.slot} not found`, C.dim)
     return
   }
+  if (occ.occupied) {
+    pushLine(`⚠ Slot ${e.slot} is being used by another live process (${occ.owner}) — continuing here will create a new copy on the next save`, C.warn)
+  }
   applySession(agent, data)
   // Rebuild from history (lazy) — the display snapshot is deprecated.
   state.lines = []