dsh-plugin-capabilities 0.3.4 → 0.3.5

package/lib/index.js

@@ -1,6 +1,6 @@
 // src/index.ts
 import { existsSync as existsSync7 } from "node:fs";
-import { dirname as dirname4, join as join10 } from "node:path";
+import { dirname as dirname4, join as join11 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/agents.ts
@@ -8,7 +8,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
-// node_modules/smol-toml/dist/date.js
+// node_modules/.pnpm/smol-toml@1.8.0/node_modules/smol-toml/dist/date.js
 var DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|[-+]\d{2}:\d{2})?$/i;
 var TomlDate = class _TomlDate extends Date {
   #hasDate = false;
@@ -100,7 +100,7 @@ var TomlDate = class _TomlDate extends Date {
   }
 };
 
-// node_modules/smol-toml/dist/error.js
+// node_modules/.pnpm/smol-toml@1.8.0/node_modules/smol-toml/dist/error.js
 function getLineColFromPtr(string, ptr) {
   let lines = string.slice(0, ptr).split(/\r\n|\n|\r/g);
   return [lines.length, lines.pop().length + 1];
@@ -140,7 +140,7 @@ ${codeblock}`, options);
   }
 };
 
-// node_modules/smol-toml/dist/util.js
+// node_modules/.pnpm/smol-toml@1.8.0/node_modules/smol-toml/dist/util.js
 function indexOfNewline(str, start = 0) {
   let idx = str.indexOf("\n", start);
   if (str.charCodeAt(idx - 1) === 13)
@@ -195,7 +195,7 @@ function skipUntil(ctx, sep2, end) {
   });
 }
 
-// node_modules/smol-toml/dist/primitive.js
+// node_modules/.pnpm/smol-toml@1.8.0/node_modules/smol-toml/dist/primitive.js
 var INT_REGEX = /^((0x[0-9a-fA-F](_?[0-9a-fA-F])*)|(([+-]|0[ob])?\d(_?\d)*))$/;
 var FLOAT_REGEX = /^[+-]?\d(_?\d)*(\.\d(_?\d)*)?([eE][+-]?\d(_?\d)*)?$/;
 var LEADING_ZERO = /^[+-]?0[0-9_]/;
@@ -351,7 +351,7 @@ function parseValue(ctx, integersAsBigInt, end) {
   return date;
 }
 
-// node_modules/smol-toml/dist/extract.js
+// node_modules/.pnpm/smol-toml@1.8.0/node_modules/smol-toml/dist/extract.js
 function extractValue(ctx, end, integersAsBigInt) {
   let ptr = ctx.p;
   let c = ctx.s.charCodeAt(ptr);
@@ -384,7 +384,7 @@ function extractValue(ctx, end, integersAsBigInt) {
   return parseValue(ctx, integersAsBigInt, end);
 }
 
-// node_modules/smol-toml/dist/struct.js
+// node_modules/.pnpm/smol-toml@1.8.0/node_modules/smol-toml/dist/struct.js
 var KEY_PART_RE = /^[a-zA-Z0-9-_]+[ \t]*$/;
 function parseKey(ctx, end = "=") {
   let start = ctx.p;
@@ -526,7 +526,7 @@ function parseArray(ctx, integersAsBigInt) {
   });
 }
 
-// node_modules/smol-toml/dist/parse.js
+// node_modules/.pnpm/smol-toml@1.8.0/node_modules/smol-toml/dist/parse.js
 function peekTable(key, table, meta, type) {
   let t = table;
   let m = meta;
@@ -771,7 +771,7 @@ function profileDir(profile, dshHome = process.env.DSH_HOME) {
 
 // src/routes.ts
 import { mkdirSync as mkdirSync6 } from "node:fs";
-import { join as join9, sep } from "node:path";
+import { join as join10, sep } from "node:path";
 
 // src/http.ts
 async function readJsonBody(request) {
@@ -949,19 +949,58 @@ function openDirectory(dir) {
 }
 
 // src/repos.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync4, readdirSync, rmSync as rmSync2, statSync as statSync2, symlinkSync } from "node:fs";
-import { basename, join as join6, resolve } from "node:path";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync4, readdirSync as readdirSync2, statSync as statSync2, symlinkSync } from "node:fs";
+import { basename, join as join7, resolve } from "node:path";
+
+// src/rmtree.ts
+import { chmodSync, readdirSync, rmSync } from "node:fs";
+import { join as join4 } from "node:path";
+var RETRIES = { maxRetries: 10, retryDelay: 200 };
+function clearReadOnly(dir) {
+  let entries;
+  try {
+    entries = readdirSync(dir, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    const child = join4(dir, entry.name);
+    if (entry.isDirectory()) {
+      try {
+        chmodSync(child, 511);
+      } catch {
+      }
+      clearReadOnly(child);
+    } else if (entry.isFile()) {
+      try {
+        chmodSync(child, 438);
+      } catch {
+      }
+    }
+  }
+  try {
+    chmodSync(dir, 511);
+  } catch {
+  }
+}
+function removeTree(path) {
+  try {
+    clearReadOnly(path);
+  } catch {
+  }
+  rmSync(path, { recursive: true, force: true, ...RETRIES });
+}
 
 // src/state.ts
-import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync3, rmSync, writeFileSync } from "node:fs";
+import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync3, writeFileSync } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 import { randomBytes } from "node:crypto";
 function pluginStateDir(dshHome = process.env.DSH_HOME) {
-  return join4(dshHome ?? join4(homedir3(), ".dsh"), "dsh-plugin-capabilities");
+  return join5(dshHome ?? join5(homedir3(), ".dsh"), "dsh-plugin-capabilities");
 }
 function statePath(dshHome) {
-  return join4(pluginStateDir(dshHome), "state.json");
+  return join5(pluginStateDir(dshHome), "state.json");
 }
 function emptyState() {
   return { skillRoots: [] };
@@ -987,7 +1026,7 @@ function newEntryId(kind) {
   return `${kind}-${randomBytes(4).toString("hex")}`;
 }
 function materialDirFor(entryId, dshHome) {
-  return join4(pluginStateDir(dshHome), "repos", entryId);
+  return join5(pluginStateDir(dshHome), "repos", entryId);
 }
 function addSkillRoot(entry, dshHome) {
   const state = loadState(dshHome);
@@ -999,13 +1038,10 @@ function addSkillRoot(entry, dshHome) {
 function removeSkillRoot(id, dshHome) {
   const state = loadState(dshHome);
   const at = state.skillRoots.findIndex((entry) => entry.id === id);
-  if (at === -1) return false;
+  if (at === -1) return void 0;
   const [removed] = state.skillRoots.splice(at, 1);
   saveState(state, dshHome);
-  if (removed.materialDir !== void 0) {
-    rmSync(removed.materialDir, { recursive: true, force: true, maxRetries: 2 });
-  }
-  return true;
+  return removed;
 }
 function findRootByUrl(url, dshHome) {
   return loadState(dshHome).skillRoots.find((entry) => entry.url === url);
@@ -1014,7 +1050,7 @@ function findRootByUrl(url, dshHome) {
 // src/tar.ts
 import { gunzipSync } from "node:zlib";
 import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "node:fs";
-import { dirname as dirname2, join as join5 } from "node:path";
+import { dirname as dirname2, join as join6 } from "node:path";
 var LIMITS = {
   /** Per-entry cap (a skill repo holds markdown and small assets). */
   entryBytes: 64 * 1024 * 1024,
@@ -1055,7 +1091,7 @@ function safeJoin(target, name2) {
     parts.push(part);
   }
   if (parts.length === 0) return null;
-  return join5(target, ...parts);
+  return join6(target, ...parts);
 }
 function paxRecords(content) {
   const out = /* @__PURE__ */ new Map();
@@ -1159,42 +1195,42 @@ function looksLikeSkillFile(file) {
 function holdsSkills(dir) {
   let entries;
   try {
-    entries = readdirSync(dir);
+    entries = readdirSync2(dir);
   } catch {
     return false;
   }
-  if (existsSync4(join6(dir, "SKILL.md"))) return true;
+  if (existsSync4(join7(dir, "SKILL.md"))) return true;
   for (const name2 of entries) {
-    if (name2.endsWith(".md") && looksLikeSkillFile(join6(dir, name2))) return true;
+    if (name2.endsWith(".md") && looksLikeSkillFile(join7(dir, name2))) return true;
   }
   for (const name2 of entries) {
-    const child = join6(dir, name2);
+    const child = join7(dir, name2);
     try {
-      if (statSync2(child).isDirectory() && existsSync4(join6(child, "SKILL.md"))) return true;
+      if (statSync2(child).isDirectory() && existsSync4(join7(child, "SKILL.md"))) return true;
     } catch {
     }
   }
   return false;
 }
 function detectSkillRoots(checkout) {
-  if (existsSync4(join6(checkout, "SKILL.md"))) return { roots: [], single: true };
+  if (existsSync4(join7(checkout, "SKILL.md"))) return { roots: [], single: true };
   const roots = [];
   if (holdsSkills(checkout)) roots.push(checkout);
   let entries;
   try {
-    entries = readdirSync(checkout);
+    entries = readdirSync2(checkout);
   } catch {
     return { roots, single: false };
   }
   for (const name2 of entries) {
     if (name2.startsWith(".")) continue;
-    const child = join6(checkout, name2);
+    const child = join7(checkout, name2);
     try {
       if (!statSync2(child).isDirectory()) continue;
     } catch {
       continue;
     }
-    if (existsSync4(join6(child, "SKILL.md"))) continue;
+    if (existsSync4(join7(child, "SKILL.md"))) continue;
     if (holdsSkills(child)) roots.push(child);
   }
   return { roots, single: false };
@@ -1211,12 +1247,12 @@ async function addLocalRepo(path, dshHome) {
   if (detected.single) {
     const id = newEntryId("local");
     const material = materialDirFor(id, dshHome);
-    rmSync2(material, { recursive: true, force: true });
+    removeTree(material);
     mkdirSync3(material, { recursive: true });
     try {
-      symlinkSync(resolved, join6(material, "skill"), process.platform === "win32" ? "junction" : "dir");
+      symlinkSync(resolved, join7(material, "skill"), process.platform === "win32" ? "junction" : "dir");
     } catch {
-      rmSync2(material, { recursive: true, force: true });
+      removeTree(material);
       throw new Error("single-skill local folders need a directory link; try adding their parent folder instead");
     }
     return addSkillRoot({ id, kind: "local", label: basename(resolved), path: resolved, roots: [material], materialDir: material }, dshHome);
@@ -1236,8 +1272,8 @@ async function addGitRepo(url, options = {}) {
   if (archive.byteLength > TARBALL_MAX_BYTES) throw new Error("repository tarball too large");
   const id = newEntryId("git");
   const material = materialDirFor(id, options.dshHome);
-  rmSync2(material, { recursive: true, force: true });
-  const checkout = join6(material, "repo");
+  removeTree(material);
+  const checkout = join7(material, "repo");
   try {
     mkdirSync3(checkout, { recursive: true });
     extractTarGz(archive, checkout, { stripComponents: 1 });
@@ -1251,7 +1287,7 @@ async function addGitRepo(url, options = {}) {
       options.dshHome
     );
   } catch (error) {
-    rmSync2(material, { recursive: true, force: true });
+    removeTree(material);
     throw error;
   }
 }
@@ -1310,12 +1346,12 @@ function restartOwnedByShell(env = process.env) {
 }
 
 // src/skills.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync5, rmSync as rmSync3, statSync as statSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync5, rmSync as rmSync2, statSync as statSync3, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 var SKILL_NAME_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 function userSkillsDir(dshHome = process.env.DSH_HOME) {
-  return join7(dshHome ?? join7(homedir4(), ".dsh"), "skills");
+  return join8(dshHome ?? join8(homedir4(), ".dsh"), "skills");
 }
 function quote(value) {
   return JSON.stringify(value);
@@ -1345,12 +1381,12 @@ function validateSkillInput(input) {
   return null;
 }
 function skillDir(name2, dshHome) {
-  return join7(userSkillsDir(dshHome), name2);
+  return join8(userSkillsDir(dshHome), name2);
 }
 function writeSkill(input, dshHome) {
   const dir = skillDir(input.name, dshHome);
   mkdirSync4(dir, { recursive: true });
-  const file = join7(dir, "SKILL.md");
+  const file = join8(dir, "SKILL.md");
   writeFileSync3(file, serializeSkill(input), "utf8");
   return file;
 }
@@ -1358,7 +1394,7 @@ function deleteSkill(name2, dshHome) {
   if (!SKILL_NAME_RE.test(name2)) return false;
   const dir = skillDir(name2, dshHome);
   if (!existsSync5(dir) || !statSync3(dir).isDirectory()) return false;
-  rmSync3(dir, { recursive: true, force: true });
+  rmSync2(dir, { recursive: true, force: true });
   return true;
 }
 function setSkillPolicy(file, enabled) {
@@ -1389,12 +1425,12 @@ function updateSkillFile(file, input) {
 
 // src/mcp.ts
 import { existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "node:fs";
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
 import { parseDocument, Document } from "yaml";
 var MCP_PLUGIN = "@deepseek-ai/dsh-mcp-client";
 var SERVER_NAME_RE = /^[A-Za-z0-9_-]{1,32}$/;
 function loadPatch(profileDirPath) {
-  const path = join8(profileDirPath, "cordis.patch.yml");
+  const path = join9(profileDirPath, "cordis.patch.yml");
   const text = existsSync6(path) ? readFileSync6(path, "utf8") : "[]";
   const doc = parseDocument(text);
   const contents = doc.contents;
@@ -1403,7 +1439,7 @@ function loadPatch(profileDirPath) {
 }
 function savePatch(profileDirPath, doc) {
   mkdirSync5(profileDirPath, { recursive: true });
-  writeFileSync4(join8(profileDirPath, "cordis.patch.yml"), String(doc), "utf8");
+  writeFileSync4(join9(profileDirPath, "cordis.patch.yml"), String(doc), "utf8");
 }
 function toNode(value) {
   return new Document(value).contents;
@@ -1665,7 +1701,7 @@ function mountCapabilitiesRoutes(host, config) {
               sendJson(response, 403, { error: `skills from source '${existing.source}' are read-only` });
               return;
             }
-            updateSkillFile(join9(dir, "SKILL.md"), input);
+            updateSkillFile(join10(dir, "SKILL.md"), input);
           } else {
             writeSkill(input);
           }
@@ -1857,12 +1893,13 @@ function mountCapabilitiesRoutes(host, config) {
             sendJson(response, 400, { error: "id is required" });
             return;
           }
-          const ok = removeSkillRoot(body.id);
-          if (!ok) {
+          const removed = removeSkillRoot(body.id);
+          if (removed === void 0) {
             sendJson(response, 404, { error: "repository not found" });
             return;
           }
           await config.remountProvider();
+          if (removed.materialDir !== void 0) removeTree(removed.materialDir);
           sendJson(response, 200, { ok: true });
         } catch (error) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) });
@@ -2171,7 +2208,7 @@ function mountCapabilitiesRoutes(host, config) {
 // src/index.ts
 var name = "dsh-plugin-capabilities";
 function packagedSkillsDir() {
-  return join10(dirname4(fileURLToPath2(import.meta.url)), "..", "skills");
+  return join11(dirname4(fileURLToPath2(import.meta.url)), "..", "skills");
 }
 var inject = ["webServer", "skills"];
 function apply(ctx, config) {