dk-frontend-skills 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dk-frontend-skills",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "dk-engineer - 幽默沉稳靠谱的前端开发助手 Claude Skills 配置包，一键注入 .claude/ 技能目录和 CLAUDE.md 人设配置",
   "author": "XiaoMa",
   "license": "MIT",

package/scripts/copy-skills.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { spawn } = require("child_process");
+const { execSync, spawn } = require("child_process");
 
 // 获取用户项目根目录
 const projectRoot = path.resolve(__dirname, "..", "..", "..");
@@ -45,34 +45,43 @@ function appendLog(level, message) {
 }
 
 /**
- * 备份已有目录
- * 将 dir 复制为 dir.bak.<timestamp>
+ * 备份已有目录到 .claude/backups/<timestamp>/
  * 清理超过 3 份的旧备份
  */
 function backupDir(dir) {
   if (!fs.existsSync(dir)) return null;
 
-  const parent = path.dirname(dir);
-  const base = path.basename(dir);
-  const bakName = `${base}.bak.${backupTimestamp()}`;
-  const bakPath = path.join(parent, bakName);
+  const backupsDir = path.join(dir, "backups");
+  if (!fs.existsSync(backupsDir)) {
+    fs.mkdirSync(backupsDir, { recursive: true });
+  }
+
+  const ts = backupTimestamp();
+  const bakPath = path.join(backupsDir, ts);
 
   fs.cpSync(dir, bakPath, { recursive: true });
-  appendLog("BACKUP", `${base}/ → ${bakName}/`);
-  console.log(`  💾 备份 ${base}/ → ${bakName}/`);
+
+  // 删掉 backups 目录自身的递归副本
+  const selfBak = path.join(bakPath, "backups");
+  if (fs.existsSync(selfBak)) {
+    fs.rmSync(selfBak, { recursive: true, force: true });
+  }
+
+  appendLog("BACKUP", `backups/${ts}/ created`);
+  console.log(`  💾 备份 → .claude/backups/${ts}/`);
 
   // 清理旧备份，只保留最近 3 份
   const backups = fs
-    .readdirSync(parent)
-    .filter((name) => name.startsWith(`${base}.bak.`))
+    .readdirSync(backupsDir)
+    .filter((name) => /^\d{8}\.\d{6}$/.test(name))
     .sort()
     .reverse();
 
   if (backups.length > 3) {
     for (const old of backups.slice(3)) {
-      const oldPath = path.join(parent, old);
+      const oldPath = path.join(backupsDir, old);
       fs.rmSync(oldPath, { recursive: true, force: true });
-      appendLog("CLEAN", `清除旧备份 ${old}/`);
+      appendLog("CLEAN", `清除旧备份 backups/${old}/`);
     }
   }
 
@@ -246,11 +255,15 @@ if (fs.existsSync(mdSource)) {
     fs.copyFileSync(mdSource, mdDest);
     appendLog("INFO", "CLAUDE.md installed");
   } else {
-    // 仅备份用户版本，方便查阅
-    const bakName = `CLAUDE.md.bak.${backupTimestamp()}`;
-    const bakPath = path.join(projectRoot, bakName);
+    // 仅备份用户版本到 .claude/backups/，方便查阅
+    const backupsDir = path.join(claudeDest, "backups");
+    if (!fs.existsSync(backupsDir)) {
+      fs.mkdirSync(backupsDir, { recursive: true });
+    }
+    const bakName = `CLAUDE.md.${backupTimestamp()}`;
+    const bakPath = path.join(backupsDir, bakName);
     fs.copyFileSync(mdDest, bakPath);
-    appendLog("BACKUP", `CLAUDE.md → ${bakName} (user version preserved)`);
+    appendLog("BACKUP", `backups/${bakName} (CLAUDE.md user version preserved)`);
   }
 }
 
@@ -269,31 +282,24 @@ if (fs.existsSync(logFile)) {
 }
 
 // 自动卸载
-console.log("🧹 清理安装包...");
-
-const spawnOptions = {
+// 用 detached 子进程延迟卸载，避免在 npm 生命周期中自卸导致冲突
+console.log("🧹 自动卸载安装包...");
+
+const uninstallCmd = `
+const { execSync } = require("child_process");
+setTimeout(() => {
+  execSync("npm uninstall dk-frontend-skills", {
+    cwd: ${JSON.stringify(projectRoot)},
+    windowsHide: true,
+    stdio: "ignore",
+  });
+}, 500);
+`;
+
+const child = spawn(process.execPath, ["-e", uninstallCmd], {
   cwd: projectRoot,
+  detached: true,
   stdio: "ignore",
-};
-spawnOptions.detached = true;
-if (process.platform === "win32") {
-  spawnOptions.windowsHide = true;
-}
-
-const child = spawn(
-  process.execPath,
-  [
-    "-e",
-    `
-    const { execSync } = require("child_process");
-    setTimeout(() => {
-      execSync("npm uninstall dk-frontend-skills", {
-        cwd: ${JSON.stringify(projectRoot)},
-        windowsHide: true,
-      });
-    }, 300);
-  `,
-  ],
-  spawnOptions,
-);
+  windowsHide: process.platform === "win32",
+});
 child.unref();