skilllib 1.11.4 → 1.11.6

package/README.md

@@ -270,7 +270,7 @@ The same skill often reaches your agents more than once: a copy in `.claude/skil
 | Links no agent you use needs | Removes them. It keeps links that `skilllib.json` records, because teammates may use other agents. |
 | **Copies that differ** | Shows which agent runs which copy (e.g. Claude Code and Cursor run `.claude`, Codex runs `.agents`), and lets you pick the one to keep. It's your call, so **Fix all** never does it. |
 | Copies that differ behind a link (a link to another copy, in or out of the repo) | Reported only: skilllib never changes what a link points to. Make the copies the same, or remove the link. |
-| A Claude Code plugin with the same skill | Your skill wins. skilllib copies all the plugin's skills into Your skills, then removes the plugin or turns it off (`claude plugin uninstall` / `disable`). If the plugin also brings MCP servers, hooks, agents or commands, turning it off is the default. When the overlap is in one repo, you can instead turn the plugin off only there (in its `.claude/settings.local.json`: Claude Code makes git ignore it when it writes it; without the `claude` command, skilllib writes the file itself and makes git ignore it), or remove your copy from that repo. If the repo commits its copy, it's the team's: skilllib never offers to remove it. A plugin that a repo's own `.claude/settings.json` turns on counts only in that repo. Cursor ignores repo settings: after a repo turns the plugin off, Cursor still lists both there, and only turning the plugin off or removing it changes that. |
+| A Claude Code plugin with the same skill | Your skill wins. skilllib copies the plugin's other skills into Your skills, then removes the plugin or turns it off (`claude plugin uninstall` / `disable`; a plugin only turned on in your settings, or synced from claude.ai, can only be turned off). If the plugin also brings MCP servers, hooks, agents or commands, turning it off is the default. When the overlap is in one repo, you can instead turn the plugin off only there (in its `.claude/settings.local.json`: Claude Code makes git ignore it when it writes it; without the `claude` command, skilllib writes the file itself and makes git ignore it), or remove your copy from that repo. If the repo commits its copy, it's the team's: skilllib never offers to remove it. A plugin that a repo's own `.claude/settings.json` turns on counts only in that repo. Cursor ignores repo settings: after a repo turns the plugin off, Cursor still lists both there, and only turning the plugin off or removing it changes that. |
 | A Cursor plugin with the same skill | Reported only. Turn the plugin off in Cursor. |
 | A repo copy of a skill you keep global | The repo copy is the extra one: remove it, or stop loading the skill globally after all. Claude Code runs the global copy anyway. |
 | A repo's own skill that also loads globally | Stop loading it globally (when no agent in any of your repos would then lack it). The repo's copy is the team's, so skilllib never offers to remove it. |

package/dist/{chunk-CS6T66EE.js → chunk-TXQQQ73J.js}

@@ -774,7 +774,7 @@ function isLink(path) {
 function notWritable(root, dir) {
   const top = realpathOrNull(root) ?? root;
   let p = root;
-  for (const part of dir.split("/")) {
+  for (const part of dir.split(/[\\/]/)) {
     p = join8(p, part);
     if (!entryExists(p)) return null;
     const real = realpathOrNull(p);
@@ -1230,6 +1230,9 @@ function addPlan(root, name, hash, force) {
   }
   return { manifest, recorded, primary, wantedLinks, to, local };
 }
+function withoutForceHint(reason) {
+  return reason.replace(/ \(use --force[^)]*\)$/, "");
+}
 function addRefusal(root, name, hash) {
   const plan = addPlan(root, name, hash, false);
   return "reason" in plan ? plan.reason : null;
@@ -1640,6 +1643,9 @@ import { basename as basename9, join as join15, resolve as resolve8, sep as sep8
 import { execFileSync as execFileSync2 } from "child_process";
 import { existsSync as existsSync9, realpathSync as realpathSync4 } from "fs";
 import { isAbsolute as isAbsolute2, join as join10, relative as relative3, sep as sep5 } from "path";
+function isShared(state) {
+  return state === "committed" || state === "changed";
+}
 function git(root, args, input) {
   try {
     return execFileSync2("git", args, { cwd: root, encoding: "utf-8", input, stdio: ["pipe", "pipe", "ignore"], maxBuffer: 16 * 1024 * 1024 });
@@ -1708,6 +1714,9 @@ import { basename as basename6, dirname as dirname6, isAbsolute as isAbsolute3,
 import { execFileSync as execFileSync3 } from "child_process";
 import { existsSync as existsSync10, mkdirSync as mkdirSync6, readdirSync as readdirSync5, readFileSync as readFileSync6, statSync as statSync4, writeFileSync as writeFileSync4 } from "fs";
 import { basename as basename4, dirname as dirname4, join as join11, resolve as resolve7 } from "path";
+function pluginNameOf(id) {
+  return id.split("@")[0];
+}
 function nonEmptyDir(path) {
   try {
     return readdirSync5(path).some((f) => !f.startsWith("."));
@@ -1898,6 +1907,10 @@ 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 unplaced(p, verb) {
+  if (!p.scope || p.scope === "user" || p.projectPath) return null;
+  return { ok: false, message: `${p.id}: skilllib doesn't know which project it's installed in; run \`claude plugin ${verb} ${p.id} --scope ${p.scope}\` there` };
+}
 function settingsFileOf(p) {
   if (p.synced || !p.scope || p.scope === "user") return join11(claudeDir(), "settings.json");
   if (!p.projectPath) return null;
@@ -1909,7 +1922,8 @@ function whereOf(p) {
 function setPluginOn(p, on) {
   const shared = p.scope === "project" && p.projectPath ? "; it's in .claude/settings.json, which git tracks, so commit it if the team should get it" : "";
   const done = { ok: true, message: `${p.id} is ${on ? "on" : "off"}${whereOf(p)}${p.synced ? "" : "; Claude Code picks it up in its next session"}${shared}` };
-  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 lost = unplaced(p, on ? "enable" : "disable");
+  if (lost) return lost;
   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);
@@ -1923,7 +1937,8 @@ function setPluginOn(p, on) {
 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 lost = unplaced(p, "uninstall");
+  if (lost) return lost;
   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}` };
@@ -1949,9 +1964,8 @@ function removedFile() {
 }
 function removePlugin(plugin, how) {
   if (plugin.settingsOnly && how === "delete") return { ok: false, message: `${plugin.id} isn't installed, only turned on in your settings: turn it off instead` };
-  if (plugin.scope && plugin.scope !== "user" && !plugin.projectPath) {
-    return { ok: false, message: `${plugin.id}: installed for one project; run \`claude plugin ${how === "delete" ? "uninstall" : "disable"} ${plugin.id} --scope ${plugin.scope}\` there` };
-  }
+  const lost = unplaced(plugin, how === "delete" ? "uninstall" : "disable");
+  if (lost) return lost;
   const viaSettings = plugin.synced || plugin.settingsOnly || !claudeBinary() && how === "off" && !plugin.projectPath;
   if (!viaSettings && !claudeBinary()) {
     return { ok: false, message: `${plugin.id}: nothing changed; Claude Code's CLI didn't run (tried \`claude\` on your PATH and ~/.local/bin/claude)` };
@@ -2003,7 +2017,7 @@ function restorePlugin(backup) {
   return { ok: true, to: where };
 }
 function cursorPluginSkills(plugins = cursorPlugins()) {
-  return plugins.flatMap((p) => p.skills.map((path) => ({ name: basename4(path), plugin: p.id.split("@")[0], path })));
+  return plugins.flatMap((p) => p.skills.map((path) => ({ name: basename4(path), plugin: pluginNameOf(p.id), path })));
 }
 
 // src/tidy.ts
@@ -2020,6 +2034,9 @@ function entriesOf(dirs, name) {
     return [{ dir, path, link: link2, real, hash: null }];
   });
 }
+function uniqueReals(entries) {
+  return entries.filter((e, i, all) => !e.link && all.findIndex((o) => !o.link && o.real === e.real) === i);
+}
 function hashReals(reals) {
   if (reals.length > 1) for (const r of reals) r.hash = treeHash(r.path);
 }
@@ -2060,15 +2077,16 @@ function planProjectTidy(root, { keep = {}, enabled = enabledHarnesses() } = {})
   let git2;
   const skillsLock = projectSkillsLock(root);
   const dirs = repoTidyDirs(root).map(abs);
+  const realRoot = realpathOrNull(root) ?? root;
   for (const name of namesIn(dirs)) {
     const entries = entriesOf(dirs, name);
-    const external = entries.find((e) => e.link && e.real && !(e.real + sep6).startsWith(realpathOrNull(root) + sep6));
+    const external = entries.find((e) => e.link && e.real && !(e.real + sep6).startsWith(realRoot + sep6));
     if (external) {
       const differs = entries.some((e) => e !== external && e.real && existsSync11(join12(e.real, "SKILL.md")) && treeHash(e.real) !== treeHash(external.real));
       report.skipped.push({ name, reason: `${rel(external.path)} links outside the repo`, ...differs ? { differs } : {} });
       continue;
     }
-    const reals = entries.filter((e, i, all) => !e.link && all.findIndex((o) => !o.link && realpathOrNull(o.path) === realpathOrNull(e.path)) === i);
+    const reals = uniqueReals(entries);
     if (reals.length === 0) continue;
     hashReals(reals);
     const dep = skills[name];
@@ -2083,7 +2101,7 @@ function planProjectTidy(root, { keep = {}, enabled = enabledHarnesses() } = {})
       if (git2 === void 0) git2 = gitInfo(root);
       const planned = installDirs(enabled).map(abs);
       const fromSkillsSh = name in skillsLock;
-      const rank = (e) => (git2 && ["committed", "changed"].includes(git2.of(rel(e.path))) ? 0 : 1e3) + (fromSkillsSh && e.dir === abs(AGENTS_SKILLS_DIR) ? 0 : 100) + (planned.includes(e.dir) ? planned.indexOf(e.dir) : 50);
+      const rank = (e) => (isShared(git2?.of(rel(e.path))) ? 0 : 1e3) + (fromSkillsSh && e.dir === abs(AGENTS_SKILLS_DIR) ? 0 : 100) + (planned.includes(e.dir) ? planned.indexOf(e.dir) : 50);
       primary = [...reals].sort((a, b) => rank(a) - rank(b))[0];
     }
     if (!primary) continue;
@@ -2103,12 +2121,12 @@ function planProjectTidy(root, { keep = {}, enabled = enabledHarnesses() } = {})
       const needed = wanted.has(e.dir);
       if (e.link) {
         if (e.real === primary.real) {
-          if (!needed && !dep && ["committed", "changed"].includes((git2 ??= gitInfo(root))?.of(rel(e.path)) ?? "")) continue;
+          if (!needed && !dep && isShared((git2 ??= gitInfo(root))?.of(rel(e.path)))) continue;
           if (!needed) steps.push({ kind: "unlink", path: e.path });
         } else steps.push(needed ? { kind: "link", path: e.path, target: primary.path } : { kind: "unlink", path: e.path });
       } else {
         const differs = e.hash !== primary.hash ? { differs: true } : {};
-        if (!needed && ["committed", "changed"].includes((git2 ??= gitInfo(root))?.of(rel(e.path)) ?? "")) continue;
+        if (!needed && !chosen && isShared((git2 ??= gitInfo(root))?.of(rel(e.path)))) continue;
         steps.push(needed ? { kind: "replace", path: e.path, target: primary.path, ...differs } : { kind: "remove", path: e.path, ...differs });
       }
     }
@@ -2132,7 +2150,7 @@ function planGlobalTidy({ keep = {}, enabled = enabledHarnesses() } = {}) {
       report.skipped.push({ name, reason: "a Claude Code plugin kept in a skills folder" });
       continue;
     }
-    const reals = entries.filter((e, i, all) => !e.link && all.findIndex((o) => !o.link && realpathOrNull(o.path) === realpathOrNull(e.path)) === i);
+    const reals = uniqueReals(entries);
     if (reals.length < 2) continue;
     hashReals(reals);
     const kept = reals.find((r) => r.dir === keep[name]);
@@ -2148,13 +2166,13 @@ function planGlobalTidy({ keep = {}, enabled = enabledHarnesses() } = {}) {
 }
 function gitVisibleSteps(plan, git2 = plan.root ? gitInfo(plan.root) : null) {
   if (!plan.root || !git2) return [];
-  const shared = (rel) => ["committed", "changed"].includes(git2.of(rel));
+  const shared = (rel) => isShared(git2.of(rel));
   const dep = readManifest(plan.root).skills[plan.name];
   const recordsLink = (s) => !!dep && (s.kind === "link" || s.kind === "replace") && !dep.links?.includes(relativeTo(plan.root, dirname5(s.path)));
   return plan.steps.filter((s) => shared(relativeTo(plan.root, s.path)) || recordsLink(s) && shared(MANIFEST_FILE));
 }
-function applyTidy(plan, { git: git2 = "keep", info: info2 } = {}) {
-  const held = git2 === "keep" ? gitVisibleSteps(plan, info2) : [];
+function applyTidy(plan, { git: git2 = "keep" } = {}) {
+  const held = git2 === "keep" ? gitVisibleSteps(plan) : [];
   const applied = [];
   for (const step of plan.steps) {
     if (held.includes(step) || !entryExists(step.path) || "target" in step && !entryExists(step.target)) continue;
@@ -2244,7 +2262,7 @@ var gitOf = (root) => {
 };
 var gitNote = (root, paths) => {
   const git2 = gitOf(root);
-  return paths.some((p) => ["committed", "changed"].includes(git2?.of(relativeTo(root, p)) ?? "")) ? "; git will see it" : "";
+  return paths.some((p) => isShared(git2?.of(relativeTo(root, p)))) ? "; git will see it" : "";
 };
 var agentNames = (ids) => ids.map((id) => harness(id).name).join(", ");
 function conflictIssue(c) {
@@ -2265,6 +2283,7 @@ function conflictIssue(c) {
     at: rows(c.root, [c.name]),
     choices: winners.flatMap((x) => {
       const plan = planFor(x.dir);
+      if (!plan?.steps.length) return [];
       const visible2 = plan ? gitVisibleSteps(plan).map((s) => describeStep(s, c.root)) : [];
       const label = `Keep the ${folderLabel(c.root, x.dir)} copy`;
       if (!visible2.length) return [{ label, hint: x.dir === c.managed ? "skilllib's version" : "the others become links to it", run: keep(x.dir, "go") }];
@@ -2330,7 +2349,7 @@ function brokenLinksIn(root, opened) {
         root,
         folders2.map((f) => placeOf(f.real)).filter((p) => p !== "" && p !== ".." && !p.startsWith("../") && !isAbsolute3(p))
       );
-      const tracked = ["committed", "changed"].includes(git2?.of(placeOf(join13(real, name))) ?? "");
+      const tracked = isShared(git2?.of(placeOf(join13(real, name))));
       const recorded = !!own && mends(own, relative4(own, real).split(sep7).join("/"), name);
       const pinnedThere = own ? ` ${placeOf(own)} has its own skilllib.json${recorded ? `, which records this link: skilllib sync in ${placeOf(own)} brings back what it points to` : ""}.` : "";
       return [
@@ -2463,7 +2482,7 @@ function findIssues(roots, machine, libraryNames, statusOf = projectStatus, load
     const dupes = names.filter((n) => libraryNames.has(n) || loadedYours.has(n));
     if (!dupes.length) continue;
     const others = plugin.skills.length - dupes.length;
-    const pluginName = plugin.id.split("@")[0];
+    const pluginName = pluginNameOf(plugin.id);
     const remove2 = {
       label: `Remove the plugin ${plugin.id}`,
       hint: plugin.extras.length ? `also removes its ${plugin.extras.join(", ")}` : "restorable with skilllib restore",
@@ -2520,7 +2539,7 @@ function findIssues(roots, machine, libraryNames, statusOf = projectStatus, load
         id: `plugin:${root}:${plugin.id}`,
         severity: "problem",
         title: `${dupes.join(", ")}: also in the Claude Code plugin ${plugin.id}, on in ${where}`,
-        detail: `${where}'s Claude Code settings turn the plugin on, so Claude Code loads both there (the plugin's as /${plugin.id.split("@")[0]}:${dupes[0]}). Your skill wins.`,
+        detail: `${where}'s Claude Code settings turn the plugin on, so Claude Code loads both there (the plugin's as /${pluginNameOf(plugin.id)}:${dupes[0]}). Your skill wins.`,
         choices: repoChoices(plugin, root, inRepo),
         at: rows(root, dupes),
         plugin: plugin.id
@@ -2653,7 +2672,7 @@ function findIssues(roots, machine, libraryNames, statusOf = projectStatus, load
     }
     const drifted = unstuck.filter((s) => s.state === "out of sync" && knownPin(s));
     if (drifted.length) {
-      const seen = drifted.some((s) => ["committed", "changed"].includes(gitOf(root)?.of(relativeTo(root, s.path)) ?? ""));
+      const seen = drifted.some((s) => isShared(gitOf(root)?.of(relativeTo(root, s.path))));
       const yours = drifted.some((s) => untrackable(s));
       const install = {
         label: "Install the pinned versions",
@@ -2701,7 +2720,7 @@ function findIssues(roots, machine, libraryNames, statusOf = projectStatus, load
         choices: [
           {
             label: "Update to the newest versions",
-            hint: ["committed", "changed"].includes(gitOf(root)?.of(MANIFEST_FILE) ?? "") ? "git will see the new copies and skilllib.json" : "replaces each copy with your library's newest",
+            hint: isShared(gitOf(root)?.of(MANIFEST_FILE)) ? "git will see the new copies and skilllib.json" : "replaces each copy with your library's newest",
             run: () => summarize(where, "updated", updateProject(root, behind.map((s) => s.name)))
           }
         ]
@@ -2784,7 +2803,7 @@ function findIssues(roots, machine, libraryNames, statusOf = projectStatus, load
     if (partial.length) {
       const missing2 = [...new Set(partial.flatMap((s) => s.visibility.filter((v) => v.paths === 0).map((v) => v.id)))];
       const tracked = [...new Set(blindHere.flatMap(({ would }) => would.blocked))];
-      const manifestShared = partial.some((s) => s.managed) && ["committed", "changed"].includes(gitOf(root)?.of(MANIFEST_FILE) ?? "");
+      const manifestShared = partial.some((s) => s.managed) && isShared(gitOf(root)?.of(MANIFEST_FILE));
       const run = (allowTracked) => () => {
         if (allowTracked) allowTrackedLinks(root);
         const r = linkAll(root, { allowTracked, names: partial.map((s) => s.name) });
@@ -2813,7 +2832,7 @@ function findIssues(roots, machine, libraryNames, statusOf = projectStatus, load
     }
     const differing = new Set(tidy2.conflicts.map((c) => c.name));
     const git2 = gitOf(root);
-    const committed = (s) => ["committed", "changed"].includes(git2?.of(relativeTo(root, s.path)) ?? "");
+    const committed = (s) => isShared(git2?.of(relativeTo(root, s.path)));
     for (const s of unstuck) {
       if (isLink(s.path) || differing.has(s.name)) continue;
       if (s.state === "local only" && (committed(s) || untrackable(s))) {
@@ -2866,7 +2885,7 @@ function findIssues(roots, machine, libraryNames, statusOf = projectStatus, load
         });
       } else if (s.state === "untracked, differs from library" || s.state === "repo skill, differs from library") {
         const teams = s.state.startsWith("repo skill") || committed(s) || !!untrackable(s);
-        const whose = s.state.startsWith("repo skill") || committed(s) ? "It's the team's copy (committed, or in the repo's own .agents/skills)" : `${untrackable(s)}, so skilllib can't track it here`;
+        const whose = s.state.startsWith("repo skill") || committed(s) ? "It's the team's copy (committed, or in the repo's own .agents/skills or .grok/skills)" : `${untrackable(s)}, so skilllib can't track it here`;
         issues.push({
           id: `differs:${root}:${s.name}`,
           severity: "suggestion",
@@ -3123,7 +3142,7 @@ function usageIssues(projects2, machine, libraryNames, uses, statusOf = projectS
   }
   if (uses.asUsed)
     for (const p of installedPlugins().filter((x) => x.agent === "claude-code" && x.on && x.skills.length)) {
-      const name = p.id.split("@")[0];
+      const name = pluginNameOf(p.id);
       if (p.skills.some((path) => uses.asUsed(`${name}:${basename6(path)}`) > 0)) continue;
       issues.push({
         id: `plugin-unused:${installId(p)}`,
@@ -3203,7 +3222,7 @@ function usableHere(root, uses = /* @__PURE__ */ new Map()) {
       const loadedBy = s.visibility.filter((v) => v.paths > 0).map((v) => v.id);
       const behind = s.state.endsWith("update available");
       const gitState = git2?.of(relativeTo(root, s.path));
-      const repo = !s.managed && (s.state.startsWith("repo skill") || gitState === "committed" || gitState === "changed");
+      const repo = !s.managed && (s.state.startsWith("repo skill") || isShared(gitState));
       const usual = s.state === "ok" || s.state === "local only" || repo && s.state !== "from npx skills";
       const attrs = {
         source: s.managed ? "library" : repo ? "repo" : "local",
@@ -3367,7 +3386,14 @@ function transcriptFiles(sinceMs) {
   return list2(base).flatMap((project) => {
     const dir = join14(base, project);
     if (!statSync5(dir, { throwIfNoEntry: false })?.isDirectory()) return [];
-    return list2(dir).filter((f) => f.endsWith(".jsonl")).map((f) => join14(dir, f)).filter((f) => (statSync5(f, { throwIfNoEntry: false })?.mtimeMs ?? 0) >= sinceMs);
+    return list2(dir).filter((f) => f.endsWith(".jsonl")).map((f) => join14(dir, f)).filter((f) => {
+      try {
+        const st = statSync5(f);
+        return st.isFile() && st.mtimeMs >= sinceMs;
+      } catch {
+        return false;
+      }
+    });
   });
 }
 async function scanUsage(days) {
@@ -3430,7 +3456,7 @@ function moveGlobalSkills(skills, roots, {
     const elsewhere = blindWithoutGlobal(name, copies, knownProjects().filter((p) => !roots.some((r) => realPath(r) === realPath(p))));
     if (elsewhere.length) return { name, moved: false, reason: `nothing moved: ${blindSaid(name, elsewhere, label)}`, changes: [] };
     const hash = treeHash(copies[0].path) ?? "";
-    const cant = roots.flatMap((root) => ((b) => b ? [`${label(root)} (${b.replace(/ \(use --force to replace (it|the link)\)$/, "")})`] : [])(trackBlocker(root, name) ?? addRefusal(root, name, hash)));
+    const cant = roots.flatMap((root) => ((b) => b ? [`${label(root)} (${withoutForceHint(b)})`] : [])(trackBlocker(root, name) ?? addRefusal(root, name, hash)));
     if (cant.length) return { name, moved: false, reason: `nothing moved: it can't be added to ${cant.join(", ")}`, changes: [] };
     const imported = importSkill(copies[0].path).status;
     if (imported === "exists")
@@ -3438,7 +3464,7 @@ function moveGlobalSkills(skills, roots, {
     if (group) recordOrigin(name, `group: ${group}`);
     const changes = roots.map((root) => [root, addSkill(root, name, { allowTracked })]);
     const skipped = changes.filter(([, c]) => c.action === "skipped");
-    const why = (reason = "") => reason.replace(/ \(use --force to replace it\)$/, ": move or remove it there first");
+    const why = (reason = "") => withoutForceHint(reason) === reason ? reason : `${withoutForceHint(reason)}: move or remove it there first`;
     const kept = imported === "added" ? `; it's in Your skills now` : "";
     if (skipped.length) return { name, moved: false, reason: `not added to ${skipped.map(([r, c]) => `${label(r)} (${why(c.reason)})`).join(", ")}, so it still loads globally${kept}`, changes };
     const blindIn = changes.flatMap(([root, c]) => ((b) => b.length ? [{ root, c, b }] : [])(blindWithoutGlobal(name, copies, [root])));
@@ -3471,6 +3497,7 @@ var FLAGS = {
   keep: { type: "string" },
   to: { type: "string", multiple: true }
 };
+var VALUE_FLAGS = Object.entries(FLAGS).flatMap(([name, f]) => f.type === "string" ? [`--${name}`] : []);
 function parseArgs(argv) {
   const { values: v, positionals } = parseFlags({ args: argv, options: FLAGS, allowPositionals: true, strict: true });
   const days = Number(v.days ?? USAGE_DAYS);
@@ -3688,7 +3715,7 @@ async function list(args) {
 }
 function teamStateIn(root, extraDirs = []) {
   const git2 = gitInfo(root, [...new Set(extraDirs)]);
-  const committed = (path) => ["committed", "changed"].includes(git2?.of(relativeTo(root, path)) ?? "");
+  const committed = (path) => isShared(git2?.of(relativeTo(root, path)));
   const asRepo = {
     "local only": "repo skill",
     "untracked copy of library skill": "repo skill, in library",
@@ -4231,7 +4258,8 @@ function tidy(args) {
     for (const s of report.skipped.filter((x) => !names.length || names.includes(x.name))) info(dim(`- ${label} \xB7 ${s.name}: skipped, ${s.reason}`));
   }
   if (args.dryRun) info(dim("\nNothing changed (--dry-run)."));
-  else if (changed) info(dim("\nReplaced copies are in ~/.skilllib/tidy-backup; `skilllib restore` puts them back."));
+  else if (changed) info(dim(`
+Replaced copies are in ${tildify(join15(skilllibHome(), "tidy-backup"))}; \`skilllib restore\` puts them back.`));
   if (held) {
     process.exitCode = 1;
     info(dim(`${held} change${held === 1 ? "" : "s"} held back because git would see them. Re-run with --allow-git to make them.`));
@@ -4316,6 +4344,7 @@ export {
   projectStatus,
   linkEverywhere,
   relinkDependency,
+  withoutForceHint,
   addRefusal,
   addSkill,
   removeSkill,
@@ -4329,6 +4358,7 @@ export {
   listBackups,
   movedTogether,
   restoreBackup,
+  isShared,
   gitInfo,
   relativeTo,
   installedPlugins,
@@ -4351,6 +4381,7 @@ export {
   scanUsage,
   skillOf,
   moveGlobalSkills,
+  VALUE_FLAGS,
   parseArgs,
   projectOfFactory,
   status,

package/dist/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import {
+  VALUE_FLAGS,
   add,
   agentSkill,
   apply,
@@ -30,7 +31,7 @@ import {
   unhide,
   update,
   usage
-} from "./chunk-CS6T66EE.js";
+} from "./chunk-TXQQQ73J.js";
 
 // src/index.ts
 import { readFileSync } from "fs";
@@ -125,7 +126,7 @@ async function main() {
   const argv = process.argv.slice(2);
   setJsonMode(argv.includes("--json"));
   let at = 0;
-  while (argv[at]?.startsWith("--") && !["--version", "--help"].includes(argv[at])) at += ["--days", "--keep", "--to"].includes(argv[at]) ? 2 : 1;
+  while (argv[at]?.startsWith("--") && !["--version", "--help"].includes(argv[at])) at += VALUE_FLAGS.includes(argv[at]) ? 2 : 1;
   const command = argv[at];
   const rest = [...argv.slice(0, at), ...argv.slice(at + 1)];
   const args = parseArgs(rest);
@@ -137,10 +138,10 @@ async function main() {
   if (!["--version", "-v", "version", "help", "--help", "-h"].includes(command ?? "")) refreshAgentSkill();
   switch (command) {
     case void 0:
-      return process.stdin.isTTY && process.stdout.isTTY ? (await import("./tui-BDLJOMSC.js")).tui() : overview(args);
+      return process.stdin.isTTY && process.stdout.isTTY ? (await import("./tui-OS2VUBGF.js")).tui() : overview(args);
     case "ui":
       if (!process.stdin.isTTY || !process.stdout.isTTY) throw new Error("`skilllib ui` needs an interactive terminal. Agents and scripts: use `skilllib status --json`.");
-      return (await import("./tui-BDLJOMSC.js")).tui();
+      return (await import("./tui-OS2VUBGF.js")).tui();
     case "status":
       return status(args);
     case "add":

package/dist/{tui-BDLJOMSC.js → tui-OS2VUBGF.js}

@@ -29,6 +29,7 @@ import {
   installDirs,
   installedPlugins,
   isDir,
+  isShared,
   keptGlobal,
   knownProjects,
   latestVersion,
@@ -81,8 +82,9 @@ import {
   updateProject,
   usageIssues,
   versionHistory,
-  visibleProjects
-} from "./chunk-CS6T66EE.js";
+  visibleProjects,
+  withoutForceHint
+} from "./chunk-TXQQQ73J.js";
 
 // src/tui/index.tsx
 import { render } from "ink";
@@ -932,7 +934,7 @@ var reviewOption = (w, name, ui, repo) => ({
   label: "Review prompt",
   action: () => ui.copy(reviewPrompt(w, [name], `Review the skill ${name}${repo ? ` in ${repo}` : ""}.`, repo), `a review prompt for ${name}`)
 });
-var gitSees = (s) => s?.git === "committed" || s?.git === "changed" ? " Git will see it." : "";
+var gitSees = (s) => isShared(s?.git) ? " Git will see it." : "";
 function versionsOption(w, repo, name, installed, ui) {
   return {
     label: "Other versions\u2026",
@@ -1741,7 +1743,7 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
       if (isNameChar(input, key)) return setModal({ ...m, query: m.query + input.toLowerCase(), cursor: 0 });
     }
   }
-  const toastLines = toast && modal?.kind !== "confirm" ? wrap(toast, termCols - 2, 3).map((l) => " " + l) : [];
+  const toastLines = toast && modal?.kind !== "confirm" ? wrap(toast, termCols - 2, Math.max(3, Math.floor(termRows / 3))).map((l) => " " + l) : [];
   const bottomH = Math.max(1, toastLines.length);
   const confirmLines = modal?.kind === "confirm" ? wrap(modal.fix.preview, columns - 6, 6) : [];
   const confirmH = modal?.kind === "confirm" ? confirmLines.length + 2 : 0;
@@ -1784,10 +1786,14 @@ function App({ initial, reload, loadUsage: loadUsage2 }) {
     }), here: onHelp }
   ];
   const sideAt = sideRows.findIndex((r) => r.here);
+  const brand = " \u25C6 skilllib  ";
+  const tabsWidth = (short) => PLACES.reduce((n, [p, label]) => n + (short && p === "library" ? 6 : label.length) + 2 + (p === "health" && healthCount ? ` ${healthCount}`.length : 0), 0);
+  const showBrand = brand.length + tabsWidth(false) <= columns;
+  const shortTabs = !showBrand && tabsWidth(false) > columns;
   const topBar = /* @__PURE__ */ jsx2(Box2, { height: 1, width: columns, justifyContent: "space-between", children: /* @__PURE__ */ jsxs2(Box2, { children: [
-    /* @__PURE__ */ jsx2(Text2, { color: color.accent, bold: true, children: " \u25C6 skilllib  " }),
+    /* @__PURE__ */ jsx2(Text2, { color: color.accent, bold: true, children: showBrand ? brand : "" }),
     PLACES.map(([p, label]) => /* @__PURE__ */ jsxs2(Text2, { backgroundColor: place === p ? color.accent : void 0, color: place === p ? "#0B1020" : color.muted, bold: place === p, children: [
-      ` ${label}`,
+      ` ${shortTabs && p === "library" ? "Skills" : label}`,
       /* @__PURE__ */ jsx2(Text2, { color: place === p ? "#0B1020" : healthWorst ? SEV[healthWorst.severity].color : color.green, children: p === "health" && healthCount ? ` ${healthCount}` : "" }),
       " "
     ] }, p))
@@ -2082,7 +2088,7 @@ function localSkill(root, s, git) {
   };
   const state = git ? git.of(relativeTo(root, s.path)) : null;
   const others = otherCopies(root, s.name, s.location);
-  const own = other[s.state]?.source === "untracked" && (state === "committed" || state === "changed") ? { source: "repo" } : {};
+  const own = other[s.state]?.source === "untracked" && isShared(state) ? { source: "repo" } : {};
   return {
     name: s.name,
     source: "lib",
@@ -2247,6 +2253,7 @@ function said3(c, repo) {
 }
 function realOps(roots, backups, machine, libraryNames) {
   const rootOf = (repo) => roots.get(repo);
+  const nameOf = (root) => [...roots].find(([, r]) => r === root)?.[0] ?? basename(root);
   const find = (repo, name) => projectStatus(rootOf(repo)).find((s) => s.name === name);
   const result = (c, repo) => c.action === "skipped" ? failed(said3(c, repo)) : said3(c, repo);
   const copyDir = (repo, name) => readManifest(rootOf(repo)).skills[name]?.dir ?? PROJECT_SKILLS_DIR;
@@ -2304,6 +2311,7 @@ function realOps(roots, backups, machine, libraryNames) {
   };
   const linkIn = (repo, name, allow) => {
     const s = find(repo, name);
+    if (!s) throw new Error(`${name} isn't in ${repo} any more`);
     return s.managed ? relinkDependency(rootOf(repo), name, { allowTracked: allow }) : linkEverywhere(rootOf(repo), name, s.location, { allowTracked: allow });
   };
   const linkSaid = (repo, name, r) => {
@@ -2315,7 +2323,7 @@ function realOps(roots, backups, machine, libraryNames) {
   const orForce = (c, repo, label, force) => (
     // Whatever --force would get past (edits, a pin from another library, another copy in the way): offer it here.
     c.action === "skipped" && !!c.reason?.includes("--force") ? {
-      message: `${c.name} in ${repo}: ${c.reason.replace(/ \(use --force[^)]*\)$/, "")}`,
+      message: `${c.name} in ${repo}: ${withoutForceHint(c.reason)}`,
       then: { label, preview: `What's there now in ${repo} goes to Settings \u203A Backups first.`, run: () => result(force(), repo) }
     } : result(c, repo)
   );
@@ -2329,7 +2337,7 @@ function realOps(roots, backups, machine, libraryNames) {
     remove: (repo, name) => {
       const s = find(repo, name);
       if (!s) return failed(`${name} isn't in ${repo}`);
-      const committed = !s.managed && ["committed", "changed"].includes(gitInfo(rootOf(repo))?.of(relativeTo(rootOf(repo), s.path)) ?? "");
+      const committed = !s.managed && isShared(gitInfo(rootOf(repo))?.of(relativeTo(rootOf(repo), s.path)));
       if (s.state.startsWith("repo skill") || committed) return failed(`${name} is the repo's own (committed by your team): skilllib doesn't delete it`);
       const others = otherCopies(rootOf(repo), name, s.location);
       const left = (r) => typeof r === "string" && others.length ? `${r}; the copy in ${others.join(", ")} stays` : r;
@@ -2340,7 +2348,7 @@ function realOps(roots, backups, machine, libraryNames) {
       const c = updateProject(rootOf(repo), [name])[0];
       return c ? orForce(c, repo, "Update anyway", () => updateProject(rootOf(repo), [name], { force: true })[0]) : `${name} is up to date`;
     },
-    copyToLibrary: (repo, name) => toLibrary(find(repo, name).path),
+    copyToLibrary: (repo, name) => ((s) => s ? toLibrary(s.path) : failed(`${name} isn't in ${repo} any more`))(find(repo, name)),
     deleteGlobal: (m) => {
       if (!entryExists(m.path)) return `${tildify(m.path)} is already gone`;
       const others = machine.filter((o) => o.name === m.name && o.path !== m.path && o.kind !== "plugin" && !o.broken);
@@ -2349,9 +2357,9 @@ function realOps(roots, backups, machine, libraryNames) {
       if (!m.broken) {
         const readers = [.../* @__PURE__ */ new Set([...m.agents, ...dependents.flatMap((o) => o.harnesses)])].filter((id) => !stays.some((o) => o.harnesses.includes(id)));
         const blind = blindWithoutGlobal(m.name, [{ path: m.path, harnesses: readers, links: [...m.links, ...dependents.map((o) => o.path)] }], [...roots.values(), ...knownProjects()]);
-        if (blind.length) return failed(`${m.name} kept: ${blindSaid(m.name, blind, (root) => [...roots].find(([, r2]) => r2 === root)?.[0] ?? basename(root))}`);
+        if (blind.length) return failed(`${m.name} kept: ${blindSaid(m.name, blind, nameOf)}`);
       }
-      const left = m.broken ? [] : strandedLinks(m.name, [{ path: m.path, links: [...m.links, ...dependents.map((o) => o.path)] }], [...roots.values(), ...knownProjects()], (root) => [...roots].find(([, r2]) => r2 === root)?.[0] ?? basename(root));
+      const left = m.broken ? [] : strandedLinks(m.name, [{ path: m.path, links: [...m.links, ...dependents.map((o) => o.path)] }], [...roots.values(), ...knownProjects()], nameOf);
       const r = deleteGlobal(m.path, [...m.links, ...dependents.map((o) => o.path)]);
       if (!r.ok) return failed(`${m.name}: ${r.reason}`);
       if (m.broken) return `Removed the broken link ${m.name}`;
@@ -2361,7 +2369,7 @@ function realOps(roots, backups, machine, libraryNames) {
     keepGlobal: (name, keep) => (setKeepGlobal([name], keep), keep ? `${name} marked as global on purpose` : `${name} is no longer marked as global on purpose`),
     moveGlobal: (skills, repos, group) => {
       const repoRoots = repos.map(rootOf);
-      const label = (root) => repos[repoRoots.indexOf(root)] ?? [...roots].find(([, r]) => r === root)?.[0] ?? basename(root);
+      const label = (root) => repos[repoRoots.indexOf(root)] ?? nameOf(root);
       const picked = new Set(skills.map((m) => m.name));
       const sourced = machine.filter((o) => picked.has(o.name) && o.movable && !o.broken);
       const attempt = (names) => moveGlobalSkills(names ? sourced.filter((m) => names.includes(m.name)) : sourced, repoRoots, { group, label, allowTrackedHint: "allow links there, then move it again" });
@@ -2408,12 +2416,13 @@ function realOps(roots, backups, machine, libraryNames) {
     replacePlugin: (p, repos) => {
       const id = p.id;
       const clashes = p.skills.filter((s) => {
-        const mine = treeHash(librarySkillDir(s.name));
-        return mine !== null && mine !== treeHash(s.path);
+        const theirs = treeHash(s.path);
+        const mine = [librarySkillDir(s.name), ...machine.filter((m) => m.movable && m.name === s.name).map((m) => m.path)].map(treeHash);
+        return mine.some((h) => h !== null && h !== theirs);
       });
-      if (clashes.length) return failed(`${id} kept: your library has different ${clashes.map((s) => s.name).join(", ")}; update or delete ${clashes.length === 1 ? "it" : "them"} first`);
+      if (clashes.length) return failed(`${id} kept: you have different ${clashes.map((s) => s.name).join(", ")} (in your library or global skills); keep yours, or update or delete ${clashes.length === 1 ? "it" : "them"} first`);
       const cant = repos.flatMap(
-        (repo) => p.skills.flatMap((s) => ((why) => why ? [`${s.name} in ${repo}: ${why.replace(/ \(use --force[^)]*\)$/, "")}`] : [])(trackBlocker(rootOf(repo), s.name) ?? addRefusal(rootOf(repo), s.name, treeHash(s.path) ?? "")))
+        (repo) => p.skills.flatMap((s) => ((why) => why ? [`${s.name} in ${repo}: ${withoutForceHint(why)}`] : [])(trackBlocker(rootOf(repo), s.name) ?? addRefusal(rootOf(repo), s.name, treeHash(s.path) ?? "")))
       );
       if (cant.length) return failed(`${id} kept, nothing changed: ${cant.join("; ")}`);
       const imported = p.skills.map((s) => ({ name: s.name, status: importSkill(s.path).status }));
@@ -2464,7 +2473,7 @@ function realOps(roots, backups, machine, libraryNames) {
         if (s && isDir(s.path) && !notWritable(root, relative(root, dirname2(s.path)).split(sep).join("/"))) removeUntracked(root, name, s.path);
         const c = removeSkill(root, name, { force: true });
         if (c.action === "skipped") return failed(`${name}: ${c.reason}${from.length ? `; removed from ${from.join(", ")} so far` : ""}`);
-        const repo = [...roots].find(([, r2]) => r2 === root)?.[0] ?? basename(root);
+        const repo = nameOf(root);
         from.push(repo);
         if (c.reason) left.push(`in ${repo}, ${c.reason}`);
       }
@@ -2511,7 +2520,8 @@ function realOps(roots, backups, machine, libraryNames) {
     usageIssues: ({ usage, totals = {} }) => {
       const repoOf = new Map([...roots].map(([name, root]) => [root, name]));
       return usageIssues([...roots.values()], machine, libraryNames, {
-        inProject: (root, skill) => usage[repoOf.get(root)]?.[skill] ?? 0,
+        // As doctor counts them: a plugin's copy (plugin:name, kept apart for the Plugins rows) counts for the skill.
+        inProject: (root, skill) => Object.entries(usage[repoOf.get(root)] ?? {}).reduce((n, [key, count]) => n + (skillOf(key) === skill ? count : 0), 0),
         total: (skill) => totals[skill] ?? 0,
         asUsed: (key) => totals[key] ?? 0,
         days: 30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skilllib",
-  "version": "1.11.4",
+  "version": "1.11.6",
   "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, Zed and Grok.",
   "keywords": [
     "agent-skills",