skilllib 1.7.0 → 1.11.0

package/dist/{chunk-AYAN7Q2X.js → chunk-LO4FMXDE.js}

@@ -24,6 +24,9 @@ function libraryDir() {
 function claudeDir() {
   return process.env.CLAUDE_CONFIG_DIR ?? join(userHome(), ".claude");
 }
+function grokDir() {
+  return process.env.GROK_HOME?.trim() || join(userHome(), ".grok");
+}
 function codexHome() {
   return process.env.CODEX_HOME?.trim() || join(userHome(), ".codex");
 }
@@ -32,7 +35,11 @@ function codexSystemDir() {
 }
 var PROJECT_SKILLS_DIR = ".claude/skills";
 var AGENTS_SKILLS_DIR = ".agents/skills";
+var GROK_SKILLS_DIR = ".grok/skills";
 var MANIFEST_FILE = "skilllib.json";
+function isRepoSkillLocation(location) {
+  return location === AGENTS_SKILLS_DIR || location === GROK_SKILLS_DIR;
+}
 var OWN_SKILL_MARKER = ".managed-by-skilllib";
 
 // src/output.ts
@@ -40,7 +47,7 @@ var jsonMode = false;
 function setJsonMode(on) {
   jsonMode = on;
 }
-function json(data) {
+function json(output, data) {
   process.stdout.write(JSON.stringify(data) + "\n");
 }
 var color = (code) => (s) => process.stdout.isTTY && !jsonMode ? `\x1B[${code}m${s}\x1B[0m` : s;
@@ -103,7 +110,7 @@ var HARNESSES = [
     icon: "\u2B21",
     color: "#E8E8E8",
     // The first folder is where links for Cursor go (see linkEverywhere). Cursor also reads .grok/skills;
-    // skilllib leaves that folder to Grok, since it can't tell what Grok needs.
+    // skilllib leaves that folder alone (see Grok). A .grok-only skill stays invisible to Cursor here.
     projectDirs: [".agents/skills", ".cursor/skills", ".claude/skills", ".codex/skills"],
     // Cursor ignores CLAUDE_CONFIG_DIR and CODEX_HOME: it always reads these under your home folder.
     globalDirs: () => [".agents", ".cursor", ".claude", ".codex"].map((d) => join2(home(), d, "skills")),
@@ -128,6 +135,19 @@ var HARNESSES = [
     projectDirs: [".agents/skills"],
     globalDirs: () => [join2(home(), ".agents", "skills")],
     installed: () => existsSync(join2(home(), ".config", "zed")) || onPath("zed") || hasApp("Zed")
+  },
+  {
+    id: "grok",
+    name: "Grok",
+    short: "Gk",
+    icon: "\u2736",
+    color: "#F5C16C",
+    // .agents/skills is first so a skill Grok can't already see is linked into the shared folder, not .grok/skills.
+    projectDirs: [".agents/skills", ".grok/skills", ".claude/skills", ".cursor/skills"],
+    // Grok ignores CLAUDE_CONFIG_DIR: the Claude compat path is always ~/.claude/skills.
+    // The first folder is where global links for Grok go, so those links stay out of ~/.grok/skills.
+    globalDirs: () => [join2(home(), ".agents", "skills"), join2(grokDir(), "skills"), join2(home(), ".claude", "skills"), join2(home(), ".cursor", "skills")],
+    installed: () => existsSync(grokDir()) || onPath("grok") || hasApp("Grok")
   }
 ];
 function onPath(bin) {
@@ -322,7 +342,10 @@ function knownProjects() {
   const path = projectsFile();
   if (!existsSync4(path)) return [];
   const list2 = JSON.parse(readFileSync3(path, "utf-8"));
-  return onePerFolder(list2.filter((p) => existsSync4(p) && isProjectCandidate(p)));
+  return onePerFolder(list2.filter((p) => existsSync4(p) && isProjectCandidate(p) && !isAgentWorktree(p)));
+}
+function isAgentWorktree(path) {
+  return /[\\/]\.claude[\\/]worktrees[\\/]/.test(path);
 }
 function onePerFolder(paths) {
   const byReal = /* @__PURE__ */ new Map();
@@ -337,7 +360,7 @@ function isProjectCandidate(root) {
   return realPath(root) !== realPath(userHome());
 }
 function rememberProjects(roots) {
-  const incoming = roots.map((r) => resolve3(r)).filter(isProjectCandidate);
+  const incoming = roots.map((r) => resolve3(r)).filter((r) => isProjectCandidate(r) && !isAgentWorktree(r));
   const all = onePerFolder([...knownProjects(), ...incoming]).sort();
   mkdirSync2(skilllibHome(), { recursive: true });
   writeFileSync2(projectsFile(), JSON.stringify(all, null, 2) + "\n");
@@ -550,6 +573,20 @@ function globalFolderSkills(enabled) {
 function tildify2(p) {
   return tildify(p).replace(/\\/g, "/");
 }
+function grokBuiltInSkills(enabled) {
+  if (!enabled.includes("grok")) return [];
+  return skillDirsIn(join7(grokDir(), "bundled", "skills")).map((path) => ({
+    name: basename2(path),
+    kind: "built-in",
+    origin: "Grok",
+    path,
+    description: readSkillInfo(path).description,
+    movable: false,
+    broken: false,
+    harnesses: ["grok"],
+    links: []
+  }));
+}
 function cursorBuiltInSkills(enabled) {
   if (!enabled.includes("cursor")) return [];
   return skillDirsIn(join7(userHome(), ".cursor", "skills-cursor")).map((path) => ({
@@ -565,30 +602,41 @@ function cursorBuiltInSkills(enabled) {
   }));
 }
 function claudeAiSkills(enabled) {
-  const synced = join7(claudeDir(), "skills", "synced");
-  const harnesses = harnessesReading(join7(claudeDir(), "skills"), enabled);
-  if (!existsSync6(synced) || harnesses.length === 0) return [];
-  return readdirSync3(synced).filter((d) => !d.startsWith(".")).flatMap(
-    (bucket) => skillDirsIn(join7(synced, bucket)).map((path) => ({
-      name: basename2(path),
-      kind: "claude.ai",
-      origin: "claude.ai account",
-      path,
-      description: readSkillInfo(path).description,
-      movable: false,
-      broken: false,
-      harnesses,
-      links: []
-    }))
+  const byReal = /* @__PURE__ */ new Map();
+  for (const skills of [join7(claudeDir(), "skills"), join7(userHome(), ".claude", "skills")]) {
+    const synced = join7(skills, "synced");
+    const real = realpathOrNull(synced);
+    const readers = harnessesReading(skills, enabled);
+    if (!real || readers.length === 0) continue;
+    const entry = byReal.get(real) ?? { dir: synced, readers: [] };
+    for (const id of readers) if (!entry.readers.includes(id)) entry.readers.push(id);
+    byReal.set(real, entry);
+  }
+  return [...byReal.values()].flatMap(
+    ({ dir, readers }) => readdirSync3(dir).filter((d) => !d.startsWith(".")).flatMap(
+      (bucket) => skillDirsIn(join7(dir, bucket)).map((path) => ({
+        name: basename2(path),
+        kind: "claude.ai",
+        origin: "claude.ai account",
+        path,
+        description: readSkillInfo(path).description,
+        movable: false,
+        broken: false,
+        harnesses: enabled.filter((id) => readers.includes(id)),
+        links: []
+      }))
+    )
   );
 }
-function setPluginEnabled(id, on) {
-  const file = join7(claudeDir(), "settings.json");
-  const settings = existsSync6(file) ? readJson(file) : {};
-  if (!settings) throw new Error(`${file} isn't valid JSON, so skilllib won't rewrite it`);
-  settings.enabledPlugins = { ...settings.enabledPlugins, [id]: on };
-  mkdirSync4(claudeDir(), { recursive: true });
-  writeFileSync4(file, JSON.stringify(settings, null, 2) + "\n");
+function pluginDirCandidates(id, installPaths) {
+  const [name = "", marketplace = ""] = id.split("@");
+  const plugins = join7(claudeDir(), "plugins");
+  return [
+    ...installPaths,
+    join7(plugins, "marketplaces", marketplace, "plugins", name),
+    join7(plugins, "marketplaces", marketplace, "external_plugins", name),
+    join7(plugins, "marketplaces", marketplace)
+  ];
 }
 function repoSettingsFiles(root) {
   return [join7(root, ".claude", "settings.json"), join7(root, ".claude", "settings.local.json")];
@@ -606,13 +654,7 @@ function pluginSkills(harnesses, root) {
   const user = enabledPlugins();
   const enabled = root ? enabledPlugins(root) : user;
   const fromMarketplaces = [.../* @__PURE__ */ new Set([...Object.keys(enabled), ...Object.keys(user)])].filter((id) => claude2 && enabled[id] || cursor && user[id]).flatMap((id) => {
-    const [name = "", marketplace = ""] = id.split("@");
-    const candidates = [
-      ...(installed[id] ?? []).flatMap((i) => i.installPath ? [i.installPath] : []),
-      join7(plugins, "marketplaces", marketplace, "plugins", name),
-      join7(plugins, "marketplaces", marketplace, "external_plugins", name),
-      join7(plugins, "marketplaces", marketplace)
-    ];
+    const candidates = pluginDirCandidates(id, (installed[id] ?? []).flatMap((i) => i.installPath ? [i.installPath] : []));
     const dir = candidates.find((c) => existsSync6(join7(c, "skills")));
     if (!dir) return [];
     const inCursor = cursor && user[id] && (installed[id] ?? []).some((i) => i.scope === "user" && i.installPath === dir);
@@ -647,6 +689,7 @@ function machineSkills(enabled = enabledHarnesses()) {
     ...claudeAiSkills(enabled),
     ...pluginSkills(enabled),
     ...cursorBuiltInSkills(enabled),
+    ...grokBuiltInSkills(enabled),
     ...systemSkills(enabled)
   ].sort(byKindAndName);
 }
@@ -670,7 +713,7 @@ function recordOrigin(name, origin) {
 function originFor(dir) {
   const match = machineSkills().find((s) => resolve5(s.path) === resolve5(dir));
   if (match) return match.kind === "global" ? "global folder" : `${match.kind}: ${match.origin}`;
-  const project = dir.split(/[\\/]\.(?:claude|agents)[\\/]skills[\\/]/)[0];
+  const project = dir.split(/[\\/]\.(?:claude|agents|grok|cursor|codex)[\\/]skills[\\/]/)[0];
   if (!project || project === dir) return dir;
   const locked = projectSkillsLock(project)[basename2(dir)]?.source;
   return locked ? `skills.sh: ${locked}` : `project: ${basename2(project)}`;
@@ -716,7 +759,7 @@ function visibilityOf(root, name, enabled = enabledHarnesses()) {
 }
 function dependencyDirs(root, name, dep) {
   const wanted = installDirs(enabledHarnesses());
-  const untracked = ALL_PROJECT_DIRS.find((d) => existsSync7(join8(root, d, name, "SKILL.md")) && !isLink(join8(root, d, name)));
+  const untracked = ALL_PROJECT_DIRS.find((d) => d !== GROK_SKILLS_DIR && existsSync7(join8(root, d, name, "SKILL.md")) && !isLink(join8(root, d, name)));
   const primary = dep ? dep.dir ?? PROJECT_SKILLS_DIR : untracked ?? wanted[0];
   return [primary, .../* @__PURE__ */ new Set([...dep?.links ?? [], ...wanted.filter((d) => d !== primary)])];
 }
@@ -768,7 +811,7 @@ function projectStatus(root) {
     unmanaged.push({
       name,
       managed: false,
-      state: unmanagedState(name, real, location === AGENTS_SKILLS_DIR, source),
+      state: unmanagedState(name, real, isRepoSkillLocation(location), source),
       version: null,
       latest: latestVersion(name)?.version ?? null,
       location,
@@ -788,10 +831,12 @@ function unmanagedState(name, real, committed, source) {
   return latest === null ? "local only" : sameAsLibrary ? "untracked copy of library skill" : "untracked, differs from library";
 }
 var NESTED_READERS = [
-  [PROJECT_SKILLS_DIR, ["claude-code", "cursor"]],
-  [AGENTS_SKILLS_DIR, ["codex", "cursor"]],
-  [".cursor/skills", ["cursor"]],
-  [".codex/skills", ["codex", "cursor"]]
+  [PROJECT_SKILLS_DIR, ["claude-code", "cursor", "grok"]],
+  [AGENTS_SKILLS_DIR, ["codex", "cursor", "grok"]],
+  [".cursor/skills", ["cursor", "grok"]],
+  [".codex/skills", ["codex", "cursor"]],
+  // Cursor reads nested .grok/skills too, but skilllib doesn't count it: that folder stays Grok's.
+  [".grok/skills", ["grok"]]
 ];
 var NESTED_SKIP = /* @__PURE__ */ new Set(["node_modules", "dist", "build", "out", "vendor", "target", "coverage"]);
 function nestedSkills(root, { depth = 3, enabled = enabledHarnesses() } = {}) {
@@ -813,7 +858,7 @@ function nestedSkills(root, { depth = 3, enabled = enabledHarnesses() } = {}) {
           found.push({
             name,
             managed: false,
-            state: unmanagedState(name, path, skillsDir === AGENTS_SKILLS_DIR, void 0),
+            state: unmanagedState(name, path, isRepoSkillLocation(skillsDir), void 0),
             version: null,
             latest: latestVersion(name)?.version ?? null,
             location,
@@ -866,10 +911,15 @@ function linkEverywhere(root, name, location, { allowTracked = false, dryRun = f
   }
   return result;
 }
-function unlinkEverywhere(root, name) {
+function unlinkEverywhere(root, name, removing) {
+  const gone = removing ? realpathOrNull2(removing) : null;
   return ALL_PROJECT_DIRS.filter((dir) => {
     const link2 = join8(root, dir, name);
     if (!isLink(link2)) return false;
+    if (dir === GROK_SKILLS_DIR) {
+      const target = realpathOrNull2(link2);
+      if (target !== null && target !== gone) return false;
+    }
     unlinkSync(link2);
     return true;
   });
@@ -1052,7 +1102,7 @@ function stash(dir, bucket) {
   return target;
 }
 function removeUntracked(root, name, path) {
-  unlinkEverywhere(root, name);
+  unlinkEverywhere(root, name, path);
   return stash(path, "trash");
 }
 function projectsUsing(name) {
@@ -1215,7 +1265,7 @@ function refreshAgentSkill() {
 
 // src/commands.ts
 import { existsSync as existsSync13, readFileSync as readFileSync9 } from "fs";
-import { basename as basename8, join as join14, resolve as resolve7, sep as sep5 } from "path";
+import { basename as basename9, join as join14, resolve as resolve7, sep as sep5 } from "path";
 
 // src/git.ts
 import { execFileSync as execFileSync2 } from "child_process";
@@ -1310,21 +1360,109 @@ function claudePlugins(machine, root) {
     };
   });
 }
+function newer(a, b) {
+  const parts = (v) => v.replace(/^v/i, "").split(/[.+-]/).map((x) => parseInt(x, 10) || 0);
+  const pa = parts(a);
+  const pb = parts(b);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) if ((pa[i] ?? 0) !== (pb[i] ?? 0)) return (pa[i] ?? 0) > (pb[i] ?? 0);
+  return false;
+}
+function updateOf(name, marketplace, entry, catalogs) {
+  const dir = join11(claudeDir(), "plugins", "marketplaces", marketplace);
+  if (!catalogs.has(marketplace)) catalogs.set(marketplace, readJson2(join11(dir, ".claude-plugin", "marketplace.json"))?.plugins ?? []);
+  const listed = catalogs.get(marketplace).find((p) => p.name === name);
+  if (!listed) return void 0;
+  const version = listed.version ?? (typeof listed.source === "string" ? readJson2(join11(dir, listed.source, ".claude-plugin", "plugin.json"))?.version : void 0);
+  if (version && entry.version) return newer(version, entry.version) ? version : void 0;
+  const sha = typeof listed.source === "object" ? listed.source?.sha : void 0;
+  return sha && entry.gitCommitSha && sha !== entry.gitCommitSha ? "newer" : void 0;
+}
+function pluginRoot(id, entry) {
+  const candidates = pluginDirCandidates(id, entry.installPath ? [entry.installPath] : []);
+  return candidates.find((c) => existsSync10(join11(c, "skills"))) ?? candidates.find((c) => existsSync10(c)) ?? candidates[0];
+}
+function describe(root) {
+  const manifest = readJson2(join11(root, ".claude-plugin", "plugin.json")) ?? {};
+  return { description: manifest.description ?? "", version: manifest.version, skills: skillDirsIn(join11(root, "skills")), extras: extrasOf(root) };
+}
+function installedPlugins() {
+  const plugins = join11(claudeDir(), "plugins");
+  const installed = readJson2(join11(plugins, "installed_plugins.json"))?.plugins ?? {};
+  const catalogs = /* @__PURE__ */ new Map();
+  const fromMarketplaces = Object.entries(installed).flatMap(
+    ([id, entries]) => entries.map((entry) => {
+      const [name = id, marketplace = ""] = id.split("@");
+      const scope = entry.scope ?? "user";
+      const projectPath = scope === "user" ? void 0 : entry.projectPath;
+      const root = pluginRoot(id, entry);
+      const about = describe(root);
+      const update2 = updateOf(name, marketplace, entry, catalogs);
+      return {
+        id,
+        scope,
+        ...projectPath ? { projectPath } : {},
+        synced: false,
+        agent: "claude-code",
+        on: enabledPlugins(projectPath)[id] === true,
+        root,
+        ...about,
+        version: entry.version ?? about.version,
+        ...update2 ? { update: update2 } : {}
+      };
+    })
+  );
+  const user = enabledPlugins();
+  const fromSettings = Object.keys(user).filter((id) => user[id] === true && id.includes("@") && !id.endsWith("@synced") && !installed[id]).flatMap((id) => {
+    const root = pluginDirCandidates(id, []).find((c) => existsSync10(join11(c, "skills")));
+    return root ? [{ id, scope: "user", synced: false, agent: "claude-code", on: true, settingsOnly: true, root, ...describe(root) }] : [];
+  });
+  const syncedDir = join11(plugins, "synced");
+  const dirs = (p) => existsSync10(p) ? readdirSync5(p, { withFileTypes: true }).filter((d) => d.isDirectory() && !d.name.startsWith(".")).map((d) => join11(p, d.name)) : [];
+  const fromSynced = dirs(syncedDir).flatMap(dirs).map((root) => {
+    const id = `${readJson2(join11(root, ".claude-plugin", "plugin.json"))?.name ?? basename4(root)}@synced`;
+    return { id, scope: null, synced: true, agent: "claude-code", on: user[id] !== false, root, ...describe(root) };
+  });
+  return [...fromMarketplaces, ...fromSettings, ...fromSynced];
+}
+function cursorPlugins() {
+  const cache = join11(userHome(), ".cursor", "plugins", "cache");
+  const dirs = (p) => existsSync10(p) ? readdirSync5(p).filter((d) => !d.startsWith(".") && statSync3(join11(p, d)).isDirectory()) : [];
+  return dirs(cache).flatMap(
+    (marketplace) => dirs(join11(cache, marketplace)).flatMap((plugin) => {
+      const versions = dirs(join11(cache, marketplace, plugin)).map((v) => join11(cache, marketplace, plugin, v));
+      const root = versions.sort((a, b) => statSync3(b).mtimeMs - statSync3(a).mtimeMs)[0];
+      if (!root) return [];
+      const about = describe(root);
+      return [{ id: `${plugin}@${marketplace}`, scope: null, synced: false, agent: "cursor", on: null, root, ...about, version: about.version ?? basename4(root) }];
+    })
+  );
+}
+var binaries = /* @__PURE__ */ new Map();
+function forgetClaudeBinary() {
+  binaries.clear();
+}
 function claudeBinary() {
-  const candidates = ["claude", join11(userHome(), ".local", "bin", "claude"), join11(userHome(), ".claude", "local", "claude")];
-  return candidates.find((bin) => {
-    try {
-      return execFileSync3(bin, ["--version"], { stdio: ["ignore", "pipe", "ignore"], timeout: 3e4, encoding: "utf-8" }).includes("Claude Code");
-    } catch {
-      return false;
-    }
-  }) ?? null;
+  const key = `${process.env.PATH}|${userHome()}`;
+  if (!binaries.has(key)) {
+    const candidates = ["claude", join11(userHome(), ".local", "bin", "claude"), join11(userHome(), ".claude", "local", "claude")];
+    const found = candidates.find((bin) => {
+      try {
+        return execFileSync3(bin, ["--version"], { stdio: ["ignore", "pipe", "ignore"], timeout: 1e4, encoding: "utf-8" }).includes("Claude Code");
+      } catch {
+        return false;
+      }
+    });
+    binaries.set(key, found ?? null);
+  }
+  return binaries.get(key);
 }
 function claude(args, cwd, bin = claudeBinary()) {
+  if (cwd && !existsSync10(cwd)) return { ok: false, reason: `${cwd} no longer exists; run \`claude ${args.join(" ")}\` in the project's new folder, or remove the install with /plugin` };
   if (!bin) return { ok: false, reason: `Claude Code's CLI didn't run (tried \`claude\` on your PATH and ~/.local/bin/claude); run \`claude ${args.join(" ")}\` yourself` };
+  const slow = args[1] === "install" || args[1] === "update";
   try {
-    execFileSync3(bin, args, { cwd, stdio: ["ignore", "pipe", "pipe"], timeout: 12e4, encoding: "utf-8" });
-    return { ok: true };
+    const out2 = execFileSync3(bin, args, { cwd, stdio: ["ignore", "pipe", "pipe"], timeout: slow ? 12e4 : 2e4, encoding: "utf-8" });
+    return { ok: true, out: out2 };
   } catch (err) {
     const e = err;
     return { ok: false, reason: `${(e.stderr || e.stdout || e.message || "failed").trim().split("\n").slice(-1)[0]} (ran ${bin})` };
@@ -1338,9 +1476,6 @@ function setPluginIn(file, id, on) {
   writeFileSync7(file, JSON.stringify({ ...settings, enabledPlugins: { ...enabled, [id]: on } }, null, 2) + "\n");
   return { ok: true };
 }
-function turnOffSynced(id) {
-  return setPluginIn(join11(claudeDir(), "settings.json"), id, false);
-}
 function ignoreLocalSettings(root) {
   const file = ".claude/settings.local.json";
   const git2 = (...args) => execFileSync3("git", args, { cwd: root, encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim();
@@ -1380,6 +1515,50 @@ function turnOffIn(plugin, root) {
   const r = claude(["plugin", "disable", plugin.id, "--scope", "local"], root, bin);
   return r.ok ? { ok: true, message: done } : { ok: false, message: `${plugin.id}: ${r.reason}` };
 }
+function settingsFileOf(p) {
+  if (p.synced || !p.scope || p.scope === "user") return join11(claudeDir(), "settings.json");
+  if (!p.projectPath) return null;
+  return join11(p.projectPath, ".claude", p.scope === "local" ? "settings.local.json" : "settings.json");
+}
+function whereOf(p) {
+  return p.projectPath ? ` in ${basename4(p.projectPath)} (${p.scope})` : "";
+}
+function setPluginOn(p, on) {
+  const done = { ok: true, message: `${p.id} is ${on ? "on" : "off"}${whereOf(p)}${p.synced ? "" : "; Claude Code picks it up in its next session"}` };
+  if (p.scope && p.scope !== "user" && !p.projectPath) return { ok: false, message: `${p.id}: skilllib doesn't know which project it's installed in; run \`claude plugin ${on ? "enable" : "disable"} ${p.id} --scope ${p.scope}\` there` };
+  const bin = p.synced || p.settingsOnly ? null : claudeBinary();
+  if (bin) {
+    const r2 = claude(["plugin", on ? "enable" : "disable", p.id, ...p.scope ? ["--scope", p.scope] : []], p.projectPath, bin);
+    return r2.ok ? done : { ok: false, message: `${p.id}: ${r2.reason}` };
+  }
+  const r = setPluginIn(settingsFileOf(p), p.id, on);
+  if (!r.ok) return { ok: false, message: `${p.id}: ${r.reason}` };
+  return p.scope === "local" && p.projectPath ? { ...done, message: done.message + ignoreLocalSettings(p.projectPath) } : done;
+}
+function uninstallPlugin(p) {
+  if (p.synced) return { ok: false, message: `${p.id} is synced from your claude.ai account: remove it there, or turn it off here` };
+  if (p.settingsOnly) return { ok: false, message: `${p.id} isn't installed, only turned on in your settings: turn it off instead` };
+  if (p.scope && p.scope !== "user" && !p.projectPath) return { ok: false, message: `${p.id}: skilllib doesn't know which project it's installed in; run \`claude plugin uninstall ${p.id} --scope ${p.scope}\` there` };
+  const wasOn = enabledPlugins(p.projectPath)[p.id] === true;
+  const r = claude(["plugin", "uninstall", p.id, "--keep-data", "--scope", p.scope ?? "user"], p.projectPath);
+  if (!r.ok) return { ok: false, message: `${p.id}: ${r.reason}` };
+  recordRemovedPlugin(p.id, p.scope ?? "user", p.projectPath, wasOn);
+  return { ok: true, message: `${p.id} is uninstalled${whereOf(p)} (Settings \u203A Backups reinstalls it)` };
+}
+function updatePlugin(p) {
+  if (p.synced) return { ok: false, message: `${p.id} is synced from your claude.ai account: it updates from there` };
+  if (p.settingsOnly) return { ok: false, message: `${p.id} isn't installed, only turned on in your settings: install it with /plugin to update it` };
+  const r = claude(["plugin", "update", p.id, ...p.scope ? ["--scope", p.scope] : [], "--json"], p.projectPath);
+  if (!r.ok) return { ok: false, message: `${p.id}: ${r.reason}; to update it yourself, run \`claude plugin update ${p.id}\`${p.projectPath ? ` in ${p.projectPath}` : ""}` };
+  let result = {};
+  try {
+    result = JSON.parse(r.out.trim().split("\n").pop() ?? "{}");
+  } catch {
+  }
+  if (result.updateOutcome === "up_to_date") return { ok: true, message: `${p.id} is already the newest version${result.newVersion ? ` (${result.newVersion})` : ""}${whereOf(p)}` };
+  const versions = result.oldVersion && result.newVersion ? ` from ${result.oldVersion} to ${result.newVersion}` : "";
+  return { ok: true, message: `${p.id} is updated${versions}${whereOf(p)}; Claude Code uses the new version after a restart` };
+}
 function removedFile() {
   return join11(skilllibHome(), "plugin-backup.json");
 }
@@ -1392,42 +1571,45 @@ function removePlugin(plugin, how) {
   }
   const imported = plugin.skills.filter((dir) => latestVersion(basename4(dir)) === null).map((dir) => importSkill(dir).name);
   const scope = plugin.scope ? ["--scope", plugin.scope] : [];
-  const r = plugin.synced ? turnOffSynced(plugin.id) : claude(["plugin", how === "delete" ? "uninstall" : "disable", plugin.id, ...scope], plugin.projectPath);
+  const r = plugin.synced ? (
+    // Synced plugins aren't installed, so `claude plugin` can't touch them: their switch is enabledPlugins.
+    setPluginIn(join11(claudeDir(), "settings.json"), plugin.id, false)
+  ) : claude(["plugin", how === "delete" ? "uninstall" : "disable", plugin.id, ...scope], plugin.projectPath);
   const saved = imported.length ? `; ${imported.join(", ")} copied into Your skills` : "";
   if (!r.ok) return { ok: false, message: `${plugin.id}: ${r.reason}${saved}` };
-  if (how === "delete" && !plugin.synced) recordRemovedPlugin(plugin.id, plugin.scope ?? "user");
+  if (how === "delete" && !plugin.synced) recordRemovedPlugin(plugin.id, plugin.scope ?? "user", plugin.projectPath, true);
   return { ok: true, message: `${plugin.id} ${how === "delete" && !plugin.synced ? "removed" : "turned off"}${saved}` };
 }
-function recordRemovedPlugin(id, scope) {
+function recordRemovedPlugin(id, scope, projectPath, on = true) {
   const list2 = readJson2(removedFile()) ?? [];
   mkdirSync7(skilllibHome(), { recursive: true });
-  writeFileSync7(removedFile(), JSON.stringify([...list2, { id, scope, at: (/* @__PURE__ */ new Date()).toISOString() }], null, 2) + "\n");
+  writeFileSync7(removedFile(), JSON.stringify([...list2, { id, scope, ...projectPath ? { projectPath } : {}, on, at: (/* @__PURE__ */ new Date()).toISOString() }], null, 2) + "\n");
 }
 function pluginBackups() {
   return (readJson2(removedFile()) ?? []).map((r) => ({
     name: r.id,
     kind: "plugin",
-    path: r.scope,
+    // Project and local installs go back into their project.
+    path: r.projectPath ? `${r.scope}:${r.projectPath}` : r.scope,
     movedAt: r.at.slice(0, 16).replace("T", " "),
     from: r.id
   }));
 }
 function restorePlugin(backup) {
-  const r = claude(["plugin", "install", backup.from, "--scope", backup.path]);
+  const [scope = "user", ...rest] = backup.path.split(":");
+  const projectPath = rest.join(":") || void 0;
+  const r = claude(["plugin", "install", backup.from, "--scope", scope], projectPath);
   if (!r.ok) return r;
-  writeFileSync7(removedFile(), JSON.stringify((readJson2(removedFile()) ?? []).filter((x) => x.id !== backup.from), null, 2) + "\n");
-  return { ok: true, to: `Claude Code plugins (${backup.path})` };
+  const records = readJson2(removedFile()) ?? [];
+  const same = (x) => x.id === backup.from && (x.projectPath ?? void 0) === projectPath && x.scope === scope;
+  const wasOff = records.filter(same).pop()?.on === false;
+  const off = wasOff ? claude(["plugin", "disable", backup.from, "--scope", scope], projectPath) : null;
+  writeFileSync7(removedFile(), JSON.stringify(records.filter((x) => !same(x)), null, 2) + "\n");
+  const where = `Claude Code plugins (${scope}${projectPath ? ` in ${basename4(projectPath)}` : ""}${wasOff ? off?.ok ? ", off as it was" : ", but it's on: turn it off from Plugins" : ""})`;
+  return { ok: true, to: where };
 }
-function cursorPluginSkills() {
-  const cache = join11(userHome(), ".cursor", "plugins", "cache");
-  const dirs = (p) => existsSync10(p) ? readdirSync5(p).filter((d) => !d.startsWith(".") && statSync3(join11(p, d)).isDirectory()) : [];
-  return dirs(cache).flatMap(
-    (marketplace) => dirs(join11(cache, marketplace)).flatMap((plugin) => {
-      const versions = dirs(join11(cache, marketplace, plugin)).map((v) => join11(cache, marketplace, plugin, v));
-      const newest = versions.sort((a, b) => statSync3(b).mtimeMs - statSync3(a).mtimeMs)[0];
-      return newest ? skillDirsIn(join11(newest, "skills")).map((path) => ({ name: basename4(path), plugin, path })) : [];
-    })
-  );
+function cursorPluginSkills(plugins = cursorPlugins()) {
+  return plugins.flatMap((p) => p.skills.map((path) => ({ name: basename4(path), plugin: p.id.split("@")[0], path })));
 }
 
 // src/tidy.ts
@@ -1455,6 +1637,11 @@ function namesIn(dirs) {
   }
   return [...names].sort();
 }
+var PROJECT_TIDY_DIRS = ALL_PROJECT_DIRS.filter((d) => d !== GROK_SKILLS_DIR);
+function globalTidyDirs() {
+  const own = realPath(join12(grokDir(), "skills"));
+  return globalSkillDirs().filter((d) => realPath(d) !== own);
+}
 function runsFrom(id, dirsWithCopy, readsOf) {
   const reads = readsOf(id).filter((d) => dirsWithCopy.includes(d));
   if (id === "codex") return reads;
@@ -1477,8 +1664,8 @@ function planProjectTidy(root, { keep = {}, enabled = enabledHarnesses() } = {})
   const readsOf = (id) => HARNESSES.find((h) => h.id === id).projectDirs.map(abs);
   let git2;
   const skillsLock = projectSkillsLock(root);
-  for (const name of namesIn(ALL_PROJECT_DIRS.map(abs))) {
-    const entries = entriesOf(ALL_PROJECT_DIRS.map(abs), name);
+  for (const name of namesIn(PROJECT_TIDY_DIRS.map(abs))) {
+    const entries = entriesOf(PROJECT_TIDY_DIRS.map(abs), name);
     const external = entries.find((e) => e.link && e.real && !(e.real + sep4).startsWith(realpathOrNull2(root) + sep4));
     if (external) {
       report.skipped.push({ name, reason: `${rel(external.path)} links outside the repo` });
@@ -1533,7 +1720,7 @@ function isSkillsDirPlugin(path) {
 }
 function planGlobalTidy({ keep = {}, enabled = enabledHarnesses() } = {}) {
   const report = { plans: [], conflicts: [], skipped: [] };
-  const dirs = globalSkillDirs();
+  const dirs = globalTidyDirs();
   const agents = join12(userHome(), ".agents", "skills");
   for (const name of namesIn(dirs)) {
     const entries = entriesOf(dirs, name);
@@ -1607,7 +1794,7 @@ function folderLabel(root, dir) {
   return root ? relativeTo(root, dir) : tildify(dir);
 }
 function foldersOf(root, name) {
-  const entries = entriesOf(root ? ALL_PROJECT_DIRS.map((d) => join12(root, d)) : globalSkillDirs(), name);
+  const entries = entriesOf(root ? PROJECT_TIDY_DIRS.map((d) => join12(root, d)) : globalTidyDirs(), name);
   return { all: entries.map((e) => e.dir), real: entries.filter((e) => !e.link).map((e) => e.dir) };
 }
 
@@ -1805,7 +1992,7 @@ function findIssues(projects2, machine, libraryNames, statusOf = projectStatus,
       id: "review:global",
       severity: "suggestion",
       title: `${plural(unreviewed.length, "global skill")} of yours ${unreviewed.length === 1 ? "loads" : "load"} in every repo`,
-      detail: `${unreviewed.join(", ")}. Move each to the repos that need it (skilllib \u2192 Global \u2192 Move it to the repos that need it\u2026), or mark the ones you want everywhere as global on purpose (skilllib global keep <name>).`
+      detail: `${unreviewed.join(", ")}. Move each to the repos that need it (skilllib global move <name> --to <repo>...), or mark the ones you want everywhere as global on purpose (skilllib global keep <name>).`
     });
   }
   const enabled = enabledHarnesses();
@@ -1831,7 +2018,7 @@ function findIssues(projects2, machine, libraryNames, statusOf = projectStatus,
       id: `usable:global${onPurpose ? ":kept" : ""}`,
       severity: "suggestion",
       title: `${plural(skills.length, "global skill")}${onPurpose ? " you keep global" : ""} not usable by ${agentNames(missing)}`,
-      detail: `${skills.map((m) => `${m.name} (only ${agentNames(m.harnesses)})`).join(", ")}. ${onPurpose ? "A link in each agent's global folder makes the one real copy reach every agent you use." : `Link ${skills.length === 1 ? "it" : "them"} for every agent, or move ${skills.length === 1 ? "it" : "them"} to the repos that need ${skills.length === 1 ? "it" : "them"} (skilllib \u2192 Global), which works for every agent too.`}`,
+      detail: `${skills.map((m) => `${m.name} (only ${agentNames(m.harnesses)})`).join(", ")}. ${onPurpose ? "A link in each agent's global folder makes the one real copy reach every agent you use." : `Link ${skills.length === 1 ? "it" : "them"} for every agent, or move ${skills.length === 1 ? "it" : "them"} to the repos that need ${skills.length === 1 ? "it" : "them"} (skilllib global move), which works for every agent too.`}`,
       ...onPurpose ? { fix: link2 } : { choices: [link2] }
     });
   }
@@ -2003,17 +2190,17 @@ function findIssues(projects2, machine, libraryNames, statusOf = projectStatus,
         });
       }
       if (s.state === "edited locally" || s.state === "edited locally, update available") {
-        const newer = s.state !== "edited locally";
+        const newer2 = s.state !== "edited locally";
         const pinned = s.version ? `v${s.version}` : "the library version";
         issues.push({
           id: `edited:${root}:${s.name}`,
           severity: "suggestion",
           title: `${s.name} in ${where} has local edits`,
-          detail: `It no longer matches ${pinned} from Your skills${newer ? `, and v${s.latest} is out` : ""}. Save the edits as a new version so your other repos can get them, or discard them. Keeping them is fine too: skilllib never overwrites edits.`,
+          detail: `It no longer matches ${pinned} from Your skills${newer2 ? `, and v${s.latest} is out` : ""}. Save the edits as a new version so your other repos can get them, or discard them. Keeping them is fine too: skilllib never overwrites edits.`,
           choices: [
             {
               label: "Save as a new version in Your skills",
-              hint: newer ? `becomes v${s.latest + 1}; v${s.latest}'s changes aren't merged in` : `becomes v${(s.latest ?? 0) + 1}; ${where} uses it`,
+              hint: newer2 ? `becomes v${s.latest + 1}; v${s.latest}'s changes aren't merged in` : `becomes v${(s.latest ?? 0) + 1}; ${where} uses it`,
               run: () => {
                 importSkill(s.path, { force: true });
                 const c = addSkill(root, s.name);
@@ -2193,6 +2380,9 @@ function topLevel(root) {
     return [];
   }
 }
+function statusIssues(root, machine = machineSkills(enabledHarnesses())) {
+  return findIssues(projectHere(root) === root ? [root] : [], machine, new Set(librarySkills().map((l) => l.name)));
+}
 function usableHere(root, uses = /* @__PURE__ */ new Map()) {
   const agents = enabledHarnesses();
   const inRepo = projectHere(root) === root;
@@ -2207,12 +2397,12 @@ function usableHere(root, uses = /* @__PURE__ */ new Map()) {
       const usual = s.state === "ok" || s.state === "local only" || repo && s.state !== "from npx skills";
       const attrs = {
         source: s.managed ? "library" : repo ? "repo" : "local",
-        ...s.location !== ".claude/skills" && { dir: s.location },
-        ...s.version !== null && { version: s.version },
-        ...!usual && { state: s.state },
-        ...behind && { latest: s.latest },
-        ...gitState && { git: gitState },
-        ...!sameSet(loadedBy, agents) && { agents: loadedBy }
+        dir: s.location !== ".claude/skills" ? s.location : void 0,
+        version: s.version ?? void 0,
+        state: usual ? void 0 : s.state,
+        latest: behind ? s.latest : void 0,
+        git: gitState,
+        agents: sameSet(loadedBy, agents) ? void 0 : loadedBy
       };
       return [JSON.stringify(attrs), s.name, () => ({ ...attrs, skills: [] })];
     })
@@ -2228,11 +2418,12 @@ function usableHere(root, uses = /* @__PURE__ */ new Map()) {
     })
   );
   const issues = /* @__PURE__ */ new Map();
-  for (const i of findIssues(inRepo ? [root] : [], machine, new Set(librarySkills().map((l) => l.name)))) {
+  for (const i of statusIssues(root, machine)) {
     const choices = i.choices?.map((c) => c.label);
     const key = `${i.detail}\0${i.fix?.label ?? ""}\0${choices?.join() ?? ""}`;
-    const issue = issues.get(key) ?? { problems: [], detail: i.detail, ...i.fix && { fix: i.fix.label }, ...choices && { choices } };
+    const issue = issues.get(key) ?? { problems: [], ids: [], detail: i.detail, fix: i.fix?.label, choices };
     issue.problems.push(i.title);
+    issue.ids.push(i.id);
     issues.set(key, issue);
   }
   const usesHere = Object.fromEntries([...uses].filter(([, n]) => n > 0));
@@ -2241,10 +2432,10 @@ function usableHere(root, uses = /* @__PURE__ */ new Map()) {
     files: topLevel(root),
     agents,
     skills,
-    ...nested.length > 0 && { nested },
+    nested: nested.length > 0 ? nested : void 0,
     global,
     issues: [...issues.values()],
-    ...Object.keys(usesHere).length > 0 && { usesHere }
+    usesHere: Object.keys(usesHere).length > 0 ? usesHere : void 0
   };
 }
 function firstSentence(description) {
@@ -2256,12 +2447,12 @@ function libraryFor(currentProject) {
   const manifests = visibleProjects().map((p) => ({ name: basename7(p), skills: readManifest(p).skills }));
   const here = currentProject ? new Set(projectStatus(currentProject).map((s) => s.name)) : null;
   const all = librarySkills();
-  const describe = (s) => {
+  const describe2 = (s) => {
     const projects2 = manifests.filter((m) => s.name in m.skills).map((m) => m.name);
-    return { name: s.name, description: firstSentence(s.description), ...projects2.length > 0 && { projects: projects2 } };
+    return { name: s.name, description: firstSentence(s.description), projects: projects2.length > 0 ? projects2 : void 0 };
   };
-  if (!here) return { skills: all.map(describe) };
-  return { inThisProject: all.filter((s) => here.has(s.name)).map((s) => s.name), skills: all.filter((s) => !here.has(s.name)).map(describe) };
+  if (!here) return { skills: all.map(describe2) };
+  return { inThisProject: all.filter((s) => here.has(s.name)).map((s) => s.name), skills: all.filter((s) => !here.has(s.name)).map(describe2) };
 }
 
 // src/usage.ts
@@ -2392,6 +2583,25 @@ function usesByProject(uses, projectOf) {
   return byProject;
 }
 
+// src/move.ts
+import { basename as basename8 } from "path";
+function moveGlobalSkills(skills, roots, { group, allowTracked = false, label = basename8 } = {}) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const m of skills) byName.set(m.name, [...byName.get(m.name) ?? [], m]);
+  return [...byName].map(([name, copies]) => {
+    if (new Set(copies.map((m) => treeHash(m.path))).size > 1)
+      return { name, moved: false, reason: `your global copies of ${name} differ; nothing moved (keep one first: skilllib tidy --global)`, changes: [] };
+    if (importSkill(copies[0].path).status === "exists")
+      return { name, moved: false, reason: `your library has a different ${name}; nothing moved (update your library from this copy first)`, changes: [] };
+    if (group) recordOrigin(name, `group: ${group}`);
+    const changes = roots.map((root) => [root, addSkill(root, name, { allowTracked })]);
+    const skipped = changes.filter(([, c]) => c.action === "skipped");
+    if (skipped.length) return { name, moved: false, reason: `not added to ${skipped.map(([r, c]) => `${label(r)} (${c.reason})`).join(", ")}, so it still loads globally`, changes };
+    const failed = copies.map((m) => unloadGlobal(m.path, m.links)).find((r) => !r.ok);
+    return failed && !failed.ok ? { name, moved: false, reason: failed.reason, changes } : { name, moved: true, changes };
+  });
+}
+
 // src/commands.ts
 var USAGE_DAYS = 30;
 function parseArgs(argv) {
@@ -2399,7 +2609,7 @@ function parseArgs(argv) {
   const days = daysIdx >= 0 ? Number(argv[daysIdx + 1]) : USAGE_DAYS;
   const keepIdx = argv.indexOf("--keep");
   return {
-    positional: argv.filter((a, i) => !a.startsWith("--") && argv[i - 1] !== "--days" && argv[i - 1] !== "--keep"),
+    positional: argv.filter((a, i) => !a.startsWith("--") && !["--days", "--keep", "--to"].includes(argv[i - 1])),
     force: argv.includes("--force"),
     all: argv.includes("--all"),
     global: argv.includes("--global"),
@@ -2409,7 +2619,8 @@ function parseArgs(argv) {
     days: Number.isFinite(days) && days > 0 ? days : USAGE_DAYS,
     dryRun: argv.includes("--dry-run"),
     allowGit: argv.includes("--allow-git"),
-    ...keepIdx >= 0 && argv[keepIdx + 1] ? { keep: argv[keepIdx + 1] } : {}
+    ...keepIdx >= 0 && argv[keepIdx + 1] ? { keep: argv[keepIdx + 1] } : {},
+    to: argv.flatMap((a, i) => argv[i - 1] === "--to" && !a.startsWith("--") ? a.split(",").filter(Boolean) : [])
   };
 }
 function colorState(state) {
@@ -2427,7 +2638,7 @@ function withDirs(root, changes) {
 }
 function printChanges(root, changes, args) {
   if (changes.some((c) => c.action === "skipped")) process.exitCode = 1;
-  if (args.json) return json(withDirs(root, changes));
+  if (args.json) return json("changes", withDirs(root, changes));
   for (const c of changes) {
     if (c.blocked?.length) {
       warn(`${c.name}: git tracks ${c.blocked.join(", ")} here, so no link was added there. Re-run with --allow-tracked to add it.`);
@@ -2482,14 +2693,14 @@ async function status(args) {
   if (args.json) {
     const root2 = findProjectRoot();
     const usage3 = await usageBySkill(args.days, root2);
-    json(usableHere(root2, new Map([...usage3].map(([name, u]) => [name, u.uses]))));
+    json("status", usableHere(root2, new Map([...usage3].map(([name, u]) => [name, u.uses]))));
     if (projectHere()) rememberProjects([root2]);
     return;
   }
   const root = requireProject();
   const skills = projectStatus(root);
   const nested = nestedSkills(root);
-  info(`${basename8(root)} ${dim(tildify(root))}
+  info(`${basename9(root)} ${dim(tildify(root))}
 `);
   if (skills.length === 0 && nested.length === 0) info("No skills in this project yet. Add one from your library with: skilllib add <name>");
   const usage2 = await usageBySkill(args.days, root);
@@ -2556,7 +2767,7 @@ async function overview(args) {
 }
 async function list(args) {
   if (args.json) {
-    return json(libraryFor(projectHere()));
+    return json("list", libraryFor(projectHere()));
   }
   const skills = librarySkills();
   if (skills.length === 0) {
@@ -2566,7 +2777,7 @@ async function list(args) {
     const installs = /* @__PURE__ */ new Map();
     for (const project of visibleProjects()) {
       for (const name of Object.keys(readManifest(project).skills)) {
-        installs.set(name, [...installs.get(name) ?? [], basename8(project)]);
+        installs.set(name, [...installs.get(name) ?? [], basename9(project)]);
       }
     }
     const usage2 = await usageBySkill(args.days);
@@ -2600,11 +2811,16 @@ function projects(args) {
   const roots = visibleProjects();
   if (args.json) {
     return json(
-      roots.map((root) => ({
-        name: basename8(root),
-        path: root,
-        skills: projectStatus(root).map((s) => ({ name: s.name, managed: s.managed, state: s.state, version: s.version, latest: s.latest }))
-      }))
+      "projects",
+      roots.map(
+        (root) => ({
+          name: basename9(root),
+          path: root,
+          skills: projectStatus(root).map(
+            (s) => ({ name: s.name, managed: s.managed, state: s.state, version: s.version, latest: s.latest })
+          )
+        })
+      )
     );
   }
   if (roots.length === 0) {
@@ -2617,7 +2833,7 @@ function projects(args) {
       const managed = skills.filter((s) => s.managed);
       const attention = skills.filter((s) => s.state !== "ok" && s.state !== "local only").length;
       return {
-        Project: basename8(root),
+        Project: basename9(root),
         Path: dim(tildify(root)),
         Skills: managed.map((s) => s.name).join(", ") || dim("none"),
         "Local only": String(skills.filter((s) => s.state === "local only").length),
@@ -2651,15 +2867,15 @@ function sync(args) {
     const changes = syncProject(root, { force: args.force });
     if (changes.some((c) => c.action === "skipped")) process.exitCode = 1;
     if (!args.json) {
-      if (args.all) info(`${basename8(root)} ${dim(tildify(root))}`);
+      if (args.all) info(`${basename9(root)} ${dim(tildify(root))}`);
       if (changes.length === 0) {
         if (existsSync13(join14(root, MANIFEST_FILE))) success("Installed versions match skilllib.json");
         else info(dim("No skilllib.json: nothing to sync"));
       } else printChanges(root, changes, args);
     }
-    return { project: basename8(root), path: root, changes: withDirs(root, changes) };
+    return { project: basename9(root), path: root, changes: withDirs(root, changes) };
   });
-  if (args.json) json(args.all ? results : results[0].changes);
+  if (args.json) args.all ? json("changes --all", results) : json("changes", results[0].changes);
   if (!args.all) rememberProjects(roots);
 }
 function update(args) {
@@ -2674,20 +2890,20 @@ function update(args) {
     }
     if (changes.some((c) => c.action === "skipped")) process.exitCode = 1;
     if (!args.json) {
-      if (args.all) info(`${basename8(root)} ${dim(tildify(root))}`);
+      if (args.all) info(`${basename9(root)} ${dim(tildify(root))}`);
       if (changes.length === 0) success("Everything is on the latest version");
       else printChanges(root, changes, args);
     }
-    return { project: basename8(root), path: root, changes: withDirs(root, changes) };
+    return { project: basename9(root), path: root, changes: withDirs(root, changes) };
   });
-  if (args.json) json(args.all ? results : results[0].changes);
+  if (args.json) args.all ? json("changes --all", results) : json("changes", results[0].changes);
 }
 function outdated(args) {
   const roots = args.all ? visibleProjects() : [requireProject()];
   const behind = roots.flatMap(
-    (root) => projectStatus(root).filter((s) => s.managed && s.latest !== null && s.version !== null && s.latest > s.version).map((s) => ({ project: basename8(root), path: root, skill: s.name, installed: s.version, latest: s.latest, state: s.state }))
+    (root) => projectStatus(root).filter((s) => s.managed && s.latest !== null && s.version !== null && s.latest > s.version).map((s) => ({ project: basename9(root), path: root, skill: s.name, installed: s.version, latest: s.latest, state: s.state }))
   );
-  if (args.json) return json(behind);
+  if (args.json) return json("outdated", behind);
   const rows = behind.map((b) => ({ Project: b.project, Skill: b.skill, Installed: `v${b.installed}`, Latest: `v${b.latest}`, Status: colorState(b.state) }));
   if (rows.length === 0) return success("Everything is on the latest version");
   table(rows);
@@ -2719,12 +2935,12 @@ function importSkills(args) {
     if (skillsDir === join14(root, ".claude", "skills") && isProjectCandidate(root)) {
       if (readManifest(root).skills[name]?.hash !== treeHash(dir)) {
         const change = addSkill(root, name);
-        if (change.action !== "skipped") info(dim(`  ${basename8(root)} now depends on ${name} v${change.to}`));
+        if (change.action !== "skipped") info(dim(`  ${basename9(root)} now depends on ${name} v${change.to}`));
       }
       rememberProjects([root]);
     }
   }
-  if (args.json) json(results);
+  if (args.json) json("import", results);
 }
 function scan(args) {
   for (const p of args.positional) addRoot(p);
@@ -2736,14 +2952,14 @@ function scan(args) {
   const found = discoverProjects();
   const library = new Set(librarySkills().map((s) => s.name));
   const skillNames = (root) => [
-    .../* @__PURE__ */ new Set([...ALL_PROJECT_DIRS.flatMap((d) => skillDirsIn(join14(root, d))).map((d) => basename8(d)), ...nestedSkills(root).map((s) => s.name)])
+    .../* @__PURE__ */ new Set([...ALL_PROJECT_DIRS.flatMap((d) => skillDirsIn(join14(root, d))).map((d) => basename9(d)), ...nestedSkills(root).map((s) => s.name)])
   ];
   const withSkills = found.filter((root) => skillNames(root).length > 0);
   info(`Scanned ${roots.map((r) => tildify(r)).join(", ")}: ${found.length} project${found.length === 1 ? "" : "s"}, ${withSkills.length} with skills
 `);
   table(
     withSkills.map((root) => ({
-      Project: basename8(root),
+      Project: basename9(root),
       Path: dim(tildify(root)),
       Skills: skillNames(root).map((n) => library.has(n) ? n : yellow(n)).join(", ")
     }))
@@ -2827,12 +3043,12 @@ function restore(args) {
     process.exitCode = 1;
   }
 }
-async function doctor(args) {
+async function allIssues(args, withUsage = true) {
   const projects2 = visibleProjects();
   const machine = machineSkills();
   const libraryNames = new Set(librarySkills().map((s) => s.name));
   const issues = findIssues(projects2, machine, libraryNames);
-  if (enabledHarnesses().includes("claude-code")) {
+  if (withUsage && enabledHarnesses().includes("claude-code")) {
     const projectOf = projectOfFactory(projects2);
     const uses = await scanUsage(args.days);
     const inProject = usesByProject(uses, projectOf);
@@ -2845,6 +3061,10 @@ async function doctor(args) {
       })
     );
   }
+  return issues;
+}
+async function doctor(args) {
+  const issues = await allIssues(args);
   const fixed = (fix) => {
     const r = runFix(fix);
     if (!r.ok) process.exitCode = 1;
@@ -2852,34 +3072,65 @@ async function doctor(args) {
   };
   if (args.json) {
     return json(
-      issues.map(({ fix, choices, ...issue }) => ({
-        ...issue,
-        ...fix && { fix: fix.label },
-        ...choices && { choices: choices.map((c) => c.label) },
-        ...args.fix && fix && { fixed: fixed(fix) }
-      }))
+      "doctor",
+      issues.map(
+        ({ id, severity, title, detail, fix, choices }) => ({
+          id,
+          severity,
+          title,
+          detail,
+          fix: fix?.label,
+          choices: choices?.map((c) => c.label),
+          fixed: args.fix && fix ? fixed(fix) : void 0
+        })
+      )
     );
   }
   if (issues.length === 0) return success("Everything looks good");
   for (const issue of issues) {
     info(`${issue.severity === "problem" ? red("\u25CF") : yellow("\u25C6")} ${issue.title}`);
     info(dim(`  ${issue.detail}${issue.fix ? `  \u2192  ${issue.fix.label}` : ""}`));
-    if (issue.choices) info(dim(`  choose in skilllib \u2192 Health: ${issue.choices.map((c) => c.label).join(" / ")}`));
+    if (issue.choices) info(dim(`  your call: ${issue.choices.map((c, i) => `${i + 1}) ${c.label}`).join("  ")}  \u2192  skilllib apply ${issue.id} <n>`));
     if (args.fix && issue.fix) {
       const r = fixed(issue.fix);
       info(`  ${r.ok ? green("\u2713") : red("\u2717")} ${r.message}`);
     }
   }
-  if (!args.fix && issues.some((i) => i.fix)) info(dim("\nRun `skilllib doctor --fix` to apply the fixes, or fix them one by one in `skilllib` \u2192 Health."));
+  if (!args.fix && issues.some((i) => i.fix)) info(dim("\nRun `skilllib doctor --fix` to apply the fixes, or one at a time with `skilllib apply <id>`."));
+}
+async function apply(args) {
+  const [id, pick] = args.positional;
+  if (!id) throw new Error("Usage: skilllib apply <issue-id> [choice]   (ids and choices: skilllib status --json or doctor --json)");
+  const found = [...statusIssues(findProjectRoot()), ...await allIssues(args, id.startsWith("unused:"))].filter((i) => i.id === id);
+  if (!found.length) throw new Error(`No issue ${id} right now (it may be fixed already; for an unused:\u2026 issue, pass doctor's --days). See skilllib status --json or doctor --json`);
+  const optionsOf = (i) => i.choices ?? (i.fix ? [i.fix] : []);
+  const labels = (i) => optionsOf(i).map((c) => c.label).join("\0");
+  const byLabel = pick === void 0 ? void 0 : found.find((i) => optionsOf(i).some((c) => c.label.toLowerCase() === pick.toLowerCase()));
+  if (!byLabel && found.some((i) => labels(i) !== labels(found[0]))) {
+    const all = [...new Set(found.flatMap((i) => optionsOf(i).map((c) => c.label)))];
+    throw new Error(`${found[0].title}: its choices differ between this repo and all your repos; pick one by label: ${all.map((l) => `"${l}"`).join("  ")}`);
+  }
+  const issue = byLabel ?? found[0];
+  const options = optionsOf(issue);
+  if (!options.length) throw new Error(`${issue.title}: nothing to apply. ${issue.detail}`);
+  const listed = options.map((c, i) => `${i + 1}) ${c.label}`).join("  ");
+  if (pick === void 0 && options.length > 1) throw new Error(`${issue.title}: pick one: ${listed}`);
+  const choice = pick === void 0 ? options[0] : options.find((c) => c.label.toLowerCase() === pick.toLowerCase()) ?? options[Number(pick) - 1];
+  if (!choice) throw new Error(`${issue.title}: no choice ${pick}. Pick one: ${listed}`);
+  const r = runFix(choice);
+  if (!r.ok) process.exitCode = 1;
+  if (args.json) return json("apply", { id, applied: choice.label, ...r });
+  if (r.ok) success(r.message);
+  else error(r.message);
 }
 async function usage(args) {
   const summaries = summarize(await scanUsage(args.days), projectOfFactory(knownProjects()));
   if (args.json) {
     const library2 = new Set(librarySkills().map((s) => s.name));
-    return json({
+    return json("usage", {
       usageDays: args.days,
       source: "Claude Code transcripts",
-      skills: summaries.map((s) => ({ skill: s.skill, uses: s.uses, lastUsed: s.lastUsed, projects: [...s.projects].map((p) => basename8(p)), inLibrary: library2.has(s.skill) })),
+      skills: summaries.map((s) => ({ skill: s.skill, uses: s.uses, lastUsed: s.lastUsed, projects: [...s.projects].map((p) => basename9(p)), inLibrary: library2.has(s.skill) })),
       unusedLibrarySkills: librarySkills().filter((l) => !summaries.some((u) => u.skill === l.name)).map((l) => l.name)
     });
   }
@@ -2894,7 +3145,7 @@ async function usage(args) {
     summaries.map((s) => ({
       Skill: s.skill,
       Uses: String(s.uses),
-      Projects: [...s.projects].map((p) => basename8(p)).join(", ") || dim("-"),
+      Projects: [...s.projects].map((p) => basename9(p)).join(", ") || dim("-"),
       "Last used": lastUsed(s),
       Library: library.has(s.skill) ? green("yes") : dim("no")
     }))
@@ -2914,13 +3165,13 @@ function show(args) {
   }
   const { description } = readSkillInfo(dir);
   if (args.json) {
-    return json({
+    return json("show", {
       name,
       description,
       path: dir,
       latest: latestVersion(name)?.version ?? null,
       origin: libraryOrigins()[name] ?? "",
-      projects: knownProjects().filter((p) => name in readManifest(p).skills).map((p) => basename8(p)),
+      projects: knownProjects().filter((p) => name in readManifest(p).skills).map((p) => basename9(p)),
       skillMd: readFileSync9(join14(dir, "SKILL.md"), "utf-8")
     });
   }
@@ -2954,7 +3205,7 @@ function link(args) {
   for (const root of roots) {
     if (args.allowTracked) allowTrackedLinks(root);
     const res = linkAll(root);
-    const label = args.all ? `${basename8(root)}: ` : "";
+    const label = args.all ? `${basename9(root)}: ` : "";
     if (res.linked.length) success(`${label}linked ${res.linked.length} skill(s) for your other agents`);
     else if (!args.all && !res.blocked.length && !res.uncommitted.length) success("Every skill here is already usable by all your agents");
     if (res.blocked.length) {
@@ -2970,6 +3221,7 @@ function link(args) {
 function globalCommand(args) {
   const [action, ...names] = args.positional;
   const yours = machineSkills().filter((m) => m.movable && !m.broken);
+  if (action === "move") return moveGlobal(args, names, yours);
   if (action === "keep" || action === "unkeep") {
     const unknown = names.filter((n) => !yours.some((m) => m.name === n));
     if (!names.length || unknown.length) {
@@ -2979,7 +3231,7 @@ function globalCommand(args) {
     setKeepGlobal(names, action === "keep");
     success(action === "keep" ? `Keeping ${names.join(", ")} global on purpose` : `${names.join(", ")} will show up in cleanup again`);
   } else if (action) {
-    error("Usage: skilllib global [keep|unkeep <name>...]");
+    error("Usage: skilllib global [keep|unkeep <name>...] | skilllib global move <name>... --to <repo>...");
     process.exit(1);
   }
   const kept = keptGlobal();
@@ -2989,6 +3241,46 @@ function globalCommand(args) {
   if (unreviewed) info(dim(`
 ${unreviewed} not reviewed. Keep one global on purpose: skilllib global keep <name>`));
 }
+function repoRoot(repo) {
+  const looksLikePath = /[\\/]/.test(repo) || repo.startsWith(".") || repo.startsWith("~");
+  const named = looksLikePath ? [] : visibleProjects().filter((p) => basename9(p) === repo);
+  if (named.length === 1) return named[0];
+  if (named.length > 1) throw new Error(`Several projects are named ${repo}: ${named.map(tildify).join(", ")}. Pass its path.`);
+  const path = expandHome(repo);
+  if (!existsSync13(path)) throw new Error(`No project ${repo} (pass its path, or see skilllib projects)`);
+  const root = projectHere(path);
+  if (root !== path) throw new Error(root ? `${tildify(path)} is inside ${tildify(root)}: pass the repo's top folder` : `${tildify(path)} isn't in a git repo`);
+  return root;
+}
+function moveGlobal(args, names, yours) {
+  if (!names.length || !args.to.length) throw new Error("Usage: skilllib global move <name>... --to <repo>[,<repo>...]");
+  const unknown = names.filter((n) => !yours.some((m) => m.name === n));
+  if (unknown.length) throw new Error(`Not one of your global skills: ${unknown.join(", ")} (see skilllib global)`);
+  const roots = [...new Set(args.to.map(repoRoot))];
+  const skills = yours.filter((m) => names.includes(m.name));
+  const moves = moveGlobalSkills(skills, roots, { allowTracked: args.allowTracked });
+  if (moves.some((m) => !m.moved)) process.exitCode = 1;
+  if (args.json) {
+    return json(
+      "global move",
+      moves.map(({ name, moved, reason, changes }) => ({
+        skill: name,
+        moved,
+        ...reason ? { reason } : {},
+        projects: changes.map(([root, c]) => ({ project: basename9(root), path: root, change: withDirs(root, [c])[0] }))
+      }))
+    );
+  }
+  for (const m of moves) {
+    if (m.moved) success(`${m.name} now loads only in ${m.changes.map(([r]) => basename9(r)).join(", ")} (the global copy is in skilllib restore)`);
+    else error(`${m.name}: ${m.reason}`);
+    for (const [root, c] of m.changes) {
+      if (c.blocked?.length) warn(`  ${basename9(root)}: git tracks ${c.blocked.join(", ")}, so no link there. Re-run with --allow-tracked to add it.`);
+      if (c.uncommitted?.length) warn(`  ${basename9(root)}: no link in ${c.uncommitted.join(", ")}: git tracks it but not the skill's copy, so the link would break for teammates. Commit the copy, then run skilllib link --allow-tracked.`);
+    }
+  }
+  if (moves.some((m) => m.moved)) info(dim("Commit skilllib.json and the skill folders in each repo."));
+}
 function tidy(args) {
   const names = args.positional;
   const keepFor = (base) => args.keep ? Object.fromEntries(names.map((n) => [n, base ? resolve7(base, args.keep) : expandHome(args.keep)])) : {};
@@ -3001,13 +3293,13 @@ function tidy(args) {
   for (const name of names) {
     const where = targets.map((root) => ({ root, ...foldersOf(root, name) })).filter((w) => w.all.length);
     if (!where.length) {
-      problems.push(`${name}: no skill by that name ${args.global ? "in your global folders" : args.all ? "in your projects" : `in ${basename8(targets[0])}`}`);
+      problems.push(`${name}: no skill by that name ${args.global ? "in your global folders" : args.all ? "in your projects" : `in ${basename9(targets[0])}`}`);
       continue;
     }
     if (!args.keep) continue;
     for (const { root, real } of where) {
       if (real.includes(keepFor(root)[name])) continue;
-      const label = root ? `${basename8(root)} \xB7 ` : "";
+      const label = root ? `${basename9(root)} \xB7 ` : "";
       problems.push(
         `${label}${name}: no copy in ${args.keep}; ${real.length ? `pick one of: ${real.map((d) => folderLabel(root, d)).join(", ")}` : "it has no real copy to keep"}`
       );
@@ -3018,7 +3310,7 @@ function tidy(args) {
     process.exit(1);
   }
   const reports = targets.map(
-    (root) => root === null ? { label: "global folders", report: planGlobalTidy({ keep: keepFor(null) }) } : { label: basename8(root), report: planProjectTidy(root, { keep: keepFor(root) }) }
+    (root) => root === null ? { label: "global folders", report: planGlobalTidy({ keep: keepFor(null) }) } : { label: basename9(root), report: planProjectTidy(root, { keep: keepFor(root) }) }
   );
   let held = 0;
   let changed = 0;
@@ -3058,7 +3350,7 @@ function agentSkill(args) {
       error(`Can't install the skilllib skill: ${r.reason}`);
       process.exit(1);
     }
-    if (args.json) return json({ state: agentSkillState(), dirs: r.dirs });
+    if (args.json) return json("agent-skill", { state: agentSkillState(), dirs: r.dirs });
     success(`Installed in ${r.dirs.map((d) => tildify(d)).join(" and ")}`);
     if (!onPath("skilllib")) warn("`skilllib` isn't on your PATH, so agents can't run it. Install it: npm install -g skilllib");
     info(dim("New agent sessions can now answer questions like \u201Cwhich skills can you use here?\u201D"));
@@ -3066,11 +3358,11 @@ function agentSkill(args) {
   }
   if (action === "remove" || action === "rm") {
     const removed = removeAgentSkill();
-    if (args.json) return json({ state: agentSkillState(), removed });
+    if (args.json) return json("agent-skill", { state: agentSkillState(), removed });
     return removed.length ? success(`Removed from ${removed.map((d) => tildify(d)).join(" and ")}`) : info("The skilllib skill isn't installed.");
   }
   const state = agentSkillState();
-  if (args.json) return json({ state, dirs: agentSkillDirs() });
+  if (args.json) return json("agent-skill", { state, dirs: agentSkillDirs() });
   if (state === "installed") success(`Your agents can use skilllib ${dim(`(${agentSkillDirs().map((d) => tildify(d)).join(", ")})`)}`);
   else if (state === "outdated") warn("The skilllib skill is out of date. Run `skilllib agent-skill install` to update it.");
   else info("Your agents don't know about skilllib yet. Run `skilllib agent-skill install` so you can ask them about your skills.");
@@ -3102,7 +3394,6 @@ export {
   allowTrackedLinks,
   keptGlobal,
   setKeepGlobal,
-  setPluginEnabled,
   machineSkills,
   skillsLoadedIn,
   libraryOrigins,
@@ -3130,9 +3421,14 @@ export {
   gitInfo,
   relativeTo,
   claudePlugins,
+  installedPlugins,
+  cursorPlugins,
+  forgetClaudeBinary,
   claudeBinary,
   turnOffIn,
-  recordRemovedPlugin,
+  setPluginOn,
+  uninstallPlugin,
+  updatePlugin,
   pluginBackups,
   restorePlugin,
   cursorPluginSkills,
@@ -3148,6 +3444,7 @@ export {
   copyLabel,
   addedAt,
   scanUsage,
+  moveGlobalSkills,
   parseArgs,
   projectOfFactory,
   status,
@@ -3166,6 +3463,7 @@ export {
   newSkill,
   restore,
   doctor,
+  apply,
   usage,
   show,
   harnessesCommand,