vet-skills 0.3.0 → 0.5.0

package/dist/index.js

@@ -7614,8 +7614,8 @@ var init_dist = __esm({
 init_dist();
 import { parseArgs } from "node:util";
 import { spawnSync } from "node:child_process";
-import { readFileSync as readFileSync3, existsSync as existsSync3 } from "node:fs";
-import { resolve, join as join3, dirname, basename } from "node:path";
+import { readFileSync as readFileSync3, existsSync as existsSync4 } from "node:fs";
+import { resolve, join as join4, dirname, basename } from "node:path";
 import { hostname, platform, userInfo } from "node:os";
 import { createHash } from "node:crypto";
 import { createInterface } from "node:readline";
@@ -7629,7 +7629,7 @@ import { mkdirSync, readFileSync, writeFileSync, existsSync, appendFileSync, chm
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { randomUUID } from "node:crypto";
-var VERSION = "0.3.0";
+var VERSION = "0.5.0";
 var HOME = process.env.VET_SKILLS_HOME ?? join(homedir(), ".vet-skills");
 var API = (process.env.KILLERSKILLS_API ?? "https://killerskills.ai").replace(/\/$/, "");
 var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
@@ -7778,6 +7778,11 @@ function report(body) {
   if (!org) return Promise.resolve({ ok: false, error: "not joined", offline: false });
   return call(`/api/v1/orgs/${org.slug}/agents/${org.agentId}/report`, { method: "POST", body: JSON.stringify(body), headers: orgHeaders() }, 8e3);
 }
+function confirmRemoval(removalId, body) {
+  const org = readOrg();
+  if (!org) return Promise.resolve({ ok: false, error: "not joined", offline: false });
+  return call(`/api/v1/orgs/${org.slug}/agents/${org.agentId}/removals/${removalId}/confirm`, { method: "POST", body: JSON.stringify(body), headers: orgHeaders() });
+}
 function publish(tgz) {
   const org = readOrg();
   if (!org) return Promise.resolve({ ok: false, status: 0, error: "not enrolled in an organization (vet-skills join <org> --token \u2026)", offline: false });
@@ -7854,7 +7859,7 @@ async function check(q, opts = {}) {
   let source = "api";
   let offline = false;
   let cacheAge;
-  let res = await resolveSkill(q);
+  let res = await resolveSkill(q, opts.registry);
   if (!res.ok && !res.offline && org) {
     const bare = q.replace(/^[^/]+\//, "");
     const priv = await resolveSkill(`${org.slug}/${bare}`, "private");
@@ -7986,9 +7991,59 @@ function restrictionText(r) {
 }
 
 // src/hook.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { join as join3 } from "node:path";
+
+// src/sync.ts
+import { existsSync as existsSync2, rmSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join as join2 } from "node:path";
+function skillDirs(name) {
+  const bare = name.replace(/^.*\//, "").replace(/@.*$/, "");
+  return [join2(homedir2(), ".claude", "skills", bare), join2(process.cwd(), ".claude", "skills", bare), join2(homedir2(), ".claude", "plugins", bare)];
+}
+async function applyRemovals(pending, log = () => {
+}) {
+  let done = 0;
+  const byRequest = /* @__PURE__ */ new Map();
+  for (const r of pending) byRequest.set(r.removal_id, [...byRequest.get(r.removal_id) ?? [], r]);
+  for (const [removalId, items] of byRequest) {
+    const detail = [];
+    let failed = false;
+    for (const it of items) {
+      const dirs = skillDirs(it.skill).filter((d) => existsSync2(d));
+      if (!dirs.length) {
+        detail.push(`${it.skill}: not on disk`);
+        continue;
+      }
+      try {
+        for (const d of dirs) rmSync(d, { recursive: true, force: true });
+        detail.push(`${it.skill}: removed ${dirs.join(", ")}`);
+      } catch (e) {
+        failed = true;
+        detail.push(`${it.skill}: ${e.message}`);
+      }
+    }
+    const res = await confirmRemoval(removalId, { status: failed ? "failed" : "confirmed", detail: detail.join("; ") });
+    if (res.ok) {
+      done += items.length;
+      log(`${failed ? "!" : "\u2713"} ${items.map((i) => i.skill).join(", ")} ${failed ? "removal failed" : "removed"} (${removalId})`);
+    } else log(`! could not confirm removal ${removalId}: ${res.error}`);
+  }
+  return done;
+}
+async function sync(log = () => {
+}) {
+  const org = readOrg();
+  if (!org) return { ok: false, removed: 0, error: "not joined" };
+  const res = await report({ installed: [], removed: [], hook_version: void 0 });
+  if (!res.ok) return { ok: false, removed: 0, error: res.error };
+  const removed = await applyRemovals(res.data.pending_removals, log);
+  return { ok: true, removed };
+}
+
+// src/hook.ts
 var INSTALL_PATTERNS = [
   { re: /(?:npx\s+(?:-y\s+)?)?skills\s+add\s+(\S+)/, kind: "skill" },
   { re: /claude\s+plugin\s+install\s+(\S+)/, kind: "plugin" },
@@ -8016,10 +8071,41 @@ function extractRemoteMcp(command) {
   const name = positional.find((a) => a !== url) ?? new URL(url).hostname;
   return { name, url };
 }
+function extractStdioPackage(command) {
+  const tail = command.split(/\s--\s/)[1];
+  if (!tail) return null;
+  const args = (tail.match(/"[^"]*"|'[^']*'|\S+/g) ?? []).map((a) => a.replace(/^(['"])(.*)\1$/, "$2"));
+  const [bin, ...rest2] = args;
+  const strip = (s) => s.replace(/(.)@[^@/]+$/, "$1");
+  if (/^(npx|bunx|pnpm)$/.test(bin ?? "")) {
+    const pkg = rest2.find((a) => !a.startsWith("-") && a !== "dlx" && a !== "exec");
+    return pkg ? { q: strip(pkg).replace(/^@/, ""), registry: "npm" } : null;
+  }
+  if (/^(uvx|pipx)$/.test(bin ?? "")) {
+    const pkg = rest2.find((a) => !a.startsWith("-") && a !== "run");
+    return pkg ? { q: strip(pkg).toLowerCase().replace(/\[.*\]$/, ""), registry: "pypi" } : null;
+  }
+  if (bin === "docker") {
+    const img = rest2.find((a) => /^(ghcr\.io\/|docker\.io\/)?[\w.-]+\/[\w.-]+(:[\w.-]+)?$/.test(a) && !a.startsWith("-"));
+    if (!img) return null;
+    const m = img.replace(/:[\w.-]+$/, "").match(/mcp\/([\w.-]+)$/);
+    return m ? { q: m[1], registry: "docker" } : null;
+  }
+  return null;
+}
 function extractInstall(command) {
   for (const p of INSTALL_PATTERNS) {
     const m = command.match(p.re);
-    if (m) return { q: m[1].replace(/^['"]|['"]$/g, ""), kind: p.kind };
+    if (!m) continue;
+    const q = m[1].replace(/^['"]|['"]$/g, "");
+    if (p.kind === "mcp") {
+      const pkg = extractStdioPackage(command);
+      if (pkg) return { q: pkg.q, kind: "mcp", registry: pkg.registry };
+      const remote = extractRemoteMcp(command);
+      if (remote) return { q: remote.name, kind: "mcp" };
+    }
+    if (p.kind === "plugin") return { q: q.split("@")[0], kind: "plugin", registry: "plugins" };
+    return { q, kind: p.kind };
   }
   return null;
 }
@@ -8032,14 +8118,17 @@ async function hookEval(stdin) {
   }
   if (payload.tool_name !== "Bash" || !payload.tool_input?.command) return 0;
   const cmd2 = payload.tool_input.command;
-  if (/^\s*vet-skills\s+(check|why|status|policy|detonate|hook|join|leave|block)\b/.test(cmd2)) return 0;
+  if (/^\s*vet-skills\s+(check|why|status|sync|policy|detonate|hook|join|leave|block|publish)\b/.test(cmd2)) return 0;
   const found = extractInstall(cmd2);
   if (!found) return 0;
-  const r = await check(found.q, { quiet: true, agentKind: "claude_code" });
+  const r = await check(found.q, { quiet: true, agentKind: "claude_code", registry: found.registry });
   const out = renderOutcome(r);
   const remote = found.kind === "mcp" ? extractRemoteMcp(cmd2) : null;
   const watch = async () => {
-    if (remote && readOrg()) await report({ installed: [], removed: [], mcp_servers: [remote] }).catch(() => null);
+    if (!readOrg()) return;
+    const res = await report({ installed: [], removed: [], ...remote ? { mcp_servers: [remote] } : {} }).catch(() => null);
+    if (res?.ok && res.data.pending_removals.length) await applyRemovals(res.data.pending_removals, (l) => process.stderr.write(`vet-skills \xB7 ${l}
+`)).catch(() => 0);
   };
   switch (r.decision.decision) {
     case "allow":
@@ -8073,11 +8162,11 @@ ${out}
   return 0;
 }
 function installClaudeCodeHook() {
-  const dir = join2(homedir2(), ".claude");
-  const path = join2(dir, "settings.json");
-  if (!existsSync2(dir)) mkdirSync2(dir, { recursive: true });
+  const dir = join3(homedir3(), ".claude");
+  const path = join3(dir, "settings.json");
+  if (!existsSync3(dir)) mkdirSync2(dir, { recursive: true });
   let settings = {};
-  if (existsSync2(path)) {
+  if (existsSync3(path)) {
     try {
       settings = JSON.parse(readFileSync2(path, "utf8"));
     } catch {
@@ -8102,6 +8191,7 @@ var { values, positionals } = parseArgs({
     org: { type: "string" },
     yes: { type: "boolean", short: "y" },
     json: { type: "boolean" },
+    ci: { type: "boolean" },
     email: { type: "string" },
     help: { type: "boolean", short: "h" },
     version: { type: "boolean", short: "v" },
@@ -8126,11 +8216,12 @@ var USAGE = `vet-skills ${VERSION} \u2014 check agent skills and MCP servers bef
   vet-skills detonate <path> [--publisher h] upload a local bundle to the sandbox and print its verdict
   vet-skills publish <path>             detonate and publish to your organization's private registry
   vet-skills why <skill>                last decision and the rule behind it
-  vet-skills join <org> --token <t> [--email you@co]   enroll this machine in an org
+  vet-skills join <org> --token <t> [--email you@co] [--ci]   enroll this machine (or a CI runner, seat-free) in an org
   vet-skills leave                      back to the personal policy
   vet-skills policy show|set <file>     view or replace the local policy
   vet-skills block <skill> [--reason]   add to the personal block list
   vet-skills status                     org, policy version, last report, cache size
+  vet-skills sync                       pull the org policy and apply pending removals
   vet-skills hook install claude-code   register the Claude Code PreToolUse hook
   vet-skills hook eval                  (called by the agent) read hook JSON on stdin
 
@@ -8154,7 +8245,7 @@ async function main() {
         usage();
         return 1;
       }
-      const r = await check(rest[0], { agentKind: values.agent });
+      const r = await check(rest[0], { agentKind: values.agent, registry: values.registry });
       if (values.json) {
         console.log(JSON.stringify({ decision: r.decision, resolved: r.resolved, source: r.source, offline: r.offline }, null, 2));
         return r.decision.decision === "block" ? 2 : 0;
@@ -8211,7 +8302,7 @@ async function main() {
         return 1;
       }
       const dir = resolve(rest[0]);
-      if (!existsSync3(join3(dir, "SKILL.md")) && !existsSync3(join3(dir, "package.json"))) {
+      if (!existsSync4(join4(dir, "SKILL.md")) && !existsSync4(join4(dir, "package.json"))) {
         console.log(`${c.blocked("\u2717")} ${dir} has no SKILL.md or package.json`);
         return 1;
       }
@@ -8254,7 +8345,7 @@ async function main() {
         return 1;
       }
       const dir = resolve(rest[0]);
-      if (!existsSync3(join3(dir, "SKILL.md"))) {
+      if (!existsSync4(join4(dir, "SKILL.md"))) {
         console.log(`${c.blocked("\u2717")} ${dir} has no SKILL.md (name and version come from its frontmatter)`);
         return 1;
       }
@@ -8306,7 +8397,8 @@ async function main() {
         agent_kind: values.agent ?? "other",
         hook_version: VERSION,
         os: platform(),
-        installed: []
+        installed: [],
+        ci: values.ci === true
       });
       if (!res.ok) {
         console.error(`${c.blocked("\u2715")} Could not join ${slug}: ${res.error}`);
@@ -8391,11 +8483,24 @@ async function main() {
             console.log(`${c.verified("\u2713")} Policy updated to v${res.data.policy_version}`);
           }
           for (const a of res.data.pending_approvals) console.log(`approval ${a.skill} \xB7 ${a.status} \xB7 ${a.request_id}`);
-          for (const r of res.data.pending_removals) console.log(`${c.caution("!")} removal requested: ${r.skill} (${r.removal_id})`);
+          if (res.data.pending_removals.length) await applyRemovals(res.data.pending_removals, (l) => console.log(l));
         } else console.log(c.caution(`report failed: ${res.error}`));
       }
       return 0;
     }
+    case "sync": {
+      if (!readOrg()) {
+        console.log(c.muted("Not joined to an org; nothing to sync."));
+        return 0;
+      }
+      const r = await sync((l) => console.log(l));
+      if (!r.ok) {
+        console.log(c.caution(`sync failed: ${r.error}`));
+        return 1;
+      }
+      console.log(`${c.verified("\u2713")} in sync \xB7 ${r.removed} removal${r.removed === 1 ? "" : "s"} applied`);
+      return 0;
+    }
     case "hook": {
       const sub = rest[0];
       if (sub === "eval") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vet-skills",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Vet agent skills and MCP servers before they run. Verdicts from KillerSkills, policy from your org.",
   "type": "module",
   "bin": {
@@ -10,21 +10,14 @@
     "dist",
     "README.md"
   ],
-  "scripts": {
-    "build": "esbuild src/index.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/index.js --banner:js=\"import { createRequire as __cr } from 'node:module'; const require = __cr(import.meta.url);\" && node scripts/shebang.mjs",
-    "dev": "tsx src/index.ts",
-    "test": "node --import tsx --test test/*.test.ts",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "prepublishOnly": "pnpm build && node dist/index.js --version"
-  },
   "dependencies": {},
   "devDependencies": {
-    "@killerskills/policy": "workspace:*",
     "yaml": "^2.6.0",
     "@types/node": "^20",
     "tsx": "^4.19.0",
     "typescript": "^5",
-    "esbuild": "^0.28.2"
+    "esbuild": "^0.28.2",
+    "@killerskills/policy": "0.1.0"
   },
   "engines": {
     "node": ">=20"
@@ -49,5 +42,11 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "build": "esbuild src/index.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/index.js --banner:js=\"import { createRequire as __cr } from 'node:module'; const require = __cr(import.meta.url);\" && node scripts/shebang.mjs",
+    "dev": "tsx src/index.ts",
+    "test": "node --import tsx --test test/*.test.ts",
+    "typecheck": "tsc -p tsconfig.json --noEmit"
   }
-}
+}