@rrskill/cli 0.1.1 → 0.1.3

package/dist/index.js

@@ -1,30 +1,30 @@
-import * as c from "node:path";
+import * as l from "node:path";
 import * as u from "node:fs/promises";
-import { fileURLToPath as x, pathToFileURL as ht } from "node:url";
-import { readFileSync as mt } from "node:fs";
-import { createHash as gt } from "node:crypto";
-import * as G from "node:os";
-import * as kt from "node:zlib";
-import { promisify as wt } from "node:util";
-const V = ["search", "install", "list", "upgrade", "bootstrap", "doctor", "version"], Z = new Set(V), yt = "--host", vt = "--output", St = /* @__PURE__ */ new Set([yt, vt]), Dt = /* @__PURE__ */ new Set(["--openclaw", "--codex", "--claude-code"]);
-function Q(t) {
+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 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 s = [];
   for (let e = 0; e < t.length; e += 1) {
     const r = t[e];
     if (r) {
-      if (St.has(r)) {
+      if (jt.has(r)) {
         const i = t[e + 1];
-        i && !i.startsWith("--") && !Z.has(i) && (e += 1);
+        i && !i.startsWith("--") && !X.has(i) && (e += 1);
         continue;
       }
-      Dt.has(r) || r.startsWith("--") || s.push(r);
+      Ct.has(r) || r.startsWith("--") || s.push(r);
     }
   }
   return s;
 }
 function Et(t) {
-  const s = Q(t)[0] ?? "";
-  return s ? Z.has(s) ? { command: s } : { command: "install", slug: s } : { command: "help" };
+  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" };
 }
 async function b(t) {
   const s = t.fsImpl ?? u;
@@ -34,7 +34,7 @@ async function b(t) {
     return !1;
   }
 }
-async function Ct(t) {
+async function _t(t) {
   const s = t.fsImpl ?? u;
   let e;
   try {
@@ -55,7 +55,7 @@ async function Ct(t) {
     };
   }
 }
-function z(t, s) {
+function J(t, s) {
   let e = t;
   for (const r of s) {
     if (!e || typeof e != "object")
@@ -64,50 +64,49 @@ function z(t, s) {
   }
   return e;
 }
-async function X(t, s = {}) {
+async function tt(t, s = {}) {
   const e = s.fs ?? u, r = [], i = ["find-skills", "rrskill-preference"];
-  for (const d of i) {
-    const f = c.join(t.skillsDir, d, "SKILL.md");
-    await b({ fsImpl: e, path: f }) || r.push({ code: "missing_builtin_skill", slug: d, path: f });
+  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 });
   }
   if (t.host !== "openclaw")
     return r.push({ code: "unsupported_host_bootstrap", host: t.host }), { ok: !1, issues: r };
-  const o = c.join(t.pluginDir, "index.ts"), n = c.join(t.pluginDir, "openclaw.plugin.json");
+  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 l = await Ct({ fsImpl: e, path: t.hostConfigPath });
-  if (!l.ok)
-    return r.push(l.issue), { ok: !1, issues: r };
-  const a = z(l.value, ["plugins", "entries", "rrskill"]);
+  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"]);
   if (!a || typeof a != "object")
     r.push({ code: "missing_host_plugin_entry", path: t.hostConfigPath });
   else {
-    const d = [
+    const f = [
       { 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 f of d) {
-      const m = z(l.value, f.key);
-      m !== f.expected && r.push({
+    for (const d of f) {
+      const h = J(c.value, d.key);
+      h !== d.expected && r.push({
         code: "host_plugin_policy_mismatch",
         path: t.hostConfigPath,
-        key: f.key.join("."),
-        expected: f.expected,
-        actual: m
+        key: d.key.join("."),
+        expected: d.expected,
+        actual: h
       });
     }
   }
   return { ok: r.length === 0, issues: r };
 }
-function P(t, s) {
-  const e = c.dirname(x(t));
+function O(t, s) {
+  const e = l.dirname(_(t));
   return [
-    c.resolve(e, "..", "builtins", s),
-    c.resolve(e, "..", "src", "builtins", s),
-    c.resolve(e, "..", "..", "src", "builtins", s)
+    l.resolve(e, "..", "assets", "builtins", s),
+    l.resolve(e, "..", "..", "assets", "builtins", s)
   ];
 }
-async function U(t) {
+async function P(t) {
   const s = t.fsImpl ?? u;
   let e;
   for (const r of t.candidates)
@@ -118,7 +117,7 @@ async function U(t) {
     }
   throw new Error(`Failed to load ${t.assetLabel} from candidates: ${t.candidates.join(", ")} (${String(e)})`);
 }
-async function $(t) {
+async function U(t) {
   const s = t.fsImpl ?? u, e = t.content.endsWith(`
 `) ? t.content : `${t.content}
 `;
@@ -127,57 +126,57 @@ async function $(t) {
       return !1;
   } catch {
   }
-  return await s.mkdir(c.dirname(t.path), { recursive: !0 }), await s.writeFile(t.path, e, "utf8"), !0;
+  return await s.mkdir(l.dirname(t.path), { recursive: !0 }), await s.writeFile(t.path, e, "utf8"), !0;
 }
-const J = ["find-skills", "rrskill-preference"];
-function _t(t) {
+const B = ["find-skills", "rrskill-preference"];
+function Lt(t) {
   return t === "find-skills" ? "skills/find-skills.md" : "skills/rrskill-preference.md";
 }
-async function Lt(t, s = {}) {
+async function bt(t, s = {}) {
   const e = s.fs ?? u;
   let r = !1;
-  for (const i of J) {
-    const o = await U({
-      candidates: P(import.meta.url, _t(i)),
+  for (const i of B) {
+    const o = await P({
+      candidates: O(import.meta.url, Lt(i)),
       fsImpl: e,
       assetLabel: "built-in skill asset"
-    }), n = c.join(t.skillsDir, i, "SKILL.md"), l = await $({ path: n, content: o, fsImpl: e });
-    r = r || l;
+    }), n = l.join(t.skillsDir, i, "SKILL.md"), c = await U({ path: n, content: o, fsImpl: e });
+    r = r || c;
   }
-  return { installed: [...J], changed: r };
+  return { installed: [...B], changed: r };
 }
-async function xt(t, s = {}) {
+async function $t(t, s = {}) {
   const e = s.fs ?? u;
   if (t.host !== "openclaw")
     return { installed: !1, changed: !1 };
-  const r = await U({
-    candidates: P(import.meta.url, "plugins/openclaw/index.ts"),
+  const r = await P({
+    candidates: O(import.meta.url, "plugins/openclaw/index.ts"),
     fsImpl: e,
     assetLabel: "built-in plugin asset"
-  }), i = await U({
-    candidates: P(import.meta.url, "plugins/openclaw/openclaw.plugin.json"),
+  }), i = await P({
+    candidates: O(import.meta.url, "plugins/openclaw/openclaw.plugin.json"),
     fsImpl: e,
     assetLabel: "built-in plugin asset"
-  }), o = c.join(t.pluginDir, "index.ts"), n = c.join(t.pluginDir, "openclaw.plugin.json"), l = await $({ path: o, content: r, fsImpl: e }), a = await $({ path: n, content: i, fsImpl: e });
-  return { installed: !0, changed: l || a };
+  }), 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 Y(t) {
+function st(t) {
   return !!t && typeof t == "object" && !Array.isArray(t);
 }
-function E(t, s) {
+function x(t, s) {
   const e = t[s];
-  if (Y(e))
+  if (st(e))
     return e;
   const r = {};
   return t[s] = r, r;
 }
-async function jt(t) {
+async function It(t) {
   const s = t.fsImpl ?? u;
   try {
     const e = await s.readFile(t.path, "utf8");
     try {
       const r = JSON.parse(e);
-      return Y(r) ? { object: r, exists: !0, parseOk: !0, rawText: e } : { object: {}, exists: !0, parseOk: !1, rawText: e, parseError: "root is not a JSON object" };
+      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" };
     } catch (r) {
       return {
         object: {},
@@ -191,37 +190,47 @@ async function jt(t) {
     return { object: {}, exists: !1, parseOk: !1 };
   }
 }
-async function bt(t) {
+async function Ot(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(c.dirname(t.path), { recursive: !0 }), await s.writeFile(t.path, e, "utf8"), !0);
+  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 Ot(t) {
-  const s = t.fsImpl ?? u, e = await jt({ fsImpl: s, path: t.hostConfigPath });
+async function Pt(t) {
+  const s = t.fsImpl ?? u, e = await It({ 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 = E(r, "plugins"), o = E(i, "entries"), n = E(o, "rrskill"), l = E(n, "config");
+  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), l.primaryCli !== "rrskill" && (l.primaryCli = "rrskill", a = !0), l.primaryLabel !== "official-registry" && (l.primaryLabel = "official-registry", a = !0), a ? bt({
+  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({
     fsImpl: s,
     path: t.hostConfigPath,
     value: r,
     prevRawText: e.rawText
   }) : !1;
 }
-async function It(t, s = {}) {
-  const e = s.fs ?? u, r = await Lt({ skillsDir: t.skillsDir }, { fs: e }), i = await xt({ host: t.host, pluginDir: t.pluginDir }, { fs: e });
+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 Ot({ fsImpl: e, hostConfigPath: t.hostConfigPath })), {
+  return t.host === "openclaw" && (o = await Pt({ fsImpl: e, hostConfigPath: t.hostConfigPath })), {
     builtinsInstalled: r.installed,
     pluginInstalled: i.installed,
     hostConfigRepaired: o
   };
 }
-async function tt(t, s = {}) {
-  const e = s.fs ?? u, r = await It(
+async function et(t, s = {}) {
+  if (t.host !== "openclaw")
+    return {
+      builtinsInstalled: [],
+      pluginInstalled: !1,
+      hostConfigRepaired: !1,
+      verification: {
+        ok: !1,
+        issues: [{ code: "unsupported_host_bootstrap", host: t.host }]
+      }
+    };
+  const e = s.fs ?? u, r = await Ut(
     {
       host: t.host,
       skillsDir: t.skillsDir,
@@ -229,7 +238,7 @@ async function tt(t, s = {}) {
       hostConfigPath: t.hostConfigPath
     },
     { fs: e }
-  ), i = await X(
+  ), i = await tt(
     {
       host: t.host,
       skillsDir: t.skillsDir,
@@ -245,7 +254,7 @@ async function tt(t, s = {}) {
     verification: i
   };
 }
-function C(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)
   ), i = new Set(
@@ -263,25 +272,25 @@ function C(t, s) {
       name: "builtin_find-skills",
       ok: !r.has("find-skills"),
       message: r.has("find-skills") ? "missing built-in skill" : "built-in skill installed",
-      path: c.join(t.skillsDir, "find-skills", "SKILL.md")
+      path: l.join(t.skillsDir, "find-skills", "SKILL.md")
     },
     {
       name: "builtin_rrskill-preference",
       ok: !r.has("rrskill-preference"),
       message: r.has("rrskill-preference") ? "missing built-in skill" : "built-in skill installed",
-      path: c.join(t.skillsDir, "rrskill-preference", "SKILL.md")
+      path: l.join(t.skillsDir, "rrskill-preference", "SKILL.md")
     },
     {
       name: "plugin_index",
-      ok: !i.has(c.join(t.pluginDir, "index.ts")),
-      message: i.has(c.join(t.pluginDir, "index.ts")) ? "missing OpenClaw plugin entry file" : "OpenClaw plugin entry file present",
-      path: c.join(t.pluginDir, "index.ts")
+      ok: !i.has(l.join(t.pluginDir, "index.ts")),
+      message: i.has(l.join(t.pluginDir, "index.ts")) ? "missing OpenClaw plugin entry file" : "OpenClaw plugin entry file present",
+      path: l.join(t.pluginDir, "index.ts")
     },
     {
       name: "plugin_manifest",
-      ok: !i.has(c.join(t.pluginDir, "openclaw.plugin.json")),
-      message: i.has(c.join(t.pluginDir, "openclaw.plugin.json")) ? "missing OpenClaw plugin manifest" : "OpenClaw plugin manifest present",
-      path: c.join(t.pluginDir, "openclaw.plugin.json")
+      ok: !i.has(l.join(t.pluginDir, "openclaw.plugin.json")),
+      message: i.has(l.join(t.pluginDir, "openclaw.plugin.json")) ? "missing OpenClaw plugin manifest" : "OpenClaw plugin manifest present",
+      path: l.join(t.pluginDir, "openclaw.plugin.json")
     },
     {
       name: "host_config",
@@ -296,7 +305,7 @@ function C(t, s) {
     }
   ];
 }
-async function Pt(t, s = {}, e = {}) {
+async function Rt(t, s = {}, e = {}) {
   const r = e.fs ?? u, i = {
     skillsDir: t.skillsDir,
     pluginDir: t.pluginDir,
@@ -325,7 +334,7 @@ async function Pt(t, s = {}, e = {}) {
       nextCommands: ["rrskill search <query>", "rrskill install <slug>"],
       paths: i
     };
-  const o = await X(t, {
+  const o = await tt(t, {
     fs: r
   });
   if (o.ok)
@@ -335,7 +344,7 @@ async function Pt(t, s = {}, e = {}) {
       bootstrapSupported: !0,
       fixed: !1,
       dryRun: s.dryRun ?? !1,
-      checks: C(t, []),
+      checks: j(t, []),
       issues: [],
       nextCommands: [],
       paths: i,
@@ -348,14 +357,14 @@ async function Pt(t, s = {}, e = {}) {
       bootstrapSupported: !0,
       fixed: !1,
       dryRun: !0,
-      checks: C(t, o.issues),
+      checks: j(t, o.issues),
       issues: o.issues,
       nextCommands: ["rrskill bootstrap --host openclaw"],
       paths: i,
       verification: o
     };
   if (s.fix) {
-    const n = await tt(t, {
+    const n = await et(t, {
       fs: r
     });
     return {
@@ -364,7 +373,7 @@ async function Pt(t, s = {}, e = {}) {
       bootstrapSupported: !0,
       fixed: !0,
       dryRun: !1,
-      checks: C(
+      checks: j(
         t,
         n.verification.ok ? [] : n.verification.issues
       ),
@@ -380,47 +389,47 @@ async function Pt(t, s = {}, e = {}) {
     bootstrapSupported: !0,
     fixed: !1,
     dryRun: !1,
-    checks: C(t, o.issues),
+    checks: j(t, o.issues),
     issues: o.issues,
     nextCommands: ["rrskill bootstrap --host openclaw"],
     paths: i,
     verification: o
   };
 }
-function Ut(t) {
+function At(t) {
   return t.HOME ?? t.USERPROFILE ?? process.env.HOME ?? process.env.USERPROFILE ?? process.cwd();
 }
-function M(t, s) {
+function q(t, s) {
   const e = t?.trim();
   if (e)
-    return e === "~" ? s : e.startsWith("~/") ? c.resolve(s, e.slice(2)) : c.resolve(e);
+    return e === "~" ? s : e.startsWith("~/") ? l.resolve(s, e.slice(2)) : l.resolve(e);
 }
-function O(t, s) {
+function $(t, s) {
   for (const e of s) {
     const r = t[e];
     if (typeof r == "string" && r.trim())
       return r.trim();
   }
 }
-function $t(t, s) {
+function Tt(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 At(t) {
-  const s = Ut(t.env), e = M(t.env.RRSKILL_CONFIG_PATH, s) ?? c.resolve(s, ".rrskill", "config.json");
+async function Ft(t) {
+  const s = At(t.env), e = q(t.env.RRSKILL_CONFIG_PATH, s) ?? l.resolve(s, ".rrskill", "config.json");
   try {
-    const r = await u.readFile(e, "utf8"), i = $t(JSON.parse(r), e);
+    const r = await u.readFile(e, "utf8"), i = Tt(JSON.parse(r), e);
     return {
       configPath: e,
-      host: O(i, ["host"]),
-      stateDir: M(
-        O(i, ["stateDir", "state_dir"]),
+      host: $(i, ["host"]),
+      stateDir: q(
+        $(i, ["stateDir", "state_dir"]),
         s
       ),
-      skillsSearchUrl: O(i, [
+      skillsSearchUrl: $(i, [
         "skillsSearchUrl",
         "skills_search_url"
       ])
@@ -433,44 +442,44 @@ async function At(t) {
     ) : r;
   }
 }
-const Rt = "openclaw", Ft = "--host", q = {
+const Nt = "openclaw", Ht = "--host", K = {
   "--openclaw": "openclaw",
   "--codex": "codex",
   "--claude-code": "claude-code"
-}, st = [
+}, rt = [
   "openclaw",
   "codex",
   "claude-code"
-], Ht = new Set(st), Nt = new Set(V);
-function Tt(t) {
+], zt = new Set(rt), Mt = new Set(Q);
+function Jt(t) {
   if (!t)
     return;
   const s = t.trim().toLowerCase();
-  if (s && Ht.has(s))
+  if (s && zt.has(s))
     return s;
 }
 function I(t, s) {
   if (t === void 0)
     return;
-  const e = Tt(t);
+  const e = Jt(t);
   if (e)
     return e;
   const r = t.trim();
   if (r)
     throw new Error(
-      `Unsupported host "${r}" from ${s}. Supported hosts: ${st.join(", ")}`
+      `Unsupported host "${r}" from ${s}. Supported hosts: ${rt.join(", ")}`
     );
 }
-function zt(t) {
-  const s = t.indexOf(Ft);
+function Bt(t) {
+  const s = t.indexOf(Ht);
   if (s < 0)
     return;
   const e = t[s + 1];
-  if (!(!e || e.startsWith("--") || Nt.has(e)))
+  if (!(!e || e.startsWith("--") || Mt.has(e)))
     return e;
 }
-function Jt(t) {
-  const s = t.filter((r) => r in q).map((r) => q[r]);
+function qt(t) {
+  const s = t.filter((r) => r in K).map((r) => K[r]);
   if (s.length === 0)
     return;
   const e = Array.from(new Set(s));
@@ -478,9 +487,9 @@ function Jt(t) {
     throw new Error(`Conflicting host flags: ${e.join(", ")}`);
   return e[0];
 }
-function Mt(t) {
-  const s = Jt(t.argv), e = I(
-    zt(t.argv),
+function Kt(t) {
+  const s = qt(t.argv), e = I(
+    Bt(t.argv),
     "--host"
   );
   if (s && e && s !== e)
@@ -494,13 +503,13 @@ function Mt(t) {
   if (i)
     return i;
   const o = t.config.configPath ? `config ${t.config.configPath}` : "config", n = I(t.config.host, o);
-  return n || Rt;
+  return n || Nt;
 }
-function qt(t) {
+function Wt(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 Kt = {
+const Vt = {
   name: "openclaw",
   getDefaultPaths({ homeDir: t }) {
     return {
@@ -509,7 +518,7 @@ const Kt = {
       hostConfigPath: `${t}/.openclaw/openclaw.json`
     };
   }
-}, Wt = {
+}, Gt = {
   name: "codex",
   getDefaultPaths({ homeDir: t, stateDir: s }) {
     const e = s ?? `${t}/.rrskill`;
@@ -519,7 +528,7 @@ const Kt = {
       hostConfigPath: `${t}/.codex/config.toml`
     };
   }
-}, Bt = {
+}, Zt = {
   name: "claude-code",
   getDefaultPaths({ homeDir: t, stateDir: s }) {
     const e = s ?? `${t}/.rrskill`;
@@ -530,8 +539,8 @@ const Kt = {
     };
   }
 };
-async function K(t) {
-  const s = await At({ env: t.env }), e = Mt({ argv: t.argv, env: t.env, config: s }), r = qt({ env: t.env, config: s }), i = e === "openclaw" ? Kt.getDefaultPaths({ homeDir: r.homeDir, stateDir: r.stateDir }) : e === "codex" ? Wt.getDefaultPaths({ homeDir: r.homeDir, stateDir: r.stateDir }) : Bt.getDefaultPaths({ homeDir: r.homeDir, stateDir: r.stateDir });
+async function W(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,
     env: t.env,
@@ -545,68 +554,68 @@ async function K(t) {
     config: s
   };
 }
-const Gt = ".rrskill_lock.json";
-function A() {
+const Qt = ".rrskill_lock.json";
+function R() {
   return { version: 1, skills: {} };
 }
-function et(t) {
-  return c.join(t, Gt);
+function it(t) {
+  return l.join(t, Qt);
 }
-function rt(t, s) {
-  const e = c.resolve(t), r = c.resolve(e, s), i = e.endsWith(c.sep) ? e : `${e}${c.sep}`;
+function nt(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}"`);
   return r;
 }
-function k(t) {
+function w(t) {
   return typeof t == "object" && t !== null;
 }
-function W(t, s) {
-  if (!k(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 = k(s.source) || i ? {
+function V(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",
-    version: (k(s.source) && typeof s.source.version == "string" ? s.source.version : void 0) ?? i
+    version: (w(s.source) && typeof s.source.version == "string" ? s.source.version : void 0) ?? i
   } : void 0;
   return { slug: e, installedAt: r, source: o };
 }
-function Vt(t) {
-  if (!k(t)) return A();
-  if (t.version === 1 && k(t.skills)) {
+function Xt(t) {
+  if (!w(t)) return R();
+  if (t.version === 1 && w(t.skills)) {
     const i = {};
     for (const [o, n] of Object.entries(t.skills)) {
-      const l = W(o, n);
-      l && (i[o] = l);
+      const c = V(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 A();
+    return R();
   const r = {};
   for (const [i, o] of Object.entries(t)) {
-    const n = W(i, o);
+    const n = V(i, o);
     n && (r[i] = n);
   }
   return { version: 1, skills: r };
 }
-async function F(t) {
-  const s = et(t.skillsDir);
+async function N(t) {
+  const s = it(t.skillsDir);
   try {
     const e = await t.fs.readFile(s, "utf8"), r = JSON.parse(e);
-    return Vt(r);
+    return Xt(r);
   } catch (e) {
-    if ((k(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 R();
     throw e;
   }
 }
-async function it(t) {
-  const s = et(t.skillsDir);
+async function ot(t) {
+  const s = it(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 nt(t, s) {
+function at(t, s) {
   return {
     version: 1,
     skills: {
@@ -615,13 +624,13 @@ function nt(t, s) {
     }
   };
 }
-function Zt() {
+function Yt() {
   return /* @__PURE__ */ new Date();
 }
-async function Qt(t) {
+async function ts(t) {
   const s = t.fsImpl ?? u;
   await s.mkdir(t.targetDir, { recursive: !0 });
-  const e = c.join(t.targetDir, "rrskill.json");
+  const e = l.join(t.targetDir, "rrskill.json");
   await s.writeFile(
     e,
     `${JSON.stringify({ slug: t.slug, installedBy: "rrskill-cli", schema: 1 }, null, 2)}
@@ -629,71 +638,71 @@ async function Qt(t) {
     "utf8"
   );
 }
-async function Xt(t, s, e = {}) {
-  const r = e.fs ?? u, i = e.now ?? Zt;
+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((m) => m.slug === s), !o))
+  if (e.searchSkills && (o = (await e.searchSkills({ query: s })).results.find((h) => h.slug === s), !o))
     throw new Error(`No exact registry match for slug "${s}"`);
-  const n = rt(t.skillsDir, s);
-  let l = o?.version;
-  e.downloadSkill ? (await r.mkdir(n, { recursive: !0 }), l = (await e.downloadSkill({ slug: s, targetDir: n, registrySkill: o })).version ?? l) : await Qt({ slug: s, targetDir: n, fsImpl: r });
-  const a = await F({ skillsDir: t.skillsDir, fs: r }), d = nt(a, {
+  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, {
     slug: s,
     installedAt: i().toISOString(),
-    source: { type: "registry", version: l }
+    source: { type: "registry", version: c }
   });
-  return await it({ skillsDir: t.skillsDir, fs: r, lockfile: d }), {
+  return await ot({ skillsDir: t.skillsDir, fs: r, lockfile: f }), {
     slug: s,
     targetDir: n,
     registryMatch: o
   };
 }
-async function Yt(t, s = {}) {
-  const e = s.fs ?? u, r = await F({ skillsDir: t.skillsDir, fs: e });
+async function es(t, s = {}) {
+  const e = s.fs ?? u, r = await N({ skillsDir: t.skillsDir, fs: e });
   return Object.keys(r.skills).sort();
 }
-async function ts(t, s, e) {
+async function rs(t, s, e) {
   return e.searchSkills({ query: s });
 }
-async function ss(t, s = {}) {
-  const e = s.fs ?? u, r = s.now ?? (() => /* @__PURE__ */ new Date()), i = await F({ skillsDir: t.skillsDir, fs: e }), o = Object.keys(i.skills).sort();
+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();
   if (!s.downloadSkill)
     return { upgraded: [] };
   const n = [];
-  let l = i;
+  let c = i;
   for (const a of o) {
-    const d = rt(t.skillsDir, a);
-    await e.mkdir(d, { recursive: !0 });
-    const f = await s.downloadSkill({ slug: a, targetDir: d });
+    const f = nt(t.skillsDir, a);
+    await e.mkdir(f, { recursive: !0 });
+    const d = await s.downloadSkill({ slug: a, targetDir: f });
     n.push(a);
-    const m = l.skills[a];
-    l = nt(l, {
+    const h = c.skills[a];
+    c = at(c, {
       slug: a,
       installedAt: r().toISOString(),
       source: {
         type: "registry",
-        version: f.version ?? m?.source?.version
+        version: d.version ?? h?.source?.version
       }
-    }), await it({ skillsDir: t.skillsDir, fs: e, lockfile: l });
+    }), await ot({ skillsDir: t.skillsDir, fs: e, lockfile: c });
   }
   return { upgraded: n };
 }
-function es(t) {
-  let s = c.dirname(x(t));
+function ns(t) {
+  let s = l.dirname(_(t));
   for (; ; ) {
-    const e = c.join(s, "package.json");
+    const e = l.join(s, "package.json");
     try {
-      return JSON.parse(mt(e, "utf8"));
+      return JSON.parse(wt(e, "utf8"));
     } catch {
-      const r = c.dirname(s);
+      const r = l.dirname(s);
       if (r === s)
         return {};
       s = r;
     }
   }
 }
-function rs(t = {}) {
-  const s = es(import.meta.url);
+function os(t = {}) {
+  const s = ns(import.meta.url);
   return {
     packageName: t.packageName ?? s.name ?? "rrskill",
     version: t.version ?? s.version ?? "0.0.0-dev",
@@ -701,8 +710,8 @@ function rs(t = {}) {
     instructions: ["npm install -g rrskill@latest", "npm install -g @rrskill/cli@latest"]
   };
 }
-const is = wt(kt.inflateRaw), ns = "https://api.rrskill.ai/skills?page=1&size={limit}&search={query}&orderBy=downloadCount&order=desc", os = 20;
-function _(t) {
+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) {
   return typeof t == "object" && t !== null && !Array.isArray(t);
 }
 function p(t, s) {
@@ -712,21 +721,21 @@ function p(t, s) {
       return r.trim();
   }
 }
-function j(t) {
+function L(t) {
   try {
     return new URL(t);
   } catch {
     return;
   }
 }
-function as(t, s, e, r) {
-  const i = s.RRSKILL_SKILLS_SEARCH_URL?.trim() || s.RRSKILL_SEARCH_URL?.trim() || t.skillsSearchUrl?.trim() || ns, o = i.replaceAll("{query}", encodeURIComponent(e)).replaceAll("{limit}", String(r)), n = j(o);
+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(
-    (l) => n.searchParams.has(l)
-  ) || n.searchParams.set("search", e), i.includes("{limit}") || ["limit", "size"].some((l) => n.searchParams.has(l)) || n.searchParams.set("limit", String(r)), n.toString()) : o;
+    (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;
 }
-async function ls(t) {
-  const s = j(t);
+async function fs(t) {
+  const s = L(t);
   if (s?.protocol === "http:" || s?.protocol === "https:") {
     const r = await fetch(t, {
       headers: {
@@ -743,19 +752,19 @@ async function ls(t) {
     };
   }
   if (s?.protocol === "file:") {
-    const r = x(s);
+    const r = _(s);
     return {
       payload: await u.readFile(r, "utf8"),
       reference: s.toString()
     };
   }
-  const e = c.resolve(t);
+  const e = l.resolve(t);
   return {
     payload: await u.readFile(e, "utf8"),
-    reference: ht(e).toString()
+    reference: kt(e).toString()
   };
 }
-function cs(t, s) {
+function ds(t, s) {
   if (t)
     try {
       return new URL(t, s).toString();
@@ -763,21 +772,21 @@ function cs(t, s) {
       return;
     }
 }
-function ot(t, s, e) {
+function lt(t, s, e) {
   const r = s?.trim().toLowerCase();
   if (!r)
     return;
-  const i = gt("sha256").update(t).digest("hex").toLowerCase();
+  const i = yt("sha256").update(t).digest("hex").toLowerCase();
   if (i !== r)
     throw new Error(
       `SHA256 mismatch for ${e}: expected ${r}, got ${i}`
     );
 }
-function us(t, s) {
+function ps(t, s) {
   const e = p(t, ["slug"]);
   if (!e)
     return;
-  const r = _(t.currentVersion) ? t.currentVersion : {}, i = cs(
+  const r = C(t.currentVersion) ? t.currentVersion : {}, i = ds(
     p(r, [
       "skillUrl",
       "downloadUrl",
@@ -796,7 +805,7 @@ function us(t, s) {
     source: p(t, ["source", "platform"])
   };
 }
-function fs(t, s, e) {
+function hs(t, s, e) {
   let r;
   try {
     r = JSON.parse(t);
@@ -805,11 +814,11 @@ function fs(t, s, e) {
       `Search response is not valid JSON: ${a instanceof Error ? a.message : String(a)}`
     );
   }
-  if (!_(r))
+  if (!C(r))
     throw new Error("Search API response must be a JSON object.");
   let i = r.results;
   if (!Array.isArray(i)) {
-    const a = _(r.data) ? r.data : void 0;
+    const a = C(r.data) ? r.data : void 0;
     a && Array.isArray(a.records) && (i = a.records);
   }
   if (!Array.isArray(i))
@@ -817,101 +826,101 @@ function fs(t, s, e) {
       'Search API response must include "results" or "data.records" array.'
     );
   const o = e.trim().toLowerCase(), n = !["http:", "https:"].includes(
-    j(s)?.protocol ?? ""
-  ), l = i.filter(_).map((a) => us(a, s)).filter((a) => a !== void 0).filter((a) => n && o ? [a.slug, a.title, a.description].filter(
-    (f) => !!f
+    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(
+    (d) => !!d
   ).some(
-    (f) => f.toLowerCase().includes(o)
+    (d) => d.toLowerCase().includes(o)
   ) : !0);
-  return { query: e, results: l };
+  return { query: e, results: c };
 }
-function ds(t) {
+function ms(t) {
   return async ({ query: s }) => {
-    const e = as(
+    const e = us(
       t.config,
       t.env,
       s,
-      os
-    ), { payload: r, reference: i } = await ls(e);
-    return fs(r, i, s);
+      cs
+    ), { payload: r, reference: i } = await fs(e);
+    return hs(r, i, s);
   };
 }
-async function at(t, s) {
+async function ct(t, s) {
   const e = [];
   let n = -1;
-  for (let d = t.length - 22; d >= Math.max(0, t.length - 65557); d -= 1)
-    if (t.readUInt32LE(d) === 101010256) {
-      n = d;
+  for (let f = t.length - 22; f >= Math.max(0, t.length - 65557); f -= 1)
+    if (t.readUInt32LE(f) === 101010256) {
+      n = f;
       break;
     }
   if (n < 0)
     throw new Error("Downloaded skill package is not a valid zip archive.");
-  const l = t.readUInt16LE(n + 10);
+  const c = t.readUInt16LE(n + 10);
   let a = t.readUInt32LE(n + 16);
   await u.mkdir(s, { recursive: !0 });
-  for (let d = 0; d < l; d += 1) {
+  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 f = t.readUInt16LE(a + 10), m = t.readUInt32LE(a + 20), lt = t.readUInt32LE(a + 24), H = t.readUInt16LE(a + 28), ct = t.readUInt16LE(a + 30), ut = 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), H = 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 + H + ct + ut;
-    const g = S.replaceAll("\\", "/");
-    if (!g || g.startsWith("/") || g.includes("../"))
+    a += 46 + H + dt + pt;
+    const k = S.replaceAll("\\", "/");
+    if (!k || k.startsWith("/") || k.includes("../"))
       throw new Error(`Unsafe zip path entry detected: ${S}`);
-    const y = c.resolve(s, g), ft = s.endsWith(c.sep) ? s : `${s}${c.sep}`;
-    if (y !== s && !y.startsWith(ft))
+    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(
         "Downloaded skill package has an invalid zip local header."
       );
-    const dt = t.readUInt16LE(v + 26), pt = t.readUInt16LE(v + 28), N = v + 30 + dt + pt, T = t.subarray(
-      N,
-      N + m
+    const mt = t.readUInt16LE(v + 26), gt = t.readUInt16LE(v + 28), z = v + 30 + mt + gt, M = t.subarray(
+      z,
+      z + h
     );
-    if (g.endsWith("/")) {
+    if (k.endsWith("/")) {
       await u.mkdir(y, { recursive: !0 });
       continue;
     }
     let D;
-    if (f === 0)
-      D = Buffer.from(T);
-    else if (f === 8)
-      D = Buffer.from(await is(T));
+    if (d === 0)
+      D = Buffer.from(M);
+    else if (d === 8)
+      D = Buffer.from(await as(M));
     else
       throw new Error(
-        `Unsupported zip compression method: ${f}`
+        `Unsupported zip compression method: ${d}`
       );
-    if (D.length !== lt)
+    if (D.length !== ft)
       throw new Error(`Zip entry size mismatch for ${S}`);
-    await u.mkdir(c.dirname(y), { recursive: !0 }), await u.writeFile(y, D), e.push(g);
+    await u.mkdir(l.dirname(y), { recursive: !0 }), await u.writeFile(y, D), e.push(k);
   }
   return e;
 }
-async function R(t, s) {
-  await u.rm(s, { recursive: !0, force: !0 }), await u.mkdir(c.dirname(s), { recursive: !0 }), await u.cp(t, s, { recursive: !0 });
+async function A(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 ps(t, s, e) {
+async function gs(t, s, e) {
   if ((await u.stat(t)).isDirectory())
-    return await R(t, s), [];
+    return await A(t, s), [];
   const i = await u.readFile(t);
-  ot(i, e, t);
+  lt(i, e, t);
   const o = await u.mkdtemp(
-    c.join(G.tmpdir(), "rrskill-registry-stage-")
+    l.join(Z.tmpdir(), "rrskill-registry-stage-")
   );
   try {
-    const n = await at(i, o);
-    return await R(o, s), n;
+    const n = await ct(i, o);
+    return await A(o, s), n;
   } finally {
     await u.rm(o, { recursive: !0, force: !0 });
   }
 }
-async function hs(t, s, e) {
+async function ks(t, s, e) {
   const r = await fetch(t, {
     headers: {
       accept: "application/zip,application/octet-stream,*/*"
@@ -922,35 +931,35 @@ async function hs(t, s, e) {
       `Skill download failed: ${r.status} ${r.statusText}`
     );
   const i = Buffer.from(await r.arrayBuffer());
-  ot(i, e, t);
+  lt(i, e, t);
   const o = await u.mkdtemp(
-    c.join(G.tmpdir(), "rrskill-registry-stage-")
+    l.join(Z.tmpdir(), "rrskill-registry-stage-")
   );
   try {
-    const n = await at(i, o);
-    return await R(o, s), n;
+    const n = await ct(i, o);
+    return await A(o, s), n;
   } finally {
     await u.rm(o, { recursive: !0, force: !0 });
   }
 }
-async function ms(t, s) {
+async function ws(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 gs(t, s) {
-  const e = s.registrySkill?.slug === s.slug ? s.registrySkill : await ms(t, s.slug), r = e.skillUrl;
+async function ys(t, s) {
+  const e = s.registrySkill?.slug === s.slug ? s.registrySkill : await ws(t, s.slug), r = e.skillUrl;
   if (!r)
     throw new Error(
       `Registry skill "${s.slug}" does not define a skillUrl/packageUrl`
     );
-  const i = j(r), o = e.sha256, n = i?.protocol === "http:" || i?.protocol === "https:" ? await hs(
+  const i = L(r), o = e.sha256, n = i?.protocol === "http:" || i?.protocol === "https:" ? await ks(
     r,
     s.targetDir,
     o
-  ) : await ps(
-    i?.protocol === "file:" ? x(i) : c.resolve(r),
+  ) : await gs(
+    i?.protocol === "file:" ? _(i) : l.resolve(r),
     s.targetDir,
     o
   );
@@ -961,10 +970,10 @@ async function gs(t, s) {
     version: e.version
   };
 }
-function ks(t) {
-  return async (s) => gs(t, s);
+function vs(t) {
+  return async (s) => ys(t, s);
 }
-class w extends Error {
+class g extends Error {
   code;
   hint;
   nextCommands;
@@ -972,11 +981,11 @@ class w extends Error {
     super(s.message), this.code = s.code, this.hint = s.hint, this.nextCommands = s.nextCommands ?? [];
   }
 }
-function ws() {
+function Ss() {
   const t = process.argv[1] ?? "";
-  return t ? ["rrskill.js", "rrskill"].includes(c.basename(t)) ? !0 : import.meta.url === `file://${t}` : !1;
+  return t ? ["rrskill.js", "rrskill"].includes(l.basename(t)) ? !0 : import.meta.url === `file://${t}` : !1;
 }
-function ys() {
+function Ds() {
   return [
     "rrskill CLI",
     "",
@@ -1012,7 +1021,7 @@ function ys() {
   ].join(`
 `);
 }
-function vs(t) {
+function xs(t) {
   const s = [
     "",
     "Global options:",
@@ -1108,14 +1117,77 @@ function vs(t) {
   ].join(`
 `);
 }
-function h(t) {
+function T(t) {
   process.stdout.write(`${JSON.stringify(t, null, 2)}
 `);
 }
-function L(t, ...s) {
+function F(t) {
+  process.stdout.write(t.endsWith(`
+`) ? t : `${t}
+`);
+}
+function m(t, s, e) {
+  if (s === "json") {
+    T(t);
+    return;
+  }
+  F(e(t));
+}
+function js(t) {
+  return [
+    `${t.packageName} ${t.version}`,
+    `Update via ${t.updateVia}:`,
+    ...t.instructions.map((s) => `  ${s}`)
+  ].join(`
+`);
+}
+function Cs(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) {
+  const s = [`Installed ${t.slug}`, `Target: ${t.targetDir}`];
+  return t.registryMatch?.version && s.push(`Version: ${t.registryMatch.version}`), s.join(`
+`);
+}
+function _s(t) {
+  return t.length === 0 ? "No skills installed." : t.join(`
+`);
+}
+function Ls(t) {
+  return t.upgraded.length === 0 ? "No skills upgraded." : ["Upgraded skills:", ...t.upgraded.map((s) => `  ${s}`)].join(`
+`);
+}
+function bs(t) {
+  const s = [
+    t.verification.ok ? "Bootstrap succeeded." : "Bootstrap failed.",
+    `Builtins installed: ${t.builtinsInstalled.length === 0 ? "none" : t.builtinsInstalled.join(", ")}`,
+    `Plugin installed: ${t.pluginInstalled ? "yes" : "no"}`,
+    `Host config repaired: ${t.hostConfigRepaired ? "yes" : "no"}`
+  ];
+  return t.verification.ok || s.push(
+    ...t.verification.issues.map(
+      (e) => "code" in e ? `Issue: ${e.code}` : `Issue: ${JSON.stringify(e)}`
+    )
+  ), s.join(`
+`);
+}
+function $s(t) {
+  const s = [
+    t.ok ? `Doctor OK for ${t.host}.` : `Doctor found issues for ${t.host}.`,
+    `Bootstrap supported: ${t.bootstrapSupported ? "yes" : "no"}`,
+    `Fixed: ${t.fixed ? "yes" : "no"}`
+  ];
+  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) {
   return t.some((e) => s.includes(e));
 }
-function Ss(t, s) {
+function Is(t, s) {
   const e = t.indexOf(s);
   if (e < 0)
     return;
@@ -1123,32 +1195,32 @@ function Ss(t, s) {
   if (!(!r || r.startsWith("--")))
     return r;
 }
-function Ds(t) {
-  if (L(t, "--json"))
+function ut(t, s = "json") {
+  if (E(t, "--json"))
     return "json";
-  const s = Ss(t, "--output");
-  if (!s) {
+  const e = Is(t, "--output");
+  if (!e) {
     if (t.includes("--output"))
-      throw new w({
+      throw new g({
         code: "missing_output_mode",
         message: "--output requires a value.",
         hint: "rrskill --output <json|text>",
         nextCommands: ["rrskill --help"]
       });
-    return "text";
-  }
-  if (s === "json" || s === "text")
     return s;
-  throw new w({
+  }
+  if (e === "json" || e === "text")
+    return e;
+  throw new g({
     code: "invalid_output_mode",
-    message: `Unsupported output mode "${s}".`,
+    message: `Unsupported output mode "${e}".`,
     hint: "rrskill --output <json|text>",
     nextCommands: ["rrskill --help"]
   });
 }
-function B(t, s) {
-  if (t instanceof w && s === "json") {
-    h({
+function G(t, s) {
+  if (t instanceof g && s === "json") {
+    T({
       ok: !1,
       error: {
         code: t.code,
@@ -1159,7 +1231,7 @@ function B(t, s) {
     });
     return;
   }
-  if (t instanceof w) {
+  if (t instanceof g) {
     const r = [`Error: ${t.message}`];
     if (t.hint && r.push(`  ${t.hint}`), t.nextCommands.length > 0) {
       r.push("Next commands:");
@@ -1173,7 +1245,7 @@ function B(t, s) {
   }
   const e = t instanceof Error ? t.message : String(t);
   if (s === "json") {
-    h({
+    T({
       ok: !1,
       error: {
         code: "unexpected_error",
@@ -1186,77 +1258,84 @@ function B(t, s) {
   process.stderr.write(`${e}
 `);
 }
-async function Es(t) {
-  const s = Et(t), e = Q(t), r = L(t, "--help", "-h");
-  if (s.command === "help" || r)
-    return s.command !== "help" && s.command !== "install" ? (process.stdout.write(`${vs(s.command)}
-`), 0) : (process.stdout.write(`${ys()}
-`), 0);
-  if (s.command === "doctor") {
-    const l = await K({ argv: t, env: process.env }), a = await Pt(
-      l,
+async function Os(t) {
+  const s = ut(t, "json"), e = Et(t), r = Y(t), i = E(t, "--help", "-h");
+  if (e.command === "unknown")
+    throw new g({
+      code: "unknown_command",
+      message: `Unknown command "${e.input}".`,
+      hint: "rrskill --help",
+      nextCommands: ["rrskill --help"]
+    });
+  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);
+  }
+  if (e.command === "doctor") {
+    const a = await W({ argv: t, env: process.env }), f = await Rt(
+      a,
       {
-        fix: L(t, "--fix"),
-        dryRun: L(t, "--dry-run")
+        fix: E(t, "--fix"),
+        dryRun: E(t, "--dry-run")
       }
     );
-    return h(a), a.ok ? 0 : 1;
+    return m(f, s, $s), f.ok ? 0 : 1;
   }
-  if (s.command === "version")
-    return h(rs()), 0;
-  const i = await K({ argv: t, env: process.env }), o = ds({ config: i.config, env: i.env }), n = ks(o);
-  if (s.command === "bootstrap") {
-    const l = await tt(i);
-    return h(l), l.verification.ok ? 0 : 1;
+  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);
+  if (e.command === "bootstrap") {
+    const a = await et(o);
+    return m(a, s, bs), a.verification.ok ? 0 : 1;
   }
-  if (s.command === "search") {
-    const l = e.slice(1).join(" ").trim();
-    if (!l)
-      throw new w({
+  if (e.command === "search") {
+    const a = r.slice(1).join(" ").trim();
+    if (!a)
+      throw new g({
         code: "missing_search_query",
         message: "Search query is required.",
         hint: "rrskill search <query>",
         nextCommands: ["rrskill search react"]
       });
-    const a = await ts(i, l, { searchSkills: o });
-    return h(a), 0;
+    const f = await rs(o, a, { searchSkills: n });
+    return m(f, s, Cs), 0;
   }
-  if (s.command === "install") {
-    const l = "slug" in s ? s.slug : e[1]?.trim();
-    if (!l)
-      throw new w({
+  if (e.command === "install") {
+    const a = "slug" in e ? e.slug : r[1]?.trim();
+    if (!a)
+      throw new g({
         code: "missing_skill_slug",
         message: "Skill slug is required.",
         hint: "rrskill install <slug>",
         nextCommands: ["rrskill install web-search"]
       });
-    const a = await Xt(i, l, { searchSkills: o, downloadSkill: n });
-    return h(a), 0;
+    const f = await ss(o, a, { searchSkills: n, downloadSkill: c });
+    return m(f, s, Es), 0;
   }
-  if (s.command === "list") {
-    const l = await Yt(i);
-    return h(l), 0;
+  if (e.command === "list") {
+    const a = await es(o);
+    return m(a, s, _s), 0;
   }
-  if (s.command === "upgrade") {
-    const l = await ss(i, { downloadSkill: n });
-    return h(l), 0;
+  if (e.command === "upgrade") {
+    const a = await is(o, { downloadSkill: c });
+    return m(a, s, Ls), 0;
   }
-  return process.stderr.write(`Command "${s.command}" is not implemented yet.
+  return process.stderr.write(`Command "${e.command}" is not implemented yet.
 `), 1;
 }
-if (ws()) {
+if (Ss()) {
   const t = process.argv.slice(2);
-  Es(t).then((s) => {
+  Os(t).then((s) => {
     process.exitCode = s;
   }).catch((s) => {
     let e = "text";
     try {
-      e = Ds(t);
+      e = ut(t, "text");
     } catch (r) {
-      B(r, "text"), process.exitCode = 1;
+      G(r, "text"), process.exitCode = 1;
       return;
     }
-    B(s, e), process.exitCode = 1;
+    G(s, e), process.exitCode = 1;
   });
 }
 export {