@newlandnpt/pep-cli 0.9.0 → 0.9.1

package/dist/pep.cjs

@@ -1524,6 +1524,11 @@ function tooBig(what, limit) {
   );
 }
 var SKILL_MANIFEST = "SKILL.md";
+function occupiedByOutsider(skill, path) {
+  return new Error(
+    `${path} already exists and pep did not install it. Installing "${skill}" would delete it, so this repository was left alone. Move that directory aside (or delete it yourself), then run this again \u2014 pep never overwrites what it does not track.`
+  );
+}
 function nameClash(owner, skill, directory) {
   return new Error(
     `${owner} already installs a skill named "${skill}" in ${directory}. Two repositories cannot both provide "${skill}" there \u2014 the second would silently overwrite the first. Install this one elsewhere (-p, or --dir <path>), or run \`pep skills remove ${owner}\` first.`
@@ -1768,6 +1773,15 @@ function pickSkipped(previous, skipped) {
     skipped.map((skill) => [skill, previous?.skills[skill] ?? ""])
   );
 }
+async function outsidersAt(directory, skills, ours) {
+  const blocked = [];
+  for (const skill of skills) {
+    if (ours.has(skill)) continue;
+    const path = (0, import_node_path4.join)(directory, skill);
+    if (await (0, import_promises4.stat)(path).catch(() => null)) blocked.push({ skill, path });
+  }
+  return blocked;
+}
 async function missingSkills(directory, skills) {
   const gone = /* @__PURE__ */ new Set();
   for (const skill of skills) {
@@ -1809,7 +1823,14 @@ async function updateSkills(dependencies) {
   }
   if (commit !== void 0 && commit === previous?.commit && sameTarget && nothingToRestore) {
     await response.body?.cancel();
-    return { status: "unchanged", name, commit, conflicts: standing, skipped: [...gone] };
+    return {
+      status: "unchanged",
+      name,
+      commit,
+      conflicts: standing,
+      skipped: [...gone],
+      blocked: []
+    };
   }
   const gzipped = await readCapped(response, dependencies.maxArchiveBytes ?? MAX_ARCHIVE_BYTES);
   let unpacked;
@@ -1844,7 +1865,22 @@ async function updateSkills(dependencies) {
     if (dependencies.restoreMissing) throw nameClash(owner, skill, dependencies.directory);
     conflicts.push({ skill, owner });
   }
-  const skills = candidates.filter((skill) => !conflicts.some((one) => one.skill === skill));
+  const unclashed = candidates.filter((skill) => !conflicts.some((one) => one.skill === skill));
+  const ours = new Set(
+    sameTarget ? Object.keys(previous?.skills ?? {}) : []
+  );
+  const blocked = [];
+  for (const one of [
+    ...await outsidersAt(dependencies.directory, unclashed, ours),
+    ...dependencies.linkInto !== void 0 ? await outsidersAt(dependencies.linkInto, unclashed, ours) : []
+  ]) {
+    if (!blocked.some((seen) => seen.skill === one.skill)) blocked.push(one);
+  }
+  if (dependencies.restoreMissing && blocked.length > 0) {
+    const [first] = blocked;
+    throw occupiedByOutsider(first.skill, first.path);
+  }
+  const skills = unclashed.filter((skill) => !blocked.some((one) => one.skill === skill));
   const hashes = {};
   const updated = [];
   const unchanged = [];
@@ -1872,7 +1908,11 @@ async function updateSkills(dependencies) {
   for (const skill of skills) {
     await (0, import_promises4.rm)((0, import_node_path4.join)(dependencies.directory, skill), { recursive: true, force: true });
   }
-  const untouched = /* @__PURE__ */ new Set([...skipped, ...conflicts.map((one) => one.skill)]);
+  const untouched = /* @__PURE__ */ new Set([
+    ...skipped,
+    ...conflicts.map((one) => one.skill),
+    ...blocked.map((one) => one.skill)
+  ]);
   for (const file of files) {
     if (untouched.has(file.skill)) continue;
     const target = (0, import_node_path4.join)(dependencies.directory, file.skill, ...file.path.split("/"));
@@ -1923,6 +1963,7 @@ async function updateSkills(dependencies) {
     removed,
     skipped,
     conflicts,
+    blocked,
     directory: dependencies.directory,
     ...dependencies.linkInto !== void 0 ? { linkedInto: dependencies.linkInto } : {},
     ...copiedCount > 0 ? { copiedCount } : {},
@@ -2128,7 +2169,7 @@ async function planSetup(dependencies) {
 }
 
 // src/cli.ts
-var VERSION = false ? "0.0.0-dev" : "0.9.0";
+var VERSION = false ? "0.0.0-dev" : "0.9.1";
 var SKILLS_ADD_DEPRECATION = "\u26A0 `pep skills add` will be removed in a future release.";
 function reportUpdate(result) {
   const conflicts = () => {
@@ -2137,6 +2178,12 @@ function reportUpdate(result) {
       console.error(`    each other. \`pep skills remove\` one of them to settle it.`);
     }
   };
+  const blocked = () => {
+    for (const { skill, path } of result.blocked) {
+      console.error(`  \u26A0 "${skill}" was not installed \u2014 ${path} already exists`);
+      console.error(`    and pep did not put it there. Move it aside, then run this again.`);
+    }
+  };
   const skipped = (list, name) => {
     if (list.length === 0) return;
     console.log(`  deleted locally, left alone: ${list.join(" ")}`);
@@ -2146,6 +2193,7 @@ function reportUpdate(result) {
     console.log(`${result.name}: already at ${result.commit}. Nothing to do.`);
     skipped(result.skipped, result.name);
     conflicts();
+    blocked();
     return;
   }
   console.log(
@@ -2156,6 +2204,7 @@ function reportUpdate(result) {
   }
   skipped(result.skipped, result.name);
   conflicts();
+  blocked();
   console.log(`  ${result.fileCount} file(s) in ${result.directory}`);
   if (result.linkedInto !== void 0) {
     console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newlandnpt/pep-cli",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "PEP CLI —— 凭 PEP 身份读取 Newland 开发者文档与 agent skills",
   "license": "UNLICENSED",
   "type": "module",