oh-skillhub 0.1.16 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-skillhub",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "OpenHarmony Skills installer for Codex, Claude Code, and OpenCode.",
   "type": "commonjs",
   "bin": {

package/src/source.js

@@ -4,6 +4,10 @@ const fs = require("node:fs");
 const os = require("node:os");
 const path = require("node:path");
 
+const DEFAULT_MOVE_RETRIES = 8;
+const DEFAULT_MOVE_DELAY_MS = 120;
+const RETRYABLE_MOVE_CODES = new Set(["EBUSY", "EPERM", "ENOTEMPTY"]);
+
 function ensureSkillSourceRoot(manifest, options = {}) {
   const env = options.env || process.env;
   if (env.OH_SKILLHUB_SOURCE_DIR) {
@@ -44,7 +48,7 @@ function ensureSkillSourceRoot(manifest, options = {}) {
     const detail = gitDetail(checkoutResult);
     throw new Error(`Failed to checkout selected skill source from ${source}#${ref}.${detail ? ` ${detail}` : ""}`);
   }
-  fs.renameSync(tempCheckout, checkout);
+  moveCheckoutIntoCache(tempCheckout, checkout);
   return checkout;
 }
 
@@ -99,10 +103,44 @@ async function ensureSkillSourceRootAsync(manifest, options = {}) {
     const detail = gitDetail(checkoutResult);
     throw new Error(`Failed to checkout selected skill source from ${source}#${ref}.${detail ? ` ${detail}` : ""}`);
   }
-  fs.renameSync(tempCheckout, checkout);
+  await moveCheckoutIntoCacheAsync(tempCheckout, checkout);
   return checkout;
 }
 
+function moveCheckoutIntoCache(tempCheckout, checkout, options = {}) {
+  const renameSync = options.renameSync || fs.renameSync;
+  const retries = options.retries ?? DEFAULT_MOVE_RETRIES;
+  const delayMs = options.delayMs ?? DEFAULT_MOVE_DELAY_MS;
+  for (let attempt = 0; attempt <= retries; attempt += 1) {
+    try {
+      renameSync(tempCheckout, checkout);
+      return;
+    } catch (error) {
+      if (!isRetryableMoveError(error) || attempt === retries) {
+        throw cacheMoveError(error, tempCheckout, checkout);
+      }
+      sleepSync(delayMs * (attempt + 1));
+    }
+  }
+}
+
+async function moveCheckoutIntoCacheAsync(tempCheckout, checkout, options = {}) {
+  const renameSync = options.renameSync || fs.renameSync;
+  const retries = options.retries ?? DEFAULT_MOVE_RETRIES;
+  const delayMs = options.delayMs ?? DEFAULT_MOVE_DELAY_MS;
+  for (let attempt = 0; attempt <= retries; attempt += 1) {
+    try {
+      renameSync(tempCheckout, checkout);
+      return;
+    } catch (error) {
+      if (!isRetryableMoveError(error) || attempt === retries) {
+        throw cacheMoveError(error, tempCheckout, checkout);
+      }
+      await sleep(delayMs * (attempt + 1));
+    }
+  }
+}
+
 function requireDirectory(value, label) {
   const dir = path.resolve(value);
   if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
@@ -163,7 +201,32 @@ function gitDetail(result) {
   return (result.stderr || result.stdout || "").trim();
 }
 
+function isRetryableMoveError(error) {
+  return RETRYABLE_MOVE_CODES.has(error && error.code);
+}
+
+function cacheMoveError(error, tempCheckout, checkout) {
+  const wrapped = new Error(
+    `Failed to finalize skill source cache because the checkout directory is busy or locked. ` +
+      `Close terminals/editors using the cache and retry. ${tempCheckout} -> ${checkout}. ${error.message}`,
+  );
+  wrapped.code = error.code;
+  wrapped.cause = error;
+  return wrapped;
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+function sleepSync(ms) {
+  if (ms <= 0) return;
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
 module.exports = {
   ensureSkillSourceRoot,
   ensureSkillSourceRootAsync,
+  moveCheckoutIntoCache,
+  moveCheckoutIntoCacheAsync,
 };