dsh-plugin-capabilities 0.1.1 → 0.1.3

package/lib/index.js

@@ -796,6 +796,52 @@ function sendJson(response, status, body) {
   response.end(payload);
 }
 
+// src/restart.ts
+import { spawn } from "node:child_process";
+import { openSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { dirname, resolve } from "node:path";
+function dshLaunch(argv = process.argv, execArgv = process.execArgv) {
+  const entry = argv[1];
+  if (entry !== void 0 && /[\\/](?:bin\.(?:js|ts)|dsh)$/.test(entry)) {
+    const abs = resolve(entry);
+    return { file: process.execPath, args: [...execArgv, abs, ...argv.slice(2)], cwd: dirname(abs), viaShell: false };
+  }
+  return { file: "dsh", args: [...argv.slice(2)], cwd: void 0, viaShell: process.platform === "win32" };
+}
+function scheduleRestart(launch) {
+  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
+  const logOut = `${tmpdir()}${tmpdir().endsWith("/") ? "" : "\\"}dsh-plugin-capabilities-restart-${stamp}.out.log`;
+  const logErr = logOut.replace(".out.log", ".err.log");
+  const child = spawn(launch.file, launch.args, {
+    cwd: launch.cwd,
+    stdio: ["ignore", openSync(logOut, "a"), openSync(logErr, "a")],
+    env: process.env,
+    shell: launch.viaShell,
+    windowsHide: true
+  });
+  child.unref();
+  setTimeout(() => process.kill(process.pid, "SIGTERM"), 500);
+  return { pid: process.pid, replacementPid: child.pid, logOut, logErr };
+}
+function trustedRestartRequest(request, socketAddress) {
+  const address = socketAddress ?? (request.socket.remoteAddress ?? "");
+  if (address !== "127.0.0.1" && address !== "::1" && address !== "::ffff:127.0.0.1") return false;
+  if (request.headers.forwarded !== void 0 || request.headers["x-forwarded-for"] !== void 0 || request.headers["x-real-ip"] !== void 0) return false;
+  const origin = request.headers.origin;
+  const host = request.headers.host;
+  if (origin === void 0 || host === void 0) return false;
+  try {
+    const parsed = new URL(origin);
+    return (parsed.protocol === "http:" || parsed.protocol === "https:") && parsed.host === host;
+  } catch {
+    return false;
+  }
+}
+function restartOwnedByShell(env = process.env) {
+  return env.DSH_DESKTOP === "1";
+}
+
 // src/skills.ts
 import { existsSync as existsSync2, mkdirSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir as homedir3 } from "node:os";
@@ -858,7 +904,10 @@ var SERVER_NAME_RE = /^[A-Za-z0-9_-]{1,32}$/;
 function loadPatch(profileDirPath) {
   const path = join4(profileDirPath, "cordis.patch.yml");
   const text = existsSync3(path) ? readFileSync2(path, "utf8") : "[]";
-  return parseDocument(text);
+  const doc = parseDocument(text);
+  const contents = doc.contents;
+  if (contents !== null && contents.flow === true && contents.items.length === 0) contents.flow = false;
+  return doc;
 }
 function savePatch(profileDirPath, doc) {
   mkdirSync2(profileDirPath, { recursive: true });
@@ -868,34 +917,87 @@ function toNode(value) {
   return new Document(value).contents;
 }
 function rowSeq(doc) {
-  if (doc.contents === null) doc.contents = toNode([]);
+  if (doc.contents === null) {
+    doc.contents = toNode([]);
+    doc.contents.flow = false;
+  }
   return doc.contents;
 }
-function mcpRows(doc) {
-  return (rowSeq(doc).items ?? []).filter((item) => item.get("name") === MCP_PLUGIN);
+function isSeqNode(value) {
+  return typeof value === "object" && value !== null && Array.isArray(value.items);
+}
+function insertListOf(item) {
+  if (item.has("id")) return void 0;
+  const node = item.get("insert");
+  return isSeqNode(node) ? node : void 0;
+}
+function mcpRowItems(doc) {
+  const found = [];
+  for (const item of rowSeq(doc).items ?? []) {
+    if (item.get("name") === MCP_PLUGIN) found.push({ node: item });
+    const list = insertListOf(item);
+    for (const row of list?.items ?? []) {
+      if (row.get("name") === MCP_PLUGIN) found.push({ node: row, list });
+    }
+  }
+  return found;
+}
+function rowToMcp(doc, item) {
+  const configNode = item.get("config");
+  const plain = typeof configNode === "object" && configNode !== null && typeof configNode.toJS === "function" ? configNode.toJS(doc) : {};
+  return {
+    id: String(item.get("id") ?? ""),
+    serverName: String(plain.serverName ?? ""),
+    transport: plain.transport === "streamable-http" ? "streamable-http" : "stdio",
+    disabled: item.get("disabled") === true,
+    ...typeof plain.command === "string" && plain.command !== "" ? { command: plain.command } : {},
+    ...Array.isArray(plain.args) ? { args: plain.args.map(String) } : {},
+    ...isStringMap(plain.env) ? { env: plain.env } : {},
+    ...typeof plain.cwd === "string" && plain.cwd !== "" ? { cwd: plain.cwd } : {},
+    ...typeof plain.url === "string" && plain.url !== "" ? { url: plain.url } : {},
+    ...isStringMap(plain.headers) ? { headers: plain.headers } : {}
+  };
 }
 function isStringMap(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
   return Object.values(value).every((entry) => typeof entry === "string");
 }
+function managedInsert(doc) {
+  const seq = rowSeq(doc);
+  const bare = [];
+  let target;
+  for (const item of seq.items ?? []) {
+    if (item.get("name") === MCP_PLUGIN) bare.push(item);
+    const list = insertListOf(item);
+    if (list !== void 0 && list.items.some((row) => row.get("name") === MCP_PLUGIN)) target ??= list;
+  }
+  if (target === void 0) {
+    const entry = toNode({ insert: [] });
+    seq.add(entry);
+    target = entry.get("insert");
+    target.flow = false;
+  }
+  for (const row of bare) {
+    seq.items.splice(seq.items.indexOf(row), 1);
+    target.add(row);
+  }
+  return target;
+}
+function takenIds(doc) {
+  const taken = /* @__PURE__ */ new Set();
+  for (const item of rowSeq(doc).items ?? []) {
+    const id = String(item.get("id") ?? "");
+    if (id !== "") taken.add(id);
+    for (const row of insertListOf(item)?.items ?? []) {
+      const rowId = String(row.get("id") ?? "");
+      if (rowId !== "") taken.add(rowId);
+    }
+  }
+  return taken;
+}
 function listMcp(profileDirPath) {
   const doc = loadPatch(profileDirPath);
-  return mcpRows(doc).map((item) => {
-    const configNode = item.get("config");
-    const plain = typeof configNode === "object" && configNode !== null && typeof configNode.toJS === "function" ? configNode.toJS(doc) : {};
-    return {
-      id: String(item.get("id") ?? ""),
-      serverName: String(plain.serverName ?? ""),
-      transport: plain.transport === "streamable-http" ? "streamable-http" : "stdio",
-      disabled: item.get("disabled") === true,
-      ...typeof plain.command === "string" && plain.command !== "" ? { command: plain.command } : {},
-      ...Array.isArray(plain.args) ? { args: plain.args.map(String) } : {},
-      ...isStringMap(plain.env) ? { env: plain.env } : {},
-      ...typeof plain.cwd === "string" && plain.cwd !== "" ? { cwd: plain.cwd } : {},
-      ...typeof plain.url === "string" && plain.url !== "" ? { url: plain.url } : {},
-      ...isStringMap(plain.headers) ? { headers: plain.headers } : {}
-    };
-  });
+  return mcpRowItems(doc).map(({ node }) => rowToMcp(doc, node));
 }
 function validateMcpInput(input) {
   if (!SERVER_NAME_RE.test(input.serverName)) return "serverName must be 1-32 chars of A-Z a-z 0-9 _ -";
@@ -911,13 +1013,11 @@ function validateMcpInput(input) {
 function upsertMcp(profileDirPath, input) {
   const inputId = input.id ?? "";
   const doc = loadPatch(profileDirPath);
-  const seq = rowSeq(doc);
-  const existing = inputId !== "" ? mcpRows(doc).find((item) => item.get("id") === inputId) : void 0;
+  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}`;
   if (existing === void 0) {
-    const taken = new Set(
-      (seq.items ?? []).map((item) => String(item.get("id") ?? "")).filter((id2) => id2 !== "")
-    );
+    const taken = takenIds(doc);
     let suffix = 2;
     while (taken.has(id)) id = `mcp-${input.serverName}-${suffix++}`;
   }
@@ -937,26 +1037,37 @@ function upsertMcp(profileDirPath, input) {
   const row = { id, name: MCP_PLUGIN, config };
   if (input.disabled === true) row.disabled = true;
   const node = toNode(row);
-  if (existing === void 0) seq.add(node);
-  else seq.items[seq.items.indexOf(existing)] = node;
+  if (existing === void 0) {
+    list.add(node);
+  } else if (existing.list !== void 0) {
+    existing.list.items.splice(existing.list.items.indexOf(existing.node), 1, node);
+  } else {
+    rowSeq(doc).items.splice(rowSeq(doc).items.indexOf(existing.node), 1, node);
+  }
   savePatch(profileDirPath, doc);
   return id;
 }
 function setMcpDisabled(profileDirPath, id, disabled) {
   const doc = loadPatch(profileDirPath);
-  const item = mcpRows(doc).find((row) => row.get("id") === id);
-  if (item === void 0) return false;
-  if (disabled) item.set("disabled", true);
-  else item.delete("disabled");
+  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);
   return true;
 }
 function removeMcp(profileDirPath, id) {
   const doc = loadPatch(profileDirPath);
-  const item = mcpRows(doc).find((row) => row.get("id") === id);
-  if (item === void 0) return false;
+  managedInsert(doc);
+  const hit = mcpRowItems(doc).find(({ node }) => String(node.get("id") ?? "") === id);
+  if (hit === void 0 || hit.list === void 0) return false;
+  hit.list.items.splice(hit.list.items.indexOf(hit.node), 1);
   const seq = rowSeq(doc);
-  seq.items.splice(seq.items.indexOf(item), 1);
+  const owner = (seq.items ?? []).find((item) => insertListOf(item) === hit.list);
+  if (owner !== void 0 && hit.list.items.length === 0 && owner.items.length === 1) {
+    seq.items.splice(seq.items.indexOf(owner), 1);
+  }
   savePatch(profileDirPath, doc);
   return true;
 }
@@ -1217,6 +1328,27 @@ function mountCapabilitiesRoutes(host, config) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) });
         }
       }
+    }),
+    host.webServer.register({
+      kind: "exact",
+      path: "/dsh-plugin-capabilities/restart",
+      handler: (request, response) => {
+        if (request.method !== "POST") {
+          response.writeHead(405, { allow: "POST" });
+          response.end();
+          return;
+        }
+        if (!trustedRestartRequest(request)) {
+          sendJson(response, 403, { error: "untrusted origin" });
+          return;
+        }
+        if (restartOwnedByShell()) {
+          sendJson(response, 409, { error: "restart is owned by the desktop shell" });
+          return;
+        }
+        const { pid, replacementPid, logOut } = scheduleRestart(dshLaunch());
+        sendJson(response, 200, { ok: true, pid, replacementPid, logOut });
+      }
     })
   ];
   return () => {