thincoder 0.12.54 → 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/index.mjs

@@ -48,6 +48,22 @@ export function pendingNoticeReady(state) {
   return Boolean(state.pendingNotice && !state.picker && !state.permission && !state.question)
 }
 
+/**
+ * SESSION.md §8 D-S2 — TUI 启动首帧前的 provider 重选流程：
+ * provider 无效（`_providerInvalid` 标记或 provider 为 null）→ 先弹模型选择 picker
+ * （复用 openModelPicker，展示当前可用 providers）；用户选定后继续正常启动。
+ * 选择取消（Esc）→ 仍进入 TUI，推送提示行（"未配置有效 provider，可用 /model 选择或
+ * /provider 配置"）——绝不因无 provider 拒绝进入。返回 true 表示弹过选择流程。
+ */
+export async function promptProviderIfInvalid(agent, openModelPicker, pushLine) {
+  if (!(agent._providerInvalid || !agent.provider)) return false
+  await openModelPicker()
+  if (!agent.provider) {
+    pushLine("未配置有效 provider，可用 /model 选择或 /provider 配置", C.warn)
+  }
+  return true
+}
+
 /**
  * Start the TUI, taking over the terminal until exit.
  * agent: return value of createAgent
@@ -221,7 +237,7 @@ export async function startTUI(agent, opts = {}) {
 
     // Scroll wheel: \x1b[<64;col;rowM = up, \x1b[<65;col;rowM = down（3 lines each）
     // 2026-08-31：坐标命中展开块内容行 → 块内滚动（handleWheel）；未命中 → 会话滚动（现状）
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     for (const m of text.matchAll(/\x1b\[<(\d+);(\d+);(\d+)([Mm])/g)) {
       const button = Number(m[1])
       if (button === 64 || button === 65) {
@@ -251,9 +267,9 @@ export async function startTUI(agent, opts = {}) {
     }
 
     // Strip complete mouse sequences; keep incomplete tail for reassembly with next chunk
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     text = text.replace(/\x1b\[<\d+;\d+;\d+[Mm]/g, "")
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
     const tail = text.match(/\x1b\[<[\d;]*$/)
     if (tail) {
       mousePending = tail[0]
@@ -368,7 +384,7 @@ export async function startTUI(agent, opts = {}) {
   }
 
   // Interaction primitives: permission approval + Q&A input, implemented in interaction.mjs
-  const { askPermission, askQuestion } = createInteraction({
+  const { askPermission, askQuestion, askBatchPermission } = createInteraction({
     agent, state, pushLine, pushLabel, render, summarize,
   })
 
@@ -378,7 +394,7 @@ export async function startTUI(agent, opts = {}) {
   // Agent loop: implemented in agent-turn.mjs
   const turnCtx = {
     agent, state, pushLine, pushLabel, render, scheduleRender: render, ensureAssistantLabel,
-    askPermission, askQuestion, handleSlash: null,
+    askPermission, askQuestion, askBatchPermission, handleSlash: null,
     get assistantLabeled() { return assistantLabeled },
     set assistantLabeled(v) { assistantLabeled = v },
   }
@@ -443,6 +459,10 @@ export async function startTUI(agent, opts = {}) {
 
   // ---------------------------------------------------------- Startup screen + background indexing
 
+  // SESSION.md §8 D-S2：startTUI 首帧前 —— provider 无效（_providerInvalid / provider 为 null）
+  // → 先弹模型选择 picker（keyStream 已挂 keypress，Esc/Enter 可用）；Esc → 提示行，仍进 TUI
+  await promptProviderIfInvalid(agent, () => openModelPicker(), pushLine)
+
   showStartup({ agent, state, opts, pushLine, pushLabel, render, startWizard })
   backgroundIndex({ agent, state, render })
 

package/src/tui/interaction.mjs

@@ -62,6 +62,33 @@ export function createInteraction(ctx) {
     })
   }
 
+  /** Batch permission ask (AGENT-LOOP.md §16 D-B1): one merged prompt covering N
+   *  non-readonly tools from the same toolCalls array — approve all / one by one /
+   *  deny. Verdicts resolve as "approveAll" | "oneByOne" | "deny". */
+  const BATCH_PREVIEW_LINES_PER_TOOL = 8
+  function askBatchPermission({ tools, count }) {
+    if (agent.autoApprove) {
+      pushLine(`  [auto] ${count} tools: ${tools.map((t) => t.name).join(", ")}`, C.warn)
+      return Promise.resolve("approveAll")
+    }
+    const names = [...new Set(tools.map((t) => t.name))]
+    const label = `${count} tools need permission: ${names.join(", ")}`
+    // Preview: one compact block per tool (name header + first N formatted lines)
+    state.permissionPreview = [
+      label,
+      ...tools.flatMap((t) => {
+        const lines = formatPermission(t.name, t.args)
+        const shown = lines.slice(0, BATCH_PREVIEW_LINES_PER_TOOL)
+        return [` ${t.name}:`, ...shown.map((l) => `  ${l}`), ...(lines.length > shown.length ? [`  … (${lines.length - shown.length} more lines)`] : [])]
+      }),
+    ]
+    return new Promise((resolve) => {
+      state.permission = { name: label, args: {}, resolve, batch: { tools, count } }
+      state.status = `Waiting: ${label}`
+      render()
+    })
+  }
+
   function askQuestion(text, options = []) {
     // only one question at a time: question is a read-only tool on a parallel channel,
     // a second concurrent one is rejected directly; otherwise the later one overwrites
@@ -91,5 +118,5 @@ export function createInteraction(ctx) {
     })
   }
 
-  return { askPermission, askQuestion, formatPermission }
+  return { askPermission, askQuestion, formatPermission, askBatchPermission }
 }

package/src/tui/key-handler.mjs

@@ -26,15 +26,27 @@ export function createKeyHandler(ctx) {
 
   return function onKeypress(str, key = {}) {
     // permission confirm state: y approve / n deny / a approve + turn ON AUTO (no further prompts)
+    // batch state (§16 D-B1): a approve all / o one by one / n deny (Esc = deny)
     if (state.permission) {
       const answer = (str || "").toLowerCase()
       const isContinue = state.permission.name === "continue"
-      const validKeys = isContinue ? ["y", "n"] : ["y", "n", "a"]
+      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
+        }
         if (answer === "a" && !isContinue) {
           agent.autoApprove = true
           agent._pendingReminders = agent._pendingReminders ?? []
@@ -255,7 +267,7 @@ export function createKeyHandler(ctx) {
       } else if (str && !key.ctrl && !key.meta) {
         // 输入即过滤；粘贴的多行文本先去换行（与输入框清洗口径一致），仍含控制字符则整段丢弃
         const text = str.replace(/[\r\n]+/g, "")
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
         if (text && !/[\x00-\x1f\x7f]/.test(text)) applyFilter(p.filter + text)
       }
       return

package/src/tui/mouse.mjs

@@ -72,7 +72,7 @@ export function handleWheel(ctx, button, col, row) {
 /** Extract left-click presses from a chunk. Returns [{ col, row }] (1-based). */
 export function parseMouseClicks(text) {
   const out = []
-  // eslint-disable-next-line no-control-regex -- 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
+  // 有意为之：控制字符协议/转义序列剥离正则（ANSI/⟦ev⟧/SGR/history 双线分隔）
   for (const m of text.matchAll(/\x1b\[<0;(\d+);(\d+)M/g)) {
     out.push({ col: Number(m[1]), row: Number(m[2]) })
   }