dsh-plugin-capabilities 0.3.6 → 0.3.8

package/README.md

@@ -25,7 +25,9 @@
 
 ![「MCP」标签页](docs/images/screenshot-mcp.png)
 
-「MCP」页管理 profile patch 中的 MCP 服务器行，每行对应一个 `@deepseek-ai/dsh-mcp-client` 实例。stdio 服务器填写命令与参数，streamable-http 服务器填写 URL，编辑、停用、移除都在页面上完成。YAML 读写采用文档级 API，文件中的其他行与注释不受影响。新行写在一个 `- insert:` 块里——加载器只会挂载 insert 形式的行，裸的 `- id:` 条目是对已有行的覆盖，目标不存在时会被跳过；0.1.3 之前写入的裸行会在下一次保存时自动迁入 insert 块。
+「MCP」页管理 profile patch 中的 MCP 服务器行，每行对应一个 `@deepseek-ai/dsh-mcp-client` 实例。stdio 服务器填写命令与参数，streamable-http 服务器填写 URL，编辑、停用、移除都在页面上完成。YAML 读写采用文档级 API，文件中的其他行与注释不受影响。新行写在一个 `- insert:` 块里——加载器只会挂载 insert 形式的行，裸的 `- id:` 条目是对已有行的覆盖，目标不存在时会被跳过；0.1.3 之前写入的裸行会在下一次保存时自动迁入 insert 块。0.3.7 起，若 `cordis.patch.yml` 本身存在语法错误（多见于手工编辑失误），页面会直接报出文件完整路径与出错行列，并且不写入任何内容；此前这种文件会在保存时抛出内部的 "Document with errors cannot be stringified"，让人无从下手。
+
+服务器行不只存在于 profile 里。dsh 还有一层全局补丁（`DSH_HOME/cordis.patch.yml`），对这台机器上的所有 profile 生效，组合时排在 profile 层之后、同名 id 以全局为准。0.3.8 起，「MCP」页把两层合在一起展示：每行带「全局」或「当前 profile」标记，两层出现同名 id 时 profile 行会注明自己不生效。添加服务器时可以选择写入哪一层，编辑、停用、移除也都落在该行所在的层。全局文件损坏不会连累整个页面：profile 行照常列出，顶部横幅单独报出全局文件的路径与出错行列。
 
 添加或编辑服务器时，表单下方有「完整格式与快速填充」区：一边是随表单实时更新的完整 YAML 行（和保存后落进 `cordis.patch.yml` 的一模一样），另一边是等价的 `mcpServers` JSON 写法，可以直接抄去别的工具。反过来也行——把 Claude Code 配置、官方文档或任意 JSON 粘进输入框，点「解析并填充」，服务器名、命令、参数、环境变量、URL、请求头都会自动填好，`{"mcpServers": {...}}` 包装、裸条目、dsh 行三种形状都认。
 

package/lib/client.js

@@ -259,7 +259,7 @@ function MarketTab(props) {
         setOutcome({ ok: true, text: t("rootRemoved") });
         refreshSkills();
       } else {
-        await mcp.remove(target.id);
+        await mcp.remove(target.id, "profile");
         setOutcome({ ok: true, text: t("restartNeeded") });
         refreshMcp();
       }
@@ -582,7 +582,8 @@ function McpTab(props) {
   const { t, injected } = props;
   const [servers, setServers] = (0, import_react2.useState)(null);
   const [editor, setEditor] = (0, import_react2.useState)(null);
-  const [confirmId, setConfirmId] = (0, import_react2.useState)(null);
+  const [confirmRow, setConfirmRow] = (0, import_react2.useState)(null);
+  const [globalError, setGlobalError] = (0, import_react2.useState)(null);
   const [importOpen, setImportOpen] = (0, import_react2.useState)(false);
   const [importItems, setImportItems] = (0, import_react2.useState)(null);
   const [busy, setBusy] = (0, import_react2.useState)(false);
@@ -635,7 +636,9 @@ function McpTab(props) {
     let current = true;
     void injected.list().then(
       (body) => {
-        if (current) setServers(body.servers);
+        if (!current) return;
+        setServers(body.servers);
+        setGlobalError(body.globalError ?? null);
       },
       (error) => {
         if (current) {
@@ -652,7 +655,7 @@ function McpTab(props) {
     setFormError(null);
     setPasteError(null);
     setPasteJson("");
-    setEditor({ id: "", serverName: "", transport: "stdio", command: "", args: "", env: "", url: "", headers: "" });
+    setEditor({ id: "", scope: "profile", serverName: "", transport: "stdio", command: "", args: "", env: "", url: "", headers: "" });
   };
   const openEdit = (row) => {
     setFormError(null);
@@ -660,6 +663,7 @@ function McpTab(props) {
     setPasteJson("");
     setEditor({
       id: row.id,
+      scope: row.scope,
       serverName: row.serverName,
       transport: row.transport,
       command: row.command ?? "",
@@ -704,6 +708,7 @@ function McpTab(props) {
     try {
       await injected.save({
         id: editor.id,
+        scope: editor.scope,
         serverName: editor.serverName.trim(),
         transport: editor.transport,
         ...editor.transport === "stdio" ? {
@@ -727,7 +732,7 @@ function McpTab(props) {
   const doToggle = async (row) => {
     setBusy(true);
     try {
-      await injected.toggle(row.id, !row.disabled);
+      await injected.toggle(row.id, !row.disabled, row.scope);
       setOutcome({ ok: true, text: t("restartNeeded") });
       reloadList(true);
     } catch (error) {
@@ -737,17 +742,17 @@ function McpTab(props) {
     }
   };
   const doRemove = async () => {
-    if (confirmId === null) return;
+    if (confirmRow === null) return;
     setBusy(true);
     try {
-      await injected.remove(confirmId);
+      await injected.remove(confirmRow.id, confirmRow.scope);
       setOutcome({ ok: true, text: t("restartNeeded") });
       reloadList(true);
     } catch (error) {
       setOutcome({ ok: false, text: `${t("failed")}: ${String(error instanceof Error ? error.message : error)}` });
     } finally {
       setBusy(false);
-      setConfirmId(null);
+      setConfirmRow(null);
     }
   };
   const doRestart = () => {
@@ -797,6 +802,13 @@ function McpTab(props) {
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.StateDot, { state: outcome.ok ? "done" : "error", size: 10 }),
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "dpc-bannerBody", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { children: outcome.text }) })
     ] }),
+    globalError !== null && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dpc-banner", "data-kind": "error", role: "alert", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.StateDot, { state: "error", size: 10 }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dpc-bannerBody", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { children: t("globalLayerError") }),
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dpc-bannerHint", children: globalError })
+      ] })
+    ] }),
     (pending || restarting) && restartBanner,
     /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dpc-listHead", children: [
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("h3", { children: t("mcpTab") }),
@@ -809,17 +821,19 @@ function McpTab(props) {
     servers !== null && servers.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("ul", { className: "dpc-cards", children: servers.map((row) => /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("li", { className: "dpc-card", children: [
       /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dpc-cardTop", children: [
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("strong", { className: "dpc-cardTitle", title: row.id, children: row.serverName }),
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dpc-tag", "data-kind": row.scope === "global" ? "source" : void 0, children: row.scope === "global" ? t("scopeGlobal") : t("scopeProfile") }),
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dpc-tag", children: row.transport }),
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dpc-tag", "data-kind": row.disabled ? "off" : void 0, children: row.disabled ? t("disabled") : t("enabled") })
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dpc-cardDesc", children: row.transport === "stdio" ? `${row.command ?? ""} ${(row.args ?? []).join(" ")}` : row.url ?? "" }),
+      row.shadowed === true && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dpc-formError", children: t("shadowedByGlobal") }),
       /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dpc-cardRow", children: [
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dpc-spacer" }),
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.Button, { variant: "ghost", size: "sm", disabled: busy, onClick: () => void doToggle(row), children: t("toggle") }),
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.Button, { variant: "ghost", size: "sm", disabled: busy, onClick: () => openEdit(row), children: t("edit") }),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.Button, { variant: "ghost", size: "sm", disabled: busy, onClick: () => setConfirmId(row.id), children: t("delete") })
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.Button, { variant: "ghost", size: "sm", disabled: busy, onClick: () => setConfirmRow(row), children: t("delete") })
       ] })
-    ] }, row.id)) }),
+    ] }, `${row.scope}/${row.id}`)) }),
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
       import_dsh_client_ui_primitives2.Modal,
       {
@@ -829,6 +843,23 @@ function McpTab(props) {
         className: "dpc-modalForm",
         contentClassName: "dpc-modalScroll",
         children: editor !== null && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dpc-form", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("label", { className: "dpc-label", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { children: t("scopeLabel") }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+              "select",
+              {
+                className: "dpc-select",
+                value: editor.scope,
+                disabled: editor.id !== "",
+                onChange: (event) => setEditor({ ...editor, scope: event.target.value }),
+                children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("option", { value: "profile", children: t("scopeProfile") }),
+                  /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("option", { value: "global", children: t("scopeGlobal") })
+                ]
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dpc-formatHint", children: t("scopeHint") })
+          ] }),
           /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("label", { className: "dpc-label", children: [
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { children: t("serverName") }),
             /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
@@ -927,12 +958,12 @@ function McpTab(props) {
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
       import_dsh_client_ui_primitives2.Modal,
       {
-        open: confirmId !== null,
-        onClose: () => setConfirmId(null),
+        open: confirmRow !== null,
+        onClose: () => setConfirmRow(null),
         title: t("confirmRemove"),
-        description: confirmId ?? void 0,
+        description: confirmRow?.serverName ?? void 0,
         footer: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.Button, { variant: "ghost", onClick: () => setConfirmId(null), children: t("cancel") }),
+          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.Button, { variant: "ghost", onClick: () => setConfirmRow(null), children: t("cancel") }),
           /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.Button, { variant: "primary", disabled: busy, onClick: () => void doRemove(), children: t("delete") })
         ] }),
         children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { children: t("removeWarn") })
@@ -4456,9 +4487,15 @@ var zh = {
   confirmRemoveRoot: "\u786E\u8BA4\u79FB\u9664\u8BE5\u4ED3\u5E93\uFF1F",
   removeRootWarn: "\u5C06\u53D6\u6D88\u626B\u63CF\u8BE5\u4ED3\u5E93\u5E76\u5220\u9664\u4E0B\u8F7D\u5230 DSH_HOME \u7684\u526F\u672C\uFF08\u672C\u5730\u76EE\u5F55\u672C\u8EAB\u4E0D\u53D7\u5F71\u54CD\uFF09\u3002",
   mcpTitle: "MCP \u670D\u52A1\u5668",
-  mcpIntro: "\u7BA1\u7406 profile \u4E2D\u7684 MCP \u670D\u52A1\u5668\u884C\uFF08@deepseek-ai/dsh-mcp-client\uFF09\u3002\u65B0\u589E\u3001\u4FEE\u6539\u6216\u5220\u9664\u540E\u9700\u8981\u91CD\u542F dsh \u624D\u751F\u6548\u3002",
+  mcpIntro: "\u7BA1\u7406 MCP \u670D\u52A1\u5668\u884C\uFF08@deepseek-ai/dsh-mcp-client\uFF09\u3002\u670D\u52A1\u5668\u53EF\u653E\u5728 profile \u5C42\uFF08\u4EC5\u672C profile\uFF09\u6216\u5168\u5C40\u5C42\uFF08DSH_HOME/cordis.patch.yml\uFF0C\u5BF9\u672C\u673A\u6240\u6709 profile \u751F\u6548\uFF09\uFF1B\u65B0\u589E\u3001\u4FEE\u6539\u6216\u5220\u9664\u540E\u9700\u8981\u91CD\u542F dsh \u624D\u751F\u6548\u3002",
   addServer: "\u6DFB\u52A0\u670D\u52A1\u5668",
   editServer: "\u7F16\u8F91\u670D\u52A1\u5668",
+  scopeLabel: "\u751F\u6548\u8303\u56F4",
+  scopeGlobal: "\u5168\u5C40",
+  scopeProfile: "\u5F53\u524D profile",
+  scopeHint: "\u5168\u5C40\uFF1A\u5199\u5165 DSH_HOME/cordis.patch.yml\uFF0C\u5BF9\u672C\u673A\u6240\u6709 profile \u751F\u6548\uFF1B\u5F53\u524D profile\uFF1A\u53EA\u5F71\u54CD\u672C profile\u3002",
+  shadowedByGlobal: "\u5168\u5C40\u5C42\u5B58\u5728\u540C\u540D id\uFF0C\u6B64\u884C\u4E0D\u751F\u6548",
+  globalLayerError: "\u5168\u5C40\u914D\u7F6E\uFF08DSH_HOME/cordis.patch.yml\uFF09\u8BFB\u53D6\u5931\u8D25\uFF0C\u5168\u5C40\u670D\u52A1\u5668\u6682\u672A\u663E\u793A\uFF1A",
   serverName: "\u670D\u52A1\u5668\u540D\uFF08\u5DE5\u5177\u540D\u524D\u7F00\uFF09",
   transport: "\u4F20\u8F93\u65B9\u5F0F",
   transportStdio: "stdio\uFF08\u672C\u5730\u547D\u4EE4\uFF09",
@@ -4472,7 +4509,7 @@ var zh = {
   enabled: "\u542F\u7528\u4E2D",
   toggle: "\u505C\u7528/\u542F\u7528",
   confirmRemove: "\u786E\u8BA4\u79FB\u9664\u8BE5\u670D\u52A1\u5668\uFF1F",
-  removeWarn: "\u5C06\u4ECE profile \u914D\u7F6E\u4E2D\u79FB\u9664\u8FD9\u4E00\u884C\uFF0C\u91CD\u542F dsh \u540E\u5176\u5DE5\u5177\u4E0D\u518D\u51FA\u73B0\u3002",
+  removeWarn: "\u5C06\u4ECE\u914D\u7F6E\u4E2D\u79FB\u9664\u8FD9\u4E00\u884C\uFF0C\u91CD\u542F dsh \u540E\u5176\u5DE5\u5177\u4E0D\u518D\u51FA\u73B0\u3002",
   emptyMcp: "\u8FD8\u6CA1\u6709\u914D\u7F6E MCP \u670D\u52A1\u5668",
   importServers: "\u4ECE\u5176\u4ED6 Agent \u5BFC\u5165",
   importIntro: "\u626B\u63CF Claude Code\uFF08~/.claude.json\uFF09\u4E0E Codex\uFF08~/.codex/config.toml\uFF09\u7684 MCP \u670D\u52A1\u5668\u914D\u7F6E\uFF0C\u52FE\u9009\u540E\u5BFC\u5165\u4E3A\u672C profile \u7684\u670D\u52A1\u5668\u884C\u3002",
@@ -4588,9 +4625,15 @@ var en = {
   confirmRemoveRoot: "Remove this repository?",
   removeRootWarn: "Stops scanning the repository and deletes the copy downloaded into DSH_HOME (a local folder itself is untouched).",
   mcpTitle: "MCP servers",
-  mcpIntro: "Manage the MCP server rows (@deepseek-ai/dsh-mcp-client) in this profile. Additions, edits, and removals take effect after a dsh restart.",
+  mcpIntro: "Manage MCP server rows (@deepseek-ai/dsh-mcp-client). A server lives either in this profile or in the global layer (DSH_HOME/cordis.patch.yml, applied to every profile on this machine); additions, edits, and removals take effect after a dsh restart.",
   addServer: "Add server",
   editServer: "Edit server",
+  scopeLabel: "Scope",
+  scopeGlobal: "Global",
+  scopeProfile: "This profile",
+  scopeHint: "Global writes DSH_HOME/cordis.patch.yml and applies to every profile on this machine; this profile writes the current profile only.",
+  shadowedByGlobal: "a global row with the same id wins \u2014 this row has no effect",
+  globalLayerError: "Failed to read the global layer (DSH_HOME/cordis.patch.yml); global servers are hidden:",
   serverName: "Server name (tool name prefix)",
   transport: "Transport",
   transportStdio: "stdio (local command)",
@@ -4604,7 +4647,7 @@ var en = {
   enabled: "Enabled",
   toggle: "Enable/disable",
   confirmRemove: "Remove this server?",
-  removeWarn: "Removes the row from the profile configuration; its tools disappear after the next dsh restart.",
+  removeWarn: "Removes the row from its configuration; its tools disappear after the next dsh restart.",
   emptyMcp: "No MCP servers configured yet",
   importServers: "Import from other agents",
   importIntro: "Scans Claude Code (~/.claude.json) and Codex (~/.codex/config.toml) MCP server configs; selected entries become server rows in this profile.",
@@ -4681,8 +4724,8 @@ function apply2(ctx) {
   const mcpInjected = {
     list: () => fetchJson("/dsh-plugin-capabilities/mcp"),
     save: (input) => post("/dsh-plugin-capabilities/mcp/save", input),
-    toggle: (id, disabled) => post("/dsh-plugin-capabilities/mcp/toggle", { id, disabled }),
-    remove: (id) => post("/dsh-plugin-capabilities/mcp/remove", { id }),
+    toggle: (id, disabled, scope) => post("/dsh-plugin-capabilities/mcp/toggle", { id, disabled, scope }),
+    remove: (id, scope) => post("/dsh-plugin-capabilities/mcp/remove", { id, scope }),
     scanImport: () => fetchJson("/dsh-plugin-capabilities/import/scan"),
     applyImport: (items) => post("/dsh-plugin-capabilities/import/apply", { items }),
     restart: async () => {