dsh-plugin-tool-management 0.12.1 → 0.14.0

package/lib/subagents/tools.js

@@ -22,7 +22,7 @@ export async function filterBySceneBinding(docs, enabledSceneLists) {
 export function defineSubagentManagerListTool(subagents) {
     return {
         name: 'subagent_manager_list',
-        description: 'List available personas (pre-configured subagent profiles) with their descriptions. The same catalog is injected into your context each turn (the「可委派的子智能体」system-reminder); call this tool before subagent_manager_run for the full, always-current list.',
+        description: 'List personas (pre-configured subagent profiles) with their descriptions. The「可委派的子智能体」reminder carries the same catalog; call this for the always-current full list.',
         parameters: {},
         output: {
             schema: { type: 'string' },
@@ -59,11 +59,25 @@ export function defineSubagentManagerRunTool(subagents) {
         // 「何时不用」那一段保留（2026-09-17，用户采纳的四条里的第 6 条）：参照 Claude Code 的
         // Agent 工具（`AgentTool/prompt.ts:232-240`），把"不该用"写成**带替代工具**的具体清单
         // （具体路径→Read；找定义→Grep/Glob），比笼统说"这个很贵"有用得多。
-        description: 'Run a named persona as a subagent: it gets the persona as its own system prompt, works on `task`, and returns only its final output.\n\nTwo modes: by default the child starts fresh — it cannot see this conversation, so `task` must be self-contained. With `inherit: true` the child is seeded with this conversation\'s finished turns (the same mechanism as the host\'s `subagent_fork`), so `task` only states what is new — use it for follow-ups on work already completed. Only **finished** turns are inherited: a delegation made during the current turn inherits nothing from that turn, so a mid-turn hand-off still needs a self-contained `task`.\n\nWrite `task` as the goal plus the context it needs — do not prescribe method or output format: those belong to the persona.\n\nWhen to use: work that matches one of the personas in the「可委派的子智能体」system-reminder injected into your context (or from subagent_manager_list) — a review, a focused investigation, a piece of writing — where the detail does not belong in your own context. Work that matches a persona belongs here, not in the host\'s `subagent` / `subagent_fork`: those take no persona. Use them only when no persona fits, or when you need a background run (this tool waits for the result).\n\nWhen NOT to use: reading a specific file (use Read), finding a definition (use Grep/Glob), or touching two or three files (use Read directly).',
+        //
+        // 2026-09-23（用户裁定）：与官方两个委派工具的**分界规则**从描述里删掉 —— 注入通道的
+        // `how` 行（context-inject.ts 的 `DOMAIN_FRAME.subagents`）已经逐字说过一遍，而两份都在
+        // 每轮上下文里 = 同一件事付两次 token。留注入那份（它出现在"正在选工具"的那一刻）。
+        // 代价如实记下：子智能体域被关掉、或走压制型预设时上下文里没有那条 how 行，模型只剩本
+        // 描述与 `agent` 参数说明（"Persona name from subagent_manager_list"）—— 够它认出这条是
+        // 带人设的委派通道，但"没有人设贴合时才用官方那两个"这层分界就没人说了。
+        //
+        // 2026-09-23（用户裁定）：本工具的 `task` / `inherit` 两个参数说明与上面的 Modes 段
+        // **逐字重复**，而工具表每轮都发 —— 同一件事付两次 token。实测 `subagent_manager_run`
+        // 整份 407 tok（参数段：`inherit` 86 / `task` 57 / `agent` 19），其中 `inherit` 是全表
+        // 最贵的单个参数。收完两处重复后目标 ≈325 tok。判据是"删掉的那句在描述里已经有了吗"：
+        // Modes 段留着（它是模型的入口），参数说明只留"这一段独有的信息"。
+        // `inherit` 那句"轮中委派拿不到当前轮"必须留 —— 它是这条参数唯一会让人写错 task 的地方。
+        description: 'Run a named persona as a subagent: it gets the persona as its own system prompt, works on `task`, and returns only its final output.\n\nModes: by default a fresh child that cannot see this conversation, so `task` must be self-contained. With `inherit: true` it also gets this conversation\'s **finished** turns (like the host\'s `subagent_fork`) — the current turn is never included, so a mid-turn hand-off still needs a self-contained `task`.\n\n`task` = the goal plus the context it needs; leave method and output format to the persona.\n\nUse it when the work matches a persona in the「可委派的子智能体」reminder (a review, an investigation, a piece of writing) and the detail should not sit in your own context. Not for reading a file (Read), finding a definition (Grep/Glob), or touching two or three files.',
         parameters: {
-            agent: { type: 'string', required: true, description: 'Persona name from subagent_manager_list.' },
-            task: { type: 'string', required: true, description: 'The task for the subagent: the goal plus the context it needs. Self-contained by default; with inherit: true it only needs to state what is new. Leave method and output format to the persona.' },
-            inherit: { type: 'boolean', description: 'Let the subagent inherit this conversation\'s finished turns, like the host\'s subagent_fork (default false = a fresh child that cannot see this conversation). Only finished turns are inherited — a delegation made mid-turn cannot pass the current turn\'s content, so write `task` as if it were self-contained.' },
+            agent: { type: 'string', required: true, description: 'Persona name.' },
+            task: { type: 'string', required: true, description: 'The task for the subagent. Self-contained by default; with inherit: true only state what is new.' },
+            inherit: { type: 'boolean', description: 'Let the subagent see this conversation\'s finished turns (the current turn is never included). Default false = a fresh child.' },
         },
         output: {
             schema: { type: 'string' },

package/lib/tools/deps.js

@@ -6,3 +6,18 @@
 export function text(value) {
     return [{ type: 'text', text: value }];
 }
+/**
+ * 名单渲染：超过 `TOOL_NAME_LIST_CAP` 项就截断，并把总数写在后面（"等 N 项"）。
+ *
+ * 为什么两个地方都要它：`scene_manager_list` 用它列档案，`scene_manager_save` 用它
+ * 在回执里回显"这一次替换挤掉了什么"。两处都必须**点名、不能只给数量** —— 只给数量
+ * 答不了"我这次给出去的段会不会盖掉原来勾着的那些"，而那正是会静默出错的地方。
+ * 截断则是因为这些文字都要进上下文，不能无上限。
+ */
+export const TOOL_NAME_LIST_CAP = 6;
+export function toolNameList(list) {
+    if (!list.length)
+        return '空';
+    const head = list.slice(0, TOOL_NAME_LIST_CAP).join('、');
+    return list.length > TOOL_NAME_LIST_CAP ? head + ' 等 ' + list.length + ' 项' : head;
+}

package/lib/tools/mcp.js

@@ -1,18 +1,80 @@
-// MCP 域的 model 工具（2026-09-19 从 index.ts 的注册区抽出）：
-// mcp_manager_list / mcp_manager_set_enabled / mcp_manager_restart / mcp_manager_add。
+// MCP 域的 model 工具（2026-09-19 从 index.ts 的注册区抽出；2026-09-23 合并）：
+// mcp_manager_list / mcp_manager_switch / mcp_manager_save。
+//
+// 两条合并理由（0.14.0 用户裁定）：
+//   · set_enabled + restart → switch：两者都是"拨一下这台服务器"，只是动词不同。合并后
+//     由 `action` 自报动词，工具名不再需要用长度去区分"启停"与"重启"。
+//   · add + edit → save：改一台已配置的服务器（含 URL / 命令）与新增一台危险度同级
+//     （stdio 都是宿主按你给的 command 起进程），所以合并后**确认门必须留在 save 上**。
+//
+// 冻结口径跟着 `src/op-registry.ts` 走，不是"整条工具一刀切"：`mcpm-set-enabled` 与
+// `mcpm-tool-enabled` 在登记表里是 `frozen: true`，而 `mcpm-restart` 明确**不冻结**
+// —— 锁定期间它是唯一还能落盘改补丁的入口，是"卡住了重连一下"这条恢复路径。
+// 所以 switch 里只有 on|off 过 `lockedSceneGuard()`，restart 不过；与面板侧
+// `guardLockedOps(frozenOps('all'))` 的口径逐字一致（两处口径不同才是真的"说假话"）。
+//
+// **改一台已配置服务器时绝不读明文凭据**：`mcpm-edit` 的守卫（`resolveMaskedKv` /
+// `resolveMaskedUrl`）就是为"接受打码值并还原"写的 —— 界面编辑框预填的本来就是打码值。
+// 所以这里拿 `mcpmListView()` 的**打码视图**把模型没给的字段填回去，让 op 去还原。
+// 反过来说，绝不能**省略**字段：`parseKv(undefined)` 返回 `{}`（不是 undefined），
+// `mcpm-edit` 里那句 `if (row[field] === undefined) return` 就不会生效，于是
+// `resolveMaskedKv({}, 旧值)` 把整份 headers / env 静默清空、连 warning 都不给。
 import { DEFAULT_MCP_NOTE_MAX_LENGTH, normalizeMcpNote } from '../mcp/state-section.js';
 import { text } from './deps.js';
+/** 「去看清单」那句：`mcp_manager_list` 被关掉时不能点名它（调用方按 `toolVisible` 决定给不给）。 */
+const MCP_LIST_HINT = '（用 mcp_manager_list 看清单，all=true 连停用的也列）';
+/** 按 serverName 定位条目；同名（project + global 各一台）时要求 level 明确指定。 */
+function locate(rows, server, level, listHint = MCP_LIST_HINT) {
+    const hits = (rows || []).filter((r) => String(r.serverName) === server);
+    if (!hits.length) {
+        throw new Error('没有这台服务器：' + server + listHint);
+    }
+    if (level) {
+        const picked = hits.filter((r) => r.level === level);
+        if (!picked.length) {
+            throw new Error('「' + server + '」没有 level=' + level + ' 的那一台（现有：' + hits.map((r) => r.level).join(' / ') + '）');
+        }
+        return picked[0];
+    }
+    if (hits.length > 1) {
+        throw new Error('「' + server + '」在 ' + hits.map((r) => r.level).join(' 与 ') + ' 各有一台，无法确定动哪一台 —— 传 level 指定');
+    }
+    return hits[0];
+}
+/**
+ * 打码过的键值映射 → `mcpm-edit` / `mcpm-add` 要的文本形态（每行 `K=V`）。
+ *
+ * 打码值原样带过去是**有意**的：`resolveMaskedKv` 会把 `••••••` 认成"这一项没改"，
+ * 拿补丁文件里的真值顶替回来；非敏感键（`maskValueMap` 只打敏感键）本来就是明文，原样往返。
+ */
+function kvToText(map) {
+    if (!map || typeof map !== 'object')
+        return '';
+    return Object.keys(map).map((k) => k + '=' + String(map[k])).join('\n');
+}
+/** 行数组形态的 args → op 要的空格分隔文本（op 侧 `parseArgs` 再拆回来）。 */
+function argsToText(value) {
+    return Array.isArray(value) ? value.join(' ') : String(value == null ? '' : value);
+}
 export function buildMcpTools(deps) {
     const { defineTool, register } = deps;
+    /** 那句"去看清单"要不要给：`mcp_manager_list` 在出厂默认里就是关着的，点名一条模型没有的工具
+     *  只会让它白跑一趟（执行侧拦住它，而它看不出为什么）。 */
+    const listHint = () => (deps.toolVisible('mcp_manager_list') ? MCP_LIST_HINT : '');
     register(defineTool({
         name: 'mcp_manager_list',
-        description: 'List configured MCP servers (level, enabled state, live loader status, tool count excluding switched-off tools, note). Read a server\'s note before choosing it. The same list is injected into your context each turn (the「本机 MCP 服务器的当前状态」system-reminder); this tool is the raw view — all=true includes disabled servers. Defaults to enabled servers; pass all=true for every configured server.',
+        // 注入段与本工具的关系要**如实说成筛过的视图**（而非"同一份清单"）：注入段只列可用 +
+        // 曾连上现掉线的服务器（停用的不进），也不带 level / loader / 工具数。把这个盲区写出来
+        // 是行动依据 —— 模型要知道"停用的那台去哪查"就得靠这句（all=true）。
+        description: 'List configured MCP servers (level, enabled state, live loader status, tool count excluding switched-off tools, note). Read a server\'s note before choosing it. The「本机 MCP 服务器的当前状态」reminder carries a filtered view (usable servers, ones that were reachable before but are down now, and their notes; disabled servers are omitted); this tool is the raw view — defaults to enabled servers, all=true for every configured one.',
         parameters: {
             all: { type: 'boolean', description: 'Include disabled servers (default false).' },
+            tools: { type: 'boolean', description: 'Also list each server\'s tool names, marking the switched-off ones (default false).' },
         },
         output: { schema: { type: 'string' }, render: (_a, v) => text(v) },
         async execute(args, exec) {
             const showAll = Boolean(args && args.all === true);
+            const showTools = Boolean(args && args.tools === true);
             // 必须走 mcpmListView()（= mcpmRowsWithNotes(false)）：备注在这里合入，且未打码的
             // url/headers/env 已被打码。备注是本插件 MCP 这一项的真正价值（用户写给未来模型的
             // 决策提示，如「A 挂了改用 B」），而它只走注入通道 —— 压制型预设下不注入时，
@@ -24,16 +86,30 @@ export function buildMcpTools(deps) {
             // 默认只列「已启用」的（用户裁定 2026-09-16，与技能 / 记忆列表同口径）：停用的服务器
             // 模型调不到，列出来只是噪音。表头给出全量口径，所以不会变成盲区。
             const shown = showAll ? all : all.filter((x) => !x.disabled);
-            const summary = shown.map((x) => {
+            const lines = [];
+            for (const x of shown) {
                 const note = normalizeMcpNote(x.notes, DEFAULT_MCP_NOTE_MAX_LENGTH);
                 // 工具数 = 可用数（停用表扣减后）：段里给模型的是同一个口径，模型据此与
                 // 自己 schema 里的 `mcp__*` 工具对得上；被场景收窄 / 手动关掉的工具不算。
                 const usableTools = typeof x.enabledToolCount === 'number' ? x.enabledToolCount : x.toolCount;
-                return x.id + ' | ' + x.serverName + ' | ' + x.level + ' | ' + (x.disabled ? 'disabled' : 'enabled') +
+                lines.push(x.id + ' | ' + x.serverName + ' | ' + x.level + ' | ' + (x.disabled ? 'disabled' : 'enabled') +
                     (x.live ? ' | loader:' + (x.live.enabled ? 'on' : 'off') + (x.live.phase ? ':' + x.live.phase : '') : '') +
                     (typeof usableTools === 'number' ? ' | tools:' + usableTools : '') +
-                    (note ? ' | user-hint:' + note : '');
-            });
+                    (note ? ' | user-hint:' + note : ''));
+                if (!showTools)
+                    continue;
+                // 工具名单只在要的时候才去问：`mcpm-tools` 要读 schemas() + 停用表 + 「上次见过」缓存，
+                // 是这次列表里最贵的一步，而默认口径（只列服务器）根本用不上它。
+                // **不调 `mcpm-tools-refresh`**：那个会临时起进程（npx 冷启动可能几十秒），
+                // 那是界面上的显式动作，不该由一次列表调用顺手触发。
+                const t = await deps.mcpmTools({ serverName: String(x.serverName) });
+                const items = t && t.ok !== false ? (t.tools || []) : [];
+                if (!items.length) {
+                    lines.push('    ' + (x.disabled ? '(tools not recorded: server is off)' : '(no tools recorded)'));
+                    continue;
+                }
+                lines.push('    tools: ' + items.map((it) => it.name + (it.enabled === false ? ' (off)' : '')).join(', '));
+            }
             const header = 'MCP servers: ' + (showAll
                 ? all.length + ' configured'
                 : shown.length + ' enabled of ' + all.length + ' configured' +
@@ -43,68 +119,233 @@ export function buildMcpTools(deps) {
             // 模型会把「能调用这些工具」当成「已经知道有哪些 server、用户给它们写了什么备注」。
             // 提示本身不点名任何工具，所以挂在哪个发现型工具上都不会出现循环指引。
             const notice = await deps.reachNoticeForAgent(deps.presetRoster(), exec && exec.agent && exec.agent.ctx, deps.injectNoticeOptions());
-            return header + (summary.join('\n') || '(none)') + notice;
+            return header + (lines.join('\n') || '(none)') + notice;
         },
     }));
     register(defineTool({
-        name: 'mcp_manager_set_enabled',
-        description: 'Enable or disable one configured MCP server (writes the patch file; takes effect via HMR).',
+        name: 'mcp_manager_switch',
+        // 为什么 action 是必填枚举而不是两个可选布尔：模型最容易犯的错是"想重启却只传了 server"，
+        // 让它在三个动词里选一个，比让它猜两个布尔的组合省一次往返。
+        description: 'Turn one configured MCP server on or off, or restart it (reconnects and re-syncs tools). Pass `tool` to switch just that tool. Only when the user asks or approves.',
         parameters: {
-            id: { type: 'string', required: true, description: 'Entry id of the MCP server, e.g. mcp-stepfun-web-search.' },
-            level: { type: 'string', required: true, description: 'project or global.' },
-            enabled: { type: 'boolean', required: true, description: 'true to enable, false to disable.' },
+            server: { type: 'string', required: true, description: 'Server name as shown in the list.' },
+            action: { type: 'string', required: true, enum: ['on', 'off', 'restart'], description: 'on = enable, off = disable, restart = reconnect and re-sync tools.' },
+            level: { type: 'string', description: 'project or global — only to disambiguate same-name servers.' },
+            tool: { type: 'string', description: 'One tool name on that server (no mcp__ prefix). Only for on/off.' },
         },
         output: { schema: { type: 'string' }, render: (_a, v) => text(v) },
         async execute(args) {
-            const blocked = await deps.lockedSceneGuard();
-            if (blocked)
-                throw new Error(blocked);
-            const r = await deps.mcpmSetEnabled({ id: args.id, level: args.level, enabled: args.enabled });
-            if (!r.ok)
-                throw new Error(r.error);
+            const action = String((args && args.action) || '');
+            if (action !== 'on' && action !== 'off' && action !== 'restart') {
+                throw new Error('action 只能是 on / off / restart（收到：' + (action || '(空)') + '）');
+            }
+            const server = String((args && args.server) || '').trim();
+            const tool = args && args.tool !== undefined ? String(args.tool).trim() : '';
+            if (tool !== '' && action === 'restart') {
+                throw new Error('重启是整台服务器的动作（先停用、等断开、再按原状态启用），不能只重启一个工具');
+            }
+            // on|off 会写补丁（`mcpm-set-enabled` / `mcpm-tool-enabled` 在登记表里是 frozen），
+            // 所以过场景冻结守卫；restart 不过 —— 它是锁定期间唯一的恢复入口（见文件头）。
+            if (action !== 'restart') {
+                const blocked = await deps.lockedSceneGuard();
+                if (blocked)
+                    throw new Error(blocked);
+            }
+            const list = await deps.mcpmListView();
+            if (!list || list.ok === false)
+                throw new Error((list && list.error) || '读取 MCP 配置失败');
+            const level = args && args.level !== undefined ? String(args.level) : undefined;
+            const row = locate(list.rows || [], server, level, listHint());
+            const enabled = action === 'on';
+            if (tool !== '') {
+                const r = await deps.mcpmToolEnabled({ serverName: String(row.serverName), tool, enabled });
+                if (!r || r.ok === false)
+                    throw new Error((r && r.error) || '切换工具启停失败');
+                // 与面板同一条同步：`mcpm-tool-enabled` 在登记表里带 syncsArchive，漏了就是
+                // "页面拨的进档案、模型拨的不进"。
+                const syncErr = await deps.syncSwitchToScene('mcpm-tool-enabled', { serverName: String(row.serverName), tool, enabled });
+                // 整台停用时，工具级开关在运行时本来就不生效（那个工具压根不存在）—— 不说的话
+                // 模型会以为已经生效。与记忆族"启用了一条不在启用场景里的记忆"同一条理由。
+                const offNote = row.disabled ? '（注意：整台服务器当前是停用的，这个工具级开关要等它启用才生效）' : '';
+                return 'OK: ' + String(row.serverName) + ' tool ' + tool + ' now ' + (enabled ? 'enabled' : 'disabled') + offNote +
+                    (syncErr ? '\nWARN: 当前场景档案未同步（' + syncErr + '）' : '');
+            }
+            if (action === 'restart') {
+                const r = await deps.mcpmRestart({ id: row.id, level: row.level });
+                if (!r || r.ok === false)
+                    throw new Error((r && r.error) || '重启失败');
+                return 'OK: ' + String(row.serverName) + ' (' + row.level + ') restarted';
+            }
+            const r = await deps.mcpmSetEnabled({ id: row.id, level: row.level, enabled });
+            if (!r || r.ok === false)
+                throw new Error((r && r.error) || '切换服务器启停失败');
             // 场景未锁定时，页面 / 模型改的开关都要落进当前场景的档案（与 handlers 层同一套同步）。
-            const syncErr = await deps.syncSwitchToScene('mcpm-set-enabled', args);
-            return 'OK: ' + args.id + ' now ' + (args.enabled ? 'enabled' : 'disabled') +
+            const syncErr = await deps.syncSwitchToScene('mcpm-set-enabled', { id: row.id, level: row.level, enabled });
+            return 'OK: ' + String(row.serverName) + ' (' + row.level + ') now ' + (enabled ? 'enabled' : 'disabled') +
                 (syncErr ? '\nWARN: 当前场景档案未同步（' + syncErr + '）' : '');
         },
     }));
     register(defineTool({
-        name: 'mcp_manager_restart',
-        description: 'Restart one configured MCP server (disable + re-enable; reconnect and re-sync tools).',
+        name: 'mcp_manager_save',
+        description: 'Add a new MCP server, or update the one with this name — the receipt says which. Omitted fields keep their current values, so never restate the whole server. Only on the user\'s explicit request.',
         parameters: {
-            id: { type: 'string', required: true, description: 'Entry id of the MCP server, e.g. mcp-stepfun-web-search.' },
-            level: { type: 'string', required: true, description: 'project or global.' },
-        },
-        output: { schema: { type: 'string' }, render: (_a, v) => text(v) },
-        async execute(args) {
-            const r = await deps.mcpmRestart({ id: args.id, level: args.level });
-            if (!r.ok)
-                throw new Error(r.error);
-            return 'OK: ' + args.id + ' restarted';
-        },
-    }));
-    register(defineTool({
-        name: 'mcp_manager_add',
-        description: 'Add a new MCP server (streamable-http or stdio) at project or global level.',
-        parameters: {
-            serverName: { type: 'string', required: true, description: 'Unique server name (1-32 chars, [A-Za-z0-9_-]).' },
-            transport: { type: 'string', required: true, description: 'streamable-http or stdio.' },
-            url: { type: 'string', description: 'Server URL (required for streamable-http).' },
-            command: { type: 'string', description: 'Executable (required for stdio).' },
-            args: { type: 'string', description: 'Arguments, space separated (stdio).' },
-            headers: { type: 'string', description: 'Extra headers as key=value lines (streamable-http).' },
-            env: { type: 'string', description: 'Extra env vars as key=value lines (stdio).' },
-            level: { type: 'string', description: 'project or global (default project).' },
+            server: { type: 'string', required: true, description: 'Server name (1-32 chars, [A-Za-z0-9_-]) — the name the mcp__<server>__ tools use.' },
+            transport: { type: 'string', description: 'streamable-http or stdio. Required when creating; omit = keep.' },
+            url: { type: 'string', description: 'Server URL (streamable-http). Omit = keep.' },
+            command: { type: 'string', description: 'Executable to spawn (stdio). Omit = keep.' },
+            args: { type: 'string', description: 'Arguments, space separated (stdio). Omit = keep.' },
+            headers: { type: 'string', description: 'Extra headers, key=value per line (streamable-http). Omit = keep — omitting is what preserves the real secrets.' },
+            env: { type: 'string', description: 'Extra env vars, key=value per line (stdio). Omit = keep.' },
+            level: { type: 'string', description: 'project or global (project when creating); only needed for same-name servers.' },
+            note: { type: 'string', description: 'Short hint for later: how to use it, or which one to fall back to when it is down.' },
         },
         output: { schema: { type: 'string' }, render: (_a, v) => text(v) },
         async execute(args) {
             const blocked = await deps.lockedSceneGuard();
             if (blocked)
                 throw new Error(blocked);
-            const r = await deps.mcpmAdd(args);
-            if (!r.ok)
-                throw new Error(r.error);
-            return 'OK: added ' + r.row.id + ' at ' + r.row.level;
+            const server = String((args && args.server) || '').trim();
+            if (!server)
+                throw new Error('缺少参数：server（服务器名）');
+            const levelArg = args && args.level !== undefined ? String(args.level) : undefined;
+            const noteText = args && args.note !== undefined ? String(args.note) : '';
+            const hasNote = noteText.trim() !== '';
+            const list = await deps.mcpmListView();
+            if (!list || list.ok === false)
+                throw new Error((list && list.error) || '读取 MCP 配置失败');
+            const rows = list.rows || [];
+            const hits = rows.filter((r) => String(r.serverName) === server);
+            // ── 建：transport 与它那一侧的必填项都得给 ─────────────────────────────
+            if (!hits.length) {
+                const transport = String((args && args.transport) || '').trim();
+                if (transport !== 'stdio' && transport !== 'streamable-http') {
+                    throw new Error('新建服务器必须给 transport：stdio 或 streamable-http');
+                }
+                if (transport === 'stdio' && String((args && args.command) || '').trim() === '') {
+                    throw new Error('新建 stdio 服务器必须给 command（宿主会按它 spawn 进程）');
+                }
+                if (transport === 'streamable-http' && String((args && args.url) || '').trim() === '') {
+                    throw new Error('新建 streamable-http 服务器必须给 url');
+                }
+                const payload = {
+                    serverName: server,
+                    transport,
+                    url: args.url,
+                    command: args.command,
+                    args: args.args,
+                    headers: args.headers,
+                    env: args.env,
+                };
+                if (levelArg)
+                    payload.level = levelArg;
+                const r = await deps.mcpmAdd(payload);
+                if (!r || r.ok === false)
+                    throw new Error((r && r.error) || '新增服务器失败');
+                // 备注单独走 `mcpm-note`（`mcpm-add` 不认这个字段）。失败**不回滚**主写入：
+                // 服务器已经建好了，"备注没写上"是 warning，不是失败（与 0.13.0 界面同规格）。
+                let warn = '';
+                if (hasNote) {
+                    const n = await deps.mcpmNote({ id: String(r.row.id), note: noteText });
+                    if (!n || n.ok === false)
+                        warn = '\nWARN: 服务器已建好，但备注没写进去（' + ((n && n.error) || '未知原因') + '）';
+                }
+                return 'OK: created ' + r.row.id + ' at ' + r.row.level + warn;
+            }
+            // ── 改：省略 = 保持，且必须**显式填回**（见文件头那条 parseKv 的坑）────────
+            const cur = locate(hits, server, levelArg, listHint());
+            const transport = args && args.transport !== undefined ? String(args.transport) : String(cur.transport);
+            if (transport !== 'stdio' && transport !== 'streamable-http') {
+                throw new Error('transport 只能是 stdio 或 streamable-http（这台现在是：' + String(cur.transport) + '）');
+            }
+            const touched = [];
+            const ignored = [];
+            if (args.transport !== undefined)
+                touched.push('transport');
+            const payload = { id: cur.id, level: cur.level, serverName: String(cur.serverName), transport };
+            if (transport === 'streamable-http') {
+                // url 与 headers 都按**打码形态**填回：`resolveMaskedUrl` / `resolveMaskedKv` 会把它们
+                // 还原成补丁文件里的真值。这样"只改 headers"不会把 url 的查询串抹掉，也不会把
+                // 没重述的密钥写成 `••••••`。
+                if (args.url !== undefined) {
+                    payload.url = String(args.url);
+                    touched.push('url');
+                }
+                else {
+                    payload.url = String(cur.url == null ? '' : cur.url);
+                }
+                if (args.headers !== undefined) {
+                    payload.headers = String(args.headers);
+                    touched.push('headers');
+                }
+                else {
+                    payload.headers = kvToText(cur.headers);
+                }
+                // 与当前传输方式无关的字段：**说出来**而不是静默丢掉（静默丢输入是"看起来成功"）。
+                // 逐项写而不是循环：参数表的类型由宿主签名推断，动态键索引会退化成 any（deps.ts 里
+                // 特意保住的正是这份推断）。
+                if (args.command !== undefined)
+                    ignored.push('command');
+                if (args.args !== undefined)
+                    ignored.push('args');
+                if (args.env !== undefined)
+                    ignored.push('env');
+            }
+            else {
+                if (args.command !== undefined) {
+                    payload.command = String(args.command);
+                    touched.push('command');
+                }
+                else {
+                    payload.command = String(cur.command == null ? '' : cur.command);
+                }
+                if (args.args !== undefined) {
+                    payload.args = String(args.args);
+                    touched.push('args');
+                }
+                else {
+                    payload.args = argsToText(cur.args);
+                }
+                if (args.env !== undefined) {
+                    payload.env = String(args.env);
+                    touched.push('env');
+                }
+                else {
+                    payload.env = kvToText(cur.env);
+                }
+                if (args.url !== undefined)
+                    ignored.push('url');
+                if (args.headers !== undefined)
+                    ignored.push('headers');
+            }
+            const levelChanged = levelArg !== undefined && levelArg !== cur.level;
+            // 只给了备注：不必走 `mcpm-edit` 把整条重建一遍（那是一次无意义的写盘 + 刷新 updatedAt），
+            // 直接写备注。这与"三个可改字段一个都没给就拒"是同一条理由的两面。
+            if (!touched.length && !levelChanged) {
+                if (!hasNote)
+                    throw new Error('没有要改的东西：transport / url / command / args / headers / env / level / note 至少给一个');
+                const n = await deps.mcpmNote({ id: cur.id, note: noteText });
+                if (!n || n.ok === false)
+                    throw new Error((n && n.error) || '写备注失败');
+                return 'OK: updated ' + String(cur.serverName) + '（改了 note）';
+            }
+            const r = await deps.mcpmEdit(payload);
+            if (!r || r.ok === false)
+                throw new Error((r && r.error) || '修改服务器失败');
+            const changed = touched.concat(levelChanged ? ['level'] : [], hasNote ? ['note'] : []);
+            let warn = '';
+            // `mcpm-edit` 的守卫会把"打码值被顶替回真值"这件事回报出来（只含键名，不含值）——
+            // 转给模型，它才知道"我没重述的密钥确实保住了"。
+            if (r.warning)
+                warn += '\nNOTE: ' + String(r.warning);
+            if (hasNote) {
+                const n = await deps.mcpmNote({ id: cur.id, note: noteText });
+                if (!n || n.ok === false)
+                    warn += '\nWARN: 服务器已保存，但备注没写进去（' + ((n && n.error) || '未知原因') + '）';
+            }
+            if (ignored.length) {
+                warn += '\nWARN: ' + ignored.join(' / ') + ' 与当前 transport（' + transport + '）无关，已忽略';
+            }
+            return 'OK: updated ' + String(cur.serverName) + '（改了 ' + changed.join('、') + '）' + warn;
         },
     }));
 }