@myclaw163/clawclaw-cli 0.6.58 → 0.6.60

package/scripts/sync-bundled-skill.mjs

@@ -1,245 +1,245 @@
 import { spawnSync } from 'child_process';
-import { createHash } from 'crypto';
-import {
-  cpSync,
-  existsSync,
-  mkdirSync,
-  readdirSync,
-  readFileSync,
-  realpathSync,
-  statSync,
-  writeFileSync,
-} from 'fs';
-import { homedir } from 'os';
-import { basename, dirname, join, relative, resolve } from 'path';
-import { fileURLToPath, pathToFileURL } from 'url';
-
-const SKILL_NAME = 'clawclaw';
-const SKILLS_ADD_TIMEOUT_MS = 60_000;
-
-function defaultBackupRoot() {
-  const appData = process.env.APPDATA?.trim();
-  if (appData) return resolve(appData, 'clawclaw', 'skill-backups');
-  return resolve(homedir(), '.clawclaw', 'skill-backups');
-}
-
-function getOpenClawSkillsDir(homeDir = homedir()) {
-  for (const dir of ['.openclaw', '.clawdbot', '.moltbot']) {
-    const base = join(homeDir, dir);
-    if (existsSync(base)) return join(base, 'skills');
-  }
-  return join(homeDir, '.openclaw', 'skills');
-}
-
-function defaultCandidateSkillDirs() {
-  const homeDir = homedir();
-  const claudeHome = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homeDir, '.claude');
-  const codexHome = process.env.CODEX_HOME?.trim() || join(homeDir, '.codex');
-  return [
-    join(homeDir, '.agents', 'skills', SKILL_NAME),
-    join(claudeHome, 'skills', SKILL_NAME),
-    join(codexHome, 'skills', SKILL_NAME),
-    join(getOpenClawSkillsDir(homeDir), SKILL_NAME),
-  ];
-}
-
-function formatTimestamp(date = new Date()) {
-  const pad = (n) => String(n).padStart(2, '0');
-  return `${date.getUTCFullYear()}${pad(date.getUTCMonth() + 1)}${pad(date.getUTCDate())}-${pad(date.getUTCHours())}${pad(date.getUTCMinutes())}${pad(date.getUTCSeconds())}Z`;
-}
-
-function chooseUniqueDir(baseDir) {
-  if (!existsSync(baseDir)) return baseDir;
-  for (let i = 1; i < 1000; i += 1) {
-    const candidate = `${baseDir}-${i}`;
-    if (!existsSync(candidate)) return candidate;
-  }
-  throw new Error(`unable to choose a unique backup directory under ${dirname(baseDir)}`);
-}
-
-function readSkillVersion(skillDir) {
-  const md = join(skillDir, 'SKILL.md');
-  if (!existsSync(md)) return null;
-  const content = readFileSync(md, 'utf8');
-  const frontmatter = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-  if (!frontmatter) return null;
-  const version = frontmatter[1].match(/^\s*version\s*:\s*["']?([^"'\r\n]+)["']?\s*$/im);
-  return version?.[1]?.trim() || null;
-}
-
-function listFilesRecursive(dir, base = dir) {
-  const entries = readdirSync(dir, { withFileTypes: true })
-    .sort((a, b) => a.name.localeCompare(b.name));
-  const files = [];
-  for (const entry of entries) {
-    const abs = join(dir, entry.name);
-    if (entry.isDirectory()) {
-      files.push(...listFilesRecursive(abs, base));
-    } else if (entry.isFile()) {
-      files.push(abs);
-    }
-  }
-  if (dir === base) files.sort((a, b) => relative(base, a).localeCompare(relative(base, b)));
-  return files;
-}
-
-export function hashDirectory(dir) {
-  const hash = createHash('sha256');
-  for (const file of listFilesRecursive(dir)) {
-    const rel = relative(dir, file).split('\\').join('/');
-    hash.update(rel);
-    hash.update('\0');
-    hash.update(readFileSync(file));
-    hash.update('\0');
-  }
-  return hash.digest('hex');
-}
-
-function existingUniqueDirs(candidateDirs) {
-  const seen = new Set();
-  const dirs = [];
-  for (const dir of candidateDirs) {
-    const abs = resolve(dir);
-    if (!existsSync(abs)) continue;
-    if (!statSync(abs).isDirectory()) continue;
-    let key;
-    try {
-      key = realpathSync(abs);
-    } catch {
-      key = abs;
-    }
-    const normalized = key.toLowerCase();
-    if (seen.has(normalized)) continue;
-    seen.add(normalized);
-    dirs.push(abs);
-  }
-  return dirs;
-}
-
-export function backupInstalledSkillTargets(options = {}) {
-  const candidateDirs = options.candidateDirs ?? defaultCandidateSkillDirs();
-  const sourceDir = options.sourceDir ? resolve(options.sourceDir) : null;
-  const existingDirs = existingUniqueDirs(candidateDirs);
-  if (existingDirs.length === 0) return null;
-
-  const backupRoot = resolve(options.backupRoot ?? defaultBackupRoot());
-  const backupDir = chooseUniqueDir(join(backupRoot, `${SKILL_NAME}-${formatTimestamp(options.now)}`));
-
-  const sourceHash = sourceDir && existsSync(sourceDir) ? hashDirectory(sourceDir) : null;
-  const backupSources = [];
-  for (const dir of existingDirs) {
-    const hash = hashDirectory(dir);
-    if (sourceHash && hash === sourceHash) continue;
-    backupSources.push({
-      dir,
-      hash,
-      oldSkillVersion: readSkillVersion(dir),
-    });
-  }
-  if (backupSources.length === 0) return null;
-
-  mkdirSync(backupDir, { recursive: true });
-  const copyByHash = new Map();
-  const copies = [];
-  const entries = [];
-  for (const { dir, hash, oldSkillVersion } of backupSources) {
-    let copy = copyByHash.get(hash);
-    if (!copy) {
-      const name = `copy-${copies.length + 1}`;
-      const backupPath = join(backupDir, name);
-      cpSync(dir, backupPath, { recursive: true, dereference: true, errorOnExist: true });
-      copy = {
-        name,
-        backupPath,
-        hash,
-        oldSkillVersion,
-      };
-      copyByHash.set(hash, copy);
-      copies.push(copy);
-    }
-    entries.push({
-      sourcePath: dir,
-      copy: copy.name,
-      hash,
-      oldSkillVersion,
-    });
-  }
-
-  const manifest = {
-    skill: SKILL_NAME,
-    createdAt: new Date().toISOString(),
-    backupDir,
-    sourceDir,
-    newSkillVersion: sourceDir ? readSkillVersion(sourceDir) : null,
-    copies,
-    entries,
-  };
-  writeFileSync(join(backupDir, 'manifest.json'), `${JSON.stringify(manifest, null, 2)}\n`, 'utf8');
-  return { backupDir, copies, entries };
-}
-
-function resolveSkillsBin(installDir) {
-  const pkgPath = resolve(installDir, 'node_modules', 'skills', 'package.json');
-  if (!existsSync(pkgPath)) throw new Error(`skills package not found: ${pkgPath}`);
-  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
-  const entry = typeof pkg.bin === 'string' ? pkg.bin : pkg.bin?.skills;
-  if (!entry) throw new Error('skills package has no bin entry');
-  return resolve(installDir, 'node_modules', 'skills', entry);
-}
-
-export function syncBundledSkill(options = {}) {
-  const scriptDir = dirname(fileURLToPath(import.meta.url));
-  const installDir = resolve(options.installDir ?? join(scriptDir, '..'));
-  const sourceDir = resolve(installDir, 'skills', SKILL_NAME);
-  if (!existsSync(sourceDir)) throw new Error(`bundled skill dir not found: ${sourceDir}`);
-
-  const backup = backupInstalledSkillTargets({
-    sourceDir,
-    backupRoot: options.backupRoot,
-    candidateDirs: options.candidateDirs,
-    now: options.now,
-  });
-
-  const skillsBin = resolveSkillsBin(installDir);
-  const spawn = options.spawnSync ?? spawnSync;
-  const result = spawn(
-    process.execPath,
-    [skillsBin, 'add', sourceDir, '-y', '-g'],
-    {
-      cwd: installDir,
-      timeout: SKILLS_ADD_TIMEOUT_MS,
-      windowsHide: true,
-      stdio: options.stdio ?? 'inherit',
-    },
-  );
-
-  if (result.error) throw result.error;
-  if (typeof result.status === 'number' && result.status !== 0) {
-    throw new Error(`skills add exited with code ${result.status}`);
-  }
-
-  return { backupDir: backup?.backupDir ?? null, copyCount: backup?.copies.length ?? 0 };
-}
-
-function formatFailure(err) {
-  return err?.message ?? String(err);
-}
-
-function main() {
-  try {
-    const result = syncBundledSkill();
-    if (result.backupDir) {
-      console.error(`[clawclaw-cli] Backed up existing clawclaw skill to: ${result.backupDir}`);
-    }
-  } catch (err) {
-    console.error('[clawclaw-cli] Bundled agent skill was not updated.');
-    console.error('[clawclaw-cli] Run: ccl upgrade skill');
-    console.error(`[clawclaw-cli] Error: ${formatFailure(err)}`);
-    process.exit(1);
-  }
-}
-
-const entry = process.argv[1] ? pathToFileURL(resolve(process.argv[1])).href : '';
-if (import.meta.url === entry || basename(process.argv[1] ?? '') === 'sync-bundled-skill.mjs') {
-  main();
-}
+import { createHash } from 'crypto';
+import {
+  cpSync,
+  existsSync,
+  mkdirSync,
+  readdirSync,
+  readFileSync,
+  realpathSync,
+  statSync,
+  writeFileSync,
+} from 'fs';
+import { homedir } from 'os';
+import { basename, dirname, join, relative, resolve } from 'path';
+import { fileURLToPath, pathToFileURL } from 'url';
+
+const SKILL_NAME = 'clawclaw';
+const SKILLS_ADD_TIMEOUT_MS = 60_000;
+
+function defaultBackupRoot() {
+  const appData = process.env.APPDATA?.trim();
+  if (appData) return resolve(appData, 'clawclaw', 'skill-backups');
+  return resolve(homedir(), '.clawclaw', 'skill-backups');
+}
+
+function getOpenClawSkillsDir(homeDir = homedir()) {
+  for (const dir of ['.openclaw', '.clawdbot', '.moltbot']) {
+    const base = join(homeDir, dir);
+    if (existsSync(base)) return join(base, 'skills');
+  }
+  return join(homeDir, '.openclaw', 'skills');
+}
+
+function defaultCandidateSkillDirs() {
+  const homeDir = homedir();
+  const claudeHome = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homeDir, '.claude');
+  const codexHome = process.env.CODEX_HOME?.trim() || join(homeDir, '.codex');
+  return [
+    join(homeDir, '.agents', 'skills', SKILL_NAME),
+    join(claudeHome, 'skills', SKILL_NAME),
+    join(codexHome, 'skills', SKILL_NAME),
+    join(getOpenClawSkillsDir(homeDir), SKILL_NAME),
+  ];
+}
+
+function formatTimestamp(date = new Date()) {
+  const pad = (n) => String(n).padStart(2, '0');
+  return `${date.getUTCFullYear()}${pad(date.getUTCMonth() + 1)}${pad(date.getUTCDate())}-${pad(date.getUTCHours())}${pad(date.getUTCMinutes())}${pad(date.getUTCSeconds())}Z`;
+}
+
+function chooseUniqueDir(baseDir) {
+  if (!existsSync(baseDir)) return baseDir;
+  for (let i = 1; i < 1000; i += 1) {
+    const candidate = `${baseDir}-${i}`;
+    if (!existsSync(candidate)) return candidate;
+  }
+  throw new Error(`unable to choose a unique backup directory under ${dirname(baseDir)}`);
+}
+
+function readSkillVersion(skillDir) {
+  const md = join(skillDir, 'SKILL.md');
+  if (!existsSync(md)) return null;
+  const content = readFileSync(md, 'utf8');
+  const frontmatter = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+  if (!frontmatter) return null;
+  const version = frontmatter[1].match(/^\s*version\s*:\s*["']?([^"'\r\n]+)["']?\s*$/im);
+  return version?.[1]?.trim() || null;
+}
+
+function listFilesRecursive(dir, base = dir) {
+  const entries = readdirSync(dir, { withFileTypes: true })
+    .sort((a, b) => a.name.localeCompare(b.name));
+  const files = [];
+  for (const entry of entries) {
+    const abs = join(dir, entry.name);
+    if (entry.isDirectory()) {
+      files.push(...listFilesRecursive(abs, base));
+    } else if (entry.isFile()) {
+      files.push(abs);
+    }
+  }
+  if (dir === base) files.sort((a, b) => relative(base, a).localeCompare(relative(base, b)));
+  return files;
+}
+
+export function hashDirectory(dir) {
+  const hash = createHash('sha256');
+  for (const file of listFilesRecursive(dir)) {
+    const rel = relative(dir, file).split('\\').join('/');
+    hash.update(rel);
+    hash.update('\0');
+    hash.update(readFileSync(file));
+    hash.update('\0');
+  }
+  return hash.digest('hex');
+}
+
+function existingUniqueDirs(candidateDirs) {
+  const seen = new Set();
+  const dirs = [];
+  for (const dir of candidateDirs) {
+    const abs = resolve(dir);
+    if (!existsSync(abs)) continue;
+    if (!statSync(abs).isDirectory()) continue;
+    let key;
+    try {
+      key = realpathSync(abs);
+    } catch {
+      key = abs;
+    }
+    const normalized = key.toLowerCase();
+    if (seen.has(normalized)) continue;
+    seen.add(normalized);
+    dirs.push(abs);
+  }
+  return dirs;
+}
+
+export function backupInstalledSkillTargets(options = {}) {
+  const candidateDirs = options.candidateDirs ?? defaultCandidateSkillDirs();
+  const sourceDir = options.sourceDir ? resolve(options.sourceDir) : null;
+  const existingDirs = existingUniqueDirs(candidateDirs);
+  if (existingDirs.length === 0) return null;
+
+  const backupRoot = resolve(options.backupRoot ?? defaultBackupRoot());
+  const backupDir = chooseUniqueDir(join(backupRoot, `${SKILL_NAME}-${formatTimestamp(options.now)}`));
+
+  const sourceHash = sourceDir && existsSync(sourceDir) ? hashDirectory(sourceDir) : null;
+  const backupSources = [];
+  for (const dir of existingDirs) {
+    const hash = hashDirectory(dir);
+    if (sourceHash && hash === sourceHash) continue;
+    backupSources.push({
+      dir,
+      hash,
+      oldSkillVersion: readSkillVersion(dir),
+    });
+  }
+  if (backupSources.length === 0) return null;
+
+  mkdirSync(backupDir, { recursive: true });
+  const copyByHash = new Map();
+  const copies = [];
+  const entries = [];
+  for (const { dir, hash, oldSkillVersion } of backupSources) {
+    let copy = copyByHash.get(hash);
+    if (!copy) {
+      const name = `copy-${copies.length + 1}`;
+      const backupPath = join(backupDir, name);
+      cpSync(dir, backupPath, { recursive: true, dereference: true, errorOnExist: true });
+      copy = {
+        name,
+        backupPath,
+        hash,
+        oldSkillVersion,
+      };
+      copyByHash.set(hash, copy);
+      copies.push(copy);
+    }
+    entries.push({
+      sourcePath: dir,
+      copy: copy.name,
+      hash,
+      oldSkillVersion,
+    });
+  }
+
+  const manifest = {
+    skill: SKILL_NAME,
+    createdAt: new Date().toISOString(),
+    backupDir,
+    sourceDir,
+    newSkillVersion: sourceDir ? readSkillVersion(sourceDir) : null,
+    copies,
+    entries,
+  };
+  writeFileSync(join(backupDir, 'manifest.json'), `${JSON.stringify(manifest, null, 2)}\n`, 'utf8');
+  return { backupDir, copies, entries };
+}
+
+function resolveSkillsBin(installDir) {
+  const pkgPath = resolve(installDir, 'node_modules', 'skills', 'package.json');
+  if (!existsSync(pkgPath)) throw new Error(`skills package not found: ${pkgPath}`);
+  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+  const entry = typeof pkg.bin === 'string' ? pkg.bin : pkg.bin?.skills;
+  if (!entry) throw new Error('skills package has no bin entry');
+  return resolve(installDir, 'node_modules', 'skills', entry);
+}
+
+export function syncBundledSkill(options = {}) {
+  const scriptDir = dirname(fileURLToPath(import.meta.url));
+  const installDir = resolve(options.installDir ?? join(scriptDir, '..'));
+  const sourceDir = resolve(installDir, 'skills', SKILL_NAME);
+  if (!existsSync(sourceDir)) throw new Error(`bundled skill dir not found: ${sourceDir}`);
+
+  const backup = backupInstalledSkillTargets({
+    sourceDir,
+    backupRoot: options.backupRoot,
+    candidateDirs: options.candidateDirs,
+    now: options.now,
+  });
+
+  const skillsBin = resolveSkillsBin(installDir);
+  const spawn = options.spawnSync ?? spawnSync;
+  const result = spawn(
+    process.execPath,
+    [skillsBin, 'add', sourceDir, '-y', '-g'],
+    {
+      cwd: installDir,
+      timeout: SKILLS_ADD_TIMEOUT_MS,
+      windowsHide: true,
+      stdio: options.stdio ?? 'inherit',
+    },
+  );
+
+  if (result.error) throw result.error;
+  if (typeof result.status === 'number' && result.status !== 0) {
+    throw new Error(`skills add exited with code ${result.status}`);
+  }
+
+  return { backupDir: backup?.backupDir ?? null, copyCount: backup?.copies.length ?? 0 };
+}
+
+function formatFailure(err) {
+  return err?.message ?? String(err);
+}
+
+function main() {
+  try {
+    const result = syncBundledSkill();
+    if (result.backupDir) {
+      console.error(`[clawclaw-cli] Backed up existing clawclaw skill to: ${result.backupDir}`);
+    }
+  } catch (err) {
+    console.error('[clawclaw-cli] Bundled agent skill was not updated.');
+    console.error('[clawclaw-cli] Run: ccl upgrade skill');
+    console.error(`[clawclaw-cli] Error: ${formatFailure(err)}`);
+    process.exit(1);
+  }
+}
+
+const entry = process.argv[1] ? pathToFileURL(resolve(process.argv[1])).href : '';
+if (import.meta.url === entry || basename(process.argv[1] ?? '') === 'sync-bundled-skill.mjs') {
+  main();
+}