@spzhongwin/skill-logger-plugin 1.0.16 → 1.0.18

package/src/expert-skill-layout.ts

@@ -1,233 +1,233 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-import { randomUUID } from "node:crypto";
-import type { Dirent } from "node:fs";
-import { compareVersions, isComparableVersion } from "./semver.ts";
-import { readSkillVersion } from "./skill-version.ts";
-
-const ASSISTANT_WORKSPACE_RE = /^workspace-assistant-\d{5,}$/;
-const REPAIR_RESIDUE_RE = /^\.(.+)\.repair-(old|new)-(.+)$/;
-
-export type ExpertSkillLayoutRepairResult = {
-  scannedWorkspaces: number;
-  repaired: string[];
-  skipped: string[];
-  errors: Array<{ path: string; message: string }>;
-};
-
-async function lstatOrUndefined(filePath: string) {
-  try {
-    return await fs.lstat(filePath);
-  } catch (error: any) {
-    if (error?.code === "ENOENT") return undefined;
-    throw error;
-  }
-}
-
-async function isRegularFile(filePath: string): Promise<boolean> {
-  const stat = await lstatOrUndefined(filePath);
-  return Boolean(stat?.isFile() && !stat.isSymbolicLink());
-}
-
-async function removeRealDirectory(dirPath: string): Promise<void> {
-  const stat = await lstatOrUndefined(dirPath);
-  if (!stat) return;
-  if (stat.isSymbolicLink() || !stat.isDirectory()) {
-    throw new Error(`拒绝清理非真实目录: ${dirPath}`);
-  }
-  await fs.rm(dirPath, { recursive: true });
-}
-
-async function removeNestedDirectoryIfPresent(dirPath: string): Promise<void> {
-  const stat = await lstatOrUndefined(dirPath);
-  if (!stat) return;
-  if (stat.isSymbolicLink()) throw new Error(`拒绝清理符号链接: ${dirPath}`);
-  if (stat.isDirectory()) await fs.rm(dirPath, { recursive: true });
-}
-
-async function recoverRepairResidues(
-  skillsRoot: string,
-  entries: Dirent<string>[],
-  result: ExpertSkillLayoutRepairResult
-): Promise<void> {
-  const groups = new Map<string, { old: string[]; stage: string[] }>();
-  for (const entry of entries) {
-    const match = REPAIR_RESIDUE_RE.exec(entry.name);
-    if (!match) continue;
-    const group = groups.get(match[1]) ?? { old: [], stage: [] };
-    group[match[2] === "old" ? "old" : "stage"].push(path.join(skillsRoot, entry.name));
-    groups.set(match[1], group);
-  }
-
-  for (const [code, group] of groups) {
-    const targetDir = path.join(skillsRoot, code);
-    try {
-      const targetStat = await lstatOrUndefined(targetDir);
-      if (targetStat?.isSymbolicLink() || (targetStat && !targetStat.isDirectory())) {
-        throw new Error(`规范路径不是可安全操作的真实目录: ${targetDir}`);
-      }
-
-      group.old.sort().reverse();
-      if (!targetStat && group.old.length > 0) {
-        const restore = group.old.shift()!;
-        const restoreStat = await lstatOrUndefined(restore);
-        if (!restoreStat?.isDirectory() || restoreStat.isSymbolicLink()) {
-          throw new Error(`拒绝从非真实目录恢复: ${restore}`);
-        }
-        await fs.rename(restore, targetDir);
-      }
-
-      if (await lstatOrUndefined(targetDir)) {
-        for (const residue of [...group.old, ...group.stage]) {
-          await removeRealDirectory(residue);
-        }
-      }
-    } catch (error: any) {
-      result.errors.push({ path: targetDir, message: error?.message || String(error) });
-    }
-  }
-}
-
-async function promoteNestedSkill(sourceDir: string, targetDir: string): Promise<void> {
-  const parent = path.dirname(targetDir);
-  const tag = `${Date.now()}-${randomUUID().slice(0, 8)}`;
-  const stage = path.join(parent, `.${path.basename(targetDir)}.repair-new-${tag}`);
-  const old = path.join(parent, `.${path.basename(targetDir)}.repair-old-${tag}`);
-
-  let movedOld = false;
-  try {
-    await fs.cp(sourceDir, stage, { recursive: true });
-    // 同名子项为目录时是历史嵌套，应删除；普通文件属于 Skill 内容，必须保留。
-    await removeNestedDirectoryIfPresent(path.join(stage, path.basename(targetDir)));
-    await fs.rename(targetDir, old);
-    movedOld = true;
-    await fs.rename(stage, targetDir);
-  } catch (error: any) {
-    const rollbackErrors: string[] = [];
-    try {
-      await removeRealDirectory(stage);
-    } catch (cleanupError: any) {
-      rollbackErrors.push(`清理暂存目录失败: ${cleanupError?.message || String(cleanupError)}`);
-    }
-    if (movedOld) {
-      try {
-        await fs.rename(old, targetDir);
-      } catch (restoreError: any) {
-        rollbackErrors.push(`恢复旧目录失败: ${restoreError?.message || String(restoreError)}`);
-      }
-    }
-    if (rollbackErrors.length > 0) {
-      throw new Error(`${error?.message || String(error)}; ${rollbackErrors.join("; ")}`);
-    }
-    throw error;
-  }
-  await removeRealDirectory(old);
-}
-
-/**
- * 修复历史 UPDATE_SKILL 将新版写入 `.user/skills/<code>/<code>` 的异常布局。
- * 完整扫描同名目录链并提升全局最高版本；符号链接和版本不明的现场一律保守跳过。
- */
-export async function repairNestedExpertSkillLayouts(
-  openclawRoot: string
-): Promise<ExpertSkillLayoutRepairResult> {
-  const result: ExpertSkillLayoutRepairResult = {
-    scannedWorkspaces: 0,
-    repaired: [],
-    skipped: [],
-    errors: [],
-  };
-
-  let workspaceEntries;
-  try {
-    workspaceEntries = await fs.readdir(openclawRoot, { withFileTypes: true });
-  } catch (error: any) {
-    result.errors.push({ path: openclawRoot, message: error?.message || String(error) });
-    return result;
-  }
-
-  for (const workspaceEntry of workspaceEntries) {
-    if (!workspaceEntry.isDirectory() || !ASSISTANT_WORKSPACE_RE.test(workspaceEntry.name)) continue;
-    result.scannedWorkspaces += 1;
-    const skillsRoot = path.join(openclawRoot, workspaceEntry.name, ".user", "skills");
-    let skillEntries;
-    try {
-      skillEntries = await fs.readdir(skillsRoot, { withFileTypes: true });
-      await recoverRepairResidues(skillsRoot, skillEntries, result);
-      skillEntries = await fs.readdir(skillsRoot, { withFileTypes: true });
-    } catch (error: any) {
-      if (error?.code !== "ENOENT") {
-        result.errors.push({ path: skillsRoot, message: error?.message || String(error) });
-      }
-      continue;
-    }
-
-    for (const skillEntry of skillEntries) {
-      if (!skillEntry.isDirectory() || skillEntry.name.startsWith(".")) continue;
-      const outerDir = path.join(skillsRoot, skillEntry.name);
-
-      try {
-        const candidates: Array<{ dir: string; version: string }> = [];
-        const outerHasSkill = await isRegularFile(path.join(outerDir, "SKILL.md"));
-        if (outerHasSkill) {
-          const version = await readSkillVersion(outerDir);
-          if (!version) {
-            result.skipped.push(outerDir);
-            continue;
-          }
-          candidates.push({ dir: outerDir, version });
-        }
-
-        let cursor = outerDir;
-        let nestedCount = 0;
-        while (true) {
-          const nestedDir = path.join(cursor, skillEntry.name);
-          const nestedStat = await lstatOrUndefined(nestedDir);
-          if (!nestedStat) break;
-          if (nestedStat.isSymbolicLink()) {
-            throw new Error(`拒绝跟随同名符号链接: ${nestedDir}`);
-          }
-          if (!nestedStat.isDirectory()) break;
-          cursor = nestedDir;
-
-          const skillMd = path.join(nestedDir, "SKILL.md");
-          const skillStat = await lstatOrUndefined(skillMd);
-          if (skillStat?.isSymbolicLink()) {
-            throw new Error(`拒绝读取符号链接 SKILL.md: ${skillMd}`);
-          }
-          if (!skillStat?.isFile()) continue;
-          nestedCount += 1;
-          const version = await readSkillVersion(nestedDir);
-          if (!version) {
-            result.skipped.push(outerDir);
-            candidates.length = 0;
-            break;
-          }
-          candidates.push({ dir: nestedDir, version });
-        }
-
-        if (nestedCount === 0 || candidates.length === 0) continue;
-        if (candidates.some((candidate) => !isComparableVersion(candidate.version))) {
-          result.skipped.push(outerDir);
-          continue;
-        }
-        let source = candidates[0];
-        for (const candidate of candidates.slice(1)) {
-          // 同版本也选择更深层，确保把异常同名子目录收敛掉。
-          if (compareVersions(candidate.version, source.version) >= 0) source = candidate;
-        }
-        if (source.dir === outerDir) {
-          result.skipped.push(outerDir);
-          continue;
-        }
-
-        await promoteNestedSkill(source.dir, outerDir);
-        result.repaired.push(outerDir);
-      } catch (error: any) {
-        result.errors.push({ path: outerDir, message: error?.message || String(error) });
-      }
-    }
-  }
-
-  return result;
-}
+import fs from "node:fs/promises";
+import path from "node:path";
+import { randomUUID } from "node:crypto";
+import type { Dirent } from "node:fs";
+import { compareVersions, isComparableVersion } from "./semver.ts";
+import { readSkillVersion } from "./skill-version.ts";
+
+const ASSISTANT_WORKSPACE_RE = /^workspace-assistant-\d{5,}$/;
+const REPAIR_RESIDUE_RE = /^\.(.+)\.repair-(old|new)-(.+)$/;
+
+export type ExpertSkillLayoutRepairResult = {
+  scannedWorkspaces: number;
+  repaired: string[];
+  skipped: string[];
+  errors: Array<{ path: string; message: string }>;
+};
+
+async function lstatOrUndefined(filePath: string) {
+  try {
+    return await fs.lstat(filePath);
+  } catch (error: any) {
+    if (error?.code === "ENOENT") return undefined;
+    throw error;
+  }
+}
+
+async function isRegularFile(filePath: string): Promise<boolean> {
+  const stat = await lstatOrUndefined(filePath);
+  return Boolean(stat?.isFile() && !stat.isSymbolicLink());
+}
+
+async function removeRealDirectory(dirPath: string): Promise<void> {
+  const stat = await lstatOrUndefined(dirPath);
+  if (!stat) return;
+  if (stat.isSymbolicLink() || !stat.isDirectory()) {
+    throw new Error(`拒绝清理非真实目录: ${dirPath}`);
+  }
+  await fs.rm(dirPath, { recursive: true });
+}
+
+async function removeNestedDirectoryIfPresent(dirPath: string): Promise<void> {
+  const stat = await lstatOrUndefined(dirPath);
+  if (!stat) return;
+  if (stat.isSymbolicLink()) throw new Error(`拒绝清理符号链接: ${dirPath}`);
+  if (stat.isDirectory()) await fs.rm(dirPath, { recursive: true });
+}
+
+async function recoverRepairResidues(
+  skillsRoot: string,
+  entries: Dirent<string>[],
+  result: ExpertSkillLayoutRepairResult
+): Promise<void> {
+  const groups = new Map<string, { old: string[]; stage: string[] }>();
+  for (const entry of entries) {
+    const match = REPAIR_RESIDUE_RE.exec(entry.name);
+    if (!match) continue;
+    const group = groups.get(match[1]) ?? { old: [], stage: [] };
+    group[match[2] === "old" ? "old" : "stage"].push(path.join(skillsRoot, entry.name));
+    groups.set(match[1], group);
+  }
+
+  for (const [code, group] of groups) {
+    const targetDir = path.join(skillsRoot, code);
+    try {
+      const targetStat = await lstatOrUndefined(targetDir);
+      if (targetStat?.isSymbolicLink() || (targetStat && !targetStat.isDirectory())) {
+        throw new Error(`规范路径不是可安全操作的真实目录: ${targetDir}`);
+      }
+
+      group.old.sort().reverse();
+      if (!targetStat && group.old.length > 0) {
+        const restore = group.old.shift()!;
+        const restoreStat = await lstatOrUndefined(restore);
+        if (!restoreStat?.isDirectory() || restoreStat.isSymbolicLink()) {
+          throw new Error(`拒绝从非真实目录恢复: ${restore}`);
+        }
+        await fs.rename(restore, targetDir);
+      }
+
+      if (await lstatOrUndefined(targetDir)) {
+        for (const residue of [...group.old, ...group.stage]) {
+          await removeRealDirectory(residue);
+        }
+      }
+    } catch (error: any) {
+      result.errors.push({ path: targetDir, message: error?.message || String(error) });
+    }
+  }
+}
+
+async function promoteNestedSkill(sourceDir: string, targetDir: string): Promise<void> {
+  const parent = path.dirname(targetDir);
+  const tag = `${Date.now()}-${randomUUID().slice(0, 8)}`;
+  const stage = path.join(parent, `.${path.basename(targetDir)}.repair-new-${tag}`);
+  const old = path.join(parent, `.${path.basename(targetDir)}.repair-old-${tag}`);
+
+  let movedOld = false;
+  try {
+    await fs.cp(sourceDir, stage, { recursive: true });
+    // 同名子项为目录时是历史嵌套，应删除；普通文件属于 Skill 内容，必须保留。
+    await removeNestedDirectoryIfPresent(path.join(stage, path.basename(targetDir)));
+    await fs.rename(targetDir, old);
+    movedOld = true;
+    await fs.rename(stage, targetDir);
+  } catch (error: any) {
+    const rollbackErrors: string[] = [];
+    try {
+      await removeRealDirectory(stage);
+    } catch (cleanupError: any) {
+      rollbackErrors.push(`清理暂存目录失败: ${cleanupError?.message || String(cleanupError)}`);
+    }
+    if (movedOld) {
+      try {
+        await fs.rename(old, targetDir);
+      } catch (restoreError: any) {
+        rollbackErrors.push(`恢复旧目录失败: ${restoreError?.message || String(restoreError)}`);
+      }
+    }
+    if (rollbackErrors.length > 0) {
+      throw new Error(`${error?.message || String(error)}; ${rollbackErrors.join("; ")}`);
+    }
+    throw error;
+  }
+  await removeRealDirectory(old);
+}
+
+/**
+ * 修复历史 UPDATE_SKILL 将新版写入 `.user/skills/<code>/<code>` 的异常布局。
+ * 完整扫描同名目录链并提升全局最高版本；符号链接和版本不明的现场一律保守跳过。
+ */
+export async function repairNestedExpertSkillLayouts(
+  openclawRoot: string
+): Promise<ExpertSkillLayoutRepairResult> {
+  const result: ExpertSkillLayoutRepairResult = {
+    scannedWorkspaces: 0,
+    repaired: [],
+    skipped: [],
+    errors: [],
+  };
+
+  let workspaceEntries;
+  try {
+    workspaceEntries = await fs.readdir(openclawRoot, { withFileTypes: true });
+  } catch (error: any) {
+    result.errors.push({ path: openclawRoot, message: error?.message || String(error) });
+    return result;
+  }
+
+  for (const workspaceEntry of workspaceEntries) {
+    if (!workspaceEntry.isDirectory() || !ASSISTANT_WORKSPACE_RE.test(workspaceEntry.name)) continue;
+    result.scannedWorkspaces += 1;
+    const skillsRoot = path.join(openclawRoot, workspaceEntry.name, ".user", "skills");
+    let skillEntries;
+    try {
+      skillEntries = await fs.readdir(skillsRoot, { withFileTypes: true });
+      await recoverRepairResidues(skillsRoot, skillEntries, result);
+      skillEntries = await fs.readdir(skillsRoot, { withFileTypes: true });
+    } catch (error: any) {
+      if (error?.code !== "ENOENT") {
+        result.errors.push({ path: skillsRoot, message: error?.message || String(error) });
+      }
+      continue;
+    }
+
+    for (const skillEntry of skillEntries) {
+      if (!skillEntry.isDirectory() || skillEntry.name.startsWith(".")) continue;
+      const outerDir = path.join(skillsRoot, skillEntry.name);
+
+      try {
+        const candidates: Array<{ dir: string; version: string }> = [];
+        const outerHasSkill = await isRegularFile(path.join(outerDir, "SKILL.md"));
+        if (outerHasSkill) {
+          const version = await readSkillVersion(outerDir);
+          if (!version) {
+            result.skipped.push(outerDir);
+            continue;
+          }
+          candidates.push({ dir: outerDir, version });
+        }
+
+        let cursor = outerDir;
+        let nestedCount = 0;
+        while (true) {
+          const nestedDir = path.join(cursor, skillEntry.name);
+          const nestedStat = await lstatOrUndefined(nestedDir);
+          if (!nestedStat) break;
+          if (nestedStat.isSymbolicLink()) {
+            throw new Error(`拒绝跟随同名符号链接: ${nestedDir}`);
+          }
+          if (!nestedStat.isDirectory()) break;
+          cursor = nestedDir;
+
+          const skillMd = path.join(nestedDir, "SKILL.md");
+          const skillStat = await lstatOrUndefined(skillMd);
+          if (skillStat?.isSymbolicLink()) {
+            throw new Error(`拒绝读取符号链接 SKILL.md: ${skillMd}`);
+          }
+          if (!skillStat?.isFile()) continue;
+          nestedCount += 1;
+          const version = await readSkillVersion(nestedDir);
+          if (!version) {
+            result.skipped.push(outerDir);
+            candidates.length = 0;
+            break;
+          }
+          candidates.push({ dir: nestedDir, version });
+        }
+
+        if (nestedCount === 0 || candidates.length === 0) continue;
+        if (candidates.some((candidate) => !isComparableVersion(candidate.version))) {
+          result.skipped.push(outerDir);
+          continue;
+        }
+        let source = candidates[0];
+        for (const candidate of candidates.slice(1)) {
+          // 同版本也选择更深层，确保把异常同名子目录收敛掉。
+          if (compareVersions(candidate.version, source.version) >= 0) source = candidate;
+        }
+        if (source.dir === outerDir) {
+          result.skipped.push(outerDir);
+          continue;
+        }
+
+        await promoteNestedSkill(source.dir, outerDir);
+        result.repaired.push(outerDir);
+      } catch (error: any) {
+        result.errors.push({ path: outerDir, message: error?.message || String(error) });
+      }
+    }
+  }
+
+  return result;
+}