@dawn0608/dsh-skill-manager 0.1.6 → 0.2.0

package/lib/index.js

@@ -7413,10 +7413,10 @@ var require_dist = __commonJS({
 
 // src/index.js
 import { homedir } from "node:os";
-import { join as join5, resolve as resolve2 } from "node:path";
+import { join as join4, resolve as resolve2 } from "node:path";
 
 // src/host.js
-import { isAbsolute as isAbsolute2, join as join4, normalize } from "node:path";
+import { isAbsolute as isAbsolute2, join as join3, normalize } from "node:path";
 
 // src/host-bundle.js
 var import_yaml = __toESM(require_dist(), 1);
@@ -7586,7 +7586,7 @@ import {
   unlinkSync,
   writeFileSync
 } from "node:fs";
-import { dirname, join as join2 } from "node:path";
+import { dirname, join as join2, resolve, toNamespacedPath } from "node:path";
 import { randomUUID } from "node:crypto";
 function stat(path) {
   try {
@@ -7599,6 +7599,13 @@ function stat(path) {
 function identity(stats) {
   return `${stats.dev}:${stats.ino}:${stats.birthtimeNs}`;
 }
+function linkTargets(path, expected) {
+  const target = resolve(dirname(path), readlinkSync(path));
+  return process.platform === "win32" ? toNamespacedPath(target).toLowerCase() === toNamespacedPath(resolve(expected)).toLowerCase() : target === resolve(expected);
+}
+function directoryLink(target, path) {
+  symlinkSync(resolve(target), path, process.platform === "win32" ? "junction" : "dir");
+}
 function safeDirectory(path, create) {
   let stats = stat(path);
   if (!stats && create) {
@@ -7685,19 +7692,30 @@ function createSkillStore(home) {
   function takeLock() {
     for (let generation = 0; ; generation += 1) {
       const path = join2(manager, `.write-lock-${generation}`);
+      const temp = join2(manager, `.lock-${randomUUID()}`);
+      writeFileSync(temp, JSON.stringify({ pid: process.pid, nonce: randomUUID() }), { flag: "wx", mode: 384 });
+      const token = identity(stat(temp));
       try {
-        symlinkSync(`dsh-skill-manager-pid-${process.pid}`, path, "file");
-        const token = identity(stat(path));
+        linkSync(temp, path);
+        if (!sameEntry(path, token)) throw new ManagerError("conflict");
         return () => unlinkOwned(path, token);
       } catch (error) {
         if (error.code !== "EEXIST") throw error;
+      } finally {
+        unlinkSync(temp);
       }
       const stats = stat(path);
-      if (!stats) throw new ManagerError("conflict");
-      if (!stats.isSymbolicLink()) throw new ManagerError("conflict");
-      const owner = /^dsh-skill-manager-pid-([1-9][0-9]*)$/.exec(readlinkSync(path));
-      const pid = Number(owner?.[1]);
-      if (!Number.isSafeInteger(pid) || pid > 2147483647) throw new ManagerError("conflict");
+      if (!stats?.isFile()) throw new ManagerError("conflict");
+      let owner;
+      try {
+        owner = JSON.parse(readRegularFile(path, 1024, identity(stats)));
+      } catch {
+        throw new ManagerError("conflict");
+      }
+      const pid = owner?.pid;
+      if (!Number.isSafeInteger(pid) || pid < 1 || pid > 2147483647 || !MANAGED_ID.test(owner?.nonce ?? "")) {
+        throw new ManagerError("conflict");
+      }
       try {
         process.kill(pid, 0);
       } catch (error) {
@@ -7713,6 +7731,9 @@ function createSkillStore(home) {
     try {
       if (!roots()) throw new ManagerError("conflict");
       return operation();
+    } catch (error) {
+      if (["EBUSY", "EACCES", "EPERM"].includes(error.code)) throw new ManagerError("conflict");
+      throw error;
     } finally {
       release();
     }
@@ -7732,13 +7753,13 @@ function createSkillStore(home) {
     if (!activation) return false;
     if (!stats?.isSymbolicLink() || activation.link !== null && identity(stats) !== activation.link) return false;
     const anchor = anchorPath(activation);
-    return readlinkSync(paths.active) === anchor && stat(anchor)?.isSymbolicLink() === true && readlinkSync(anchor) === paths.bundle;
+    return linkTargets(paths.active, anchor) && stat(anchor)?.isSymbolicLink() === true && linkTargets(anchor, paths.bundle);
   }
   function discardAnchor(paths, activation) {
     if (!activation) return;
     const anchor = anchorPath(activation);
     const stats = stat(anchor);
-    if (stats?.isSymbolicLink() && readlinkSync(anchor) === paths.bundle) unlinkOwned(anchor, identity(stats));
+    if (stats?.isSymbolicLink() && linkTargets(anchor, paths.bundle)) unlinkOwned(anchor, identity(stats));
   }
   function lookup(name, id) {
     const paths = pathsFor(name);
@@ -7804,7 +7825,7 @@ function createSkillStore(home) {
     assertFree(skills, [name, `${name}.md`]);
     const activation = { anchor: randomUUID(), link: null };
     const anchor = anchorPath(activation);
-    symlinkSync(paths.bundle, anchor, "dir");
+    directoryLink(paths.bundle, anchor);
     let prepared;
     try {
       prepared = writeRecord(paths.record, { ...record.data, activation }, record.token);
@@ -7814,7 +7835,7 @@ function createSkillStore(home) {
     }
     discardAnchor(paths, record.data.activation);
     try {
-      symlinkSync(anchor, paths.active, "dir");
+      directoryLink(anchor, paths.active);
     } catch (error) {
       if (error.code === "EEXIST") throw new ManagerError("conflict");
       throw error;
@@ -7929,142 +7950,6 @@ function createSkillStore(home) {
   return { install, list, read, remove, setEnabled };
 }
 
-// src/shared-sync.js
-import { constants as constants3, watchFile, unwatchFile } from "node:fs";
-import { lstat as lstat2, open as open2, readdir, realpath as realpath2 } from "node:fs/promises";
-import { createConnection } from "node:net";
-import { dirname as dirname2, join as join3, resolve } from "node:path";
-var syncDirectory = (home) => join3(home, "skill-manager", "shared-sync");
-var syncSocket = (home) => join3(syncDirectory(home), "control.sock");
-var syncStateFile = (home) => join3(syncDirectory(home), "state.json");
-var MAX_STATE_BYTES = 2 * 1024 * 1024;
-var disabled = { modelInvocable: false, userInvocable: false };
-async function regularFile(path, limit) {
-  var _stack = [];
-  try {
-    const before = await lstat2(path);
-    if (!before.isFile() || before.size > limit) throw new ManagerError("invalid");
-    const file = __using(_stack, await open2(path, constants3.O_RDONLY | (constants3.O_NOFOLLOW ?? 0) | (constants3.O_NONBLOCK ?? 0)), true);
-    const stat2 = await file.stat();
-    if (!stat2.isFile() || stat2.dev !== before.dev || stat2.ino !== before.ino || stat2.size > limit) {
-      throw new ManagerError("conflict");
-    }
-    const bytes = Buffer.alloc(stat2.size + 1);
-    const { bytesRead } = await file.read(bytes);
-    if (bytesRead !== stat2.size) throw new ManagerError("conflict");
-    return bytes.subarray(0, bytesRead);
-  } catch (_) {
-    var _error = _, _hasError = true;
-  } finally {
-    var _promise = __callDispose(_stack, _error, _hasError);
-    _promise && await _promise;
-  }
-}
-async function sharedSkills(agentsHome) {
-  const root = await realpath2(join3(agentsHome, "skills")).catch((error) => {
-    if (error.code !== "ENOENT") throw error;
-  });
-  const skills = /* @__PURE__ */ new Map();
-  if (!root) return skills;
-  for (const entry of await readdir(root, { withFileTypes: true })) {
-    if (!entry.isDirectory() || !isManagedName(entry.name) || entry.name === "synced" || entry.name === "anthropic-skills") continue;
-    const path = join3(root, entry.name, "SKILL.md");
-    try {
-      if (await realpath2(path) !== path) continue;
-      const parsed = parseSkillFile(await regularFile(path, MAX_BUNDLE_BYTES));
-      if (parsed.name === entry.name) skills.set(path, { path, name: parsed.name, description: parsed.description });
-    } catch (error) {
-      if (error.code !== "ENOENT" && error.code !== "invalid") throw error;
-    }
-  }
-  return skills;
-}
-async function readSyncState(home) {
-  try {
-    const value = JSON.parse(await regularFile(syncStateFile(home), MAX_STATE_BYTES));
-    if (value.version !== 1 || !isRecord(value.entries)) return null;
-    return value;
-  } catch (error) {
-    if (error.code === "ENOENT") return null;
-    throw new ManagerError("unavailable");
-  }
-}
-function requestSync(home, message) {
-  return new Promise((resolve3, reject) => {
-    const socket = createConnection(syncSocket(home));
-    let data = "";
-    const fail = () => {
-      socket.destroy();
-      reject(new ManagerError("unavailable"));
-    };
-    socket.setEncoding("utf8");
-    socket.setTimeout(9e3, fail);
-    socket.on("error", fail);
-    socket.on("connect", () => socket.write(JSON.stringify(message) + "\n"));
-    socket.on("data", (chunk) => {
-      data += chunk;
-      if (data.length > 8192) return fail();
-      if (!data.includes("\n")) return;
-      socket.destroy();
-      try {
-        const reply = JSON.parse(data);
-        if (!reply.ok) return reject(new ManagerError(reply.error === "conflict" ? "conflict" : "unavailable"));
-        resolve3(reply.result);
-      } catch {
-        fail();
-      }
-    });
-    socket.on("end", fail);
-  });
-}
-function sharedPolicyEnabled(entry) {
-  if (!entry) return void 0;
-  if (typeof entry.policyEnabled === "boolean") return entry.policyEnabled;
-  if (entry.pending && (entry.codex === false || entry.claude === "off")) return false;
-  return entry.enabled;
-}
-function registerSharedPolicy(skills, home, agentsHome) {
-  if (typeof skills.registerProvider !== "function") return () => {
-  };
-  let invalidate;
-  const dispose = skills.registerProvider((control) => {
-    invalidate = control.invalidate;
-    return {
-      name: "skill-manager-shared-policy",
-      async list() {
-        const state = await readSyncState(home);
-        if (!state || !Object.values(state.entries).some((entry) => sharedPolicyEnabled(entry) === false)) return [];
-        return [...(await sharedSkills(agentsHome)).values()].filter((skill) => sharedPolicyEnabled(state.entries[skill.path]) === false).map((skill) => ({
-          ...skill,
-          provider: "skill-manager-shared-policy",
-          source: "user-agents",
-          // Immediately ahead of the default user-agents provider. Project and user-dsh win.
-          rank: 499,
-          invocation: disabled,
-          locator: skill.path,
-          resourceBase: { kind: "directory", path: dirname2(skill.path) }
-        }));
-      },
-      async get(candidate) {
-        try {
-          if (await realpath2(candidate.path) !== candidate.path) return void 0;
-          const { name, description, body } = parseSkillFile(await regularFile(candidate.path, MAX_BUNDLE_BYTES));
-          return { ...candidate, name, description, content: body };
-        } catch (error) {
-          if (error.code === "ENOENT" || error.code === "invalid") return void 0;
-          throw error;
-        }
-      }
-    };
-  });
-  const path = syncStateFile(home);
-  watchFile(path, { persistent: false, interval: 500 }, invalidate);
-  return () => {
-    unwatchFile(path, invalidate);
-    dispose();
-  };
-}
-
 // src/host.js
 var ROUTE = "/api/skill-manager";
 var MAX_REQUEST_BYTES = 12 * 1024 * 1024;
@@ -8105,7 +7990,7 @@ function parseId(id) {
 function skillProvenance(skill, provenance) {
   return skill.source === "bundled" ? { origin: "builtin" } : provenance(skill);
 }
-function catalogRow(skill, provenance, shared) {
+function catalogRow(skill, provenance) {
   const origin = skillProvenance(skill, provenance)?.origin;
   return {
     id: `catalog:${skill.name}`,
@@ -8113,7 +7998,7 @@ function catalogRow(skill, provenance, shared) {
     description: skill.description,
     group: SOURCES.get(skill.source) ?? "local",
     source: SOURCES.has(skill.source) ? skill.source : "other",
-    enabled: skill.source === "user-agents" && typeof sharedPolicyEnabled(shared?.[skill.path]) === "boolean" ? sharedPolicyEnabled(shared[skill.path]) : null,
+    enabled: null,
     shadowed: false,
     ...origin && { origin }
   };
@@ -8122,7 +8007,7 @@ function matchesManaged(skill, managed) {
   if (!skill || skill.source !== "user-dsh" || typeof skill.path !== "string") return false;
   if (!managed.enabled && !managed.activeMissing) return false;
   const path = normalize(skill.path);
-  return path === managed.resolvedFile || path === join4(managed.bundle, "SKILL.md") || path === join4(managed.active, "SKILL.md");
+  return path === managed.resolvedFile || path === join3(managed.bundle, "SKILL.md") || path === join3(managed.active, "SKILL.md");
 }
 function createSkillManager({ home, agentsHome, skills, workspaceRegistry, agentPresets }) {
   const store = createSkillStore(home);
@@ -8156,10 +8041,9 @@ function createSkillManager({ home, agentsHome, skills, workspaceRegistry, agent
   }
   async function list(options) {
     const workspaces = workspaceRegistry.list().map(({ id, title }) => ({ id, title }));
-    const [catalog, provenance, sync] = await Promise.all([
+    const [catalog, provenance] = await Promise.all([
       snapshot(options),
-      readProvenance(agentsHome),
-      readSyncState(home).catch(() => ({ error: "unavailable" }))
+      readProvenance(agentsHome)
     ]);
     const managed = store.list();
     const byName = new Map(catalog.skills.map((skill) => [skill.name, skill]));
@@ -8178,17 +8062,12 @@ function createSkillManager({ home, agentsHome, skills, workspaceRegistry, agent
         shadowed: skill.enabled && Boolean(match) && !ownWinner
       });
     }
-    rows.push(...[...byName.values()].map((skill) => catalogRow(skill, provenance, sync?.entries)));
+    rows.push(...[...byName.values()].map((skill) => catalogRow(skill, provenance)));
     rows.sort((left, right) => left.name.localeCompare(right.name) || Number(right.group === "imported") - Number(left.group === "imported"));
-    const syncError = sync?.error ?? Object.values(sync?.entries ?? {}).find((entry) => entry.error)?.error;
-    const stopped = sync && !sync.error && (!Number.isFinite(Date.parse(sync.health?.lastAttemptAt)) || Date.now() - Date.parse(sync.health.lastAttemptAt) > 15e3);
-    const healthError = stopped ? "sharedStopped" : sync?.health?.status === "unavailable" ? "sharedUnavailable" : null;
     return {
-      ...sync?.health && { syncHealth: sync.health },
       skills: rows,
       workspaces,
-      complete: catalog.complete && managed.complete,
-      ...(healthError || syncError) && { syncError: healthError ?? (syncError === "conflict" ? "sharedConflict" : "sharedUnavailable") }
+      complete: catalog.complete && managed.complete
     };
   }
   async function detail(id, options) {
@@ -8235,17 +8114,6 @@ function createSkillManager({ home, agentsHome, skills, workspaceRegistry, agent
       case "setEnabled":
       case "remove": {
         const { kind, name, installId } = parseId(payload.id);
-        if (kind === "catalog" && action === "setEnabled") {
-          if (typeof payload.enabled !== "boolean") throw new ManagerError("invalid");
-          return scoped(options, async (scopedOptions) => {
-            const skill = await load(name, scopedOptions);
-            const sync = await readSyncState(home);
-            if (skill?.source !== "user-agents" || !sync?.entries[skill.path]) throw new ManagerError("forbidden");
-            signal?.throwIfAborted();
-            await requestSync(home, { type: "set", path: skill.path, enabled: payload.enabled });
-            return null;
-          });
-        }
         if (kind !== "managed") throw new ManagerError("forbidden");
         signal?.throwIfAborted();
         if (action === "setEnabled") {
@@ -8323,8 +8191,8 @@ function createFetchHandler(manager) {
 var inject = ["agentPresets", "connection", "skills", "workspaceRegistry"];
 function resolveHome(configured, fallback) {
   return configured?.trim() ? resolve2(
-    configured === "~" ? homedir() : /^~[/\\]/.test(configured) ? join5(homedir(), configured.slice(2)) : configured
-  ) : join5(homedir(), fallback);
+    configured === "~" ? homedir() : /^~[/\\]/.test(configured) ? join4(homedir(), configured.slice(2)) : configured
+  ) : join4(homedir(), fallback);
 }
 function apply(ctx) {
   const home = resolveHome(process.env.DSH_HOME, ".dsh");
@@ -8336,9 +8204,6 @@ function apply(ctx) {
     workspaceRegistry: ctx.workspaceRegistry,
     agentPresets: ctx.agentPresets
   });
-  if (typeof ctx.skills.registerProvider === "function") {
-    ctx.effect(() => registerSharedPolicy(ctx.skills, home, agentsHome), "skill-manager: shared invocation policy");
-  }
   ctx.effect(() => ctx.connection.fetch.register({
     path: ROUTE,
     methods: ["POST"],