dsh-plugin-capabilities 0.3.8 → 0.3.9

package/lib/index.js

@@ -667,14 +667,14 @@ function stringArray(value) {
   const out = value.filter((entry) => typeof entry === "string");
   return out.length > 0 ? out : void 0;
 }
-function mapClaudeEntry(name2, entry) {
+function mapMcpServersEntry(agent, name2, entry) {
   if (typeof entry !== "object" || entry === null) return null;
   const record = entry;
   const type = typeof record.type === "string" ? record.type : "stdio";
   if (type === "stdio" || type === "stdio" && record.command !== void 0) {
     if (typeof record.command !== "string" || record.command === "") return null;
     return {
-      agent: "claude-code",
+      agent,
       name: name2,
       transport: "stdio",
       command: record.command,
@@ -685,7 +685,7 @@ function mapClaudeEntry(name2, entry) {
   if (type === "http" || type === "streamable-http") {
     if (typeof record.url !== "string" || record.url === "") return null;
     return {
-      agent: "claude-code",
+      agent,
       name: name2,
       transport: "streamable-http",
       url: record.url,
@@ -708,11 +708,57 @@ function scanClaudeMcp(home = homedir()) {
   }
   const out = [];
   for (const [name2, entry] of Object.entries(merged)) {
-    const mapped = mapClaudeEntry(name2, entry);
+    const mapped = mapMcpServersEntry("claude-code", name2, entry);
     if (mapped !== null) out.push(mapped);
   }
   return out;
 }
+function scanCursorMcp(home = homedir()) {
+  const file = join(home, ".cursor", "mcp.json");
+  if (!existsSync(file)) return [];
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(file, "utf8"));
+  } catch {
+    return [];
+  }
+  if (typeof parsed.mcpServers !== "object" || parsed.mcpServers === null) return [];
+  const out = [];
+  for (const [name2, entry] of Object.entries(parsed.mcpServers)) {
+    const mapped = mapMcpServersEntry("cursor", name2, entry);
+    if (mapped !== null) out.push(mapped);
+  }
+  return out;
+}
+function scanGeminiMcp(home = homedir()) {
+  const file = join(home, ".gemini", "settings.json");
+  if (!existsSync(file)) return [];
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(file, "utf8"));
+  } catch {
+    return [];
+  }
+  if (typeof parsed.mcpServers !== "object" || parsed.mcpServers === null) return [];
+  const out = [];
+  for (const [name2, entry] of Object.entries(parsed.mcpServers)) {
+    if (typeof entry !== "object" || entry === null) continue;
+    const record = entry;
+    if (typeof record.command === "string" && record.command !== "") {
+      out.push({
+        agent: "gemini",
+        name: name2,
+        transport: "stdio",
+        command: record.command,
+        args: stringArray(record.args),
+        env: stringEntries(record.env)
+      });
+    } else if (typeof record.httpUrl === "string" && record.httpUrl !== "") {
+      out.push({ agent: "gemini", name: name2, transport: "streamable-http", url: record.httpUrl });
+    }
+  }
+  return out;
+}
 function scanCodexMcp(home = homedir()) {
   const file = join(home, ".codex", "config.toml");
   if (!existsSync(file)) return [];
@@ -745,7 +791,7 @@ function scanCodexMcp(home = homedir()) {
 }
 function scanAllMcp(home = homedir()) {
   const seen = /* @__PURE__ */ new Set();
-  return [...scanClaudeMcp(home), ...scanCodexMcp(home)].filter((server) => {
+  return [...scanClaudeMcp(home), ...scanCodexMcp(home), ...scanCursorMcp(home), ...scanGeminiMcp(home)].filter((server) => {
     const key = `${server.agent}/${server.name}`;
     if (seen.has(key)) return false;
     seen.add(key);
@@ -1636,6 +1682,56 @@ function removeMcp(dirPath, id) {
   savePatch(dirPath, doc);
   return true;
 }
+function mcpRowToInput(row) {
+  return {
+    id: "",
+    serverName: row.serverName,
+    transport: row.transport,
+    disabled: row.disabled,
+    ...row.transport === "stdio" ? {
+      command: row.command,
+      ...row.args !== void 0 ? { args: row.args } : {},
+      ...row.env !== void 0 ? { env: row.env } : {},
+      ...row.cwd !== void 0 ? { cwd: row.cwd } : {}
+    } : {
+      url: row.url,
+      ...row.headers !== void 0 ? { headers: row.headers } : {}
+    }
+  };
+}
+function resolveCommandOnPath(command, pathEnv, platform = process.platform) {
+  if (command.includes("/") || command.includes("\\")) return existsSync6(command);
+  const exts = platform === "win32" ? ["", ".com", ".exe", ".bat", ".cmd"] : [""];
+  const separator = platform === "win32" ? ";" : ":";
+  for (const rawDir of pathEnv.split(separator)) {
+    const dir = rawDir.trim().replace(/^"|"$/g, "");
+    if (dir === "") continue;
+    for (const ext of exts) {
+      if (existsSync6(join9(dir, command + ext))) return true;
+    }
+  }
+  return false;
+}
+async function checkMcpRow(row, options = {}) {
+  const pathEnv = options.pathEnv ?? process.env.PATH ?? "";
+  if (row.transport === "stdio") {
+    const command = row.command ?? "";
+    if (command === "") return { ok: false, detail: "row has no command" };
+    return resolveCommandOnPath(command, pathEnv, options.platform) ? { ok: true, detail: command } : { ok: false, detail: `${command} not found on PATH` };
+  }
+  if (row.url === void 0 || !/^https?:\/\//.test(row.url)) return { ok: false, detail: "row has no http url" };
+  try {
+    const response = await fetch(row.url, {
+      headers: { accept: "application/json, text/event-stream" },
+      signal: AbortSignal.timeout(options.timeoutMs ?? 5e3)
+    });
+    return { ok: true, detail: `HTTP ${response.status}` };
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const cause = error.cause?.code;
+    return { ok: false, detail: cause !== void 0 ? String(cause) : message };
+  }
+}
 
 // src/routes.ts
 function customSkillWritable(dir, dshHome) {
@@ -2054,8 +2150,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(body.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) });
         }
@@ -2160,6 +2257,76 @@ function mountCapabilitiesRoutes(host, config) {
         }
       }
     }),
+    host.webServer.register({
+      kind: "exact",
+      path: "/dsh-plugin-capabilities/mcp/check",
+      handler: async (request, response) => {
+        if (request.method !== "POST") {
+          response.writeHead(405, { allow: "POST" });
+          response.end();
+          return;
+        }
+        if (!sameOrigin(request)) {
+          sendJson(response, 403, { error: "untrusted origin" });
+          return;
+        }
+        try {
+          const body = await readJsonBody(request);
+          if (typeof body.id !== "string") {
+            sendJson(response, 400, { error: "id is required" });
+            return;
+          }
+          const dir = mcpScopeDir(readScope(body.scope), config.profileDirPath, config.dshHomePath);
+          const row = listMcp(dir).find((item) => item.id === body.id);
+          if (row === void 0) {
+            sendJson(response, 404, { error: "server row not found" });
+            return;
+          }
+          sendJson(response, 200, await checkMcpRow(row));
+        } catch (error) {
+          sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) });
+        }
+      }
+    }),
+    host.webServer.register({
+      kind: "exact",
+      path: "/dsh-plugin-capabilities/mcp/copy",
+      handler: async (request, response) => {
+        if (request.method !== "POST") {
+          response.writeHead(405, { allow: "POST" });
+          response.end();
+          return;
+        }
+        if (!sameOrigin(request)) {
+          sendJson(response, 403, { error: "untrusted origin" });
+          return;
+        }
+        try {
+          const body = await readJsonBody(request);
+          if (typeof body.id !== "string") {
+            sendJson(response, 400, { error: "id is required" });
+            return;
+          }
+          const scope = readScope(body.scope);
+          const toScope = readScope(body.toScope);
+          const sourceRow = listMcp(mcpScopeDir(scope, config.profileDirPath, config.dshHomePath)).find((item) => item.id === body.id);
+          if (sourceRow === void 0) {
+            sendJson(response, 404, { error: "server row not found" });
+            return;
+          }
+          const input = mcpRowToInput(sourceRow);
+          const invalid = validateMcpInput(input);
+          if (invalid !== null) {
+            sendJson(response, 400, { error: invalid });
+            return;
+          }
+          const id = upsertMcp(mcpScopeDir(toScope, config.profileDirPath, config.dshHomePath), input);
+          sendJson(response, 200, { ok: true, id, scope: toScope, restartNeeded: true });
+        } catch (error) {
+          sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) });
+        }
+      }
+    }),
     host.webServer.register({
       kind: "exact",
       path: "/dsh-plugin-capabilities/import/scan",
@@ -2217,7 +2384,7 @@ function mountCapabilitiesRoutes(host, config) {
               results.push({ name: server.name, ok: false, error: invalid });
               continue;
             }
-            upsertMcp(config.profileDirPath, input);
+            upsertMcp(mcpScopeDir(readScope(body.scope), config.profileDirPath, config.dshHomePath), input);
             results.push({ name: server.name, ok: true });
           }
           sendJson(response, 200, { ok: results.every((item) => item.ok), results, restartNeeded: true });