@qilitt-mickey/vue3-temp-skill 1.2.8 → 1.2.9

package/bin/cli.js

@@ -39,6 +39,13 @@ export function createInstaller({ home = os.homedir(), skillDir = PACKAGE_DIR, c
     try { return fs.lstatSync(file); } catch (err) { if (err.code === "ENOENT") return null; throw err; }
   };
   const conflict = (file) => { throw new Error(`未管理或类型不符的路径冲突，保留原内容: ${file}`); };
+  // 迁移受阻一次报全：逐个文件中止会让用户反复重试才知道还有冲突。
+  function unclaimed(list, dir) {
+    const unique = [...new Set(list)];
+    const shown = unique.slice(0, 20);
+    const rest = unique.length - shown.length;
+    throw new Error(`旧资源冲突：${unique.length} 个路径无法与本包核对，原内容全部保留：\n${shown.map((file) => `  ${file}`).join("\n")}${rest ? `\n  …另有 ${rest} 个` : ""}\n人工迁移：把 ${dir} 改名备份（如 ${dir}.bak）后重新执行 ${SKILL_NAME} install <target>；或只删除以上路径后重试 --force。`);
+  }
   function safePath(file) {
     for (let current = path.resolve(file); ; current = path.dirname(current)) {
       const info = stat(current);
@@ -115,22 +122,26 @@ export function createInstaller({ home = os.homedir(), skillDir = PACKAGE_DIR, c
       }
       return { files: data.files, exists: true };
     }
-    if (!force) throw new Error(`未管理的旧目录冲突: ${dir}；仅可用 --force 尝试识别自有资源后迁移`);
+    if (!force) throw new Error(`未管理的旧目录冲突: ${dir}；用 --force 仅迁移可识别的自有资源，或把 ${dir} 改名备份后重新执行 ${SKILL_NAME} install <target>`);
     source ||= runtimeFiles();
+    const keys = [...source.keys()];
     const files = [];
+    const offenders = [];
     function inspect(relative = "") {
       for (const entry of fs.readdirSync(path.join(dir, relative), { withFileTypes: true })) {
         const file = relative ? `${relative}/${entry.name}` : entry.name;
         const full = path.join(dir, file);
-        if (entry.isSymbolicLink()) conflict(full);
+        if (entry.isSymbolicLink()) { offenders.push(full); continue; }
         if (entry.isDirectory()) {
-          if (![...source.keys()].some((key) => key.startsWith(`${file}/`))) conflict(full);
+          // 整目录不可核对时只报目录本身，不把它里面的文件逐个铺开。
+          if (!keys.some((key) => key.startsWith(`${file}/`))) { offenders.push(full); continue; }
           inspect(file);
         } else if (entry.isFile() && source.has(file) && fs.readFileSync(full).equals(source.get(file))) files.push(file);
-        else conflict(full);
+        else offenders.push(full);
       }
     }
     inspect();
+    if (offenders.length) unclaimed(offenders, dir);
     if (!files.includes("SKILL.md")) conflict(dir);
     return { files, exists: true, legacy: true };
   }
@@ -163,17 +174,19 @@ export function createInstaller({ home = os.homedir(), skillDir = PACKAGE_DIR, c
     safePath(dest);
     if (!stat(dest)) return { text: "", range: null };
     if (stat(dest).isDirectory()) {
-      if (!force) throw new Error(`旧目录占用了索引文件: ${dest}；需要 --force 并识别自有资源后迁移`);
+      if (!force) throw new Error(`旧目录占用了索引文件: ${dest}；把 ${dest} 改名备份后重新执行 ${SKILL_NAME} install <target>，或用 --force 仅迁移可识别的自有资源`);
       const directory = ownership(dest, force, source);
       // 索引目录必须可完整移走；不能先删除受管文件再发现其中还留有用户文件。
+      const offenders = [];
       function check(relative = "") {
         for (const entry of fs.readdirSync(path.join(dest, relative), { withFileTypes: true })) {
           const file = relative ? `${relative}/${entry.name}` : entry.name;
           if (entry.isDirectory() && directory.files.some((owned) => owned.startsWith(`${file}/`))) check(file);
-          else if (!entry.isFile() || (!directory.files.includes(file) && (directory.legacy || file !== MANIFEST))) conflict(path.join(dest, file));
+          else if (!entry.isFile() || (!directory.files.includes(file) && (directory.legacy || file !== MANIFEST))) offenders.push(path.join(dest, file));
         }
       }
       check();
+      if (offenders.length) unclaimed(offenders, dest);
       return { text: "", range: null, directory };
     }
     if (!stat(dest).isFile()) conflict(dest);
@@ -182,7 +195,7 @@ export function createInstaller({ home = os.homedir(), skillDir = PACKAGE_DIR, c
     if (cfg.type === "rules" && !range) {
       const legacyBody = path.join(path.dirname(path.dirname(dest)), "skills", SKILL_NAME);
       if (!force || text !== legacyRulesText(legacyBody)) {
-        throw new Error(`未管理的规则文件冲突: ${dest}；旧版本需 --force 且可识别，否则请人工迁移`);
+        throw new Error(`未管理的规则文件冲突: ${dest}；内容与本包旧版本逐字一致时可用 --force 迁移，否则把 ${dest} 改名备份后重新执行 ${SKILL_NAME} install <target>`);
       }
       return { text: "", range: null, legacyBody, legacyOwnership: ownership(legacyBody, force, source) };
     }
@@ -321,6 +334,15 @@ export function createInstaller({ home = os.homedir(), skillDir = PACKAGE_DIR, c
       jobs = track.filter((entry) => !target || target === "all" || entry.target === target);
       if (opts.project !== undefined) jobs = jobs.map((entry) => ({ ...entry, project: opts.project }));
       if (target && target !== "all" && (opts.project !== undefined || jobs.length === 0)) jobs = [{ target, project: opts.project || null }];
+      // 批量任务沿用 install 的规则：无 --project 的项目专属目标跳过并说明，不让一条历史记录中止整批。
+      if (!target || target === "all") {
+        const batch = [];
+        for (const job of jobs) {
+          if (targets[job.target].projectOnly && !job.project) { log(`${job.target} 仅支持项目安装，未指定 --project，已跳过`); continue; }
+          batch.push(job);
+        }
+        jobs = batch;
+      }
     }
     const identity = (entry) => JSON.stringify([entry.target, entry.project]);
     jobs = [...new Map(jobs.map((entry) => [identity(entry), entry])).values()];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qilitt-mickey/vue3-temp-skill",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "type": "module",
   "description": "vue3-web-temp 项目工程技能：按需功能开发、保留业务的设计还原与视觉及功能双重验证",
   "bin": {