rrskill 0.1.4 → 0.1.5

package/dist/index.js

@@ -1,32 +1,32 @@
 import * as l from "node:path";
 import * as u from "node:fs/promises";
-import { fileURLToPath as _, pathToFileURL as kt } from "node:url";
+import { fileURLToPath as L, pathToFileURL as kt } from "node:url";
 import { readFileSync as wt } from "node:fs";
 import { createHash as yt } from "node:crypto";
-import * as Q from "node:os";
+import * as X from "node:os";
 import * as vt from "node:zlib";
 import { promisify as St } from "node:util";
-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 Y = ["search", "install", "list", "upgrade", "bootstrap", "doctor", "version"], tt = new Set(Y), Dt = "--host", xt = "--output", Ct = /* @__PURE__ */ new Set([Dt, xt]), jt = /* @__PURE__ */ new Set(["--openclaw", "--codex", "--claude-code"]);
+function st(t) {
   const s = [];
   for (let e = 0; e < t.length; e += 1) {
     const r = t[e];
     if (r) {
-      if (jt.has(r)) {
+      if (Ct.has(r)) {
         const i = t[e + 1];
-        i && !i.startsWith("--") && !Y.has(i) && (e += 1);
+        i && !i.startsWith("--") && !tt.has(i) && (e += 1);
         continue;
       }
-      Ct.has(r) || r.startsWith("--") || s.push(r);
+      jt.has(r) || r.startsWith("--") || s.push(r);
     }
   }
   return s;
 }
 function Et(t) {
-  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" };
+  const s = st(t), e = s[0] ?? "";
+  return e ? e === "help" ? { command: "help" } : tt.has(e) ? { command: e } : s.length === 1 ? { command: "install", slug: e } : { command: "unknown", input: e } : { command: "help" };
 }
-async function b(t) {
+async function $(t) {
   const s = t.fsImpl ?? u;
   try {
     return (await s.stat(t.path)).isFile();
@@ -55,7 +55,7 @@ async function _t(t) {
     };
   }
 }
-function B(t, s) {
+function I(t, s) {
   let e = t;
   for (const r of s) {
     if (!e || typeof e != "object")
@@ -64,49 +64,58 @@ function B(t, s) {
   }
   return e;
 }
-async function st(t, s = {}) {
+function Lt(t, s) {
+  return Array.isArray(t) && t.some((e) => e === s);
+}
+async function et(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");
-    await b({ fsImpl: e, path: d }) || r.push({ code: "missing_builtin_skill", slug: f, path: d });
+  for (const d of i) {
+    const p = l.join(t.skillsDir, d, "SKILL.md");
+    await $({ fsImpl: e, path: p }) || r.push({ code: "missing_builtin_skill", slug: d, path: p });
   }
   if (t.host !== "openclaw")
     return r.push({ code: "unsupported_host_bootstrap", host: t.host }), { ok: !1, issues: r };
-  const o = l.join(t.pluginDir, "index.ts"), n = l.join(t.pluginDir, "openclaw.plugin.json");
-  await b({ fsImpl: e, path: o }) || r.push({ code: "missing_plugin_file", path: o }), await b({ fsImpl: e, path: n }) || r.push({ code: "missing_plugin_file", path: n });
+  const n = l.join(t.pluginDir, "index.ts"), o = l.join(t.pluginDir, "openclaw.plugin.json");
+  await $({ fsImpl: e, path: n }) || r.push({ code: "missing_plugin_file", path: n }), await $({ fsImpl: e, path: o }) || r.push({ code: "missing_plugin_file", path: o });
   const c = await _t({ fsImpl: e, path: t.hostConfigPath });
   if (!c.ok)
     return r.push(c.issue), { ok: !1, issues: r };
-  const a = B(c.value, ["plugins", "entries", "rrskill"]);
-  if (!a || typeof a != "object")
+  const a = I(c.value, ["plugins", "entries", "rrskill"]), f = I(c.value, ["plugins", "allow"]);
+  if (Lt(f, "rrskill") || r.push({
+    code: "host_plugin_policy_mismatch",
+    path: t.hostConfigPath,
+    key: "plugins.allow",
+    expected: 'array containing "rrskill"',
+    actual: f
+  }), !a || typeof a != "object")
     r.push({ code: "missing_host_plugin_entry", path: t.hostConfigPath });
   else {
-    const f = [
+    const d = [
       { key: ["plugins", "entries", "rrskill", "enabled"], expected: !0 },
       { key: ["plugins", "entries", "rrskill", "config", "primaryCli"], expected: "rrskill" },
       { key: ["plugins", "entries", "rrskill", "config", "primaryLabel"], expected: "official-registry" }
     ];
-    for (const d of f) {
-      const h = B(c.value, d.key);
-      h !== d.expected && r.push({
+    for (const p of d) {
+      const v = I(c.value, p.key);
+      v !== p.expected && r.push({
         code: "host_plugin_policy_mismatch",
         path: t.hostConfigPath,
-        key: d.key.join("."),
-        expected: d.expected,
-        actual: h
+        key: p.key.join("."),
+        expected: p.expected,
+        actual: v
       });
     }
   }
   return { ok: r.length === 0, issues: r };
 }
-function O(t, s) {
-  const e = l.dirname(_(t));
+function U(t, s) {
+  const e = l.dirname(L(t));
   return [
     l.resolve(e, "..", "assets", "builtins", s),
     l.resolve(e, "..", "..", "assets", "builtins", s)
   ];
 }
-async function P(t) {
+async function A(t) {
   const s = t.fsImpl ?? u;
   let e;
   for (const r of t.candidates)
@@ -117,7 +126,7 @@ async function P(t) {
     }
   throw new Error(`Failed to load ${t.assetLabel} from candidates: ${t.candidates.join(", ")} (${String(e)})`);
 }
-async function U(t) {
+async function R(t) {
   const s = t.fsImpl ?? u, e = t.content.endsWith(`
 `) ? t.content : `${t.content}
 `;
@@ -128,55 +137,58 @@ async function U(t) {
   }
   return await s.mkdir(l.dirname(t.path), { recursive: !0 }), await s.writeFile(t.path, e, "utf8"), !0;
 }
-const q = ["find-skills", "rrskill-preference"];
-function Lt(t) {
+const K = ["find-skills", "rrskill-preference"];
+function bt(t) {
   return t === "find-skills" ? "skills/find-skills.md" : "skills/rrskill-preference.md";
 }
-async function bt(t, s = {}) {
+async function $t(t, s = {}) {
   const e = s.fs ?? u;
   let r = !1;
-  for (const i of q) {
-    const o = await P({
-      candidates: O(import.meta.url, Lt(i)),
+  for (const i of K) {
+    const n = await A({
+      candidates: U(import.meta.url, bt(i)),
       fsImpl: e,
       assetLabel: "built-in skill asset"
-    }), n = l.join(t.skillsDir, i, "SKILL.md"), c = await U({ path: n, content: o, fsImpl: e });
+    }), o = l.join(t.skillsDir, i, "SKILL.md"), c = await R({ path: o, content: n, fsImpl: e });
     r = r || c;
   }
-  return { installed: [...q], changed: r };
+  return { installed: [...K], changed: r };
 }
-async function $t(t, s = {}) {
+async function It(t, s = {}) {
   const e = s.fs ?? u;
   if (t.host !== "openclaw")
     return { installed: !1, changed: !1 };
-  const r = await P({
-    candidates: O(import.meta.url, "plugins/openclaw/index.ts"),
+  const r = await A({
+    candidates: U(import.meta.url, "plugins/openclaw/index.ts"),
     fsImpl: e,
     assetLabel: "built-in plugin asset"
-  }), i = await P({
-    candidates: O(import.meta.url, "plugins/openclaw/openclaw.plugin.json"),
+  }), i = await A({
+    candidates: U(import.meta.url, "plugins/openclaw/openclaw.plugin.json"),
     fsImpl: e,
     assetLabel: "built-in plugin asset"
-  }), 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 });
+  }), n = l.join(t.pluginDir, "index.ts"), o = l.join(t.pluginDir, "openclaw.plugin.json"), c = await R({ path: n, content: r, fsImpl: e }), a = await R({ path: o, content: i, fsImpl: e });
   return { installed: !0, changed: c || a };
 }
-function et(t) {
+function rt(t) {
   return !!t && typeof t == "object" && !Array.isArray(t);
 }
-function x(t, s) {
+function C(t, s) {
   const e = t[s];
-  if (et(e))
+  if (rt(e))
     return e;
   const r = {};
   return t[s] = r, r;
 }
-async function It(t) {
+function Ot(t) {
+  return Array.isArray(t) ? t.filter((s) => typeof s == "string") : [];
+}
+async function Pt(t) {
   const s = t.fsImpl ?? u;
   try {
     const e = await s.readFile(t.path, "utf8");
     try {
       const r = JSON.parse(e);
-      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" };
+      return rt(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: {},
@@ -190,36 +202,36 @@ async function It(t) {
     return { object: {}, exists: !1, parseOk: !1 };
   }
 }
-async function Ot(t) {
+async function Ut(t) {
   const s = t.fsImpl ?? u, e = `${JSON.stringify(t.value, null, 2)}
 `;
   return t.prevRawText !== void 0 && t.prevRawText === e ? !1 : (await s.mkdir(l.dirname(t.path), { recursive: !0 }), await s.writeFile(t.path, e, "utf8"), !0);
 }
-async function Pt(t) {
-  const s = t.fsImpl ?? u, e = await It({ fsImpl: s, path: t.hostConfigPath });
+async function At(t) {
+  const s = t.fsImpl ?? u, e = await Pt({ fsImpl: s, path: t.hostConfigPath });
   if (e.exists && !e.parseOk)
     throw new Error(
       `Invalid OpenClaw config JSON at ${t.hostConfigPath}: ${e.parseError ?? "unknown parse error"}`
     );
-  const r = e.object, i = x(r, "plugins"), o = x(i, "entries"), n = x(o, "rrskill"), c = x(n, "config");
-  let a = !e.exists || !e.parseOk;
-  return n.enabled !== !0 && (n.enabled = !0, a = !0), c.primaryCli !== "rrskill" && (c.primaryCli = "rrskill", a = !0), c.primaryLabel !== "official-registry" && (c.primaryLabel = "official-registry", a = !0), a ? Ot({
+  const r = e.object, i = C(r, "plugins"), n = Ot(i.allow), o = C(i, "entries"), c = C(o, "rrskill"), a = C(c, "config");
+  let f = !e.exists || !e.parseOk;
+  return n.includes("rrskill") ? i.allow !== n && (i.allow = n, f = !0) : (i.allow = [...n, "rrskill"], f = !0), c.enabled !== !0 && (c.enabled = !0, f = !0), a.primaryCli !== "rrskill" && (a.primaryCli = "rrskill", f = !0), a.primaryLabel !== "official-registry" && (a.primaryLabel = "official-registry", f = !0), f ? Ut({
     fsImpl: s,
     path: t.hostConfigPath,
     value: r,
     prevRawText: e.rawText
   }) : !1;
 }
-async function Ut(t, s = {}) {
-  const e = s.fs ?? u, r = await bt({ skillsDir: t.skillsDir }, { fs: e }), i = await $t({ host: t.host, pluginDir: t.pluginDir }, { fs: e });
-  let o = !1;
-  return t.host === "openclaw" && (o = await Pt({ fsImpl: e, hostConfigPath: t.hostConfigPath })), {
+async function Rt(t, s = {}) {
+  const e = s.fs ?? u, r = await $t({ skillsDir: t.skillsDir }, { fs: e }), i = await It({ host: t.host, pluginDir: t.pluginDir }, { fs: e });
+  let n = !1;
+  return t.host === "openclaw" && (n = await At({ fsImpl: e, hostConfigPath: t.hostConfigPath })), {
     builtinsInstalled: r.installed,
     pluginInstalled: i.installed,
-    hostConfigRepaired: o
+    hostConfigRepaired: n
   };
 }
-async function R(t, s = {}) {
+async function T(t, s = {}) {
   if (t.host !== "openclaw")
     return {
       builtinsInstalled: [],
@@ -230,7 +242,7 @@ async function R(t, s = {}) {
         issues: [{ code: "unsupported_host_bootstrap", host: t.host }]
       }
     };
-  const e = s.fs ?? u, r = await Ut(
+  const e = s.fs ?? u, r = await Rt(
     {
       host: t.host,
       skillsDir: t.skillsDir,
@@ -238,7 +250,7 @@ async function R(t, s = {}) {
       hostConfigPath: t.hostConfigPath
     },
     { fs: e }
-  ), i = await st(
+  ), i = await et(
     {
       host: t.host,
       skillsDir: t.skillsDir,
@@ -255,17 +267,17 @@ async function R(t, s = {}) {
   };
 }
 function j(t, s) {
-  const e = new Set(s.map((n) => n.code)), r = new Set(
-    s.filter((n) => n.code === "missing_builtin_skill").map((n) => n.slug)
+  const e = new Set(s.map((o) => o.code)), r = new Set(
+    s.filter((o) => o.code === "missing_builtin_skill").map((o) => o.slug)
   ), i = new Set(
-    s.filter((n) => n.code === "missing_plugin_file").map((n) => n.path)
-  ), o = s.some(
-    (n) => [
+    s.filter((o) => o.code === "missing_plugin_file").map((o) => o.path)
+  ), n = s.some(
+    (o) => [
       "missing_host_config",
       "invalid_host_config_json",
       "missing_host_plugin_entry",
       "host_plugin_policy_mismatch"
-    ].includes(n.code)
+    ].includes(o.code)
   );
   return [
     {
@@ -294,8 +306,8 @@ function j(t, s) {
     },
     {
       name: "host_config",
-      ok: !o,
-      message: o ? "OpenClaw host config is missing or does not match rrskill policy" : "OpenClaw host config matches rrskill policy",
+      ok: !n,
+      message: n ? "OpenClaw host config is missing or does not match rrskill policy" : "OpenClaw host config matches rrskill policy",
       path: t.hostConfigPath
     },
     {
@@ -305,7 +317,7 @@ function j(t, s) {
     }
   ];
 }
-async function Rt(t, s = {}, e = {}) {
+async function Tt(t, s = {}, e = {}) {
   const r = e.fs ?? u, i = {
     skillsDir: t.skillsDir,
     pluginDir: t.pluginDir,
@@ -334,10 +346,10 @@ async function Rt(t, s = {}, e = {}) {
       nextCommands: ["rrskill search <query>", "rrskill install <slug>"],
       paths: i
     };
-  const o = await st(t, {
+  const n = await et(t, {
     fs: r
   });
-  if (o.ok)
+  if (n.ok)
     return {
       ok: !0,
       host: t.host,
@@ -348,7 +360,7 @@ async function Rt(t, s = {}, e = {}) {
       issues: [],
       nextCommands: [],
       paths: i,
-      verification: o
+      verification: n
     };
   if (s.dryRun)
     return {
@@ -357,30 +369,30 @@ async function Rt(t, s = {}, e = {}) {
       bootstrapSupported: !0,
       fixed: !1,
       dryRun: !0,
-      checks: j(t, o.issues),
-      issues: o.issues,
+      checks: j(t, n.issues),
+      issues: n.issues,
       nextCommands: ["rrskill bootstrap --host openclaw"],
       paths: i,
-      verification: o
+      verification: n
     };
   if (s.fix) {
-    const n = await R(t, {
+    const o = await T(t, {
       fs: r
     });
     return {
-      ok: n.verification.ok,
+      ok: o.verification.ok,
       host: t.host,
       bootstrapSupported: !0,
       fixed: !0,
       dryRun: !1,
       checks: j(
         t,
-        n.verification.ok ? [] : n.verification.issues
+        o.verification.ok ? [] : o.verification.issues
       ),
-      issues: n.verification.ok ? [] : n.verification.issues,
-      nextCommands: n.verification.ok ? [] : ["rrskill bootstrap --host openclaw"],
+      issues: o.verification.ok ? [] : o.verification.issues,
+      nextCommands: o.verification.ok ? [] : ["rrskill bootstrap --host openclaw"],
       paths: i,
-      verification: n.verification
+      verification: o.verification
     };
   }
   return {
@@ -389,47 +401,47 @@ async function Rt(t, s = {}, e = {}) {
     bootstrapSupported: !0,
     fixed: !1,
     dryRun: !1,
-    checks: j(t, o.issues),
-    issues: o.issues,
+    checks: j(t, n.issues),
+    issues: n.issues,
     nextCommands: ["rrskill bootstrap --host openclaw"],
     paths: i,
-    verification: o
+    verification: n
   };
 }
-function At(t) {
+function Ft(t) {
   return t.HOME ?? t.USERPROFILE ?? process.env.HOME ?? process.env.USERPROFILE ?? process.cwd();
 }
-function K(t, s) {
+function W(t, s) {
   const e = t?.trim();
   if (e)
     return e === "~" ? s : e.startsWith("~/") ? l.resolve(s, e.slice(2)) : l.resolve(e);
 }
-function $(t, s) {
+function O(t, s) {
   for (const e of s) {
     const r = t[e];
     if (typeof r == "string" && r.trim())
       return r.trim();
   }
 }
-function Tt(t, s) {
+function Nt(t, s) {
   if (typeof t != "object" || t === null || Array.isArray(t))
     throw new Error(
       `Invalid rrskill config at ${s}: root must be a JSON object`
     );
   return t;
 }
-async function Ft(t) {
-  const s = At(t.env), e = K(t.env.RRSKILL_CONFIG_PATH, s) ?? l.resolve(s, ".rrskill", "config.json");
+async function Ht(t) {
+  const s = Ft(t.env), e = W(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);
+    const r = await u.readFile(e, "utf8"), i = Nt(JSON.parse(r), e);
     return {
       configPath: e,
-      host: $(i, ["host"]),
-      stateDir: K(
-        $(i, ["stateDir", "state_dir"]),
+      host: O(i, ["host"]),
+      stateDir: W(
+        O(i, ["stateDir", "state_dir"]),
         s
       ),
-      skillsSearchUrl: $(i, [
+      skillsSearchUrl: O(i, [
         "skillsSearchUrl",
         "skills_search_url"
       ])
@@ -442,44 +454,44 @@ async function Ft(t) {
     ) : r;
   }
 }
-const Nt = "openclaw", Ht = "--host", W = {
+const zt = "openclaw", Mt = "--host", V = {
   "--openclaw": "openclaw",
   "--codex": "codex",
   "--claude-code": "claude-code"
-}, rt = [
+}, it = [
   "openclaw",
   "codex",
   "claude-code"
-], zt = new Set(rt), Mt = new Set(X);
-function Jt(t) {
+], Jt = new Set(it), Bt = new Set(Y);
+function qt(t) {
   if (!t)
     return;
   const s = t.trim().toLowerCase();
-  if (s && zt.has(s))
+  if (s && Jt.has(s))
     return s;
 }
-function I(t, s) {
+function P(t, s) {
   if (t === void 0)
     return;
-  const e = Jt(t);
+  const e = qt(t);
   if (e)
     return e;
   const r = t.trim();
   if (r)
     throw new Error(
-      `Unsupported host "${r}" from ${s}. Supported hosts: ${rt.join(", ")}`
+      `Unsupported host "${r}" from ${s}. Supported hosts: ${it.join(", ")}`
     );
 }
-function Bt(t) {
-  const s = t.indexOf(Ht);
+function Kt(t) {
+  const s = t.indexOf(Mt);
   if (s < 0)
     return;
   const e = t[s + 1];
-  if (!(!e || e.startsWith("--") || Mt.has(e)))
+  if (!(!e || e.startsWith("--") || Bt.has(e)))
     return e;
 }
-function qt(t) {
-  const s = t.filter((r) => r in W).map((r) => W[r]);
+function Wt(t) {
+  const s = t.filter((r) => r in V).map((r) => V[r]);
   if (s.length === 0)
     return;
   const e = Array.from(new Set(s));
@@ -487,9 +499,9 @@ function qt(t) {
     throw new Error(`Conflicting host flags: ${e.join(", ")}`);
   return e[0];
 }
-function Kt(t) {
-  const s = qt(t.argv), e = I(
-    Bt(t.argv),
+function Vt(t) {
+  const s = Wt(t.argv), e = P(
+    Kt(t.argv),
     "--host"
   );
   if (s && e && s !== e)
@@ -499,17 +511,17 @@ function Kt(t) {
   const r = e ?? s;
   if (r)
     return r;
-  const i = I(t.env.RRSKILL_HOST, "RRSKILL_HOST");
+  const i = P(t.env.RRSKILL_HOST, "RRSKILL_HOST");
   if (i)
     return i;
-  const o = t.config.configPath ? `config ${t.config.configPath}` : "config", n = I(t.config.host, o);
-  return n || Nt;
+  const n = t.config.configPath ? `config ${t.config.configPath}` : "config", o = P(t.config.host, n);
+  return o || zt;
 }
-function Wt(t) {
+function Gt(t) {
   const s = t.env.HOME ?? t.env.USERPROFILE ?? process.env.HOME ?? process.env.USERPROFILE ?? process.cwd(), e = t.config.stateDir ?? `${s}/.rrskill`;
   return { homeDir: s, stateDir: e };
 }
-const Vt = {
+const Zt = {
   name: "openclaw",
   getDefaultPaths({ homeDir: t }) {
     return {
@@ -518,7 +530,7 @@ const Vt = {
       hostConfigPath: `${t}/.openclaw/openclaw.json`
     };
   }
-}, Gt = {
+}, Qt = {
   name: "codex",
   getDefaultPaths({ homeDir: t, stateDir: s }) {
     const e = s ?? `${t}/.rrskill`;
@@ -528,7 +540,7 @@ const Vt = {
       hostConfigPath: `${t}/.codex/config.toml`
     };
   }
-}, Zt = {
+}, Xt = {
   name: "claude-code",
   getDefaultPaths({ homeDir: t, stateDir: s }) {
     const e = s ?? `${t}/.rrskill`;
@@ -539,8 +551,8 @@ const Vt = {
     };
   }
 };
-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 });
+async function G(t) {
+  const s = await Ht({ env: t.env }), e = Vt({ argv: t.argv, env: t.env, config: s }), r = Gt({ env: t.env, config: s }), i = e === "openclaw" ? Zt.getDefaultPaths({ homeDir: r.homeDir, stateDir: r.stateDir }) : e === "codex" ? Qt.getDefaultPaths({ homeDir: r.homeDir, stateDir: r.stateDir }) : Xt.getDefaultPaths({ homeDir: r.homeDir, stateDir: r.stateDir });
   return {
     argv: t.argv,
     env: t.env,
@@ -554,14 +566,14 @@ async function V(t) {
     config: s
   };
 }
-const Qt = ".rrskill_lock.json";
-function A() {
+const Yt = ".rrskill_lock.json";
+function F() {
   return { version: 1, skills: {} };
 }
-function it(t) {
-  return l.join(t, Qt);
+function nt(t) {
+  return l.join(t, Yt);
 }
-function nt(t, s) {
+function ot(t, s) {
   const e = l.resolve(t), r = l.resolve(e, s), i = e.endsWith(l.sep) ? e : `${e}${l.sep}`;
   if (!r.startsWith(i))
     throw new Error(`Refusing to write outside skillsDir: slug="${s}"`);
@@ -570,52 +582,52 @@ function nt(t, s) {
 function w(t) {
   return typeof t == "object" && t !== null;
 }
-function G(t, s) {
+function Z(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 ? {
+  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, n = w(s.source) || i ? {
     type: "registry",
     version: (w(s.source) && typeof s.source.version == "string" ? s.source.version : void 0) ?? i
   } : void 0;
-  return { slug: e, installedAt: r, source: o };
+  return { slug: e, installedAt: r, source: n };
 }
-function Xt(t) {
-  if (!w(t)) return A();
+function ts(t) {
+  if (!w(t)) return F();
   if (t.version === 1 && w(t.skills)) {
     const i = {};
-    for (const [o, n] of Object.entries(t.skills)) {
-      const c = G(o, n);
-      c && (i[o] = c);
+    for (const [n, o] of Object.entries(t.skills)) {
+      const c = Z(n, o);
+      c && (i[n] = c);
     }
     return { version: 1, skills: i };
   }
   const s = Object.hasOwn(t, "version"), e = Object.hasOwn(t, "skills");
   if (s || e)
-    return A();
+    return F();
   const r = {};
-  for (const [i, o] of Object.entries(t)) {
-    const n = G(i, o);
-    n && (r[i] = n);
+  for (const [i, n] of Object.entries(t)) {
+    const o = Z(i, n);
+    o && (r[i] = o);
   }
   return { version: 1, skills: r };
 }
-async function H(t) {
-  const s = it(t.skillsDir);
+async function M(t) {
+  const s = nt(t.skillsDir);
   try {
     const e = await t.fs.readFile(s, "utf8"), r = JSON.parse(e);
-    return Xt(r);
+    return ts(r);
   } catch (e) {
-    if ((w(e) && typeof e.code == "string" ? e.code : void 0) === "ENOENT") return A();
+    if ((w(e) && typeof e.code == "string" ? e.code : void 0) === "ENOENT") return F();
     throw e;
   }
 }
-async function ot(t) {
-  const s = it(t.skillsDir);
+async function at(t) {
+  const s = nt(t.skillsDir);
   await t.fs.mkdir(t.skillsDir, { recursive: !0 });
   const e = `${s}.tmp`, r = `${JSON.stringify(t.lockfile, null, 2)}
 `;
   await t.fs.writeFile(e, r, "utf8"), await t.fs.rename(e, s);
 }
-function at(t, s) {
+function lt(t, s) {
   return {
     version: 1,
     skills: {
@@ -624,10 +636,10 @@ function at(t, s) {
     }
   };
 }
-function Yt() {
+function ss() {
   return /* @__PURE__ */ new Date();
 }
-async function ts(t) {
+async function es(t) {
   const s = t.fsImpl ?? u;
   await s.mkdir(t.targetDir, { recursive: !0 });
   const e = l.join(t.targetDir, "rrskill.json");
@@ -638,57 +650,57 @@ async function ts(t) {
     "utf8"
   );
 }
-async function ss(t, s, e = {}) {
-  const r = e.fs ?? u, i = e.now ?? Yt;
-  let o;
-  if (e.searchSkills && (o = (await e.searchSkills({ query: s })).results.find((h) => h.slug === s), !o))
+async function rs(t, s, e = {}) {
+  const r = e.fs ?? u, i = e.now ?? ss;
+  let n;
+  if (e.searchSkills && (n = (await e.searchSkills({ query: s })).results.find((p) => p.slug === s), !n))
     throw new Error(`No exact registry match for slug "${s}"`);
-  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 H({ skillsDir: t.skillsDir, fs: r }), f = at(a, {
+  const o = ot(t.skillsDir, s);
+  let c = n?.version;
+  e.downloadSkill ? (await r.mkdir(o, { recursive: !0 }), c = (await e.downloadSkill({ slug: s, targetDir: o, registrySkill: n })).version ?? c) : await es({ slug: s, targetDir: o, fsImpl: r });
+  const a = await M({ skillsDir: t.skillsDir, fs: r }), f = lt(a, {
     slug: s,
     installedAt: i().toISOString(),
     source: { type: "registry", version: c }
   });
-  return await ot({ skillsDir: t.skillsDir, fs: r, lockfile: f }), {
+  return await at({ skillsDir: t.skillsDir, fs: r, lockfile: f }), {
     slug: s,
-    targetDir: n,
-    registryMatch: o
+    targetDir: o,
+    registryMatch: n
   };
 }
-async function es(t, s = {}) {
-  const e = s.fs ?? u, r = await H({ skillsDir: t.skillsDir, fs: e });
+async function is(t, s = {}) {
+  const e = s.fs ?? u, r = await M({ skillsDir: t.skillsDir, fs: e });
   return Object.keys(r.skills).sort();
 }
-async function rs(t, s, e) {
+async function ns(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 H({ skillsDir: t.skillsDir, fs: e }), o = Object.keys(i.skills).sort();
+async function os(t, s = {}) {
+  const e = s.fs ?? u, r = s.now ?? (() => /* @__PURE__ */ new Date()), i = await M({ skillsDir: t.skillsDir, fs: e }), n = Object.keys(i.skills).sort();
   if (!s.downloadSkill)
     return { upgraded: [] };
-  const n = [];
+  const o = [];
   let c = i;
-  for (const a of o) {
-    const f = nt(t.skillsDir, a);
+  for (const a of n) {
+    const f = ot(t.skillsDir, a);
     await e.mkdir(f, { recursive: !0 });
     const d = await s.downloadSkill({ slug: a, targetDir: f });
-    n.push(a);
-    const h = c.skills[a];
-    c = at(c, {
+    o.push(a);
+    const p = c.skills[a];
+    c = lt(c, {
       slug: a,
       installedAt: r().toISOString(),
       source: {
         type: "registry",
-        version: d.version ?? h?.source?.version
+        version: d.version ?? p?.source?.version
       }
-    }), await ot({ skillsDir: t.skillsDir, fs: e, lockfile: c });
+    }), await at({ skillsDir: t.skillsDir, fs: e, lockfile: c });
   }
-  return { upgraded: n };
+  return { upgraded: o };
 }
-function ns(t) {
-  let s = l.dirname(_(t));
+function as(t) {
+  let s = l.dirname(L(t));
   for (; ; ) {
     const e = l.join(s, "package.json");
     try {
@@ -701,8 +713,8 @@ function ns(t) {
     }
   }
 }
-function os(t = {}) {
-  const s = ns(import.meta.url);
+function ls(t = {}) {
+  const s = as(import.meta.url);
   return {
     packageName: t.packageName ?? s.name ?? "rrskill",
     version: t.version ?? s.version ?? "0.0.0-dev",
@@ -710,32 +722,32 @@ function os(t = {}) {
     instructions: ["npm install -g rrskill@latest", "npm install -g @rrskill/cli@latest"]
   };
 }
-const as = St(vt.inflateRaw), ls = "https://api.rrskill.ai/skills?page=1&size={limit}&search={query}&orderBy=downloadCount&order=desc", cs = 20;
-function C(t) {
+const cs = St(vt.inflateRaw), us = "https://api.rrskill.ai/skills?page=1&size={limit}&search={query}&orderBy=downloadCount&order=desc", fs = 20;
+function E(t) {
   return typeof t == "object" && t !== null && !Array.isArray(t);
 }
-function p(t, s) {
+function h(t, s) {
   for (const e of s) {
     const r = t[e];
     if (typeof r == "string" && r.trim())
       return r.trim();
   }
 }
-function L(t) {
+function b(t) {
   try {
     return new URL(t);
   } catch {
     return;
   }
 }
-function us(t, s, e, r) {
-  const i = s.RRSKILL_SKILLS_SEARCH_URL?.trim() || s.RRSKILL_SEARCH_URL?.trim() || t.skillsSearchUrl?.trim() || ls, o = i.replaceAll("{query}", encodeURIComponent(e)).replaceAll("{limit}", String(r)), n = L(o);
-  return n && ["http:", "https:"].includes(n.protocol) ? (i.includes("{query}") || ["search", "q", "keyword", "slug"].some(
-    (c) => n.searchParams.has(c)
-  ) || n.searchParams.set("search", e), i.includes("{limit}") || ["limit", "size"].some((c) => n.searchParams.has(c)) || n.searchParams.set("limit", String(r)), n.toString()) : o;
+function ds(t, s, e, r) {
+  const i = s.RRSKILL_SKILLS_SEARCH_URL?.trim() || s.RRSKILL_SEARCH_URL?.trim() || t.skillsSearchUrl?.trim() || us, n = i.replaceAll("{query}", encodeURIComponent(e)).replaceAll("{limit}", String(r)), o = b(n);
+  return o && ["http:", "https:"].includes(o.protocol) ? (i.includes("{query}") || ["search", "q", "keyword", "slug"].some(
+    (c) => o.searchParams.has(c)
+  ) || o.searchParams.set("search", e), i.includes("{limit}") || ["limit", "size"].some((c) => o.searchParams.has(c)) || o.searchParams.set("limit", String(r)), o.toString()) : n;
 }
-async function fs(t) {
-  const s = L(t);
+async function ps(t) {
+  const s = b(t);
   if (s?.protocol === "http:" || s?.protocol === "https:") {
     const r = await fetch(t, {
       headers: {
@@ -752,7 +764,7 @@ async function fs(t) {
     };
   }
   if (s?.protocol === "file:") {
-    const r = _(s);
+    const r = L(s);
     return {
       payload: await u.readFile(r, "utf8"),
       reference: s.toString()
@@ -764,7 +776,7 @@ async function fs(t) {
     reference: kt(e).toString()
   };
 }
-function ds(t, s) {
+function hs(t, s) {
   if (t)
     try {
       return new URL(t, s).toString();
@@ -772,7 +784,7 @@ function ds(t, s) {
       return;
     }
 }
-function lt(t, s, e) {
+function ct(t, s, e) {
   const r = s?.trim().toLowerCase();
   if (!r)
     return;
@@ -782,30 +794,30 @@ function lt(t, s, e) {
       `SHA256 mismatch for ${e}: expected ${r}, got ${i}`
     );
 }
-function ps(t, s) {
-  const e = p(t, ["slug"]);
+function ms(t, s) {
+  const e = h(t, ["slug"]);
   if (!e)
     return;
-  const r = C(t.currentVersion) ? t.currentVersion : {}, i = ds(
-    p(r, [
+  const r = E(t.currentVersion) ? t.currentVersion : {}, i = hs(
+    h(r, [
       "skillUrl",
       "downloadUrl",
       "packageUrl",
       "url"
-    ]) ?? p(t, ["skillUrl", "downloadUrl", "packageUrl", "url"]),
+    ]) ?? h(t, ["skillUrl", "downloadUrl", "packageUrl", "url"]),
     s
   );
   return {
     slug: e,
-    title: p(t, ["displayName", "name", "title"]) ?? e,
-    description: p(t, ["summary", "description"]),
-    version: p(r, ["version"]) ?? p(t, ["version"]),
+    title: h(t, ["displayName", "name", "title"]) ?? e,
+    description: h(t, ["summary", "description"]),
+    version: h(r, ["version"]) ?? h(t, ["version"]),
     skillUrl: i,
-    sha256: p(r, ["sha256"]) ?? p(t, ["sha256", "checksum"]),
-    source: p(t, ["source", "platform"])
+    sha256: h(r, ["sha256"]) ?? h(t, ["sha256", "checksum"]),
+    source: h(t, ["source", "platform"])
   };
 }
-function hs(t, s, e) {
+function gs(t, s, e) {
   let r;
   try {
     r = JSON.parse(t);
@@ -814,113 +826,113 @@ function hs(t, s, e) {
       `Search response is not valid JSON: ${a instanceof Error ? a.message : String(a)}`
     );
   }
-  if (!C(r))
+  if (!E(r))
     throw new Error("Search API response must be a JSON object.");
   let i = r.results;
   if (!Array.isArray(i)) {
-    const a = C(r.data) ? r.data : void 0;
+    const a = E(r.data) ? r.data : void 0;
     a && Array.isArray(a.records) && (i = a.records);
   }
   if (!Array.isArray(i))
     throw new Error(
       'Search API response must include "results" or "data.records" array.'
     );
-  const o = e.trim().toLowerCase(), n = !["http:", "https:"].includes(
-    L(s)?.protocol ?? ""
-  ), c = i.filter(C).map((a) => ps(a, s)).filter((a) => a !== void 0).filter((a) => n && o ? [a.slug, a.title, a.description].filter(
+  const n = e.trim().toLowerCase(), o = !["http:", "https:"].includes(
+    b(s)?.protocol ?? ""
+  ), c = i.filter(E).map((a) => ms(a, s)).filter((a) => a !== void 0).filter((a) => o && n ? [a.slug, a.title, a.description].filter(
     (d) => !!d
   ).some(
-    (d) => d.toLowerCase().includes(o)
+    (d) => d.toLowerCase().includes(n)
   ) : !0);
   return { query: e, results: c };
 }
-function ms(t) {
+function ks(t) {
   return async ({ query: s }) => {
-    const e = us(
+    const e = ds(
       t.config,
       t.env,
       s,
-      cs
-    ), { payload: r, reference: i } = await fs(e);
-    return hs(r, i, s);
+      fs
+    ), { payload: r, reference: i } = await ps(e);
+    return gs(r, i, s);
   };
 }
-async function ct(t, s) {
+async function ut(t, s) {
   const e = [];
-  let n = -1;
+  let o = -1;
   for (let f = t.length - 22; f >= Math.max(0, t.length - 65557); f -= 1)
     if (t.readUInt32LE(f) === 101010256) {
-      n = f;
+      o = f;
       break;
     }
-  if (n < 0)
+  if (o < 0)
     throw new Error("Downloaded skill package is not a valid zip archive.");
-  const c = t.readUInt16LE(n + 10);
-  let a = t.readUInt32LE(n + 16);
+  const c = t.readUInt16LE(o + 10);
+  let a = t.readUInt32LE(o + 16);
   await u.mkdir(s, { recursive: !0 });
   for (let f = 0; f < c; f += 1) {
     if (t.readUInt32LE(a) !== 33639248)
       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), z = 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), p = t.readUInt32LE(a + 20), v = t.readUInt32LE(a + 24), J = t.readUInt16LE(a + 28), dt = t.readUInt16LE(a + 30), pt = t.readUInt16LE(a + 32), S = t.readUInt32LE(a + 42), D = t.toString(
       "utf8",
       a + 46,
-      a + 46 + z
+      a + 46 + J
     );
-    a += 46 + z + dt + pt;
-    const k = S.replaceAll("\\", "/");
+    a += 46 + J + dt + pt;
+    const k = D.replaceAll("\\", "/");
     if (!k || k.startsWith("/") || k.includes("../"))
-      throw new Error(`Unsafe zip path entry detected: ${S}`);
+      throw new Error(`Unsafe zip path entry detected: ${D}`);
     const y = l.resolve(s, k), ht = s.endsWith(l.sep) ? s : `${s}${l.sep}`;
     if (y !== s && !y.startsWith(ht))
-      throw new Error(`Unsafe zip path entry detected: ${S}`);
-    if (t.readUInt32LE(v) !== 67324752)
+      throw new Error(`Unsafe zip path entry detected: ${D}`);
+    if (t.readUInt32LE(S) !== 67324752)
       throw new Error(
         "Downloaded skill package has an invalid zip local header."
       );
-    const mt = t.readUInt16LE(v + 26), gt = t.readUInt16LE(v + 28), M = v + 30 + mt + gt, J = t.subarray(
-      M,
-      M + h
+    const mt = t.readUInt16LE(S + 26), gt = t.readUInt16LE(S + 28), B = S + 30 + mt + gt, q = t.subarray(
+      B,
+      B + p
     );
     if (k.endsWith("/")) {
       await u.mkdir(y, { recursive: !0 });
       continue;
     }
-    let D;
+    let x;
     if (d === 0)
-      D = Buffer.from(J);
+      x = Buffer.from(q);
     else if (d === 8)
-      D = Buffer.from(await as(J));
+      x = Buffer.from(await cs(q));
     else
       throw new Error(
         `Unsupported zip compression method: ${d}`
       );
-    if (D.length !== ft)
-      throw new Error(`Zip entry size mismatch for ${S}`);
-    await u.mkdir(l.dirname(y), { recursive: !0 }), await u.writeFile(y, D), e.push(k);
+    if (x.length !== v)
+      throw new Error(`Zip entry size mismatch for ${D}`);
+    await u.mkdir(l.dirname(y), { recursive: !0 }), await u.writeFile(y, x), e.push(k);
   }
   return e;
 }
-async function T(t, s) {
+async function N(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) {
+async function ws(t, s, e) {
   if ((await u.stat(t)).isDirectory())
-    return await T(t, s), [];
+    return await N(t, s), [];
   const i = await u.readFile(t);
-  lt(i, e, t);
-  const o = await u.mkdtemp(
-    l.join(Q.tmpdir(), "rrskill-registry-stage-")
+  ct(i, e, t);
+  const n = await u.mkdtemp(
+    l.join(X.tmpdir(), "rrskill-registry-stage-")
   );
   try {
-    const n = await ct(i, o);
-    return await T(o, s), n;
+    const o = await ut(i, n);
+    return await N(n, s), o;
   } finally {
-    await u.rm(o, { recursive: !0, force: !0 });
+    await u.rm(n, { recursive: !0, force: !0 });
   }
 }
-async function ks(t, s, e) {
+async function ys(t, s, e) {
   const r = await fetch(t, {
     headers: {
       accept: "application/zip,application/octet-stream,*/*"
@@ -931,47 +943,47 @@ async function ks(t, s, e) {
       `Skill download failed: ${r.status} ${r.statusText}`
     );
   const i = Buffer.from(await r.arrayBuffer());
-  lt(i, e, t);
-  const o = await u.mkdtemp(
-    l.join(Q.tmpdir(), "rrskill-registry-stage-")
+  ct(i, e, t);
+  const n = await u.mkdtemp(
+    l.join(X.tmpdir(), "rrskill-registry-stage-")
   );
   try {
-    const n = await ct(i, o);
-    return await T(o, s), n;
+    const o = await ut(i, n);
+    return await N(n, s), o;
   } finally {
-    await u.rm(o, { recursive: !0, force: !0 });
+    await u.rm(n, { recursive: !0, force: !0 });
   }
 }
-async function ws(t, s) {
+async function vs(t, s) {
   const r = (await t({ query: s })).results.find((i) => i.slug === s);
   if (!r)
     throw new Error(`No exact registry match for slug "${s}"`);
   return r;
 }
-async function ys(t, s) {
-  const e = s.registrySkill?.slug === s.slug ? s.registrySkill : await ws(t, s.slug), r = e.skillUrl;
+async function Ss(t, s) {
+  const e = s.registrySkill?.slug === s.slug ? s.registrySkill : await vs(t, s.slug), r = e.skillUrl;
   if (!r)
     throw new Error(
       `Registry skill "${s.slug}" does not define a skillUrl/packageUrl`
     );
-  const i = L(r), o = e.sha256, n = i?.protocol === "http:" || i?.protocol === "https:" ? await ks(
+  const i = b(r), n = e.sha256, o = i?.protocol === "http:" || i?.protocol === "https:" ? await ys(
     r,
     s.targetDir,
-    o
-  ) : await gs(
-    i?.protocol === "file:" ? _(i) : l.resolve(r),
+    n
+  ) : await ws(
+    i?.protocol === "file:" ? L(i) : l.resolve(r),
     s.targetDir,
-    o
+    n
   );
   return {
     slug: s.slug,
     targetDir: s.targetDir,
-    writtenFiles: n,
+    writtenFiles: o,
     version: e.version
   };
 }
-function vs(t) {
-  return async (s) => ys(t, s);
+function Ds(t) {
+  return async (s) => Ss(t, s);
 }
 class g extends Error {
   code;
@@ -981,11 +993,11 @@ class g extends Error {
     super(s.message), this.code = s.code, this.hint = s.hint, this.nextCommands = s.nextCommands ?? [];
   }
 }
-function Ss() {
+function xs() {
   const t = process.argv[1] ?? "";
   return t ? ["rrskill.js", "rrskill"].includes(l.basename(t)) ? !0 : import.meta.url === `file://${t}` : !1;
 }
-function Ds() {
+function Cs() {
   return [
     "rrskill CLI",
     "",
@@ -1021,7 +1033,7 @@ function Ds() {
   ].join(`
 `);
 }
-function xs(t) {
+function js(t) {
   const s = [
     "",
     "Global options:",
@@ -1117,23 +1129,23 @@ function xs(t) {
   ].join(`
 `);
 }
-function F(t) {
+function H(t) {
   process.stdout.write(`${JSON.stringify(t, null, 2)}
 `);
 }
-function N(t) {
+function z(t) {
   process.stdout.write(t.endsWith(`
 `) ? t : `${t}
 `);
 }
 function m(t, s, e) {
   if (s === "json") {
-    F(t);
+    H(t);
     return;
   }
-  N(e(t));
+  z(e(t));
 }
-function js(t) {
+function Es(t) {
   return [
     `${t.packageName} ${t.version}`,
     `Update via ${t.updateVia}:`,
@@ -1141,27 +1153,27 @@ function js(t) {
   ].join(`
 `);
 }
-function Cs(t) {
+function _s(t) {
   return t.results.length === 0 ? `No skills found for "${t.query}".` : t.results.map((s) => {
     const e = s.version ? `@${s.version}` : "", r = s.title && s.title !== s.slug ? ` - ${s.title}` : "";
     return `${s.slug}${e}${r}`;
   }).join(`
 `);
 }
-function Es(t) {
+function Ls(t) {
   const s = [`Installed ${t.slug}`, `Target: ${t.targetDir}`];
   return t.registryMatch?.version && s.push(`Version: ${t.registryMatch.version}`), s.join(`
 `);
 }
-function _s(t) {
+function bs(t) {
   return t.length === 0 ? "No skills installed." : t.join(`
 `);
 }
-function Ls(t) {
+function $s(t) {
   return t.upgraded.length === 0 ? "No skills upgraded." : ["Upgraded skills:", ...t.upgraded.map((s) => `  ${s}`)].join(`
 `);
 }
-function bs(t) {
+function Is(t) {
   const s = [
     t.verification.ok ? "Bootstrap succeeded." : "Bootstrap failed.",
     `Builtins installed: ${t.builtinsInstalled.length === 0 ? "none" : t.builtinsInstalled.join(", ")}`,
@@ -1175,7 +1187,7 @@ function bs(t) {
   ), s.join(`
 `);
 }
-function $s(t) {
+function Os(t) {
   const s = [
     t.ok ? `Doctor OK for ${t.host}.` : `Doctor found issues for ${t.host}.`,
     `Bootstrap supported: ${t.bootstrapSupported ? "yes" : "no"}`,
@@ -1184,10 +1196,10 @@ function $s(t) {
   return t.checks.length > 0 && s.push(...t.checks.map((e) => `[${e.ok ? "ok" : "fail"}] ${e.name}: ${e.message}`)), t.nextCommands.length > 0 && s.push("Next commands:", ...t.nextCommands.map((e) => `  ${e}`)), s.join(`
 `);
 }
-function E(t, ...s) {
+function _(t, ...s) {
   return t.some((e) => s.includes(e));
 }
-function Is(t, s) {
+function Ps(t, s) {
   const e = t.indexOf(s);
   if (e < 0)
     return;
@@ -1195,10 +1207,10 @@ function Is(t, s) {
   if (!(!r || r.startsWith("--")))
     return r;
 }
-function ut(t, s = "json") {
-  if (E(t, "--json"))
+function ft(t, s = "json") {
+  if (_(t, "--json"))
     return "json";
-  const e = Is(t, "--output");
+  const e = Ps(t, "--output");
   if (!e) {
     if (t.includes("--output"))
       throw new g({
@@ -1218,9 +1230,9 @@ function ut(t, s = "json") {
     nextCommands: ["rrskill --help"]
   });
 }
-function Z(t, s) {
+function Q(t, s) {
   if (t instanceof g && s === "json") {
-    F({
+    H({
       ok: !1,
       error: {
         code: t.code,
@@ -1245,7 +1257,7 @@ function Z(t, s) {
   }
   const e = t instanceof Error ? t.message : String(t);
   if (s === "json") {
-    F({
+    H({
       ok: !1,
       error: {
         code: "unexpected_error",
@@ -1258,8 +1270,8 @@ function Z(t, s) {
   process.stderr.write(`${e}
 `);
 }
-async function Os(t) {
-  const s = ut(t, "json"), e = Et(t), r = tt(t), i = E(t, "--help", "-h");
+async function Us(t) {
+  const s = ft(t, "json"), e = Et(t), r = st(t), i = _(t, "--help", "-h");
   if (e.command === "unknown")
     throw new g({
       code: "unknown_command",
@@ -1269,30 +1281,30 @@ 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) ? (N(xs(a)), 0) : (N(Ds()), 0);
+    return a && ["search", "install", "list", "upgrade", "bootstrap", "doctor", "version"].includes(a) ? (z(js(a)), 0) : (z(Cs()), 0);
   }
   if (e.command === "doctor") {
-    const a = await V({ argv: t, env: process.env }), f = await Rt(
+    const a = await G({ argv: t, env: process.env }), f = await Tt(
       a,
       {
-        fix: E(t, "--fix"),
-        dryRun: E(t, "--dry-run")
+        fix: _(t, "--fix"),
+        dryRun: _(t, "--dry-run")
       }
     );
-    return m(f, s, $s), f.ok ? 0 : 1;
+    return m(f, s, Os), f.ok ? 0 : 1;
   }
   if (e.command === "version")
-    return m(os(), s, js), 0;
-  const o = await V({ argv: t, env: process.env });
-  if (e.command === "install" && o.host === "openclaw")
+    return m(ls(), s, Es), 0;
+  const n = await G({ argv: t, env: process.env });
+  if (e.command === "install" && n.host === "openclaw")
     try {
-      await R(o);
+      await T(n);
     } catch {
     }
-  const n = ms({ config: o.config, env: o.env }), c = vs(n);
+  const o = ks({ config: n.config, env: n.env }), c = Ds(o);
   if (e.command === "bootstrap") {
-    const a = await R(o);
-    return m(a, s, bs), a.verification.ok ? 0 : 1;
+    const a = await T(n);
+    return m(a, s, Is), a.verification.ok ? 0 : 1;
   }
   if (e.command === "search") {
     const a = r.slice(1).join(" ").trim();
@@ -1303,8 +1315,8 @@ async function Os(t) {
         hint: "rrskill search <query>",
         nextCommands: ["rrskill search react"]
       });
-    const f = await rs(o, a, { searchSkills: n });
-    return m(f, s, Cs), 0;
+    const f = await ns(n, a, { searchSkills: o });
+    return m(f, s, _s), 0;
   }
   if (e.command === "install") {
     const a = "slug" in e ? e.slug : r[1]?.trim();
@@ -1315,33 +1327,33 @@ async function Os(t) {
         hint: "rrskill install <slug>",
         nextCommands: ["rrskill install web-search"]
       });
-    const f = await ss(o, a, { searchSkills: n, downloadSkill: c });
-    return m(f, s, Es), 0;
+    const f = await rs(n, a, { searchSkills: o, downloadSkill: c });
+    return m(f, s, Ls), 0;
   }
   if (e.command === "list") {
-    const a = await es(o);
-    return m(a, s, _s), 0;
+    const a = await is(n);
+    return m(a, s, bs), 0;
   }
   if (e.command === "upgrade") {
-    const a = await is(o, { downloadSkill: c });
-    return m(a, s, Ls), 0;
+    const a = await os(n, { downloadSkill: c });
+    return m(a, s, $s), 0;
   }
   return process.stderr.write(`Command "${e.command}" is not implemented yet.
 `), 1;
 }
-if (Ss()) {
+if (xs()) {
   const t = process.argv.slice(2);
-  Os(t).then((s) => {
+  Us(t).then((s) => {
     process.exitCode = s;
   }).catch((s) => {
     let e = "text";
     try {
-      e = ut(t, "text");
+      e = ft(t, "text");
     } catch (r) {
-      Z(r, "text"), process.exitCode = 1;
+      Q(r, "text"), process.exitCode = 1;
       return;
     }
-    Z(s, e), process.exitCode = 1;
+    Q(s, e), process.exitCode = 1;
   });
 }
 export {