skilllib 1.7.0 → 1.11.0

package/dist/{tui-RU255WYX.js → tui-3LDZ5GOZ.js}

@@ -12,11 +12,13 @@ import {
   copyLabel,
   createSkill,
   cursorPluginSkills,
+  cursorPlugins,
   deleteGlobal,
   deleteLibrarySkill,
   describeStep,
   discoverProjects,
   enabledHarnesses,
+  forgetClaudeBinary,
   forgetLatest,
   gitInfo,
   gitVisibleSteps,
@@ -24,6 +26,7 @@ import {
   harnessesChosen,
   importSkill,
   installAgentSkill,
+  installedPlugins,
   keptGlobal,
   latestVersion,
   libraryOrigins,
@@ -33,6 +36,7 @@ import {
   linkGlobal,
   listBackups,
   machineSkills,
+  moveGlobalSkills,
   planGlobalTidy,
   planProjectTidy,
   pluginBackups,
@@ -44,7 +48,6 @@ import {
   readManifest,
   readSkillInfo,
   recordOrigin,
-  recordRemovedPlugin,
   relativeTo,
   relinkDependency,
   removeAgentSkill,
@@ -57,18 +60,20 @@ import {
   setHarnesses,
   setHidden,
   setKeepGlobal,
-  setPluginEnabled,
+  setPluginOn,
   skilllibHome,
   skillsLoadedIn,
   syncProject,
   tildify,
   turnOffIn,
+  uninstallPlugin,
   unloadGlobal,
+  updatePlugin,
   updateProject,
   versionHistory,
   visibilityOf,
   visibleProjects
-} from "./chunk-AYAN7Q2X.js";
+} from "./chunk-LO4FMXDE.js";
 
 // src/tui/index.tsx
 import { render } from "ink";
@@ -240,7 +245,7 @@ function buildReviewPrompt(skills, ctx) {
 - A skill is a folder with a SKILL.md. Every loaded skill's name and description sit in the agent's context in every session, so each one costs context and can trigger when it shouldn't.
 - "Global" skills load in EVERY repo for the listed agents. Project skills only load inside that repo.
 - I use these agents: ${ctx.harnesses.join(", ") || "(none configured)"}.
-- I manage skills with skilllib, which can: keep a skill global; move it into specific projects (and out of global); delete it (a backup is kept); or leave vendor skills alone. Vendor skills (plugins, claude.ai, Cursor built-ins) can only be turned off at their source.
+- I manage skills with skilllib, which can: keep a skill global; move it into specific projects (and out of global); delete it (a backup is kept); or leave vendor skills alone. Vendor skills (plugins, claude.ai, Cursor built-ins, Grok bundled skills) can only be turned off at their source.
 - Usage counts only cover Claude Code sessions over the last ${ctx.usageDays} days; other agents' usage isn't tracked, so treat "unused" as a strong hint, not proof.
 
 ## My projects
@@ -543,7 +548,7 @@ function issuesOf(w, projectName, u) {
       title: `Same name as a skill in plugin ${vendor.where}: Claude Code has it off in ${projectName}, but Cursor ignores repo settings and lists both`,
       short: "Cursor also lists a plugin's copy",
       decision: true,
-      fixes: [replacePluginFix(w, vendor.where)]
+      fixes: [pluginFixFor(w, vendor.where)]
     });
   else if (vendor)
     issues.push({
@@ -745,25 +750,117 @@ function deleteLibraryFix(w, names) {
     run: (w2) => joined(names.map((n) => w2.ops.deleteLibrary(n)))
   };
 }
-function replacePluginFix(w, id) {
-  const skills = w.machine.filter((m) => m.source === "plugin" && m.where === id);
-  const names = skills.map((m) => m.name);
-  const parts = skills[0]?.pluginParts ?? [];
-  const synced = id.endsWith("@synced");
+var plural = (n, what) => `${n} ${what}${n === 1 ? "" : "s"}`;
+function pluginName(p) {
+  return p.id.split("@")[0];
+}
+function pluginSkillKey(p, skill) {
+  return `${pluginName(p)}:${skill}`;
+}
+function pluginUses(w, p, repo) {
+  return p.skills.reduce((n, s) => n + (repo ? w.usage[repo]?.[pluginSkillKey(p, s.name)] ?? 0 : totalUses(w, pluginSkillKey(p, s.name))), 0);
+}
+function pluginScope(p) {
+  return p.repo ? `${p.scope} ${p.repo}` : p.scope;
+}
+function replacePluginFix(p) {
+  const names = p.skills.map((s) => s.name);
+  const synced = p.scope === "claude.ai";
+  const offOnly = synced || !!p.settingsOnly;
   return {
-    label: `Replace ${id.split("@")[0]} with library skills\u2026`,
+    label: `Replace ${pluginName(p)} with library skills\u2026`,
     preview: [
-      `Copies its ${skills.length} skill${skills.length === 1 ? "" : "s"} into your library and adds them to the repos you tick (or none),`,
-      synced ? `then turns ${id} off in Claude Code. It's synced from your claude.ai account: to delete it for good, remove it there.` : `then uninstalls ${id} from Claude Code (its saved data is kept).`,
-      parts.length ? `It also brings ${parts.join(", ")}: those ${synced ? "stop" : "go"} too.` : "",
-      synced ? "Turn it back on with /plugin." : "Reinstall it anytime with /plugin."
+      `Copies its ${plural(names.length, "skill")} into your library and adds them to the repos you tick (or none),`,
+      synced ? `then turns ${p.id} off in Claude Code. It's synced from your claude.ai account: to delete it for good, remove it there.` : p.settingsOnly ? `then turns ${p.id} off in ~/.claude/settings.json. It isn't installed, only turned on there, so there's nothing to uninstall.` : `then uninstalls ${p.id}${p.repo ? ` from ${p.repo}` : ""} (its saved data is kept).`,
+      p.parts.length ? `It also brings ${p.parts.join(", ")}: those ${offOnly ? "stop" : "go"} too.` : "",
+      offOnly ? "Turn it back on from Plugins." : "Settings \u203A Backups reinstalls it."
     ].filter(Boolean).join(" "),
     run: () => "",
     allowNone: true,
-    preticked: (w2) => w2.projects.filter((p) => names.some((n) => (w2.usage[p.name]?.[n] ?? 0) > 0)).map((p) => p.name),
-    pickRepos: (w2, repos) => w2.ops.replacePlugin(id, repos)
+    preticked: (w) => w.projects.filter((x) => pluginUses(w, p, x.name) > 0).map((x) => x.name),
+    pickRepos: (w, repos) => w.ops.replacePlugin(p, repos)
+  };
+}
+function pluginFixFor(w, id) {
+  const ofId = w.plugins.filter((p2) => p2.agent === "claude-code" && p2.id === id);
+  const p = ofId.find((x) => !x.repo) ?? ofId[0];
+  if (p) return replacePluginFix(p);
+  return { label: "Turn the plugin off with /plugin in Claude Code", preview: `skilllib can't tell where ${id} is installed.`, run: () => `Turn ${id} off with /plugin in Claude Code; skilllib picks it up next time` };
+}
+function pluginSwitchFix(p, on) {
+  const where = p.repo ? ` in ${p.repo} (${p.scope} install)` : p.scope === "claude.ai" ? " on this machine" : " in every repo";
+  return {
+    label: on ? "Turn it on" : "Turn it off",
+    preview: `Turns ${p.id} ${on ? "on" : "off"}${where}${p.parts.length ? `, with its ${p.parts.join(", ")}` : ""}. ${p.scope === "claude.ai" ? `Sets "${p.id}": ${on} in ~/.claude/settings.json.` : `Runs claude plugin ${on ? "enable" : "disable"} ${p.id} --scope ${p.scope}${p.repo ? ` in ${p.repo}` : ""}.`} Claude Code picks it up in its next session.`,
+    run: (w) => w.ops.setPlugin(p, on)
+  };
+}
+function uninstallPluginFix(p) {
+  return {
+    label: "Uninstall",
+    preview: `Runs claude plugin uninstall ${p.id} --keep-data --scope ${p.scope}${p.repo ? ` in ${p.repo}` : ""}: its ${[plural(p.skills.length, "skill"), ...p.parts].join(", ")} go, its saved data stays. Settings \u203A Backups reinstalls it.`,
+    run: (w) => w.ops.uninstallPlugin(p)
   };
 }
+function updatePluginFix(p) {
+  return {
+    label: p.update === "newer" ? "Update it" : `Update to ${p.update}`,
+    preview: `Runs claude plugin update ${p.id}${p.repo ? ` in ${p.repo}` : ""}. Updates can bring new commands, hooks or MCP servers. If the marketplace asks to run a command, skilllib stops and you update it yourself. Claude Code uses the new version after a restart.`,
+    run: (w) => w.ops.updatePlugin(p)
+  };
+}
+function pluginIssues(w, p) {
+  const library = new Set(w.library.map((l) => l.name));
+  const global = new Set(w.machine.filter((m) => m.source === "global" && !m.broken).map((m) => m.name));
+  if (p.agent === "cursor") {
+    const dupes = p.skills.filter((s) => library.has(s.name) || global.has(s.name));
+    return dupes.length ? [
+      {
+        id: `plugin-dupes:${p.key}`,
+        severity: "warning",
+        title: `Repeats your ${dupes.map((s) => s.name).join(", ")}: Cursor lists both while it's on`,
+        short: `Repeats ${dupes.length} of yours`,
+        decision: true,
+        fixes: [{ label: "Turn it off in Cursor (Settings \u203A Plugins)", preview: "skilllib can't read or change Cursor's plugins.", run: () => `Turn ${p.id} off in Cursor; skilllib can't tell whether it's on` }]
+      }
+    ] : [];
+  }
+  const issues = [];
+  if (p.on) {
+    const repo = p.repo ? w.projects.find((x) => x.name === p.repo) : void 0;
+    const here = repo ? new Set(repo.skills.map((s) => s.name)) : void 0;
+    const yours = (n) => global.has(n) || (p.repo ? !!here?.has(n) : library.has(n));
+    const dupes = p.skills.filter((s) => yours(s.name));
+    if (dupes.length)
+      issues.push({
+        id: `plugin-dupes:${p.key}`,
+        severity: "warning",
+        title: `Repeats your ${dupes.map((s) => s.name).join(", ")}`,
+        short: `Repeats ${dupes.length} of yours`,
+        decision: true,
+        fixes: [replacePluginFix(p), pluginSwitchFix(p, false)]
+      });
+    if (w.days && p.skills.length && pluginUses(w, p) === 0)
+      issues.push({
+        id: `plugin-unused:${p.key}`,
+        severity: "hint",
+        title: `Its skills weren't used in 30 days (Claude Code)${p.parts.length ? `; it also brings ${p.parts.join(", ")}` : ""}`,
+        short: "Unused 30 days",
+        decision: true,
+        fixes: [pluginSwitchFix(p, false), ...p.scope === "claude.ai" || p.settingsOnly ? [] : [uninstallPluginFix(p)]]
+      });
+  }
+  if (p.update)
+    issues.push({
+      id: `plugin-update:${p.key}`,
+      severity: "hint",
+      title: p.update === "newer" ? "Its marketplace has a newer commit" : `Update available: ${p.version ?? "?"} \u2192 ${p.update}`,
+      short: p.update === "newer" ? "Update available" : `Update to ${p.update}`,
+      decision: true,
+      fixes: [updatePluginFix(p)]
+    });
+  return issues;
+}
 function originGroup(origin) {
   if (!origin) return null;
   const plugin = origin.match(/^plugin: (.+)$/);
@@ -777,17 +874,21 @@ function originGroup(origin) {
   return null;
 }
 var word = (name) => name.split(/[-_.]/)[0];
+function libraryOrigin(w, l) {
+  return l && (l.origin ?? w.library.find((x) => x.origin?.match(/^plugin: ([^@]+)@/)?.[1] === l.name)?.origin);
+}
 function groupCandidates(w, u) {
   const byTime = (family, installed) => installed ? [{ key: `time:${family}:${installed}`, label: `installed together ${installed.slice(0, 10)}` }] : [];
   const byWord = (family, name) => word(name).length >= 3 ? [{ key: `word:${family}:${word(name)}`, label: `${word(name)}-*` }] : [];
   if (!("source" in u)) {
-    const origin = originGroup(u.origin);
+    const origin = originGroup(libraryOrigin(w, u));
     return [...origin ? [origin] : [], ...byWord("library", u.name)];
   }
   const m = u.machine;
   if (m?.source === "plugin") return [{ key: `plugin:${m.where}`, label: `\u29C9 ${m.where.split("@")[0]} plugin` }];
   if (m?.source === "claude.ai") return [{ key: "claude.ai", label: "claude.ai skills" }];
   if (m?.source === "cursor") return [{ key: "cursor", label: "Cursor built-ins" }];
+  if (m?.source === "grok") return [{ key: "grok", label: "Grok bundled" }];
   if (m?.source === "system") return [{ key: `system:${m.where}`, label: m.where }];
   if (m?.source === "skilllib") return [];
   if (m) {
@@ -795,8 +896,7 @@ function groupCandidates(w, u) {
     return [...origin ? [origin] : [], ...byTime("global", m.installed), ...byWord("global", m.name)];
   }
   if (u.local?.source === "lib") {
-    const l = w.library.find((x) => x.name === u.name);
-    const origin = originGroup(l?.origin);
+    const origin = originGroup(libraryOrigin(w, w.library.find((x) => x.name === u.name)));
     return [...origin ? [origin] : [], ...byWord("local", u.name)];
   }
   return byWord("local", u.name);
@@ -823,7 +923,33 @@ function addRows(w, target, q) {
   const taken = new Set(target ? project(w, target).skills.map((s) => s.name) : []);
   const loaded = new Set(target ? usable(w, target).map((u) => u.name) : []);
   const hit = (name, description) => !q || matches(name, q) || q.length >= 3 && description.toLowerCase().includes(q);
-  const library = target ? w.library.filter((l) => !taken.has(l.name) && hit(l.name, w.descriptions[l.name] ?? "")).map((l) => ({ key: `lib:${l.name}`, name: l.name, note: `v${l.latest}`, description: w.descriptions[l.name] ?? "", run: (w2) => w2.ops.add(target, l.name) })) : [];
+  const groups = assignGroups(w.library.map((l) => groupCandidates(w, l)));
+  const shown = w.library.map((l, i) => ({ l, g: groups[i] })).filter(({ l }) => !taken.has(l.name) && hit(l.name, w.descriptions[l.name] ?? ""));
+  const skillRow = (l, inGroup) => ({
+    key: `lib:${l.name}`,
+    name: l.name,
+    note: `v${l.latest}`,
+    description: w.descriptions[l.name] ?? "",
+    members: [l.name],
+    ...inGroup ? { inGroup } : {},
+    run: (w2) => w2.ops.add(target, l.name)
+  });
+  const library = [];
+  const done = /* @__PURE__ */ new Set();
+  for (const { l, g } of target ? shown : []) {
+    if (done.has(l.name)) continue;
+    const members = g ? shown.filter((x) => x.g?.key === g.key).map((x) => x.l) : [l];
+    members.forEach((m) => done.add(m.name));
+    if (members.length < 2) {
+      library.push(skillRow(l, false));
+      continue;
+    }
+    const names = members.map((m) => m.name);
+    library.push(
+      { key: `group:${g.key}`, name: groupLabel(g, names), note: `${names.length} skills`, description: names.join(", "), members: names, run: (w2) => w2.ops.addTo([target], names) },
+      ...members.map((m) => skillRow(m, true))
+    );
+  }
   const exists = q !== "" && (loaded.has(q) || w.library.some((l) => l.name === q));
   const where = target ? ` for ${target}` : "";
   const fresh = exists ? [] : [
@@ -918,6 +1044,7 @@ var PLACES = [
   ["projects", "Projects"],
   ["library", "Your skills"],
   ["global", "Global"],
+  ["plugins", "Plugins"],
   ["health", "Health"],
   ["settings", "Settings"]
 ];
@@ -996,7 +1123,7 @@ function TitleRow({ cells, width }) {
 }
 var fixOption = (fix) => ({ label: fix.label, fix });
 var GIT_LABEL = { committed: "\u2713 committed", changed: "\xB1 uncommitted changes", new: "+ not committed", ignored: "\u2205 gitignored" };
-var COPY_RANK = { lib: 0, repo: 0, untracked: 0, global: 1, skilllib: 1, plugin: 2, "claude.ai": 3, cursor: 3, system: 3 };
+var COPY_RANK = { lib: 0, repo: 0, untracked: 0, global: 1, skilllib: 1, plugin: 2, "claude.ai": 3, cursor: 3, grok: 3, system: 3 };
 function byName(copies) {
   const groups = /* @__PURE__ */ new Map();
   for (const c of copies) groups.set(c.name, [...groups.get(c.name) ?? [], c]);
@@ -1139,11 +1266,13 @@ function overview(w, p) {
   const project2 = project(w, p);
   const info = w.ops.repoInfo(p);
   const manifest = project2.manifest === "none" ? ["no skilllib.json", color.faint] : project2.manifest === "no git" ? ["skilllib.json (not a git repo)", color.muted] : [`skilllib.json ${GIT_LABEL[project2.manifest]}`, project2.manifest === "committed" ? color.text : color.yellow];
+  const plugins = [...new Set(machineIn(w, project2).filter((m) => m.source === "plugin").map((m) => m.where.split("@")[0]))];
   return [
     ["Folder", [[tildify3(project2.path), color.text]]],
     ["Remote", [[info.remote ?? "none", info.remote ? color.blue : color.faint]]],
     ["Branch", [[info.branch ?? "\u2013", color.text], [info.dirty ? `  ${info.dirty} uncommitted` : "", color.yellow]]],
-    ["Manifest", [manifest]]
+    ["Manifest", [manifest]],
+    ["Plugins", [[plugins.length ? plugins.join(", ") : "none", plugins.length ? color.magenta : color.faint]]]
   ];
 }
 function InfoGrid({ rows, columns, width }) {
@@ -1185,13 +1314,21 @@ function globalItems(w, nameW, ui) {
   const copies = w.machine.map((m) => ({ name: m.name, source: m.source, where: m.where, agents: m.agents, uses: totalUses(w, m.name), machine: m }));
   return byName(copies).map((g) => skillItem(w, g, mergeIssues(g.map((c) => machineIssues(w, c.machine))), nameW, globalActions(w, g[0], ui), null));
 }
+var AT_SOURCE = {
+  global: null,
+  plugin: null,
+  skilllib: null,
+  "claude.ai": "Turn it off in claude.ai \u203A Settings",
+  cursor: "Cursor manages it",
+  grok: "Ships with Grok; a same-named skill of yours overrides it"
+};
 function globalActions(w, u, ui) {
   const m = u.machine;
-  const atSource = m.source === "plugin" ? "Turn it off with /plugin in Claude Code" : m.source === "claude.ai" ? "Turn it off in claude.ai \u203A Settings" : m.source === "system" ? `An admin manages ${m.where}` : "Cursor manages it";
+  const atSource = m.source === "system" ? `An admin manages ${m.where}` : AT_SOURCE[m.source];
   return [
     ...machineActions(m).map(fixOption),
-    ...m.source === "plugin" ? [fixOption(replacePluginFix(w, m.where))] : [],
-    ...m.source === "global" || m.source === "skilllib" ? [] : [{ label: atSource, action: () => ui.notify(`${atSource}; skilllib picks up the change next time`) }],
+    ...m.source === "plugin" ? [{ label: `Open ${m.where.split("@")[0]} in Plugins`, action: () => ui.openInPlugins(m.where) }] : [],
+    ...atSource ? [{ label: atSource, action: () => ui.notify(`${atSource}; skilllib picks up the change next time`) }] : [],
     ...m.source === "global" && !m.broken ? [{ label: "Edit SKILL.md", action: () => ui.edit(`${m.path}/SKILL.md`) }] : [],
     reviewOption(w, m.name, ui)
   ];
@@ -1283,6 +1420,66 @@ function agentSkillItems(w, nameW) {
     }
   ];
 }
+var pluginW = (nameW) => Math.min(nameW, 17);
+var STATE = { on: ["on", color.green], off: ["off", color.faint], unknown: ["?", color.faint] };
+function pluginItems(w, skillW, ui, issuesOf2) {
+  const nameW = pluginW(skillW);
+  return w.plugins.map((p) => {
+    const issues = issuesOf2.get(p.key) ?? [];
+    const top = worst(issues);
+    const cursor = p.agent === "cursor";
+    const uses = cursor ? 0 : pluginUses(w, p);
+    const [state, stateColor] = STATE[p.on === null ? "unknown" : p.on ? "on" : "off"];
+    const n = p.skills.length;
+    const name = pluginName(p);
+    const actions = cursor ? [{ label: "Turn it off in Cursor (Settings \u203A Plugins)", action: () => ui.notify(`Turn ${p.id} off in Cursor; skilllib can't read or change Cursor's plugins`) }] : [
+      fixOption(pluginSwitchFix(p, !p.on)),
+      ...p.update ? [fixOption(updatePluginFix(p))] : [],
+      ...n ? [fixOption(replacePluginFix(p))] : [],
+      ...p.scope === "claude.ai" || p.settingsOnly ? [] : [fixOption(uninstallPluginFix(p))]
+    ];
+    return {
+      key: p.key,
+      name: p.id,
+      plugin: p,
+      issues,
+      uses,
+      cells: [
+        { text: top ? SEV[top.severity].icon : " ", width: 2, color: top ? SEV[top.severity].color : void 0 },
+        { text: clip(name, nameW), width: nameW, color: p.on === false ? color.muted : void 0 },
+        { text: harness(p.agent).icon, width: 3, color: harness(p.agent).color },
+        { text: clip(cursor ? "\u2013" : pluginScope(p), 19), width: 19, color: p.repo ? color.blue : color.muted },
+        { text: clip(`${n} skill${n === 1 ? "" : "s"}${p.parts.length ? ` +${p.parts.length}` : ""}`, 13), width: 13, color: color.muted },
+        { text: state.padEnd(4), width: 4, color: stateColor },
+        { text: cursor ? "    \u2013 " : usesText(uses), width: 6, color: color.muted },
+        { text: " " + (top?.short ?? ""), grow: true, color: top ? SEV[top.severity].color : color.faint }
+      ],
+      detail: (width) => {
+        const b = builder(p.id);
+        for (const l of wrap(p.description || "(no description)", width - 4, 2)) b.line([l, color.muted]);
+        b.line();
+        b.issues(issues);
+        b.actions([...actions, { label: "Open its folder", action: () => ui.notify(said2(w.ops.openFolder(p.path))) }, {
+          label: "Review prompt",
+          action: () => ui.copy(
+            reviewPrompt(w, p.skills.map((s) => s.name), `Review the ${harness(p.agent).name} plugin ${p.id}${p.description ? ` (${p.description})` : ""}: these are its skills${p.parts.length ? `, and it also brings ${p.parts.join(", ")}` : ""}. Should I keep it ${p.on === false ? "off" : "on"}, turn it ${p.on === false ? "on" : "off"}, uninstall it, or replace it with my own copies of the skills I use?`),
+            `a review prompt for ${name}`
+          )
+        }], width);
+        b.line();
+        const label = (t) => [t.padEnd(12), color.muted];
+        const uses2 = (n2) => n2 ? `${n2} use${n2 === 1 ? "" : "s"}` : "unused";
+        const skills = p.skills.map((s) => cursor || !w.days ? s.name : `${s.name} (${uses2(totalUses(w, pluginSkillKey(p, s.name)))})`);
+        wrap(skills.join(" \xB7 ") || "none", width - 16, 4).forEach((l, i) => b.line(label(i ? "" : "Skills"), [l, color.text]));
+        b.line(label("Also brings"), [p.parts.join(", ") || "nothing else", p.parts.length ? color.text : color.faint]);
+        const installed = cursor ? "in Cursor (whether it's on is only in Cursor)" : p.scope === "claude.ai" ? "synced from your claude.ai account" : p.repo ? `${p.scope} scope, in ${p.repo} only` : `user scope, in every repo`;
+        b.line(label("Installed"), [installed, color.text], [p.version ? `   v${p.version.replace(/^v/, "")}` : "", color.muted], [p.id.includes("@") && p.scope !== "claude.ai" ? `   from ${p.id.split("@")[1]}` : "", color.faint]);
+        b.line(label("Folder"), [tildify3(p.path), color.faint]);
+        return b.d;
+      }
+    };
+  });
+}
 function addCursor(rows, cursor) {
   const i = Math.min(cursor, rows.length - 1);
   return rows[i] && !rows[i].header ? i : Math.max(0, rows.findIndex((r) => !r.header));
@@ -1324,10 +1521,12 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
   const ui = {
     notify: setToast,
     openInGlobal,
+    openInPlugins,
     edit,
     copy: (text, what) => setToast(said2(world.ops.copy(text, what))),
     menu: (title, options) => setModal({ kind: "menu", title, options, cursor: 0 })
   };
+  const pluginIssues2 = new Map(world.plugins.map((p) => [p.key, pluginIssues(world, p)]));
   const flagged = [
     ...world.projects.flatMap((p) => projectIssues(world, p.name).map((x) => ({ key: `${p.name}:${x.skill.name}`, issue: x.issue }))),
     ...world.machine.flatMap((m) => machineIssues(world, m).map((issue) => ({ key: `Global:${m.name}`, issue }))),
@@ -1336,7 +1535,7 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
   ];
   const healthCount = new Set(flagged.map((f) => f.key)).size;
   const healthWorst = worst(flagged.map((f) => f.issue));
-  const all = place === "projects" ? open ? projectSkillItems(world, open, nameW, ui) : projectItems(world) : place === "global" ? globalItems(world, nameW, ui) : place === "library" ? libraryItems(world, nameW, ui) : place === "health" ? healthItems(world, nameW, ui) : settingsItems();
+  const all = place === "projects" ? open ? projectSkillItems(world, open, nameW, ui) : projectItems(world) : place === "global" ? globalItems(world, nameW, ui) : place === "library" ? libraryItems(world, nameW, ui) : place === "plugins" ? pluginItems(world, nameW, ui, pluginIssues2) : place === "health" ? healthItems(world, nameW, ui) : settingsItems();
   const inChip = (i, c) => c === "all" || (c === "issues" ? i.issues.length > 0 : i.group === c);
   let items = all.filter((i) => i.header || (!query || matches(i.name, query)) && inChip(i, chip));
   const viewKey = [place, open, chip, query, used ? "usage" : ""].join("|");
@@ -1485,8 +1684,7 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
       ] : [],
       ...libs.length ? [fixOption(deleteLibraryFix(world, libs.map((l) => l.name)))] : [],
       ...locals.length ? [fixOption({ label: `Remove all ${locals.length} from this repo`, preview: `Remove these ${n(locals.length)} from ${open}; your library keeps the tracked ones.`, run: (w) => (locals.forEach((s) => w.ops.remove(open, s.name)), `Removed ${n(locals.length)} from ${open}`) })] : [],
-      ...[...new Set(machines.filter((m) => m.source === "plugin").map((m) => m.where))].map((id) => fixOption(replacePluginFix(world, id))),
-      ...machines.some((m) => m.source === "plugin") ? [{ label: "Turn the plugin off with /plugin in Claude Code", action: () => setToast("Turn it off with /plugin in Claude Code; skilllib picks it up next time") }] : [],
+      ...[...new Set(machines.filter((m) => m.source === "plugin").map((m) => m.where))].map((id) => ({ label: `Open ${id.split("@")[0]} in Plugins`, action: () => openInPlugins(id) })),
       { label: "Review prompt", action: () => ui.copy(reviewPrompt(world, names, `Review these related skills (${label}).`), `a review prompt for ${label}`) }
     ];
   }
@@ -1513,7 +1711,7 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
       const repo = open;
       const skills = project(world, repo).skills.map((s) => s.name);
       return [
-        row("#add", "+ Add a skill\u2026", ["Search your library, or create a new skill."], () => setModal({ kind: "add", cursor: 0, query: "", target: repo })),
+        row("#add", "+ Add a skill\u2026", ["Search your library, or create a new skill."], () => setModal({ kind: "add", cursor: 0, query: "", target: repo, picked: /* @__PURE__ */ new Set() })),
         ...fix,
         row(
           "#repo",
@@ -1536,7 +1734,7 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
     }
     if (place === "health") return fix;
     if (place === "library")
-      return [row("#add", "+ New skill\u2026", ["Create a skill in your library, or have an agent write it. Skills in your repos can be copied in from their own actions."], () => setModal({ kind: "add", cursor: 0, query: "", target: null }))];
+      return [row("#add", "+ New skill\u2026", ["Create a skill in your library, or have an agent write it. Skills in your repos can be copied in from their own actions."], () => setModal({ kind: "add", cursor: 0, query: "", target: null, picked: /* @__PURE__ */ new Set() }))];
     return [];
   }
   function move(delta) {
@@ -1579,6 +1777,10 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
     goPlace("global");
     setQuery(name);
   }
+  function openInPlugins(id) {
+    goPlace("plugins");
+    setQuery(id);
+  }
   function settingsItems() {
     const header = (key, text) => ({ key, name: "", header: true, issues: [], uses: 0, cells: [{ text }] });
     const row = (key, text, sub, onEnter, c) => ({
@@ -1790,6 +1992,18 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
       if (key.upArrow) return step(-1);
       if (key.downArrow) return step(1);
       if (key.backspace || key.delete) return setModal({ ...m, query: m.query.slice(0, -1), cursor: 0 });
+      const members = rows[cursor2]?.members;
+      if (input === " " && members) {
+        const picked = new Set(m.picked);
+        const all2 = members.every((n) => picked.has(n));
+        for (const n of members) all2 ? picked.delete(n) : picked.add(n);
+        return setModal({ ...m, picked });
+      }
+      if (key.return && m.target && m.picked.size) {
+        const [target, names] = [m.target, [...m.picked]];
+        setModal(null);
+        return apply((w) => w.ops.addTo([target], names));
+      }
       if (key.return && rows[cursor2]?.agent) {
         setModal(null);
         return ui.copy(writeSkillPrompt(world, m.query, m.target), "a prompt for an agent to write the skill");
@@ -1812,6 +2026,7 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
   const globalFlagged = world.machine.map((m) => [m.name, machineIssues(world, m)]).filter(([, issues]) => issues.length);
   const globalIssues = new Set(globalFlagged.map(([name]) => name)).size;
   const globalProblem = globalFlagged.some(([, issues]) => issues.some((x) => x.severity === "problem"));
+  const pluginsWorst = worst([...pluginIssues2.values()].flat().filter((i) => i.severity !== "hint"));
   const badge = (p) => {
     const found = projectIssues(world, p);
     const top = worst(found.map((x) => x.issue));
@@ -1833,6 +2048,9 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
     sideRow("global", "\u25C8 Global", place === "global", () => goPlace("global"), [
       { text: String(new Set(world.machine.map((m) => m.name)).size), width: 4, color: globalProblem ? color.red : globalIssues ? color.yellow : color.muted }
     ]),
+    sideRow("plugins", "\u29C9 Plugins", place === "plugins", () => goPlace("plugins"), [
+      { text: String(world.plugins.length), width: 4, color: pluginsWorst ? SEV[pluginsWorst.severity].color : color.muted }
+    ]),
     sideRow("health", "\u2713 Health", place === "health", () => goPlace("health"), [
       { text: String(healthCount), width: 4, color: healthWorst ? SEV[healthWorst.severity].color : color.green }
     ]),
@@ -1870,17 +2088,17 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
     }),
     /* @__PURE__ */ jsx2(Text2, { color: color.accent, children: query ? `    \u2315 ${query}\u258F` : "" })
   ] }) });
-  const columnTitles = dashboard || place === "global" ? titles([["", 2], ["Skill", nameW], ["Source", 14], [" Uses", 6], [" Issue", 0]]) : place === "projects" ? titles([["", 2], ["Project", 18], ["Skills", 10], ["Issues", 0]]) : place === "library" ? titles([["", 2], ["Skill", nameW], ["Ver", 5], ["Used in", 18], [" Uses", 6], [" Issue / description", 0]]) : place === "health" ? titles([["", 2], ["Skill", nameW], ["Where", 16], [" Issue", 0]]) : null;
+  const columnTitles = dashboard || place === "global" ? titles([["", 2], ["Skill", nameW], ["Source", 14], [" Uses", 6], [" Issue", 0]]) : place === "projects" ? titles([["", 2], ["Project", 18], ["Skills", 10], ["Issues", 0]]) : place === "library" ? titles([["", 2], ["Skill", nameW], ["Ver", 5], ["Used in", 18], [" Uses", 6], [" Issue / description", 0]]) : place === "plugins" ? titles([["", 2], ["Plugin", pluginW(nameW)], ["", 3], ["Scope", 19], ["Brings", 13], ["On", 4], [" Uses", 6], [" Issue", 0]]) : place === "health" ? titles([["", 2], ["Skill", nameW], ["Where", 16], [" Issue", 0]]) : null;
   const showChips = chips.length > 0;
   const listHeader = /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
     showChips ? chipRow : null,
     columnTitles ? /* @__PURE__ */ jsx2(TitleRow, { cells: columnTitles, width: columns }) : null
   ] });
-  const overviewH = dashboard && !sidebar ? 4 : 0;
+  const overviewH = dashboard && !sidebar ? Math.ceil(overview(world, open).length / 2) + 2 : 0;
   const listH = split ? Math.floor((bodyH - overviewH) / 2) : bodyH - overviewH;
   const detailH = split ? bodyH - overviewH - listH : bodyH;
   const listRows = items.map((i) => ({ key: i.key, cells: i.cells, header: i.header }));
-  const listTitle = dashboard ? "Skills" : place === "projects" ? "Projects" : place === "library" ? "Your skills" : place === "global" ? "Loads everywhere" : place === "health" ? "To fix" : "Settings";
+  const listTitle = dashboard ? "Skills" : place === "projects" ? "Projects" : place === "library" ? "Your skills" : place === "global" ? "Loads everywhere" : place === "plugins" ? "Plugins" : place === "health" ? "To fix" : "Settings";
   const list = /* @__PURE__ */ jsx2(
     ListPanel,
     {
@@ -1944,6 +2162,7 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
   else if (modal?.kind === "repos") {
     const repos = (modal.only ?? world.projects.map((p) => p.name)).filter((r) => !modal.query || matches(r, modal.query));
     const name = current?.name ?? "";
+    const usedHere = (r) => current?.plugin ? pluginUses(world, current.plugin, r) : world.usage[r]?.[name] ?? 0;
     const pickerLines = wrap(modal.fix.preview, columns - 6, 4);
     body = /* @__PURE__ */ jsx2(
       ListPanel,
@@ -1964,7 +2183,7 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
           cells: [
             { text: modal.picked.has(r) ? "[x] " : "[ ] ", width: 4, color: modal.picked.has(r) ? color.green : color.faint },
             { text: r, width: 20 },
-            { text: world.usage[r]?.[name] ? `used ${world.usage[r][name]}\xD7 here` : "", grow: true, color: color.faint }
+            { text: usedHere(r) ? `used ${usedHere(r)}\xD7 here` : "", grow: true, color: color.faint }
           ]
         }))
       }
@@ -1992,10 +2211,15 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
     );
   } else if (modal?.kind === "add") {
     const rows = addRows(world, modal.target, modal.query);
+    const picked = modal.picked;
+    const tick = (names) => {
+      const n = names.filter((x) => picked.has(x)).length;
+      return { text: n === names.length ? "[x] " : n ? "[-] " : "[ ] ", width: 4, color: n ? color.green : color.faint };
+    };
     body = /* @__PURE__ */ jsx2(
       ListPanel,
       {
-        title: modal.target ? `Add a skill to ${modal.target}` : "New skill",
+        title: modal.target ? picked.size ? `Add ${picked.size} skill${picked.size === 1 ? "" : "s"} to ${modal.target}` : `Add a skill to ${modal.target}` : "New skill",
         focused: true,
         width: columns,
         height: bodyH,
@@ -2004,10 +2228,14 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
         header: /* @__PURE__ */ jsx2(Text2, { color: modal.query ? color.accent : color.muted, children: modal.query ? `\u2315 ${modal.query}\u258F` : modal.target ? "type to search your library, or to name a new skill" : "type the new skill's name" }),
         headerHeight: 1,
         rows: rows.map(
-          (r) => r.header ? { key: r.key, header: true, cells: [{ text: r.header }] } : r.create || r.agent ? { key: r.key, cells: [{ text: r.name, grow: true, color: color.accent }] } : {
+          (r) => r.header ? { key: r.key, header: true, cells: [{ text: r.header }] } : r.create || r.agent ? { key: r.key, cells: [{ text: r.name, grow: true, color: color.accent }] } : r.members.length > 1 ? {
+            key: r.key,
+            cells: [tick(r.members), { text: clip(r.name, 30), width: 30, bold: true }, { text: `${r.note}: ${r.description}`, grow: true, color: color.faint }]
+          } : {
             key: r.key,
             cells: [
-              { text: clip(r.name, 22), width: 22 },
+              tick(r.members),
+              { text: clip(`${r.inGroup ? "  " : ""}${r.name}`, 24), width: 24 },
               { text: r.note, width: 6, color: color.accent },
               { text: r.description, grow: true, color: color.faint }
             ]
@@ -2022,7 +2250,7 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
       list,
       split ? side : null
     ] });
-  const hints = modal?.kind === "confirm" ? "enter apply \xB7 esc cancel" : modal?.kind === "repos" || modal?.kind === "fixall" ? "space tick \xB7 enter apply \xB7 esc cancel" : modal?.kind === "agents" ? "space tick \xB7 enter save" : modal?.kind === "menu" ? "\u2191\u2193 choose \xB7 enter do it \xB7 esc cancel" : modal?.kind === "add" ? "enter add \xB7 esc cancel" : modal ? "any key closes" : focus === "detail" ? "\u2191\u2193 \u2190\u2192 choose \xB7 enter apply \xB7 esc back" : focus === "sidebar" ? "\u2191\u2193 choose \xB7 enter open \xB7 type to filter repos" : place === "projects" && !open ? `type to filter \xB7 enter open \xB7 ${sidebar ? "\u2190 sidebar" : "\u2190\u2192 places"} \xB7 ? keys` : place === "settings" ? `enter toggle \xB7 ${sidebar ? "\u2190 sidebar" : "\u2190\u2192 places"} \xB7 ? keys` : `type to filter \xB7 space \u2605 fix \xB7 enter actions \xB7 tab tabs${sidebar ? " \xB7 esc back" : `${dashboard ? " \xB7 esc all projects" : ""} \xB7 ? keys`}`;
+  const hints = modal?.kind === "confirm" ? "enter apply \xB7 esc cancel" : modal?.kind === "repos" || modal?.kind === "fixall" ? "space tick \xB7 enter apply \xB7 esc cancel" : modal?.kind === "agents" ? "space tick \xB7 enter save" : modal?.kind === "menu" ? "\u2191\u2193 choose \xB7 enter do it \xB7 esc cancel" : modal?.kind === "add" ? modal.target ? "space tick \xB7 enter add \xB7 esc cancel" : "enter add \xB7 esc cancel" : modal ? "any key closes" : focus === "detail" ? "\u2191\u2193 \u2190\u2192 choose \xB7 enter apply \xB7 esc back" : focus === "sidebar" ? "\u2191\u2193 choose \xB7 enter open \xB7 type to filter repos" : place === "projects" && !open ? `type to filter \xB7 enter open \xB7 ${sidebar ? "\u2190 sidebar" : "\u2190\u2192 places"} \xB7 ? keys` : place === "settings" ? `enter toggle \xB7 ${sidebar ? "\u2190 sidebar" : "\u2190\u2192 places"} \xB7 ? keys` : `type to filter \xB7 space \u2605 fix \xB7 enter actions \xB7 tab tabs${sidebar ? " \xB7 esc back" : `${dashboard ? " \xB7 esc all projects" : ""} \xB7 ? keys`}`;
   return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", width: termCols, height: termRows, children: [
     sidebar ? null : topBar,
     /* @__PURE__ */ jsxs2(Box2, { children: [
@@ -2100,7 +2328,7 @@ function Help({ width, height }) {
 }
 
 // src/tui/load.ts
-import { execFileSync, spawn, spawnSync as spawnSync3 } from "child_process";
+import { execFileSync, spawn } from "child_process";
 import { existsSync as existsSync3, lstatSync, realpathSync } from "fs";
 import { basename, dirname, join as join2 } from "path";
 function tildify4(p) {
@@ -2155,20 +2383,6 @@ function localSkill(root, s, git2) {
     git: state
   };
 }
-var partsOf = /* @__PURE__ */ new Map();
-function pluginParts(root) {
-  if (!partsOf.has(root))
-    partsOf.set(
-      root,
-      [
-        ["commands", "commands"],
-        ["agents", "agents"],
-        ["hooks", "hooks"],
-        [".mcp.json", "MCP servers"]
-      ].flatMap(([file, what]) => existsSync3(join2(root, file)) ? [what] : [])
-    );
-  return partsOf.get(root);
-}
 function installedAt(path) {
   try {
     const st = lstatSync(path);
@@ -2182,7 +2396,7 @@ function machineSkill(s, kept) {
   const global = s.kind === "global" || s.kind === "skills.sh";
   return {
     name: s.name,
-    source: global ? "global" : s.kind === "plugin" ? "plugin" : s.kind === "claude.ai" ? "claude.ai" : s.kind === "system" ? "system" : s.kind === "skilllib" ? "skilllib" : "cursor",
+    source: global ? "global" : s.kind === "plugin" ? "plugin" : s.kind === "claude.ai" ? "claude.ai" : s.kind === "system" ? "system" : s.kind === "skilllib" ? "skilllib" : s.kind === "built-in" && s.harnesses[0] === "grok" ? "grok" : "cursor",
     where: global || s.kind === "skilllib" ? tildify4(dirname(s.path)) : s.kind === "claude.ai" ? "claude.ai account" : s.kind === "built-in" ? `${s.origin} built-in` : s.origin,
     ...s.kind === "skills.sh" ? { origin: `npx skills: ${s.origin}` } : {},
     path: s.path,
@@ -2190,10 +2404,31 @@ function machineSkill(s, kept) {
     agents: s.harnesses,
     ...global && kept.has(s.name) ? { kept: true } : {},
     ...s.broken ? { broken: true } : {},
-    ...global && s.kind !== "skills.sh" ? { installed: installedAt(s.path) } : {},
-    ...s.kind === "plugin" ? { pluginParts: pluginParts(dirname(dirname(s.path))) } : {}
+    ...global && s.kind !== "skills.sh" ? { installed: installedAt(s.path) } : {}
+  };
+}
+function pluginOf(p, repoOf) {
+  const scope = p.agent === "cursor" ? "cursor" : p.synced ? "claude.ai" : p.scope ?? "user";
+  const repo = p.projectPath ? repoOf(p.projectPath) ?? basename(p.projectPath) : void 0;
+  return {
+    key: [p.agent, p.id, scope, p.projectPath ?? ""].join("|"),
+    id: p.id,
+    agent: p.agent,
+    scope,
+    ...repo ? { repo, projectPath: p.projectPath } : {},
+    on: p.on,
+    ...p.version ? { version: p.version } : {},
+    ...p.update ? { update: p.update } : {},
+    ...p.settingsOnly ? { settingsOnly: true } : {},
+    description: p.description,
+    path: p.root,
+    skills: p.skills.map((path) => ({ name: basename(path), path })),
+    parts: p.extras
   };
 }
+function refOf(p) {
+  return { id: p.id, scope: p.scope === "claude.ai" ? null : p.scope, ...p.projectPath ? { projectPath: p.projectPath } : {}, synced: p.scope === "claude.ai", ...p.settingsOnly ? { settingsOnly: true } : {} };
+}
 function dupesOf(r, root, git2 = null) {
   const out = /* @__PURE__ */ new Map();
   for (const p of r.plans) out.set(p.name, { steps: p.steps.map((s) => describeStep(s, root)), git: gitVisibleSteps(p, git2).map((s) => describeStep(s, root)) });
@@ -2203,6 +2438,7 @@ function dupesOf(r, root, git2 = null) {
 }
 function loadWorld() {
   forgetLatest();
+  forgetClaudeBinary();
   const agents = enabledHarnesses();
   const here = projectHere();
   const real = (p) => {
@@ -2223,7 +2459,8 @@ function loadWorld() {
     return { name: s.name, latest: latestVersion(s.name)?.version ?? 1, origin: origins[s.name] };
   });
   const kept = keptGlobal();
-  const cursorPlugin = new Map(agents.includes("cursor") ? cursorPluginSkills().map((s) => [s.name, s.plugin]) : []);
+  const cursorList = agents.includes("cursor") ? cursorPlugins() : [];
+  const cursorPlugin = new Map(cursorPluginSkills(cursorList).map((s) => [s.name, s.plugin]));
   const globalDupes = dupesOf(planGlobalTidy({ enabled: agents }), null);
   const sourced = machineSkills(agents);
   const machine = sourced.map((s) => {
@@ -2234,7 +2471,7 @@ function loadWorld() {
     const plugin = cursorPlugin.get(m.name);
     return { ...m, ...dupes ? { dupes } : {}, ...plugin ? { cursorPlugin: plugin } : {} };
   });
-  const plugins = (root) => {
+  const loadedHere = (root) => {
     const loaded = skillsLoadedIn(root, sourced, agents);
     if (loaded === sourced) return {};
     for (const s of loaded) descriptions[s.name] ??= s.description;
@@ -2255,15 +2492,18 @@ function loadWorld() {
         const plugin = cursorPlugin.get(s.name);
         return { ...localSkill(root, s, git2), ...d ? { dupes: d } : {}, ...plugin ? { cursorPlugin: plugin } : {} };
       }),
-      ...plugins(root)
+      ...loadedHere(root)
     };
   });
   const backups = [...listBackups(), ...pluginBackups()].sort((a, b) => b.movedAt.localeCompare(a.movedAt));
+  const repoOf = (path) => projects.find((p) => real(p.path) === real(path))?.name;
+  const plugins = [...installedPlugins(), ...cursorList].map((p) => pluginOf(p, repoOf));
   return {
     agents,
     cwd: cwd ? names.get(cwd) : null,
     projects,
     machine,
+    plugins,
     library,
     usage: {},
     descriptions,
@@ -2325,6 +2565,9 @@ function realOps(roots, backups) {
   };
   const addTo = (repos, names) => {
     if (repos.length === 1 && names.length === 1) return withLinks(addSkill(rootOf(repos[0]), names[0]), repos[0], names[0]);
+    return addMany(repos, names).result;
+  };
+  const addMany = (repos, names) => {
     const changes = repos.flatMap((repo) => names.map((name) => ({ repo, name, c: addSkill(rootOf(repo), name) })));
     const done = changes.filter((x) => x.c.action !== "skipped");
     const added = [...new Set(done.map((x) => x.name))];
@@ -2343,9 +2586,8 @@ function realOps(roots, backups) {
     const skipped = changes.filter((x) => x.c.action === "skipped").map((x) => `${x.name} not added to ${x.repo}: ${x.c.reason}`);
     const text = [summary, ...notes, ...skipped].filter(Boolean).join("; ");
     const held = done.flatMap((x) => x.c.blocked?.length ? [{ repo: x.repo, name: x.name, blocked: x.c.blocked }] : []);
-    if (!done.length) return failed(text);
-    if (held.length) return { message: text, then: allowTracked(held) };
-    return skipped.length ? failed(text) : text;
+    const result2 = !done.length ? failed(text) : held.length ? { message: text, then: allowTracked(held) } : skipped.length ? failed(text) : text;
+    return { result: result2, skipped, notes };
   };
   const allowTracked = (held) => {
     const repos = [...new Set(held.map((h) => h.repo))];
@@ -2463,29 +2705,19 @@ function realOps(roots, backups) {
       const moved = [];
       const notes = [];
       const held = [];
-      for (const m of skills) {
-        if (importSkill(m.path).status === "exists") {
-          notes.push(`${m.name}: your library has a different ${m.name}; nothing moved (update your library from this copy first)`);
-          continue;
-        }
-        if (group) recordOrigin(m.name, `group: ${group}`);
-        const results = repos.map((r2) => [r2, addSkill(rootOf(r2), m.name)]);
-        const skipped = results.filter(([, c]) => c.action === "skipped");
-        if (skipped.length) {
-          notes.push(`${m.name}: not added to ${skipped.map(([r2, c]) => `${r2} (${c.reason})`).join(", ")}, so it still loads globally`);
-          continue;
-        }
-        const r = unloadGlobal(m.path, m.links);
-        if (!r.ok) {
-          notes.push(`${m.name}: ${r.reason}`);
+      const repoRoots = repos.map(rootOf);
+      for (const mv of moveGlobalSkills(skills, repoRoots, { group, label: (root) => repos[repoRoots.indexOf(root)] })) {
+        if (!mv.moved) {
+          notes.push(`${mv.name}: ${mv.reason}`);
           continue;
         }
-        moved.push(m.name);
-        for (const [repo, c] of results) {
-          const blind = visibilityOf(rootOf(repo), m.name).flatMap((v) => v.paths === 0 ? [v.id] : []);
+        moved.push(mv.name);
+        for (const [i, [root, c]] of mv.changes.entries()) {
+          const repo = repos[i];
+          const blind = visibilityOf(root, mv.name).flatMap((v) => v.paths === 0 ? [v.id] : []);
           const blocked = [...c.blocked ?? [], ...c.uncommitted ?? []];
           if (!blocked.length || !blind.length) continue;
-          held.push({ repo, name: m.name, blocked, blind, copy: copyDir(repo, m.name), shared: !c.uncommitted?.length });
+          held.push({ repo, name: mv.name, blocked, blind, copy: copyDir(repo, mv.name), shared: !c.uncommitted?.length });
         }
       }
       const gaps = /* @__PURE__ */ new Map();
@@ -2519,33 +2751,44 @@ function realOps(roots, backups) {
       const r = turnOffIn(plugin, root);
       return r.ok ? r.message : failed(r.message);
     },
-    replacePlugin: (id, repos) => {
-      const skills = machineSkills().filter((s) => s.kind === "plugin" && s.origin === id && !s.broken);
-      const clashes = skills.filter((s) => importSkill(s.path).status === "exists").map((s) => s.name);
+    replacePlugin: (p, repos) => {
+      const id = p.id;
+      const imported = p.skills.map((s) => ({ name: s.name, status: importSkill(s.path).status }));
+      const clashes = imported.filter((r) => r.status === "exists").map((r) => r.name);
       if (clashes.length) return failed(`${id} kept: your library has different ${clashes.join(", ")}; update or delete ${clashes.length === 1 ? "it" : "them"} first`);
-      const skipped = repos.flatMap((r) => skills.flatMap((s) => {
-        const c = addSkill(rootOf(r), s.name);
-        return c.action === "skipped" ? [`${s.name} in ${r} (${c.reason})`] : [];
-      }));
-      if (skipped.length) return failed(`${id} kept: not added ${skipped.join(", ")}`);
-      const copied = `${skills.length} skill${skills.length === 1 ? " from " + id + " is" : "s from " + id + " are"} in your library${repos.length ? ` and in ${repos.join(", ")}` : ""}`;
+      for (const r of imported) if (r.status !== "unchanged") recordOrigin(r.name, `plugin: ${id}`);
+      const added = repos.length ? addMany(repos, p.skills.map((s) => s.name)) : { result: "", skipped: [], notes: [] };
+      if (added.skipped.length) return failed(`${id} kept: ${added.skipped.join("; ")}`);
+      const n = p.skills.length;
+      const copied = `${n} skill${n === 1 ? " from " + id + " is" : "s from " + id + " are"} in your library${repos.length ? ` and in ${repos.join(", ")}` : ""}`;
+      const notes = added.notes.length ? `; ${added.notes.join("; ")}` : "";
+      const then = followUp(added.result);
+      const done = (message) => then ? { message: message + notes, then } : message + notes;
+      const ref = refOf(p);
       const bin = claudeBinary();
-      const claude = (...args) => spawnSync3(bin, ["plugin", ...args], { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"], timeout: 2e4 });
-      const synced = id.endsWith("@synced");
-      const off = bin && !synced && claude("uninstall", id, "--keep-data").status === 0 ? "uninstalled" : bin ? claude("disable", id) : null;
-      if (off === "uninstalled") {
-        recordRemovedPlugin(id, "user");
-        return `${copied}; ${id} is uninstalled (restore it from Settings \u203A Backups, or reinstall with /plugin)`;
+      let uninstallFailed = "";
+      if (bin && !ref.synced && !ref.settingsOnly) {
+        const r = uninstallPlugin(ref);
+        if (r.ok) return done(`${copied}; ${r.message}`);
+        uninstallFailed = ` (uninstalling failed: ${r.message.replace(`${id}: `, "")})`;
       }
-      if (off?.status === 0)
-        return synced ? `${copied}; ${id} is off (it's synced from claude.ai: remove it there to delete it for good)` : `${copied}; ${id} is off: finish with /plugin uninstall ${id}`;
-      const why = !off ? "the claude command isn't on your PATH" : off.error ? `claude didn't answer: ${off.error.message}` : (off.stderr || off.stdout).trim().split("\n")[0] || `exit ${off.status}`;
-      try {
-        setPluginEnabled(id, false);
-      } catch (e) {
-        return failed(`${copied}; couldn't turn ${id} off (${why}; ${e.message}): turn it off with /plugin`);
-      }
-      return `${copied}; turned ${id} off in ~/.claude/settings.json (${why})${synced ? "" : `: finish with /plugin uninstall ${id}`}`;
+      const off = setPluginOn(ref, false);
+      if (!off.ok) return failed(`${copied}; couldn't turn ${id} off (${off.message}): turn it off with /plugin${notes}`);
+      if (ref.synced) return done(`${copied}; ${id} is off (it's synced from claude.ai: remove it there to delete it for good)`);
+      if (ref.settingsOnly) return done(`${copied}; ${id} is off (it was only turned on in your settings, so there's nothing to uninstall)`);
+      return done(`${copied}; ${id} is off${bin ? uninstallFailed : " (the claude command isn't on your PATH)"}: finish with /plugin uninstall ${id}`);
+    },
+    setPlugin: (p, on) => {
+      const r = setPluginOn(refOf(p), on);
+      return r.ok ? r.message : failed(r.message);
+    },
+    uninstallPlugin: (p) => {
+      const r = uninstallPlugin(refOf(p));
+      return r.ok ? r.message : failed(r.message);
+    },
+    updatePlugin: (p) => {
+      const r = updatePlugin(refOf(p));
+      return r.ok ? r.message : failed(r.message);
     },
     deleteLibrary: (name) => {
       const from = [];
@@ -2584,7 +2827,7 @@ function realOps(roots, backups) {
     },
     copy: (text, what) => {
       const r = copyText(text);
-      return r.copied ? `Copied ${what}: paste it into Claude Code, Cursor or Codex` : `Couldn't reach the clipboard; ${what} is in ${tildify4(r.savedTo)}`;
+      return r.copied ? `Copied ${what}: paste it into Claude Code, Cursor, Codex or Grok` : `Couldn't reach the clipboard; ${what} is in ${tildify4(r.savedTo)}`;
     },
     installAgentSkill: () => {
       const r = installAgentSkill();