dsh-plugin-capabilities 0.3.7 → 0.3.8

package/lib/index.js

@@ -764,9 +764,11 @@ function argvProfile(argv = process.argv) {
   if (flag !== -1 && flag + 1 < argv.length && !argv[flag + 1].startsWith("-")) return argv[flag + 1];
   return void 0;
 }
+function dshHomeDir(dshHome = process.env.DSH_HOME) {
+  return dshHome ?? join2(homedir2(), ".dsh");
+}
 function profileDir(profile, dshHome = process.env.DSH_HOME) {
-  const home = dshHome ?? join2(homedir2(), ".dsh");
-  return join2(home, "profiles", profile);
+  return join2(dshHomeDir(dshHome), "profiles", profile);
 }
 
 // src/routes.ts
@@ -1437,8 +1439,8 @@ function assertPatchParses(path, doc) {
     `\u914D\u7F6E\u6587\u4EF6 ${path} \u5B58\u5728 YAML \u8BED\u6CD5\u9519\u8BEF\uFF08${at}${total}\uFF09\uFF0C\u672A\u5199\u5165\u4EFB\u4F55\u5185\u5BB9\uFF0C\u8BF7\u4FEE\u590D\u8BE5\u6587\u4EF6\u540E\u91CD\u8BD5 / YAML syntax error in the patch file (${at}${total}); nothing was written \u2014 fix it and retry`
   );
 }
-function loadPatch(profileDirPath) {
-  const path = join9(profileDirPath, "cordis.patch.yml");
+function loadPatch(dirPath) {
+  const path = join9(dirPath, "cordis.patch.yml");
   const text = existsSync6(path) ? readFileSync6(path, "utf8") : "[]";
   const doc = parseDocument(text);
   assertPatchParses(path, doc);
@@ -1446,9 +1448,9 @@ function loadPatch(profileDirPath) {
   if (contents !== null && contents.flow === true && contents.items.length === 0) contents.flow = false;
   return doc;
 }
-function savePatch(profileDirPath, doc) {
-  mkdirSync5(profileDirPath, { recursive: true });
-  writeFileSync4(join9(profileDirPath, "cordis.patch.yml"), String(doc), "utf8");
+function savePatch(dirPath, doc) {
+  mkdirSync5(dirPath, { recursive: true });
+  writeFileSync4(join9(dirPath, "cordis.patch.yml"), String(doc), "utf8");
 }
 function toNode(value) {
   return new Document(value).contents;
@@ -1532,10 +1534,36 @@ function takenIds(doc) {
   }
   return taken;
 }
-function listMcp(profileDirPath) {
-  const doc = loadPatch(profileDirPath);
+function listMcp(dirPath) {
+  const doc = loadPatch(dirPath);
   return mcpRowItems(doc).map(({ node }) => rowToMcp(doc, node));
 }
+function listMcpScoped(profileDirPath, dshHomePath) {
+  let globalRows = [];
+  let globalError;
+  if (existsSync6(join9(dshHomePath, "cordis.patch.yml"))) {
+    try {
+      globalRows = listMcp(dshHomePath);
+    } catch (error) {
+      globalError = error instanceof Error ? error.message : String(error);
+    }
+  }
+  const globalIds = new Set(globalRows.map((row) => row.id).filter((id) => id !== ""));
+  return {
+    servers: [
+      ...globalRows.map((row) => ({ ...row, scope: "global" })),
+      ...listMcp(profileDirPath).map((row) => ({
+        ...row,
+        scope: "profile",
+        ...globalIds.has(row.id) ? { shadowed: true } : {}
+      }))
+    ],
+    ...globalError !== void 0 ? { globalError } : {}
+  };
+}
+function mcpScopeDir(scope, profileDirPath, dshHomePath) {
+  return scope === "global" ? dshHomePath : profileDirPath;
+}
 function validateMcpInput(input) {
   if (!SERVER_NAME_RE.test(input.serverName)) return "serverName must be 1-32 chars of A-Z a-z 0-9 _ -";
   const id = input.id ?? "";
@@ -1547,9 +1575,9 @@ function validateMcpInput(input) {
   }
   return null;
 }
-function upsertMcp(profileDirPath, input) {
+function upsertMcp(dirPath, input) {
   const inputId = input.id ?? "";
-  const doc = loadPatch(profileDirPath);
+  const doc = loadPatch(dirPath);
   const list = managedInsert(doc);
   const existing = inputId !== "" ? mcpRowItems(doc).find(({ node: node2 }) => String(node2.get("id") ?? "") === inputId) : void 0;
   let id = inputId !== "" ? inputId : `mcp-${input.serverName}`;
@@ -1581,21 +1609,21 @@ function upsertMcp(profileDirPath, input) {
   } else {
     rowSeq(doc).items.splice(rowSeq(doc).items.indexOf(existing.node), 1, node);
   }
-  savePatch(profileDirPath, doc);
+  savePatch(dirPath, doc);
   return id;
 }
-function setMcpDisabled(profileDirPath, id, disabled) {
-  const doc = loadPatch(profileDirPath);
+function setMcpDisabled(dirPath, id, disabled) {
+  const doc = loadPatch(dirPath);
   managedInsert(doc);
   const hit = mcpRowItems(doc).find(({ node }) => String(node.get("id") ?? "") === id);
   if (hit === void 0) return false;
   if (disabled) hit.node.set("disabled", true);
   else hit.node.delete("disabled");
-  savePatch(profileDirPath, doc);
+  savePatch(dirPath, doc);
   return true;
 }
-function removeMcp(profileDirPath, id) {
-  const doc = loadPatch(profileDirPath);
+function removeMcp(dirPath, id) {
+  const doc = loadPatch(dirPath);
   managedInsert(doc);
   const hit = mcpRowItems(doc).find(({ node }) => String(node.get("id") ?? "") === id);
   if (hit === void 0 || hit.list === void 0) return false;
@@ -1605,7 +1633,7 @@ function removeMcp(profileDirPath, id) {
   if (owner !== void 0 && hit.list.items.length === 0 && owner.items.length === 1) {
     seq.items.splice(seq.items.indexOf(owner), 1);
   }
-  savePatch(profileDirPath, doc);
+  savePatch(dirPath, doc);
   return true;
 }
 
@@ -1633,6 +1661,9 @@ function toSkillRow(skill, dshHome) {
 function toRootView(entry) {
   return { ...entry, live: entry.roots.every((root) => rootExists(root)) };
 }
+function readScope(value) {
+  return value === "global" ? "global" : "profile";
+}
 function mountCapabilitiesRoutes(host, config) {
   const disposers = [
     host.webServer.register({
@@ -1949,7 +1980,7 @@ function mountCapabilitiesRoutes(host, config) {
           sendJson(response, 502, { error: "market index unavailable (offline?)" });
           return;
         }
-        const existing = new Set(listMcp(config.profileDirPath).map((row) => row.serverName));
+        const existing = new Set(listMcpScoped(config.profileDirPath, config.dshHomePath).servers.map((row) => row.serverName));
         sendJson(response, 200, {
           source: index.source,
           servers: (index.servers ?? []).map((server) => ({ ...server, installed: existing.has(server.id) }))
@@ -2008,7 +2039,7 @@ function mountCapabilitiesRoutes(host, config) {
             sendJson(response, 404, { error: "server not found in the market index" });
             return;
           }
-          if (listMcp(config.profileDirPath).some((row) => row.serverName === server.id)) {
+          if (listMcpScoped(config.profileDirPath, config.dshHomePath).servers.some((row) => row.serverName === server.id)) {
             sendJson(response, 409, { error: "already installed" });
             return;
           }
@@ -2039,7 +2070,12 @@ function mountCapabilitiesRoutes(host, config) {
           response.end();
           return;
         }
-        sendJson(response, 200, { servers: listMcp(config.profileDirPath), restartNeeded: true });
+        const listing = listMcpScoped(config.profileDirPath, config.dshHomePath);
+        sendJson(response, 200, {
+          servers: listing.servers,
+          ...listing.globalError !== void 0 ? { globalError: listing.globalError } : {},
+          restartNeeded: true
+        });
       }
     }),
     host.webServer.register({
@@ -2062,8 +2098,9 @@ function mountCapabilitiesRoutes(host, config) {
             sendJson(response, 400, { error: invalid });
             return;
           }
-          const id = upsertMcp(config.profileDirPath, input);
-          sendJson(response, 200, { ok: true, id, restartNeeded: true });
+          const scope = readScope(input.scope);
+          const id = upsertMcp(mcpScopeDir(scope, config.profileDirPath, config.dshHomePath), input);
+          sendJson(response, 200, { ok: true, id, scope, restartNeeded: true });
         } catch (error) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) });
         }
@@ -2088,7 +2125,8 @@ function mountCapabilitiesRoutes(host, config) {
             sendJson(response, 400, { error: "id and disabled are required" });
             return;
           }
-          const ok = setMcpDisabled(config.profileDirPath, body.id, body.disabled);
+          const dir = mcpScopeDir(readScope(body.scope), config.profileDirPath, config.dshHomePath);
+          const ok = setMcpDisabled(dir, body.id, body.disabled);
           sendJson(response, ok ? 200 : 404, ok ? { ok: true, restartNeeded: true } : { error: "server row not found" });
         } catch (error) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) });
@@ -2114,7 +2152,8 @@ function mountCapabilitiesRoutes(host, config) {
             sendJson(response, 400, { error: "id is required" });
             return;
           }
-          const ok = removeMcp(config.profileDirPath, body.id);
+          const dir = mcpScopeDir(readScope(body.scope), config.profileDirPath, config.dshHomePath);
+          const ok = removeMcp(dir, body.id);
           sendJson(response, ok ? 200 : 404, ok ? { ok: true, restartNeeded: true } : { error: "server row not found" });
         } catch (error) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) });
@@ -2133,8 +2172,9 @@ function mountCapabilitiesRoutes(host, config) {
         try {
           sendJson(response, 200, {
             servers: scanAllMcp(),
-            // Profile serverNames, so the browser can grey out existing ones.
-            existing: listMcp(config.profileDirPath).map((row) => row.serverName)
+            // ServerNames present in either patch layer, so the browser can
+            // grey out existing ones.
+            existing: listMcpScoped(config.profileDirPath, config.dshHomePath).servers.map((row) => row.serverName)
           });
         } catch (error) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) });
@@ -2162,9 +2202,8 @@ function mountCapabilitiesRoutes(host, config) {
           const results = [];
           for (const server of scanAllMcp()) {
             if (!wanted.has(`${server.agent}/${server.name}`)) continue;
-            const existing = listMcp(config.profileDirPath).some((row) => row.serverName === server.name);
-            if (existing) {
-              results.push({ name: server.name, ok: false, error: "already in profile" });
+            if (listMcpScoped(config.profileDirPath, config.dshHomePath).servers.some((row) => row.serverName === server.name)) {
+              results.push({ name: server.name, ok: false, error: "already configured" });
               continue;
             }
             const input = {
@@ -2261,6 +2300,7 @@ function apply(ctx, config) {
       ctx.effect(
         () => mountCapabilitiesRoutes(hostCtx, {
           profileDirPath: profileDir(profile),
+          dshHomePath: dshHomeDir(),
           remountProvider
         }),
         "dsh-plugin-capabilities: http routes"