skilllib 1.12.0 → 1.12.2

package/README.md

@@ -195,7 +195,7 @@ A skill's pin goes in one of two places:
 - **`skilllib.json` in the repo (shared).** Commit it with the skill folders, and teammates get the same skills. This is where pins go when the repo already has a `skilllib.json`.
 - **Your personal pins (`~/.skilllib/pins/`).** One file per repo, matched by its `origin` remote, so every clone and worktree of the repo shares it. skilllib keeps the copies and links out of git through the repo's `.git/info/exclude` (only your clone; the repo's `.gitignore` doesn't change). Nothing shows up in `git status`. This is where pins go when the repo has no `skilllib.json`.
 
-`skilllib add <name> --personal` or `--shared` picks the place, and moves an existing pin without changing its version. In the app, a library skill's actions offer *Make it personal* or *Pin it for the team*, and its tag says `lib v2 · personal`. A copy git already has can't become personal. A skill pinned in both places uses the repo's pin; doctor offers to drop yours (a choice: yours would keep the skill if the team unpinned it).
+`skilllib add <name> --personal` or `--shared` picks the place, and moves an existing pin without changing its version. In the app, a library skill's actions offer *Make it personal* or *Pin it for the team*, and its tag says `personal v2`. A copy git already has can't become personal. A skill pinned in both places uses the repo's pin; doctor offers to drop yours (a choice: yours would keep the skill if the team unpinned it).
 
 **On another machine:** keep `~/.skilllib/pins/` and `~/.skilllib/library/` in git (a dotfiles repo, say). Clone a repo there and run `skilllib sync`: your personal skills come back, out of git again. A repo without a remote keeps its pins by folder, so they stay on that machine until it gets one: adding a remote (or renaming it) keeps them. Only a repo's top folder can have personal pins, not a monorepo package's.
 

package/dist/{chunk-57EEPVXJ.js → chunk-YQFLFWAY.js}

@@ -235,7 +235,7 @@ function installDirs(enabled, keep) {
 import { execFileSync } from "child_process";
 import { createHash as createHash2 } from "crypto";
 import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync as readdirSync2, readFileSync as readFileSync3, renameSync as renameSync2, rmSync as rmSync3, statSync as statSync3, writeFileSync as writeFileSync2 } from "fs";
-import { basename as basename2, dirname as dirname2, join as join5, resolve as resolve3 } from "path";
+import { basename as basename2, dirname as dirname2, isAbsolute, join as join5, relative as relative2, resolve as resolve3, sep as sep3 } from "path";
 
 // src/versions.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync2 } from "fs";
@@ -425,7 +425,7 @@ function writeManifest(root, manifest) {
   for (const [name, dep] of Object.entries(readPins(file).skills)) if (onDisk[name] && manifest.skills[name] && !manifest.skills[name].personal) mine[name] = dep;
   if (Object.keys(mine).length) writeChanged(file, { ...pinsHeader(repoOf(root)), skills: sorted(mine) });
   else rmSync3(file, { force: true });
-  excludePersonal(root, mine);
+  excludePersonal(root, Object.fromEntries(Object.entries(mine).filter(([name]) => !shared[name])));
 }
 function writeChanged(path, data) {
   try {
@@ -478,7 +478,7 @@ function repoOf(root) {
   const seen = changedAt(config);
   let repo = null;
   if (out2[0] === "") {
-    const urls = (gitIn(root, ["config", "--get-regexp", "^remote\\..*\\.url$"]) ?? "").split("\n").filter(Boolean).map((l) => l.split(" "));
+    const urls = (gitIn(root, ["config", "--get-regexp", "^remote\\..*\\.url$"]) ?? "").split("\n").filter(Boolean).map((l) => [l.slice(0, l.indexOf(" ")), l.slice(l.indexOf(" ") + 1)]);
     const url = (urls.find(([k]) => k === "remote.origin.url") ?? urls[0])?.[1];
     const remote = url ? normalizeRemote(url) : void 0;
     repo = { file: pinsFileFor(root, remote, folder), folder, common, ...remote ? { remote } : {}, root };
@@ -530,7 +530,15 @@ function excludePersonal(root, skills = Object.fromEntries(Object.entries(readMa
   const end = start === -1 ? -1 : lines.indexOf(EXCLUDE_END, start);
   const rest = start === -1 ? lines : [...lines.slice(0, start), ...lines.slice(end === -1 ? start + 1 : end + 1)];
   while (rest.length && rest[rest.length - 1] === "") rest.pop();
-  const paths = Object.entries(skills).flatMap(([name, d]) => [d.dir ?? PROJECT_SKILLS_DIR, ...d.links ?? []].map((dir) => `/${dir}/${name.replace(/[[\]*?\\]/g, "\\$&")}`));
+  const top = realNative(root) ?? root;
+  const places = (dir) => {
+    const real = realNative(join5(root, dir));
+    const rel = real ? relative2(top, real).split(sep3).join("/") : "";
+    return rel && rel !== ".." && !rel.startsWith("../") && !isAbsolute(rel) && rel !== dir ? [dir, rel] : [dir];
+  };
+  const paths = Object.entries(skills).flatMap(
+    ([name, d]) => [d.dir ?? PROJECT_SKILLS_DIR, ...d.links ?? []].flatMap(places).map((dir) => `/${dir}/${name.replace(/[[\]*?\\]/g, "\\$&")}`)
+  );
   const block = paths.length ? [EXCLUDE_START, ...[...new Set(paths)].sort(), EXCLUDE_END] : [];
   const next = [...rest, ...rest.length && block.length ? [""] : [], ...block].join("\n") + (rest.length || block.length ? "\n" : "");
   if (next === text) return;
@@ -688,11 +696,11 @@ import { join as join9 } from "path";
 // src/library.ts
 import { execFileSync as execFileSync2 } from "child_process";
 import { cpSync as cpSync2, existsSync as existsSync7, lstatSync as lstatSync2, mkdirSync as mkdirSync5, readdirSync as readdirSync5, readFileSync as readFileSync4, readlinkSync as readlinkSync2, renameSync as renameSync3, rmSync as rmSync4, symlinkSync, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
-import { basename as basename4, dirname as dirname3, isAbsolute, join as join8, posix, relative as relative2, resolve as resolve6, sep as sep4 } from "path";
+import { basename as basename4, dirname as dirname3, isAbsolute as isAbsolute2, join as join8, posix, relative as relative3, resolve as resolve6, sep as sep5 } from "path";
 
 // src/sources.ts
 import { existsSync as existsSync6, lstatSync, mkdirSync as mkdirSync4, readdirSync as readdirSync4, readlinkSync } from "fs";
-import { basename as basename3, join as join7, resolve as resolve5, sep as sep3 } from "path";
+import { basename as basename3, join as join7, resolve as resolve5, sep as sep4 } from "path";
 import { tmpdir } from "os";
 function skillsShLock() {
   return readJson(join7(userHome(), ".agents", ".skill-lock.json"))?.skills ?? {};
@@ -884,7 +892,7 @@ function recordOrigin(name, origin) {
   writeState(originsFile(), { ...origins, [name]: origin });
 }
 function originFor(dir) {
-  const under = (path, folder) => path.startsWith((realpathOrNull(folder) ?? folder) + sep3);
+  const under = (path, folder) => path.startsWith((realpathOrNull(folder) ?? folder) + sep4);
   const real = realpathOrNull(dir) ?? dir;
   const temps = [tmpdir(), "/tmp", "/var/tmp"];
   const homeInTemp = temps.some((t) => under(realpathOrNull(userHome()) ?? userHome(), t));
@@ -922,7 +930,7 @@ function notWritable(root, dir) {
     p = join8(p, part);
     if (!entryExists(p)) return null;
     const real = realpathOrNull(p);
-    if (!isDir(p) || real === null || real !== top && !real.startsWith(top + sep4)) return relative2(root, p).split(sep4).join("/");
+    if (!isDir(p) || real === null || real !== top && !real.startsWith(top + sep5)) return relative3(root, p).split(sep5).join("/");
   }
   return null;
 }
@@ -973,7 +981,7 @@ function syncBlocker(root, name, dep = readManifest(root).skills[name]) {
 }
 function linkDir(target, link2) {
   if (process.platform === "win32") symlinkSync(target, link2, "junction");
-  else symlinkSync(relative2(dirname3(link2), target), link2);
+  else symlinkSync(relative3(dirname3(link2), target), link2);
 }
 function entryExists(path) {
   return isLink(path) || existsSync7(path);
@@ -1005,7 +1013,7 @@ function lostAt(path, gone) {
   let last = null;
   for (let hop = 0; hop < 40; hop++) {
     const here = canon(at);
-    if (moved.some((m) => key(here) === m || key(here).startsWith(m + sep4))) return last ?? here;
+    if (moved.some((m) => key(here) === m || key(here).startsWith(m + sep5))) return last ?? here;
     if (!isLink(here)) return existsSync7(join8(here, "SKILL.md")) ? null : here;
     last = here;
     at = resolve6(dirname3(here), readlinkSync2(here).replace(/^\\\\\?\\(UNC\\)?/, (_m, unc) => unc ? "\\\\" : ""));
@@ -1019,7 +1027,7 @@ function blindWithoutGlobal(name, copies, roots, nestedOf = (root) => nestedEntr
   const holds = (root) => ALL_PROJECT_DIRS.some((d) => reposChoice(root, d) && entryExists(join8(root, d, name))) || pinsSkill(root, name);
   const keepsTop = (root, id) => harness(id).projectDirs.some((d) => existsSync7(join8(root, d, name, "SKILL.md")) && survives(join8(root, d, name), gone));
   const shown = (root, p) => {
-    const under = (dir) => ((d) => p.startsWith(d + sep4) ? relative2(d, p).split(sep4).join("/") : null)(realNative(dir) ?? dir);
+    const under = (dir) => ((d) => p.startsWith(d + sep5) ? relative3(d, p).split(sep5).join("/") : null)(realNative(dir) ?? dir);
     return under(root) ?? ((h) => h === null ? p : `~/${h}`)(under(userHome()));
   };
   const blindIn = (root) => enabled.flatMap((id) => {
@@ -1047,16 +1055,16 @@ function blindWithoutGlobal(name, copies, roots, nestedOf = (root) => nestedEntr
     const had = byWho.get(k);
     if (!had || !(had.link || had.folder || had.shared) && (b.link || b.folder || b.shared)) byWho.set(k, b);
   }
-  const within = (d) => unique.some((r) => d === r || d.startsWith(r + sep4));
+  const within = (d) => unique.some((r) => d === r || d.startsWith(r + sep5));
   const home2 = realNative(userHome()) ?? userHome();
-  const belowHome = (d) => (realNative(d) ?? d) !== home2 && !home2.startsWith((realNative(d) ?? d) + sep4);
+  const belowHome = (d) => (realNative(d) ?? d) !== home2 && !home2.startsWith((realNative(d) ?? d) + sep5);
   const gitTop = (from) => {
     for (let d = from; d !== dirname3(d) && belowHome(d); d = dirname3(d)) if (existsSync7(join8(d, ".git"))) return d;
     return null;
   };
   const servedAbove = (b) => {
     const top = gitTop(b.root);
-    const inside = (d) => belowHome(d) && (top ? d === top || d.startsWith(top + sep4) : within(d));
+    const inside = (d) => belowHome(d) && (top ? d === top || d.startsWith(top + sep5) : within(d));
     for (let d = dirname3(b.root); inside(d) && d !== dirname3(d); d = dirname3(d)) if (keepsTop(d, b.id)) return true;
     return false;
   };
@@ -1073,7 +1081,7 @@ function strandedLinks(name, copies, roots, label = basename4) {
     ).map(
       (d) => `${d}/${name} in ${label(root)}`
     ),
-    ...nestedEntries(root).filter((n) => n.name === name && isLink(n.path) && !survives(n.path, gone) && once(n.path)).map((n) => `${relative2(root, n.path).split(sep4).join("/")} in ${label(root)}`)
+    ...nestedEntries(root).filter((n) => n.name === name && isLink(n.path) && !survives(n.path, gone) && once(n.path)).map((n) => `${relative3(root, n.path).split(sep5).join("/")} in ${label(root)}`)
   ]);
 }
 function copiesDiffer(paths) {
@@ -1082,7 +1090,7 @@ function copiesDiffer(paths) {
 function blindSaid(name, blind, label = basename4) {
   const who = blind.map((b) => `${harness(b.id).name} in ${label(b.root)}`).join(", ");
   const folders2 = [...new Set(blind.flatMap((b) => b.folder ? [`${b.folder} in ${label(b.root)}`] : []))];
-  const links = [...new Set(blind.flatMap((b) => b.link ? [b.link.startsWith("~") || isAbsolute(b.link) ? b.link : `${b.link} in ${label(b.root)}`] : []))];
+  const links = [...new Set(blind.flatMap((b) => b.link ? [b.link.startsWith("~") || isAbsolute2(b.link) ? b.link : `${b.link} in ${label(b.root)}`] : []))];
   const sharedBy = /* @__PURE__ */ new Map();
   for (const b of blind.filter((x) => x.shared)) {
     if (!sharedBy.has(b.shared.to)) sharedBy.set(b.shared.to, { to: b.shared.to, where: /* @__PURE__ */ new Set(), dirs: /* @__PURE__ */ new Set() });
@@ -1178,7 +1186,7 @@ function projectStatus(root) {
   }
   for (const [name, paths] of byName) {
     const real = paths.find((p) => !isLink(p)) ?? paths[0];
-    const location = relative2(root, join8(real, "..")).split(sep4).join("/");
+    const location = relative3(root, join8(real, "..")).split(sep5).join("/");
     const source = lock[name]?.source;
     unmanaged.push({
       name,
@@ -1226,7 +1234,7 @@ function nestedEntries(root, { depth = PACKAGE_DEPTH, enabled = enabledHarnesses
   const top = realpathOrNull(root) ?? root;
   const found = packageSkillFolders(root, subs ?? packageDirs(root, depth)).flatMap(
     ({ sub, skillsDir, location }) => skillDirsIn(join8(sub, skillsDir)).flatMap((path) => {
-      if (isLink(path) && (realpathOrNull(path) ?? "").startsWith(top + sep4)) return [];
+      if (isLink(path) && (realpathOrNull(path) ?? "").startsWith(top + sep5)) return [];
       const name = basename4(path);
       const readers = NESTED_READERS.filter(([d]) => realpathOrNull(join8(sub, d, name)) === realpathOrNull(path)).flatMap(([, r]) => r);
       return [{ name, path, location, skillsDir, readers: enabled.filter((id) => readers.includes(id)) }];
@@ -1257,7 +1265,7 @@ function packageSkillFolders(root, subs = packageDirs(root)) {
   return subs.flatMap(
     (sub) => NESTED_READERS.flatMap(([skillsDir]) => {
       if (!existsSync7(join8(sub, skillsDir))) return [];
-      const location = relative2(root, join8(sub, skillsDir)).split(sep4).join("/");
+      const location = relative3(root, join8(sub, skillsDir)).split(sep5).join("/");
       return reposChoice(root, location) ? [{ sub, skillsDir, location }] : [];
     })
   );
@@ -1387,8 +1395,8 @@ function addSkill(root, name, { force = false, version, allowTracked = false, pe
   if (moving && !keep) return { name, action: "skipped", reason: `your library has no copy of the version it pins, so its pin can't move as it is: skilllib update ${name} first` };
   const target = keep ?? (version === void 0 ? latestVersion(name) : getVersion(name, version));
   if (!target) return { name, action: "skipped", reason: version === void 0 ? "not in the library" : `version ${version} doesn't exist` };
-  const plan = addPlan(root, name, target.hash, force);
-  if ("reason" in plan) return { name, action: "skipped", reason: plan.reason };
+  const plan = addPlan(root, name, target.hash, moving ? false : force);
+  if ("reason" in plan) return { name, action: "skipped", reason: moving ? `${withoutForceHint(plan.reason)}, so its pin can't move: save the edits to your library first` : plan.reason };
   const { manifest, recorded, primary, wantedLinks, to, local } = plan;
   const mine = pinsWhere(root, recorded, personal);
   if (typeof mine === "string") return { name, action: "skipped", reason: mine };
@@ -1636,7 +1644,7 @@ function stash(dir, bucket) {
   return target;
 }
 function removeUntracked(root, name, path) {
-  const stuck = notWritable(root, relative2(root, dirname3(path)));
+  const stuck = notWritable(root, relative3(root, dirname3(path)));
   if (stuck) throw new Error(`${stuck} isn't a folder in the repo: skilllib leaves what's in it alone`);
   const to = stash(path, "trash");
   unlinkEverywhere(root, name);
@@ -1801,12 +1809,12 @@ function refreshAgentSkill() {
 // src/commands.ts
 import { existsSync as existsSync14, readFileSync as readFileSync7 } from "fs";
 import { parseArgs as parseFlags } from "util";
-import { basename as basename10, join as join15, resolve as resolve8, sep as sep8 } from "path";
+import { basename as basename10, join as join15, resolve as resolve8, sep as sep9 } from "path";
 
 // src/git.ts
 import { execFileSync as execFileSync3 } from "child_process";
 import { existsSync as existsSync9, realpathSync as realpathSync3 } from "fs";
-import { isAbsolute as isAbsolute2, join as join10, relative as relative3, sep as sep5 } from "path";
+import { isAbsolute as isAbsolute3, join as join10, relative as relative4, sep as sep6 } from "path";
 function isShared(state) {
   return state === "committed" || state === "changed";
 }
@@ -1835,7 +1843,7 @@ function gitInfo(root, extraDirs = []) {
   };
   const realRoot = real(root);
   const places = new Map(
-    [.../* @__PURE__ */ new Set([...ALL_PROJECT_DIRS, MANIFEST_FILE, ...extraDirs])].filter((d) => existsSync9(join10(root, d))).map((d) => [d, relative3(realRoot, real(join10(root, d))).split(sep5).join("/")]).filter(([, place]) => place !== "" && place !== ".." && !place.startsWith("../") && !isAbsolute2(place))
+    [.../* @__PURE__ */ new Set([...ALL_PROJECT_DIRS, MANIFEST_FILE, ...extraDirs])].filter((d) => existsSync9(join10(root, d))).map((d) => [d, relative4(realRoot, real(join10(root, d))).split(sep6).join("/")]).filter(([, place]) => place !== "" && place !== ".." && !place.startsWith("../") && !isAbsolute3(place))
   );
   const dirs = [...new Set(places.values())];
   if (dirs.length === 0) return { of: () => "new" };
@@ -1863,7 +1871,7 @@ function gitInfo(root, extraDirs = []) {
   };
 }
 function relativeTo(root, path) {
-  return relative3(root, path).split("\\").join("/");
+  return relative4(root, path).split("\\").join("/");
 }
 
 // src/here.ts
@@ -1872,7 +1880,7 @@ import { basename as basename8 } from "path";
 
 // src/health.ts
 import { existsSync as existsSync12, lstatSync as lstatSync4, readdirSync as readdirSync8 } from "fs";
-import { basename as basename7, dirname as dirname6, isAbsolute as isAbsolute3, join as join13, relative as relative4, sep as sep7 } from "path";
+import { basename as basename7, dirname as dirname6, isAbsolute as isAbsolute4, join as join13, relative as relative5, sep as sep8 } from "path";
 
 // src/plugins.ts
 import { execFileSync as execFileSync4 } from "child_process";
@@ -2175,7 +2183,7 @@ function cursorPluginSkills(plugins = cursorPlugins()) {
 
 // src/tidy.ts
 import { existsSync as existsSync11, mkdirSync as mkdirSync8, readdirSync as readdirSync7, unlinkSync as unlinkSync3 } from "fs";
-import { basename as basename6, dirname as dirname5, join as join12, sep as sep6 } from "path";
+import { basename as basename6, dirname as dirname5, join as join12, sep as sep7 } from "path";
 function entriesOf(dirs, name) {
   return dirs.flatMap((dir) => {
     const path = join12(dir, name);
@@ -2233,7 +2241,7 @@ function planProjectTidy(root, { keep = {}, enabled = enabledHarnesses() } = {})
   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(realRoot + sep6));
+    const external = entries.find((e) => e.link && e.real && !(e.real + sep7).startsWith(realRoot + sep7));
     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 } : {} });
@@ -2392,6 +2400,8 @@ function intoLibrary(path, force = false) {
   if (r.status === "exists") throw new Error(`${r.name}: your library has a different ${r.name}; update or delete it first`);
   return r.name;
 }
+var pinsOf = (where, personal) => personal ? "your personal pins" : `${where}'s skilllib.json`;
+var newPinsOf = (root, where) => pinsOf(where, !existsSync12(join13(root, MANIFEST_FILE)) && personalPinsFile(root) !== null);
 function track(root, name) {
   const c = addSkill(root, name);
   if (c.action === "skipped") throw new Error(`${name}: ${c.reason}`);
@@ -2465,7 +2475,7 @@ function brokenLinksIn(root, opened) {
   const realRoot = realNative(root) ?? root;
   const ownerOf = (real) => {
     let nearest = null;
-    for (let d = dirname6(dirname6(real)); d.startsWith(realRoot + sep7); d = dirname6(d)) {
+    for (let d = dirname6(dirname6(real)); d.startsWith(realRoot + sep8); d = dirname6(d)) {
       if (!existsSync12(join13(d, MANIFEST_FILE))) continue;
       if (opened.has(d)) return { opened: true, own: d };
       nearest ??= d;
@@ -2497,13 +2507,13 @@ function brokenLinksIn(root, opened) {
           return `Removed the broken link ${dir}/${name} in ${where} (restorable with skilllib restore)`;
         }
       };
-      const placeOf = (p) => relative4(realRoot, p).split(sep7).join("/");
+      const placeOf = (p) => relative5(realRoot, p).split(sep8).join("/");
       git2 ??= gitInfo(
         root,
-        folders2.map((f) => placeOf(f.real)).filter((p) => p !== "" && p !== ".." && !p.startsWith("../") && !isAbsolute3(p))
+        folders2.map((f) => placeOf(f.real)).filter((p) => p !== "" && p !== ".." && !p.startsWith("../") && !isAbsolute4(p))
       );
       const tracked = isShared(git2?.of(placeOf(join13(real, name))));
-      const recorded = !!own && mends(own, relative4(own, real).split(sep7).join("/"), name);
+      const recorded = !!own && mends(own, relative5(own, real).split(sep8).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 [
         {
@@ -2911,7 +2921,7 @@ function repoIssues(root, ctx) {
     ctx.issues.push({
       id: `stuck:${root}:${name}`,
       severity: "problem",
-      title: `${name} in ${where}: sync can't put it back as skilllib.json pins it`,
+      title: `${name} in ${where}: sync can't put it back as ${pins[name]?.personal ? "your personal pins have" : "skilllib.json pins"} it`,
       // What to do depends on what's there: a folder that links out of the repo is a setup of yours, and a pin
       // your library has no version of can't come back by sync anyway.
       detail: `${blocker.said}, so sync can't put it back there.${blocker.outside ? " skilllib only installs inside the repo: point that folder back into the repo, or remove the skill here (skilllib remove)." : versionForHash(name, pins[name]?.hash ?? "") !== null ? " Move it out of the way, then run skilllib sync." : " Move it out of the way; your library has no copy of the pinned version either."}`,
@@ -2925,11 +2935,11 @@ function repoIssues(root, ctx) {
     ctx.issues.push({
       id: `pin:${root}:${s.name}`,
       severity: "problem",
-      title: `${s.name}: the version ${where}'s skilllib.json pins isn't in your library`,
-      detail: `${s.state === "folder missing" ? "The folder is missing, and no" : "The copy is another version, and no"} version in Your skills has the content it pins (pinned from another library?). ${untrackable(s) ? `${untrackable(s)}, so skilllib can't install it here.` : `Install your newest v${s.latest}; ${where}'s skilllib.json then pins it.`}`,
+      title: `${s.name}: the version ${s.personal ? "your personal pins" : `${where}'s skilllib.json`} pin${s.personal ? "" : "s"} isn't in your library`,
+      detail: `${s.state === "folder missing" ? "The folder is missing, and no" : "The copy is another version, and no"} version in Your skills has the content it pins (pinned from another library?). ${untrackable(s) ? `${untrackable(s)}, so skilllib can't install it here.` : `Install your newest v${s.latest}; ${s.personal ? "your personal pins" : `${where}'s skilllib.json`} then pin${s.personal ? "" : "s"} it.`}`,
       at: rows(root, [s.name]),
       // It changes what the shared skilllib.json pins: a choice, never run by `doctor --fix`.
-      ...untrackable(s) ? {} : { choices: [{ label: `Install your newest (v${s.latest})`, hint: `${where}'s skilllib.json pins it`, run: () => `${s.name}: installed v${track(root, s.name).to}` }] }
+      ...untrackable(s) ? {} : { choices: [{ label: `Install your newest (v${s.latest})`, hint: s.personal ? "your personal pins pin it" : `${where}'s skilllib.json pins it`, run: () => `${s.name}: installed v${track(root, s.name).to}` }] }
     });
   if (restorable.length > 0) {
     ctx.issues.push({
@@ -2967,18 +2977,18 @@ function repoIssues(root, ctx) {
     ctx.issues.push({
       id: `unavailable:${root}:${s.name}`,
       severity: "problem",
-      title: `${s.name}: pinned in ${where}'s skilllib.json, but not in your library`,
+      title: `${s.name}: pinned in ${s.personal ? "your personal pins" : `${where}'s skilllib.json`}, but not in your library`,
       detail: `Its folder is missing, and your library (${tildify(libraryDir())}) has no copy to restore: import it, or set SKILLLIB_HOME to the skilllib folder whose library has it.`,
       at: rows(root, [s.name]),
       // Editing skilllib.json is the team's call: a choice, never run by `doctor --fix`.
       choices: [
         {
-          label: "Remove it from skilllib.json",
+          label: s.personal ? "Remove it from your personal pins" : "Remove it from skilllib.json",
           hint: `${where} stops pinning it`,
           run: () => {
             const r = removeSkill(root, s.name);
             if (r.action !== "removed") throw new Error(`${s.name}: ${r.reason}`);
-            return `${s.name}: removed from ${where}'s skilllib.json`;
+            return `${s.name}: removed from ${pinsOf(where, s.personal)}`;
           }
         }
       ]
@@ -2995,7 +3005,7 @@ function repoIssues(root, ctx) {
       choices: [
         {
           label: "Update to the newest versions",
-          hint: isShared(gitOf(root)?.of(MANIFEST_FILE)) ? "git will see the new copies and skilllib.json" : "replaces each copy with your library's newest",
+          hint: behind.some((s) => !s.personal) && 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)))
         }
       ]
@@ -3078,7 +3088,7 @@ function repoIssues(root, ctx) {
   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) && isShared(gitOf(root)?.of(MANIFEST_FILE));
+    const manifestShared = partial.some((s) => s.managed && !s.personal) && isShared(gitOf(root)?.of(MANIFEST_FILE));
     const run = (allowTracked) => () => {
       if (allowTracked) allowTrackedLinks(root);
       const r = linkAll(root, { allowTracked, names: partial.map((s) => s.name) });
@@ -3134,7 +3144,7 @@ function repoIssues(root, ctx) {
         id: `local:${root}:${s.name}`,
         severity: "suggestion",
         title: `${s.name} in ${where} isn't in your library`,
-        detail: "Import it into the library to reuse it in other projects and keep it backed up. The repo then tracks it in skilllib.json.",
+        detail: "Import it into the library to reuse it in other projects and keep it backed up. The repo then tracks it (in skilllib.json, or your personal pins when it has none).",
         at: rows(root, [s.name]),
         choices: [
           {
@@ -3154,9 +3164,9 @@ function repoIssues(root, ctx) {
         id: `adopt:${root}:${s.name}`,
         severity: "suggestion",
         title: `${s.name} in ${where} isn't tracked`,
-        detail: "It's identical to the library copy; track it (in skilllib.json) so future library changes reach it.",
+        detail: `It's identical to the library copy; track it (in ${newPinsOf(root, where)}) so future library changes reach it.`,
         at: rows(root, [s.name]),
-        choices: [{ label: "Track it", hint: `adds it to ${where}'s skilllib.json`, run: () => `${track(root, s.name).name} tracked in ${where}` }]
+        choices: [{ label: "Track it", hint: `adds it to ${newPinsOf(root, where)}`, run: () => `${track(root, s.name).name} tracked in ${where}` }]
       });
     } 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);
@@ -3197,7 +3207,7 @@ function repoIssues(root, ctx) {
         id: `npx:${root}:${s.name}`,
         severity: "suggestion",
         title: `${s.name} in ${where} came from npx skills, not your library`,
-        detail: `Installed with \`npx skills add\`${s.source ? ` (${s.source})` : ""}. Import it into your library to reuse it in other projects and keep it backed up${teams ? `; ${where}'s copy stays as it is (${committed(s) ? "committed" : `${untrackable(s)}, so skilllib can't track it here`})` : `; ${where} then tracks it in skilllib.json`}.`,
+        detail: `Installed with \`npx skills add\`${s.source ? ` (${s.source})` : ""}. Import it into your library to reuse it in other projects and keep it backed up${teams ? `; ${where}'s copy stays as it is (${committed(s) ? "committed" : `${untrackable(s)}, so skilllib can't track it here`})` : `; ${where} then tracks it (in skilllib.json, or your personal pins when it has none)`}.`,
         at: rows(root, [s.name]),
         choices: [
           {
@@ -3218,7 +3228,7 @@ function repoIssues(root, ctx) {
         id: `not-in-lib:${root}:${s.name}`,
         severity: "suggestion",
         title: `${s.name} in ${where} is tracked, but no longer in your library`,
-        detail: `${where}'s skilllib.json pins it, but your library has no copy: if the folder goes, sync can't restore it, and your other repos can't add it. Copy ${where}'s copy back into the library.`,
+        detail: `${s.personal ? "Your personal pins have" : `${where}'s skilllib.json pins`} it, but your library has no copy: if the folder goes, sync can't restore it, and your other repos can't add it. Copy ${where}'s copy back into the library.`,
         at: rows(root, [s.name]),
         choices: [
           {
@@ -3739,9 +3749,9 @@ function projectOfFactory(projects2) {
   const sorted2 = [...projects2].sort((a, b) => b.length - a.length);
   return (cwd) => {
     if (!cwd) return null;
-    const known = sorted2.find((p) => cwd === p || cwd.startsWith(p + sep8));
+    const known = sorted2.find((p) => cwd === p || cwd.startsWith(p + sep9));
     if (known) return known;
-    const repo = cwd.split(`${sep8}.claude${sep8}worktrees${sep8}`)[0];
+    const repo = cwd.split(`${sep9}.claude${sep9}worktrees${sep9}`)[0];
     return isProjectCandidate(repo) ? repo : null;
   };
 }
@@ -3950,7 +3960,7 @@ function add(args) {
   printChanges(root, changes, args);
   const pins = readManifest(root).skills;
   const done = changes.filter((c) => c.action !== "skipped" && pins[c.name]);
-  if (!args.json && done.some((c) => pins[c.name].personal))
+  if (!args.json && args.personal === void 0 && done.some((c) => c.action === "installed" && !c.moved && pins[c.name].personal))
     info(dim(`Pinned in your personal pins (${tildify(personalPinsDir())}) and kept out of git. --shared pins in skilllib.json for the team.`));
   rememberProjects([root]);
 }
@@ -4382,7 +4392,7 @@ function moveGlobal(args, names, yours) {
     for (const [root, c] of m.changes) warnHeldLinks(root, c, `in ${basename10(root)}`);
     if (m.left) warn(`${m.name}: ${m.left.join(", ")} now point${m.left.length === 1 ? "s" : ""} at nothing (the repo's own copy serves that package): remove ${m.left.length === 1 ? "it" : "them"}`);
   }
-  const toCommit = [...new Set(moves.filter((m) => m.moved).flatMap((m) => m.changes.map(([r]) => r)))].filter((r) => existsSync14(join15(r, MANIFEST_FILE)));
+  const toCommit = [...new Set(moves.filter((m) => m.moved).flatMap((m) => m.changes.filter(([r]) => pinsIn(r)[m.name] && !pinsIn(r)[m.name].personal).map(([r]) => r)))];
   if (toCommit.length) info(dim(`Commit skilllib.json and the skill folders in ${toCommit.map((r) => basename10(r)).join(", ")}.`));
 }
 function tidy(args) {
@@ -4489,11 +4499,14 @@ export {
   versionHistory,
   forgetLatest,
   latestVersion,
+  versionForHash,
   projectHere,
   readManifest,
+  personalPinsFile,
   knownProjects,
   rememberProjects,
   readableRoots,
+  pinsIn,
   setJsonMode,
   isJsonMode,
   json,

package/dist/index.js

@@ -31,7 +31,7 @@ import {
   unhide,
   update,
   usage
-} from "./chunk-57EEPVXJ.js";
+} from "./chunk-YQFLFWAY.js";
 
 // src/index.ts
 import { readFileSync } from "fs";
@@ -140,10 +140,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-BCCAP7GJ.js")).tui() : overview(args);
+      return process.stdin.isTTY && process.stdout.isTTY ? (await import("./tui-P3HKRNHI.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-BCCAP7GJ.js")).tui();
+      return (await import("./tui-P3HKRNHI.js")).tui();
     case "status":
       return status(args);
     case "add":

package/dist/{tui-BCCAP7GJ.js → tui-P3HKRNHI.js}

@@ -43,6 +43,8 @@ import {
   moveGlobalSkills,
   movedTogether,
   notWritable,
+  personalPinsFile,
+  pinsIn,
   pluginBackups,
   projectHere,
   projectOfFactory,
@@ -81,10 +83,11 @@ import {
   updatePlugin,
   updateProject,
   usageIssues,
+  versionForHash,
   versionHistory,
   visibleProjects,
   withoutForceHint
-} from "./chunk-57EEPVXJ.js";
+} from "./chunk-YQFLFWAY.js";
 
 // src/tui/index.tsx
 import { render } from "ink";
@@ -445,7 +448,7 @@ function globalFixes(m) {
   ];
 }
 function pinFix(w, repo, s) {
-  if (s.source !== "lib" || !w.library.some((l) => l.name === s.name)) return null;
+  if (s.source !== "lib" || !s.pinMoves || !w.library.some((l) => l.name === s.name)) return null;
   if (s.personal)
     return { label: "Pin it for the team", preview: `Move ${s.name}'s pin into ${repo}'s skilllib.json. Git will see skilllib.json and ${s.dir}/${s.name}: commit them to share it.`, run: (w2) => w2.ops.pin(repo, s.name, false) };
   if (s.inGit || isShared(s.git)) return null;
@@ -2095,7 +2098,7 @@ function uniqueNames(roots) {
     })
   );
 }
-function localSkill(root, s, git) {
+function localSkill(root, s, git, pins, canBePersonal) {
   const managed = {
     "edited locally": { edited: true },
     "edited locally, update available": { edited: true },
@@ -2114,7 +2117,9 @@ 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" && isShared(state) ? { source: "repo" } : {};
-  const inGit = s.managed && (isShared(state) || (readManifest(root).skills[s.name]?.links ?? []).some((d) => isShared(git?.of(`${d}/${s.name}`))));
+  const dep = pins[s.name];
+  const inGit = s.managed && (isShared(state) || (dep?.links ?? []).some((d) => isShared(git?.of(`${d}/${s.name}`))));
+  const pinMoves = s.managed && !!dep && versionForHash(s.name, dep.hash) !== null && !s.state.startsWith("edited") && (s.personal || canBePersonal);
   return {
     name: s.name,
     source: "lib",
@@ -2122,7 +2127,7 @@ function localSkill(root, s, git) {
     path: s.path,
     // Agents that actually load it here: visibility lists every agent you use, with `paths: 0` for the blind ones.
     agents: s.visibility.filter((v) => v.paths > 0).map((v) => v.id),
-    ...s.managed ? { version: s.version ?? void 0, ...s.personal ? { personal: true } : {}, ...inGit ? { inGit: true } : {}, ...managed[s.state] } : { ...other[s.state], ...own },
+    ...s.managed ? { version: s.version ?? void 0, ...s.personal ? { personal: true } : {}, ...inGit ? { inGit: true } : {}, ...pinMoves ? { pinMoves: true } : {}, ...managed[s.state] } : { ...other[s.state], ...own },
     ...s.source ? { origin: `npx skills: ${s.source}` } : {},
     ...others.length ? { others } : {},
     git: state
@@ -2219,11 +2224,11 @@ function loadWorld() {
       name: names.get(root),
       path: root,
       manifest: hasManifest ? git ? git.of("skilllib.json") : "no git" : "none",
-      skills: status.map((s) => {
-        const local = localSkill(root, s, git);
+      skills: ((pins, canBePersonal) => status.map((s) => {
+        const local = localSkill(root, s, git, pins, canBePersonal);
         const own = s.state.includes("missing") ? "" : readSkillInfo(s.path).description;
         return own && own !== descriptions[s.name] ? { ...local, description: own } : local;
-      }),
+      }))(pinsIn(root), personalPinsFile(root) !== null),
       ...loadedHere(root)
     };
   });
@@ -2376,8 +2381,14 @@ function realOps(roots, backups, machine, libraryNames) {
     },
     pin: (repo, name, personal) => {
       const c = addSkill(rootOf(repo), name, { personal });
-      if (c.action === "skipped") return failed(said3(c, repo));
-      return personal ? `${name} is now personal in ${repo}: only on your machines, kept out of git` : `${name} is now pinned in ${repo}'s skilllib.json for the team`;
+      if (c.action === "skipped") return failed(`${name}: ${withoutForceHint(c.reason ?? "skipped")}`);
+      const moved = personal ? `${name} is now personal in ${repo}: only on your machines, kept out of git` : `${name} is now pinned in ${repo}'s skilllib.json for the team`;
+      if (c.uncommitted?.length) {
+        const copy = `${copyDir(repo, name)}/${name}`;
+        return failed(`${moved}, but not linked in ${c.uncommitted.join(", ")}: git tracks ${c.uncommitted.length === 1 ? "it" : "them"} and ${copy} isn't committed, so agents reading ${c.uncommitted.length === 1 ? "it" : "them"} can't use ${name}. Commit ${copy}, then run skilllib link --allow-tracked`);
+      }
+      if (c.blocked?.length || c.inTheWay?.length) return withLinks(c, repo, name);
+      return moved;
     },
     copyToLibrary: (repo, name) => ((s) => s ? toLibrary(s.path) : failed(`${name} isn't in ${repo} any more`))(find(repo, name)),
     deleteGlobal: (m) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skilllib",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "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",

package/skills/skilllib/SKILL.md

@@ -25,7 +25,7 @@ Also: `usage --json` (Claude Code usage only, so "unused" is a hint; each skill
 
 ## Changing (ask first unless the user asked for this exact change)
 
-`add <name>...` (pins in `skilllib.json` when the repo has one, else in personal pins; `--personal` / `--shared` choose, and move an existing pin without changing its version) · `remove <name>...` (skills skilllib manages, `source: library`) · `update [name...]` · `sync` (installs what `skilllib.json` pins; takes no names). Pass several names in one call. Their result is `[{name, action, from, to, dirs, reason, blocked, uncommitted, inTheWay, backedUp}]`, which is the whole result: there's no need to check files afterwards. `import <dir>...` (into the library) prints `[{path, name, status}]` and exits 1 if a folder was skipped (`exists`, `no SKILL.md`). `doctor --fix` prints doctor's issues, each fix with `fixed: {ok, message}`.
+`add <name>...` (pins in `skilllib.json` when the repo has one, else in personal pins; `--personal` / `--shared` choose, and move an existing pin without changing its version) · `remove <name>...` (skills skilllib manages, `source: library`) · `update [name...]` · `sync` (installs what's pinned, in `skilllib.json` and your personal pins; takes no names). Pass several names in one call. Their result is `[{name, action, from, to, dirs, personal, moved, reason, blocked, uncommitted, inTheWay, backedUp}]` (`personal: true` when the pin is in your personal pins; `moved` when `--personal`/`--shared` moved it), which is the whole result: there's no need to check files afterwards. `import <dir>...` (into the library) prints `[{path, name, status}]` and exits 1 if a folder was skipped (`exists`, `no SKILL.md`). `doctor --fix` prints doctor's issues, each fix with `fixed: {ok, message}`.
 
 - `skipped` + `reason`: nothing changed for that skill, and the command exits 1; tell the user. `--force` overwrites local edits (`backedUp` says where they went; `skilllib restore <name>` brings them back), but only use it with their OK.
 - `removed` + `reason`: removed from skilllib.json, but something was left as it is (its copy behind a folder that links out of the repo, a file of the user's, or a link in such a folder). Tell the user what the reason says is still there.