skilllib 1.12.1 → 1.12.2

package/dist/{chunk-LORSEDNW.js → chunk-YQFLFWAY.js}

@@ -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 };
@@ -1395,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 };
@@ -2400,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}`);
@@ -2937,7 +2939,7 @@ function repoIssues(root, ctx) {
       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({
@@ -2981,12 +2983,12 @@ function repoIssues(root, ctx) {
       // 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)}`;
           }
         }
       ]
@@ -3003,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)))
         }
       ]
@@ -3086,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) });
@@ -3162,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);
@@ -3226,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: [
           {
@@ -3958,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]);
 }
@@ -4390,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) {
@@ -4497,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-LORSEDNW.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-3QD6RQGL.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-3QD6RQGL.js")).tui();
+      return (await import("./tui-P3HKRNHI.js")).tui();
     case "status":
       return status(args);
     case "add":

package/dist/{tui-3QD6RQGL.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-LORSEDNW.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.1",
+  "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.