@rrskill/cli 0.1.2 → 0.1.4

package/dist/index.js

@@ -3,18 +3,18 @@ import * as u from "node:fs/promises";
 import { fileURLToPath as _, pathToFileURL as kt } from "node:url";
 import { readFileSync as wt } from "node:fs";
 import { createHash as yt } from "node:crypto";
-import * as Z from "node:os";
+import * as Q from "node:os";
 import * as vt from "node:zlib";
 import { promisify as St } from "node:util";
-const Q = ["search", "install", "list", "upgrade", "bootstrap", "doctor", "version"], X = new Set(Q), Dt = "--host", xt = "--output", jt = /* @__PURE__ */ new Set([Dt, xt]), Ct = /* @__PURE__ */ new Set(["--openclaw", "--codex", "--claude-code"]);
-function Y(t) {
+const X = ["search", "install", "list", "upgrade", "bootstrap", "doctor", "version"], Y = new Set(X), Dt = "--host", xt = "--output", jt = /* @__PURE__ */ new Set([Dt, xt]), Ct = /* @__PURE__ */ new Set(["--openclaw", "--codex", "--claude-code"]);
+function tt(t) {
   const s = [];
   for (let e = 0; e < t.length; e += 1) {
     const r = t[e];
     if (r) {
       if (jt.has(r)) {
         const i = t[e + 1];
-        i && !i.startsWith("--") && !X.has(i) && (e += 1);
+        i && !i.startsWith("--") && !Y.has(i) && (e += 1);
         continue;
       }
       Ct.has(r) || r.startsWith("--") || s.push(r);
@@ -23,8 +23,8 @@ function Y(t) {
   return s;
 }
 function Et(t) {
-  const s = Y(t), e = s[0] ?? "";
-  return e ? e === "help" ? { command: "help" } : X.has(e) ? { command: e } : s.length === 1 ? { command: "install", slug: e } : { command: "unknown", input: e } : { command: "help" };
+  const s = tt(t), e = s[0] ?? "";
+  return e ? e === "help" ? { command: "help" } : Y.has(e) ? { command: e } : s.length === 1 ? { command: "install", slug: e } : { command: "unknown", input: e } : { command: "help" };
 }
 async function b(t) {
   const s = t.fsImpl ?? u;
@@ -55,7 +55,7 @@ async function _t(t) {
     };
   }
 }
-function J(t, s) {
+function B(t, s) {
   let e = t;
   for (const r of s) {
     if (!e || typeof e != "object")
@@ -64,7 +64,7 @@ function J(t, s) {
   }
   return e;
 }
-async function tt(t, s = {}) {
+async function st(t, s = {}) {
   const e = s.fs ?? u, r = [], i = ["find-skills", "rrskill-preference"];
   for (const f of i) {
     const d = l.join(t.skillsDir, f, "SKILL.md");
@@ -77,7 +77,7 @@ async function tt(t, s = {}) {
   const c = await _t({ fsImpl: e, path: t.hostConfigPath });
   if (!c.ok)
     return r.push(c.issue), { ok: !1, issues: r };
-  const a = J(c.value, ["plugins", "entries", "rrskill"]);
+  const a = B(c.value, ["plugins", "entries", "rrskill"]);
   if (!a || typeof a != "object")
     r.push({ code: "missing_host_plugin_entry", path: t.hostConfigPath });
   else {
@@ -87,7 +87,7 @@ async function tt(t, s = {}) {
       { key: ["plugins", "entries", "rrskill", "config", "primaryLabel"], expected: "official-registry" }
     ];
     for (const d of f) {
-      const h = J(c.value, d.key);
+      const h = B(c.value, d.key);
       h !== d.expected && r.push({
         code: "host_plugin_policy_mismatch",
         path: t.hostConfigPath,
@@ -128,14 +128,14 @@ async function U(t) {
   }
   return await s.mkdir(l.dirname(t.path), { recursive: !0 }), await s.writeFile(t.path, e, "utf8"), !0;
 }
-const B = ["find-skills", "rrskill-preference"];
+const q = ["find-skills", "rrskill-preference"];
 function Lt(t) {
   return t === "find-skills" ? "skills/find-skills.md" : "skills/rrskill-preference.md";
 }
 async function bt(t, s = {}) {
   const e = s.fs ?? u;
   let r = !1;
-  for (const i of B) {
+  for (const i of q) {
     const o = await P({
       candidates: O(import.meta.url, Lt(i)),
       fsImpl: e,
@@ -143,7 +143,7 @@ async function bt(t, s = {}) {
     }), n = l.join(t.skillsDir, i, "SKILL.md"), c = await U({ path: n, content: o, fsImpl: e });
     r = r || c;
   }
-  return { installed: [...B], changed: r };
+  return { installed: [...q], changed: r };
 }
 async function $t(t, s = {}) {
   const e = s.fs ?? u;
@@ -160,12 +160,12 @@ async function $t(t, s = {}) {
   }), o = l.join(t.pluginDir, "index.ts"), n = l.join(t.pluginDir, "openclaw.plugin.json"), c = await U({ path: o, content: r, fsImpl: e }), a = await U({ path: n, content: i, fsImpl: e });
   return { installed: !0, changed: c || a };
 }
-function st(t) {
+function et(t) {
   return !!t && typeof t == "object" && !Array.isArray(t);
 }
 function x(t, s) {
   const e = t[s];
-  if (st(e))
+  if (et(e))
     return e;
   const r = {};
   return t[s] = r, r;
@@ -176,7 +176,7 @@ async function It(t) {
     const e = await s.readFile(t.path, "utf8");
     try {
       const r = JSON.parse(e);
-      return st(r) ? { object: r, exists: !0, parseOk: !0, rawText: e } : { object: {}, exists: !0, parseOk: !1, rawText: e, parseError: "root is not a JSON object" };
+      return et(r) ? { object: r, exists: !0, parseOk: !0, rawText: e } : { object: {}, exists: !0, parseOk: !1, rawText: e, parseError: "root is not a JSON object" };
     } catch (r) {
       return {
         object: {},
@@ -219,7 +219,7 @@ async function Ut(t, s = {}) {
     hostConfigRepaired: o
   };
 }
-async function et(t, s = {}) {
+async function R(t, s = {}) {
   if (t.host !== "openclaw")
     return {
       builtinsInstalled: [],
@@ -238,7 +238,7 @@ async function et(t, s = {}) {
       hostConfigPath: t.hostConfigPath
     },
     { fs: e }
-  ), i = await tt(
+  ), i = await st(
     {
       host: t.host,
       skillsDir: t.skillsDir,
@@ -334,7 +334,7 @@ async function Rt(t, s = {}, e = {}) {
       nextCommands: ["rrskill search <query>", "rrskill install <slug>"],
       paths: i
     };
-  const o = await tt(t, {
+  const o = await st(t, {
     fs: r
   });
   if (o.ok)
@@ -364,7 +364,7 @@ async function Rt(t, s = {}, e = {}) {
       verification: o
     };
   if (s.fix) {
-    const n = await et(t, {
+    const n = await R(t, {
       fs: r
     });
     return {
@@ -399,7 +399,7 @@ async function Rt(t, s = {}, e = {}) {
 function At(t) {
   return t.HOME ?? t.USERPROFILE ?? process.env.HOME ?? process.env.USERPROFILE ?? process.cwd();
 }
-function q(t, s) {
+function K(t, s) {
   const e = t?.trim();
   if (e)
     return e === "~" ? s : e.startsWith("~/") ? l.resolve(s, e.slice(2)) : l.resolve(e);
@@ -419,13 +419,13 @@ function Tt(t, s) {
   return t;
 }
 async function Ft(t) {
-  const s = At(t.env), e = q(t.env.RRSKILL_CONFIG_PATH, s) ?? l.resolve(s, ".rrskill", "config.json");
+  const s = At(t.env), e = K(t.env.RRSKILL_CONFIG_PATH, s) ?? l.resolve(s, ".rrskill", "config.json");
   try {
     const r = await u.readFile(e, "utf8"), i = Tt(JSON.parse(r), e);
     return {
       configPath: e,
       host: $(i, ["host"]),
-      stateDir: q(
+      stateDir: K(
         $(i, ["stateDir", "state_dir"]),
         s
       ),
@@ -442,7 +442,7 @@ async function Ft(t) {
     ) : r;
   }
 }
-const Nt = "openclaw", Ht = "--host", K = {
+const Nt = "openclaw", Ht = "--host", W = {
   "--openclaw": "openclaw",
   "--codex": "codex",
   "--claude-code": "claude-code"
@@ -450,7 +450,7 @@ const Nt = "openclaw", Ht = "--host", K = {
   "openclaw",
   "codex",
   "claude-code"
-], zt = new Set(rt), Mt = new Set(Q);
+], zt = new Set(rt), Mt = new Set(X);
 function Jt(t) {
   if (!t)
     return;
@@ -479,7 +479,7 @@ function Bt(t) {
     return e;
 }
 function qt(t) {
-  const s = t.filter((r) => r in K).map((r) => K[r]);
+  const s = t.filter((r) => r in W).map((r) => W[r]);
   if (s.length === 0)
     return;
   const e = Array.from(new Set(s));
@@ -539,7 +539,7 @@ const Vt = {
     };
   }
 };
-async function W(t) {
+async function V(t) {
   const s = await Ft({ env: t.env }), e = Kt({ argv: t.argv, env: t.env, config: s }), r = Wt({ env: t.env, config: s }), i = e === "openclaw" ? Vt.getDefaultPaths({ homeDir: r.homeDir, stateDir: r.stateDir }) : e === "codex" ? Gt.getDefaultPaths({ homeDir: r.homeDir, stateDir: r.stateDir }) : Zt.getDefaultPaths({ homeDir: r.homeDir, stateDir: r.stateDir });
   return {
     argv: t.argv,
@@ -555,7 +555,7 @@ async function W(t) {
   };
 }
 const Qt = ".rrskill_lock.json";
-function R() {
+function A() {
   return { version: 1, skills: {} };
 }
 function it(t) {
@@ -570,7 +570,7 @@ function nt(t, s) {
 function w(t) {
   return typeof t == "object" && t !== null;
 }
-function V(t, s) {
+function G(t, s) {
   if (!w(s)) return;
   const e = typeof s.slug == "string" ? s.slug : t, r = typeof s.installedAt == "string" ? s.installedAt : void 0, i = typeof s.version == "string" ? s.version : void 0, o = w(s.source) || i ? {
     type: "registry",
@@ -579,32 +579,32 @@ function V(t, s) {
   return { slug: e, installedAt: r, source: o };
 }
 function Xt(t) {
-  if (!w(t)) return R();
+  if (!w(t)) return A();
   if (t.version === 1 && w(t.skills)) {
     const i = {};
     for (const [o, n] of Object.entries(t.skills)) {
-      const c = V(o, n);
+      const c = G(o, n);
       c && (i[o] = c);
     }
     return { version: 1, skills: i };
   }
   const s = Object.hasOwn(t, "version"), e = Object.hasOwn(t, "skills");
   if (s || e)
-    return R();
+    return A();
   const r = {};
   for (const [i, o] of Object.entries(t)) {
-    const n = V(i, o);
+    const n = G(i, o);
     n && (r[i] = n);
   }
   return { version: 1, skills: r };
 }
-async function N(t) {
+async function H(t) {
   const s = it(t.skillsDir);
   try {
     const e = await t.fs.readFile(s, "utf8"), r = JSON.parse(e);
     return Xt(r);
   } catch (e) {
-    if ((w(e) && typeof e.code == "string" ? e.code : void 0) === "ENOENT") return R();
+    if ((w(e) && typeof e.code == "string" ? e.code : void 0) === "ENOENT") return A();
     throw e;
   }
 }
@@ -646,7 +646,7 @@ async function ss(t, s, e = {}) {
   const n = nt(t.skillsDir, s);
   let c = o?.version;
   e.downloadSkill ? (await r.mkdir(n, { recursive: !0 }), c = (await e.downloadSkill({ slug: s, targetDir: n, registrySkill: o })).version ?? c) : await ts({ slug: s, targetDir: n, fsImpl: r });
-  const a = await N({ skillsDir: t.skillsDir, fs: r }), f = at(a, {
+  const a = await H({ skillsDir: t.skillsDir, fs: r }), f = at(a, {
     slug: s,
     installedAt: i().toISOString(),
     source: { type: "registry", version: c }
@@ -658,14 +658,14 @@ async function ss(t, s, e = {}) {
   };
 }
 async function es(t, s = {}) {
-  const e = s.fs ?? u, r = await N({ skillsDir: t.skillsDir, fs: e });
+  const e = s.fs ?? u, r = await H({ skillsDir: t.skillsDir, fs: e });
   return Object.keys(r.skills).sort();
 }
 async function rs(t, s, e) {
   return e.searchSkills({ query: s });
 }
 async function is(t, s = {}) {
-  const e = s.fs ?? u, r = s.now ?? (() => /* @__PURE__ */ new Date()), i = await N({ skillsDir: t.skillsDir, fs: e }), o = Object.keys(i.skills).sort();
+  const e = s.fs ?? u, r = s.now ?? (() => /* @__PURE__ */ new Date()), i = await H({ skillsDir: t.skillsDir, fs: e }), o = Object.keys(i.skills).sort();
   if (!s.downloadSkill)
     return { upgraded: [] };
   const n = [];
@@ -863,12 +863,12 @@ async function ct(t, s) {
       throw new Error(
         "Downloaded skill package has an invalid zip central directory."
       );
-    const d = t.readUInt16LE(a + 10), h = t.readUInt32LE(a + 20), ft = t.readUInt32LE(a + 24), H = t.readUInt16LE(a + 28), dt = t.readUInt16LE(a + 30), pt = t.readUInt16LE(a + 32), v = t.readUInt32LE(a + 42), S = t.toString(
+    const d = t.readUInt16LE(a + 10), h = t.readUInt32LE(a + 20), ft = t.readUInt32LE(a + 24), z = t.readUInt16LE(a + 28), dt = t.readUInt16LE(a + 30), pt = t.readUInt16LE(a + 32), v = t.readUInt32LE(a + 42), S = t.toString(
       "utf8",
       a + 46,
-      a + 46 + H
+      a + 46 + z
     );
-    a += 46 + H + dt + pt;
+    a += 46 + z + dt + pt;
     const k = S.replaceAll("\\", "/");
     if (!k || k.startsWith("/") || k.includes("../"))
       throw new Error(`Unsafe zip path entry detected: ${S}`);
@@ -879,9 +879,9 @@ async function ct(t, s) {
       throw new Error(
         "Downloaded skill package has an invalid zip local header."
       );
-    const mt = t.readUInt16LE(v + 26), gt = t.readUInt16LE(v + 28), z = v + 30 + mt + gt, M = t.subarray(
-      z,
-      z + h
+    const mt = t.readUInt16LE(v + 26), gt = t.readUInt16LE(v + 28), M = v + 30 + mt + gt, J = t.subarray(
+      M,
+      M + h
     );
     if (k.endsWith("/")) {
       await u.mkdir(y, { recursive: !0 });
@@ -889,9 +889,9 @@ async function ct(t, s) {
     }
     let D;
     if (d === 0)
-      D = Buffer.from(M);
+      D = Buffer.from(J);
     else if (d === 8)
-      D = Buffer.from(await as(M));
+      D = Buffer.from(await as(J));
     else
       throw new Error(
         `Unsupported zip compression method: ${d}`
@@ -902,20 +902,20 @@ async function ct(t, s) {
   }
   return e;
 }
-async function A(t, s) {
+async function T(t, s) {
   await u.rm(s, { recursive: !0, force: !0 }), await u.mkdir(l.dirname(s), { recursive: !0 }), await u.cp(t, s, { recursive: !0 });
 }
 async function gs(t, s, e) {
   if ((await u.stat(t)).isDirectory())
-    return await A(t, s), [];
+    return await T(t, s), [];
   const i = await u.readFile(t);
   lt(i, e, t);
   const o = await u.mkdtemp(
-    l.join(Z.tmpdir(), "rrskill-registry-stage-")
+    l.join(Q.tmpdir(), "rrskill-registry-stage-")
   );
   try {
     const n = await ct(i, o);
-    return await A(o, s), n;
+    return await T(o, s), n;
   } finally {
     await u.rm(o, { recursive: !0, force: !0 });
   }
@@ -933,11 +933,11 @@ async function ks(t, s, e) {
   const i = Buffer.from(await r.arrayBuffer());
   lt(i, e, t);
   const o = await u.mkdtemp(
-    l.join(Z.tmpdir(), "rrskill-registry-stage-")
+    l.join(Q.tmpdir(), "rrskill-registry-stage-")
   );
   try {
     const n = await ct(i, o);
-    return await A(o, s), n;
+    return await T(o, s), n;
   } finally {
     await u.rm(o, { recursive: !0, force: !0 });
   }
@@ -1117,21 +1117,21 @@ function xs(t) {
   ].join(`
 `);
 }
-function T(t) {
+function F(t) {
   process.stdout.write(`${JSON.stringify(t, null, 2)}
 `);
 }
-function F(t) {
+function N(t) {
   process.stdout.write(t.endsWith(`
 `) ? t : `${t}
 `);
 }
 function m(t, s, e) {
   if (s === "json") {
-    T(t);
+    F(t);
     return;
   }
-  F(e(t));
+  N(e(t));
 }
 function js(t) {
   return [
@@ -1218,9 +1218,9 @@ function ut(t, s = "json") {
     nextCommands: ["rrskill --help"]
   });
 }
-function G(t, s) {
+function Z(t, s) {
   if (t instanceof g && s === "json") {
-    T({
+    F({
       ok: !1,
       error: {
         code: t.code,
@@ -1245,7 +1245,7 @@ function G(t, s) {
   }
   const e = t instanceof Error ? t.message : String(t);
   if (s === "json") {
-    T({
+    F({
       ok: !1,
       error: {
         code: "unexpected_error",
@@ -1259,7 +1259,7 @@ function G(t, s) {
 `);
 }
 async function Os(t) {
-  const s = ut(t, "json"), e = Et(t), r = Y(t), i = E(t, "--help", "-h");
+  const s = ut(t, "json"), e = Et(t), r = tt(t), i = E(t, "--help", "-h");
   if (e.command === "unknown")
     throw new g({
       code: "unknown_command",
@@ -1269,10 +1269,10 @@ async function Os(t) {
     });
   if (e.command === "help" || i) {
     const a = e.command === "help" ? r[1] : e.command !== "install" ? e.command : void 0;
-    return a && ["search", "install", "list", "upgrade", "bootstrap", "doctor", "version"].includes(a) ? (F(xs(a)), 0) : (F(Ds()), 0);
+    return a && ["search", "install", "list", "upgrade", "bootstrap", "doctor", "version"].includes(a) ? (N(xs(a)), 0) : (N(Ds()), 0);
   }
   if (e.command === "doctor") {
-    const a = await W({ argv: t, env: process.env }), f = await Rt(
+    const a = await V({ argv: t, env: process.env }), f = await Rt(
       a,
       {
         fix: E(t, "--fix"),
@@ -1283,9 +1283,15 @@ async function Os(t) {
   }
   if (e.command === "version")
     return m(os(), s, js), 0;
-  const o = await W({ argv: t, env: process.env }), n = ms({ config: o.config, env: o.env }), c = vs(n);
+  const o = await V({ argv: t, env: process.env });
+  if (e.command === "install" && o.host === "openclaw")
+    try {
+      await R(o);
+    } catch {
+    }
+  const n = ms({ config: o.config, env: o.env }), c = vs(n);
   if (e.command === "bootstrap") {
-    const a = await et(o);
+    const a = await R(o);
     return m(a, s, bs), a.verification.ok ? 0 : 1;
   }
   if (e.command === "search") {
@@ -1332,10 +1338,10 @@ if (Ss()) {
     try {
       e = ut(t, "text");
     } catch (r) {
-      G(r, "text"), process.exitCode = 1;
+      Z(r, "text"), process.exitCode = 1;
       return;
     }
-    G(s, e), process.exitCode = 1;
+    Z(s, e), process.exitCode = 1;
   });
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rrskill/cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "bin": {
     "rrskill": "bin/rrskill.js"