skilllib 1.1.0 → 1.2.1

package/dist/index.js

@@ -19,10 +19,11 @@ import {
   show,
   status,
   sync,
+  tidy,
   unhide,
   update,
   usage
-} from "./chunk-HLCJQVHB.js";
+} from "./chunk-O5TY4NWZ.js";
 
 // src/index.ts
 import { readFileSync } from "fs";
@@ -44,6 +45,9 @@ In a project:
   skilllib add <name>...         Install library skills where your harnesses look
   skilllib remove <name>...      Remove skills from this project
   skilllib link [--all]          Make every skill here usable by all your agents (adds links)
+  skilllib tidy [--all|--global] One real copy per skill, plus only the links your agents need
+                                 (--dry-run to preview, --allow-git to change what git sees,
+                                 <name> --keep <folder> to pick the copy that wins)
   skilllib sync [--all]          Install exactly the versions in skilllib.json
   skilllib outdated [--all]      Skills with a newer version in the library
   skilllib update [name...]      Move to the newest versions (--all: every project)
@@ -75,9 +79,9 @@ async function main() {
   const args = parseArgs(rest);
   switch (command) {
     case void 0:
-      return process.stdin.isTTY && process.stdout.isTTY ? (await import("./tui-YF7BQ7CD.js")).tui() : status(args);
+      return process.stdin.isTTY && process.stdout.isTTY ? (await import("./tui-6BOQIKAU.js")).tui() : status(args);
     case "ui":
-      return (await import("./tui-YF7BQ7CD.js")).tui();
+      return (await import("./tui-6BOQIKAU.js")).tui();
     case "status":
       return status(args);
     case "add":
@@ -106,6 +110,9 @@ async function main() {
       return projects();
     case "link":
       return link(args);
+    case "tidy":
+    case "dedup":
+      return tidy(args);
     case "harnesses":
     case "agents":
       return harnessesCommand(args);

package/dist/{tui-YF7BQ7CD.js → tui-6BOQIKAU.js}

@@ -1,7 +1,6 @@
 import {
   ALL_PROJECT_DIRS,
   HARNESSES,
-  MANIFEST_FILE,
   addRoot,
   addSkill,
   allowTrackedLinks,
@@ -13,6 +12,7 @@ import {
   findIssues,
   findProjectRoot,
   forgetLatest,
+  gitInfo,
   harnessesChosen,
   importSkill,
   installDirs,
@@ -26,14 +26,18 @@ import {
   linkEverywhere,
   listBackups,
   machineSkills,
+  pluginBackups,
   projectOfFactory,
   projectStatus,
   readConfig,
   readSkillInfo,
+  relativeTo,
   relinkDependency,
   removeRoot,
   removeSkill,
   restoreBackup,
+  restorePlugin,
+  runFix,
   scanUsage,
   setHarnesses,
   setHidden,
@@ -48,7 +52,7 @@ import {
   versionHistory,
   visibilityOf,
   visibleProjects
-} from "./chunk-HLCJQVHB.js";
+} from "./chunk-O5TY4NWZ.js";
 
 // src/tui/index.tsx
 import { render } from "ink";
@@ -56,7 +60,7 @@ import { render } from "ink";
 // src/tui/App.tsx
 import { spawn, spawnSync as spawnSync2 } from "child_process";
 import { homedir } from "os";
-import { basename as basename3, dirname, join as join4, sep } from "path";
+import { basename as basename3, dirname, join as join3, sep } from "path";
 import { useEffect, useRef, useState as useState2 } from "react";
 import { Box as Box3, Text as Text3, useApp, useInput, useWindowSize } from "ink";
 import { lstatSync } from "fs";
@@ -104,6 +108,8 @@ function stateBadge(state) {
       return { icon: "\u2713", label: "in your skills too", color: color.green };
     case "repo skill, differs from library":
       return { icon: "\u2260", label: "differs from yours", color: color.yellow };
+    case "from npx skills":
+      return { icon: "\u2193", label: "npx skills", color: color.magenta };
     case "available":
       return { icon: " ", label: "", color: color.faint };
   }
@@ -262,7 +268,7 @@ function loadSnapshot() {
     library,
     machine,
     issues: findIssues(projects, machine, new Set(library.map((l) => l.name)), statusOf),
-    backups: listBackups(),
+    backups: [...listBackups(), ...pluginBackups()].sort((a, b) => b.movedAt.localeCompare(a.movedAt)),
     roots: readConfig().roots,
     harnesses: enabledHarnesses(),
     harnessesChosen: harnessesChosen(),
@@ -284,6 +290,7 @@ function projectRows(root, library, status = projectStatus(root)) {
       location: s.location,
       path: s.path,
       visibility: s.visibility,
+      ...s.source ? { source: s.source } : {},
       description: library.find((l) => l.name === s.name)?.description ?? readSkillInfo(s.path).description
     })
   );
@@ -633,11 +640,10 @@ var HELP_TOPICS = [
         heading: "Badges",
         lines: [
           "\u273B \u2B21 \u25CE \u2124       Claude Code, Cursor, Codex, Zed \u2014 lit when that agent loads the skill here",
-          "\xB2             Cursor reaches it through two folders (it reads several)",
           "\u26A0 loaded globally   loads in every repo on this machine, and you haven't decided about it yet",
           "\u2713 global      loads in every repo, and you keep it global on purpose (Enter \u2192 Keep global on purpose)",
-          "\u29C9 N copies    the same skill reaches agents from N places \u2014 keep one",
-          "\u25CF in sync \xB7 \u2191 update \xB7 \u270E edited \xB7 \u25CB only here",
+          "\u29C9 N copies    the same skill reaches agents from N places \u2014 Health has the fix",
+          "\u25CF in sync \xB7 \u2191 update \xB7 \u270E edited \xB7 \u25CB only here \xB7 \u2193 owner/repo  installed here by npx skills",
           "\u2713 committed   in git, so teammates get it      \xB1 changed   committed, with local edits",
           "+ not added   not committed yet                \u2205 ignored   gitignored \u2014 only on your machine"
         ]
@@ -654,8 +660,9 @@ var HELP_TOPICS = [
       {
         heading: "In a repo (only agents working in that repo see them)",
         lines: [
-          ".claude/skills   Claude Code (Cursor reads it too). Where skilllib installs your skills.",
           ".agents/skills   the shared folder: Codex, Cursor, Zed and most other agents. Repos often commit their team skills here.",
+          "                 skilllib (like `npx skills`) keeps the real copy here whenever one of your agents needs it.",
+          ".claude/skills   Claude Code (Cursor reads it too). A link to .agents/skills, or the copy itself if only Claude Code needs it.",
           ".cursor/skills   Cursor only.     .codex/skills   Cursor only (compatibility)."
         ]
       },
@@ -735,7 +742,7 @@ var HELP_TOPICS = [
           "Compat    .claude/skills, .codex/skills, ~/.claude/skills, ~/.codex/skills",
           "Plus      plugins from its marketplace, and Cursor's built-in skills",
           "Cloud Agents only see ~/.cursor/skills.",
-          "Its docs don't say what happens when two folders hold the same skill (the \xB2 badge)."
+          "A skill in two folders is listed once (tested). A plugin's copy and yours are listed separately."
         ]
       },
       {
@@ -761,7 +768,7 @@ var HELP_TOPICS = [
           "User     ~/.agents/skills",
           "Admin    /etc/codex/skills",
           "System   skills bundled by OpenAI",
-          "It does NOT read .claude/skills \u2014 skilllib links your skills into .agents/skills when Codex is on."
+          "It does NOT read .claude/skills \u2014 skilllib keeps your skills' real copies in .agents/skills."
         ]
       },
       {
@@ -802,57 +809,18 @@ var HELP_TOPICS = [
   }
 ];
 
-// src/git.ts
-import { execFileSync } from "child_process";
-import { existsSync as existsSync2 } from "fs";
-import { join as join2, relative } from "path";
-function git(root, args, input) {
-  try {
-    return execFileSync("git", args, { cwd: root, encoding: "utf-8", input, stdio: ["pipe", "pipe", "ignore"], maxBuffer: 16 * 1024 * 1024 });
-  } catch (err) {
-    const out = err.stdout;
-    return typeof out === "string" ? out : null;
-  }
-}
-function gitInfo(root) {
-  if (!existsSync2(join2(root, ".git"))) return null;
-  const dirs = [...ALL_PROJECT_DIRS, MANIFEST_FILE].filter((d) => existsSync2(join2(root, d)));
-  if (dirs.length === 0) return { of: () => "new" };
-  const tracked = (git(root, ["ls-files", "-z", "--", ...dirs]) ?? "").split("\0").filter(Boolean);
-  const dirty = (git(root, ["status", "--porcelain=v1", "-z", "--untracked-files=all", "--", ...dirs]) ?? "").split("\0").filter(Boolean).map((entry) => entry.slice(3));
-  const ignoredCache = /* @__PURE__ */ new Map();
-  const isIgnored = (rel) => {
-    if (!ignoredCache.has(rel)) {
-      const out = git(root, ["check-ignore", "--no-index", "--", rel]) ?? "";
-      ignoredCache.set(rel, out.trim().length > 0);
-    }
-    return ignoredCache.get(rel);
-  };
-  const under = (list, rel) => list.some((p) => p === rel || p.startsWith(rel + "/"));
-  return {
-    of: (relPath) => {
-      const rel = relPath.replace(/\/+$/, "");
-      if (under(tracked, rel)) return under(dirty, rel) ? "changed" : "committed";
-      return isIgnored(rel) ? "ignored" : "new";
-    }
-  };
-}
-function relativeTo(root, path) {
-  return relative(root, path).split("\\").join("/");
-}
-
 // src/review.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync3, mkdirSync, readdirSync as readdirSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
-import { join as join3 } from "path";
+import { existsSync as existsSync2, mkdirSync, readdirSync as readdirSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { join as join2 } from "path";
 var EXCERPT_CHARS = 1200;
 function tildify(p) {
   const home = userHome();
   return p.startsWith(home) ? "~" + p.slice(home.length) : p;
 }
 function skillExcerpt(dir, chars) {
-  const file = join3(dir, "SKILL.md");
-  if (!existsSync3(file)) return { text: "(SKILL.md not found)", files: 0, size: 0 };
+  const file = join2(dir, "SKILL.md");
+  if (!existsSync2(file)) return { text: "(SKILL.md not found)", files: 0, size: 0 };
   const content = readFileSync2(file, "utf-8").replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n?/, "");
   let files = 0;
   try {
@@ -923,7 +891,7 @@ Reply with a short table (skill \xB7 decision \xB7 projects \xB7 one-line reason
 `;
 }
 function copyText(text) {
-  const savedTo = join3(skilllibHome(), "review-prompt.md");
+  const savedTo = join2(skilllibHome(), "review-prompt.md");
   mkdirSync(skilllibHome(), { recursive: true });
   writeFileSync(savedTo, text);
   const tools = process.platform === "darwin" ? [["pbcopy", []]] : process.platform === "win32" ? [["clip", []]] : [
@@ -1063,15 +1031,18 @@ function versionText(r) {
 }
 var harnessName = (id) => HARNESSES.find((h) => h.id === id)?.name ?? id;
 function harnessChips(visibility, installed) {
-  return visibility.flatMap((v) => {
+  return visibility.map((v) => {
     const h = HARNESSES.find((x) => x.id === v.id);
     const on = installed && v.paths > 0;
-    return [
-      { text: ` ${h?.icon ?? "?"}`, color: on ? h?.color : color.faint, dim: !on },
-      { text: v.paths > 1 && installed ? "\xB2" : " ", color: color.yellow }
-    ];
+    return { text: ` ${h?.icon ?? "?"} `, color: on ? h?.color : color.faint, dim: !on };
   });
 }
+var BACKUP_LABEL = {
+  trash: "deleted from library",
+  "global-backup": "unloaded from global",
+  "tidy-backup": "duplicate replaced by a link",
+  plugin: "plugin removed"
+};
 var GIT_LABEL = {
   committed: { text: "\u2713 committed", color: color.green },
   changed: { text: "\xB1 changed", color: color.yellow },
@@ -1117,7 +1088,7 @@ function wrapAligned(line, width) {
 function hasLinks(root, name) {
   return ALL_PROJECT_DIRS.some((d) => {
     try {
-      return lstatSync(join4(root, d, name)).isSymbolicLink();
+      return lstatSync(join3(root, d, name)).isSymbolicLink();
     } catch {
       return false;
     }
@@ -1282,8 +1253,8 @@ function App() {
   const pKey = placeKey(place);
   function projectSections(root) {
     const where = basename3(root);
-    const git2 = gitFor(root);
-    const gitOf = (path) => git2 ? git2.of(relativeTo(root, path)) : null;
+    const git = gitFor(root);
+    const gitOf = (path) => git ? git.of(relativeTo(root, path)) : null;
     const rows = snapshot.rows.get(root) ?? [];
     const projectActions = [
       {
@@ -1336,7 +1307,8 @@ function App() {
       const dir = r.path;
       const badge = stateBadge(r.state);
       const edited = r.state.startsWith("edited");
-      const inRepo = r.location === ".agents/skills" && !r.managed;
+      const npx = r.state === "from npx skills";
+      const inRepo = r.location === ".agents/skills" && !r.managed && !npx;
       const missing = r.visibility.filter((v) => v.paths === 0);
       const seenBy = r.visibility.filter((v) => v.paths > 0);
       const notInLibrary = r.state === "local only" || r.state === "untracked, differs from library" || r.state === "repo skill" || r.state === "repo skill, differs from library";
@@ -1377,7 +1349,10 @@ function App() {
         ...r.installed && missing.length ? [{ label: `Make visible to ${missing.map((v) => harnessName(v.id)).join(", ")}`, hint: "adds links; one real copy", run: () => makeVisible() }] : [],
         ...r.installed && !r.managed && r.visibility.some((v) => v.paths > 0) && hasLinks(root, r.name) ? [{ label: "Remove links", hint: "keeps the real folder", run: removeLinks }] : []
       ];
-      if (inRepo) {
+      if (npx) {
+        primary = { label: "copy to your skills", run: copyRepoSkillToLibrary };
+        actions.push({ label: "Copy to Your skills", hint: "so other repos can use it; npx skills keeps this copy", run: copyRepoSkillToLibrary });
+      } else if (inRepo) {
         const libraryAction = r.state === "repo skill" ? { label: "Copy to Your skills", hint: "so other repos can use it; this repo keeps its copy", run: copyRepoSkillToLibrary } : r.state === "repo skill, differs from library" ? { label: "Update Your skills from this repo's copy", hint: "becomes a new version", run: copyRepoSkillToLibrary } : { label: "Already in Your skills", hint: `v${r.latest}`, run: () => say(`${r.name} matches library v${r.latest}`) };
         primary = r.state === "repo skill, in library" ? missing.length ? { label: "make visible to all", run: () => makeVisible() } : void 0 : { label: "copy to your skills", run: copyRepoSkillToLibrary };
         actions.push(libraryAction, ...visibilityActions);
@@ -1437,7 +1412,7 @@ function App() {
       }
       if (!inRepo) actions.push(...visibilityActions);
       actions.push(
-        { label: "Edit SKILL.md", run: () => void edit(join4(dir, "SKILL.md")) },
+        { label: "Edit SKILL.md", run: () => void edit(join3(dir, "SKILL.md")) },
         { label: "Open folder", run: () => openFolder(dir) },
         ...projectActions
       );
@@ -1446,11 +1421,11 @@ function App() {
       return {
         key,
         search: r.name,
-        group: prefixGroup(r.name),
+        group: npx ? { key: `repo:${r.source}`, label: r.source, about: `Installed with \`npx skills add ${r.source}\` into this repo (recorded in skills-lock.json).` } : prefixGroup(r.name),
         skill: { name: r.name, path: dir },
         tags: [
           r.installed ? "in this project" : "installable",
-          ...r.installed && r.state !== "ok" && r.state !== "repo skill, in library" ? ["needs attention"] : []
+          ...r.installed && r.state !== "ok" && r.state !== "repo skill, in library" && !npx ? ["needs attention"] : []
         ],
         row: {
           key,
@@ -1461,11 +1436,11 @@ function App() {
             },
             { text: r.name, grow: true, color: r.installed ? void 0 : color.muted },
             { text: whereLabel.padStart(8), width: 8, color: color.faint },
-            ...gitCell(r.installed ? gitOf(r.path) : null, !!git2),
+            ...gitCell(r.installed ? gitOf(r.path) : null, !!git),
             ...harnessChips(r.visibility.length ? r.visibility : enabledIds.map((id) => ({ id, paths: 0 })), r.installed),
             { text: versionText(r).padStart(8), width: 8, color: behind ? color.yellow : color.muted },
             {
-              text: r.installed && dupes(r.name) > 1 ? `  \u29C9 ${dupes(r.name)} copies` : !r.installed && globalCopy ? "  \u2197 already global" : `  ${badge.icon} ${badge.label}`,
+              text: r.installed && dupes(r.name) > 1 ? `  \u29C9 ${dupes(r.name)} copies` : !r.installed && globalCopy ? "  \u2197 already global" : `  ${badge.icon} ${npx ? r.source : badge.label}`,
               width: 19,
               color: r.installed && dupes(r.name) > 1 ? color.red : !r.installed && globalCopy ? color.yellow : badge.color
             },
@@ -1479,12 +1454,12 @@ function App() {
           dir,
           meta: [
             r.installed ? `${seenBy.length ? `loaded by ${seenBy.map((v) => `${harnessName(v.id)}${v.paths > 1 ? ` (via ${v.paths} folders)` : ""}`).join(", ")}` : "not loaded by your harnesses"}${missing.length ? ` \xB7 not ${missing.map((v) => harnessName(v.id)).join(", ")}` : ""}` : "not installed",
-            inRepo ? `committed in ${r.location}` : r.installed ? r.managed ? `v${r.version} installed in .claude/skills` : notInLibrary ? "only in this project" : "untracked copy" : "not installed",
-            ...r.installed && git2 ? [GIT_ABOUT[gitOf(r.path)]] : [],
+            npx ? `installed by npx skills from ${r.source} into ${r.location}` : inRepo ? `committed in ${r.location}` : r.installed ? r.managed ? `v${r.version} installed in ${r.location}` : notInLibrary ? "only in this project" : "untracked copy" : "not installed",
+            ...r.installed && git ? [GIT_ABOUT[gitOf(r.path)]] : [],
             r.inLibrary ? `in Your skills (v${r.latest}${origin ? `, from ${origin}` : ""})` : "not in Your skills",
             `${usesText(r.name, root)} Claude Code uses here (${USAGE_DAYS}d)`
           ],
-          ...r.installed && dupes(r.name) > 1 ? { description: `Loaded ${dupes(r.name)} times here: ${copiesOf(r.name).join(" \xB7 ")}. Agents may see it twice \u2014 keep one.` } : {}
+          ...r.installed && dupes(r.name) > 1 ? { description: `Reaches your agents from ${dupes(r.name)} places: ${copiesOf(r.name).join(" \xB7 ")}. Health has the fix (your skill wins over plugins).` } : {}
         }
       };
     };
@@ -1535,7 +1510,7 @@ function App() {
             { text: "\u25C8 ", color: color.accentDim },
             { text: m.name, grow: true },
             { text: (m.kind === "global" || m.kind === "skills.sh" ? "global" : m.kind).padStart(8), width: 8, color: color.faint },
-            ...gitCell(null, !!git2),
+            ...gitCell(null, !!git),
             ...harnessChips(enabledIds.map((id) => ({ id, paths: m.harnesses.includes(id) ? 1 : 0 })), true),
             { text: "", width: 8 },
             {
@@ -1556,7 +1531,7 @@ function App() {
             `${m.kind}: ${m.origin}`,
             kept ? "yours: kept global on purpose" : m.movable ? "yours: the cleanup wizard can scope it to projects" : "managed by the vendor"
           ],
-          description: dupes(m.name) > 1 ? `Loaded ${dupes(m.name)} times here: ${copiesOf(m.name).join(" \xB7 ")}. Agents may see it twice \u2014 keep one.` : sourceGroup(m)?.about
+          description: dupes(m.name) > 1 ? `Reaches your agents from ${dupes(m.name)} places: ${copiesOf(m.name).join(" \xB7 ")}. Health has the fix (your skill wins over plugins).` : sourceGroup(m)?.about
         }
       };
     };
@@ -1601,12 +1576,23 @@ function App() {
         preview: {
           title: "Make every skill usable by all your agents",
           meta: [`${plural2(partial.length, "skill")} missing for ${missingAgents.map(harnessName).join(", ")}`],
-          description: `Adds relative symlinks so each agent's folder reaches the one real copy (e.g. .claude/skills/<name> \u2192 .agents/skills/<name>). The repo's files aren't changed; folders git tracks need your OK first. Cursor reads several folders, so it may see a linked skill through two paths (shown as \xB2).`
+          description: `Adds relative symlinks so each agent's folder reaches the one real copy (e.g. .claude/skills/<name> \u2192 .agents/skills/<name>). The repo's files aren't changed; folders git tracks need your OK first. Cursor lists a skill it reaches through several folders once.`
         }
       }
     ] : [];
     const fromLibrary = local.filter((r) => r.managed || r.state === "untracked copy of library skill");
-    const repoOwn = local.filter((r) => !fromLibrary.includes(r));
+    const fromNpx = local.filter((r) => r.state === "from npx skills");
+    const repoOwn = local.filter((r) => !fromLibrary.includes(r) && !fromNpx.includes(r));
+    const copyAllToLibrary = (members) => [
+      {
+        label: `Copy all ${members.length} into your library`,
+        hint: "the repo keeps its copies",
+        run: () => act(() => {
+          const added = members.map((m) => importSkill(m.skill.path, { force: true })).filter((r) => r.status !== "unchanged").length;
+          return ok(`${plural2(added, "skill")} copied into your library`);
+        })
+      }
+    ];
     const yours = globals.filter((m) => m.movable);
     const keptYours = yours.filter((m) => snapshot.keptGlobal.has(m.name));
     const unreviewed = yours.filter((m) => !snapshot.keptGlobal.has(m.name));
@@ -1649,20 +1635,8 @@ function App() {
             }
           ]
         },
-        {
-          title: `The repo's own (${repoOwn.length})`,
-          items: repoOwn.map(item),
-          groupActions: (members) => [
-            {
-              label: `Copy all ${members.length} into your library`,
-              hint: "the repo keeps its copies",
-              run: () => act(() => {
-                const added = members.map((m) => importSkill(m.skill.path, { force: true })).filter((r) => r.status !== "unchanged").length;
-                return ok(`${plural2(added, "skill")} copied into your library`);
-              })
-            }
-          ]
-        },
+        { title: `From npx skills (${fromNpx.length})`, items: fromNpx.map(item), groupActions: copyAllToLibrary },
+        { title: `The repo's own (${repoOwn.length})`, items: repoOwn.map(item), groupActions: copyAllToLibrary },
         {
           title: `\u26A0 Global \xB7 yours, not reviewed, loaded in every repo (${unreviewed.length})`,
           items: [...cleanupItem, ...unreviewed.map(globalItem)],
@@ -1754,7 +1728,7 @@ function App() {
         primary: { label: "choose projects", run: toggleProjects.run },
         actions: [
           toggleProjects,
-          { label: "Edit SKILL.md", hint: "saving creates a new version", run: () => void edit(join4(librarySkillDir(l.name), "SKILL.md")) },
+          { label: "Edit SKILL.md", hint: "saving creates a new version", run: () => void edit(join3(librarySkillDir(l.name), "SKILL.md")) },
           { label: "Open folder", run: () => openFolder(librarySkillDir(l.name)) },
           {
             label: "Copy review prompt",
@@ -2182,7 +2156,12 @@ function App() {
         title: "Issues",
         items: snapshot.issues.map((issue) => {
           const fix = issue.fix;
-          const run = fix ? () => confirm(`${fix.label}?`, () => ok(fix.run())) : void 0;
+          const result = (c) => {
+            const r = runFix(c);
+            return r.ok ? ok(r.message) : warn(r.message);
+          };
+          const choices = (issue.choices ?? []).map((c) => ({ label: c.label, hint: c.hint, run: () => act(() => result(c)) }));
+          const run = fix ? () => confirm(`${fix.label}?`, () => result(fix)) : choices.length ? () => setOverlay({ type: "menu", title: issue.title, index: 0, build: () => choices }) : void 0;
           return {
             key: issue.id,
             search: issue.title,
@@ -2196,10 +2175,10 @@ function App() {
               ]
             },
             primary: run ? { label: "fix", run } : void 0,
-            actions: run && fix ? [{ label: fix.label, run }] : [],
+            actions: fix && run ? [{ label: fix.label, run }] : choices,
             preview: {
               title: issue.title,
-              meta: [issue.severity, fix ? `fix: ${fix.label.toLowerCase()}` : "no automatic fix"],
+              meta: [issue.severity, fix ? `fix: ${fix.label.toLowerCase()}` : choices.length ? `${choices.length} ways to fix it: pick one` : "no automatic fix"],
               description: issue.detail
             }
           };
@@ -2209,7 +2188,7 @@ function App() {
         title: "Moved out \xB7 restorable",
         items: snapshot.backups.map((b) => {
           const restore = () => act(() => {
-            const r = restoreBackup(b);
+            const r = b.kind === "plugin" ? restorePlugin(b) : restoreBackup(b);
             return r.ok ? ok(`${b.name} restored to ${tildify2(r.to)}`) : warn(`Can't restore ${b.name}: ${r.reason}`);
           });
           return {
@@ -2220,7 +2199,7 @@ function App() {
               key: b.path,
               cells: [
                 { text: b.name, grow: true },
-                { text: b.kind === "trash" ? " deleted from library" : " unloaded from global", color: color.muted },
+                { text: ` ${BACKUP_LABEL[b.kind]}`, color: color.muted },
                 { text: `   ${b.movedAt}`, color: color.faint }
               ]
             },
@@ -2229,7 +2208,7 @@ function App() {
             preview: {
               title: b.name,
               dir: b.path,
-              meta: [b.kind === "trash" ? "deleted from the library" : "removed from ~/.claude/skills", `moved ${b.movedAt}`]
+              meta: [b.kind === "plugin" ? "Claude Code plugin; restoring reinstalls it" : `from ${tildify2(b.from)}`, `moved ${b.movedAt}`]
             }
           };
         })
@@ -2280,7 +2259,7 @@ function App() {
         if (!r.ok) return say(`Can't create ${value}: ${r.reason}`, false);
         setSelected((s) => ({ ...s, "right:library": value.trim() }));
         reload();
-        void edit(join4(r.dir, "SKILL.md"));
+        void edit(join3(r.dir, "SKILL.md"));
       }
     });
   }
@@ -2472,7 +2451,7 @@ function App() {
         "Skills your harnesses load in EVERY project (~/.claude/skills, ~/.agents/skills, plugins\u2026). Move yours into the library and add them only where needed."
       ],
       help: ["Help", "Where skills come from, and how Claude Code, Cursor, Codex and Zed find and use them. Press enter (or ? anywhere)."],
-      health: ["Health", "Broken links, skills loaded twice, out-of-date projects, repo-only skills \u2014 and everything skilllib moved out, ready to restore."],
+      health: ["Health", "Broken links, duplicates, copies that differ, plugins that repeat your skills, skills some agents can't reach, out-of-date projects \u2014 and everything skilllib moved out, ready to restore."],
       settings: ["Settings", `Harnesses: ${snapshot.harnesses.map(harnessName).join(", ") || "none"} \xB7 Folders: ${snapshot.roots.map(tildify2).join(", ") || "none yet"}`]
     };
     const [title, description] = about[place.kind] ?? ["", ""];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skilllib",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Manage your agent skills like dependencies. One library for all your skills; each repo gets only the ones it needs, and every agent can see them. Works with Claude Code, Cursor, Codex and Zed.",
   "keywords": [
     "agent-skills",