nextclaw 0.9.26 → 0.9.28

package/dist/cli/index.js

@@ -199,20 +199,20 @@ async function installMarketplaceSkill(options) {
   const dirName = options.dir?.trim() || "skills";
   const destinationDir = isAbsolute(dirName) ? resolve2(dirName, slug) : resolve2(workdir, dirName, slug);
   const skillFile = join(destinationDir, "SKILL.md");
-  if (!options.force && existsSync2(destinationDir)) {
-    if (existsSync2(skillFile)) {
-      return {
-        slug,
-        destinationDir,
-        alreadyInstalled: true,
-        source: "marketplace"
-      };
-    }
-    throw new Error(`Skill directory already exists: ${destinationDir} (use --force)`);
-  }
   const apiBase = resolveMarketplaceApiBase(options.apiBaseUrl);
   const item = await fetchMarketplaceSkillItem(apiBase, slug);
   if (item.install.kind === "builtin") {
+    if (!options.force && existsSync2(destinationDir)) {
+      if (existsSync2(skillFile)) {
+        return {
+          slug,
+          destinationDir,
+          alreadyInstalled: true,
+          source: "builtin"
+        };
+      }
+      throw new Error(`Skill directory already exists: ${destinationDir} (use --force)`);
+    }
     if (existsSync2(destinationDir) && options.force) {
       rmSync2(destinationDir, { recursive: true, force: true });
     }
@@ -224,6 +224,22 @@ async function installMarketplaceSkill(options) {
     };
   }
   const filesPayload = await fetchMarketplaceSkillFiles(apiBase, slug);
+  if (!options.force && existsSync2(destinationDir)) {
+    const existingDirState = inspectMarketplaceSkillDirectory(destinationDir, filesPayload.files);
+    if (existingDirState === "installed") {
+      return {
+        slug,
+        destinationDir,
+        alreadyInstalled: true,
+        source: "marketplace"
+      };
+    }
+    if (existingDirState === "recoverable") {
+      rmSync2(destinationDir, { recursive: true, force: true });
+    } else {
+      throw new Error(`Skill directory already exists: ${destinationDir} (use --force)`);
+    }
+  }
   if (existsSync2(destinationDir) && options.force) {
     rmSync2(destinationDir, { recursive: true, force: true });
   }
@@ -235,7 +251,7 @@ async function installMarketplaceSkill(options) {
       throw new Error(`Invalid marketplace file path: ${file.path}`);
     }
     mkdirSync2(dirname(targetPath), { recursive: true });
-    const bytes = await fetchMarketplaceSkillFileBlob(apiBase, slug, file);
+    const bytes = file.contentBase64 ? decodeMarketplaceFileContent(file.path, file.contentBase64) : await fetchMarketplaceSkillFileBlob(apiBase, slug, file);
     writeFileSync2(targetPath, bytes);
   }
   if (!existsSync2(join(destinationDir, "SKILL.md"))) {
@@ -247,6 +263,49 @@ async function installMarketplaceSkill(options) {
     source: "marketplace"
   };
 }
+function inspectMarketplaceSkillDirectory(destinationDir, files) {
+  if (existsSync2(join(destinationDir, "SKILL.md"))) {
+    return "installed";
+  }
+  const discoveredFiles = collectRelativeFiles(destinationDir);
+  if (discoveredFiles === null) {
+    return "conflict";
+  }
+  const relevantFiles = discoveredFiles.filter((file) => !isIgnorableMarketplaceResidue(file));
+  if (relevantFiles.length === 0) {
+    return "recoverable";
+  }
+  const manifestPaths = new Set(files.map((file) => normalizeMarketplaceRelativePath(file.path)));
+  return relevantFiles.every((file) => manifestPaths.has(normalizeMarketplaceRelativePath(file))) ? "recoverable" : "conflict";
+}
+function collectRelativeFiles(rootDir) {
+  const output = [];
+  const walk = (dir) => {
+    const entries = readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const absolute = join(dir, entry.name);
+      if (entry.isDirectory()) {
+        if (!walk(absolute)) {
+          return false;
+        }
+        continue;
+      }
+      if (!entry.isFile()) {
+        return false;
+      }
+      const relativePath = relative(rootDir, absolute);
+      output.push(normalizeMarketplaceRelativePath(relativePath));
+    }
+    return true;
+  };
+  return walk(rootDir) ? output : null;
+}
+function normalizeMarketplaceRelativePath(path) {
+  return path.replace(/\\/g, "/");
+}
+function isIgnorableMarketplaceResidue(path) {
+  return path === ".DS_Store";
+}
 async function publishMarketplaceSkill(options) {
   const skillDir = resolve2(options.skillDir);
   if (!existsSync2(skillDir)) {
@@ -376,6 +435,9 @@ async function fetchMarketplaceSkillFiles(apiBase, slug) {
     if (typeof entry.downloadPath === "string" && entry.downloadPath.trim().length > 0) {
       normalized.downloadPath = entry.downloadPath.trim();
     }
+    if (typeof entry.contentBase64 === "string" && entry.contentBase64.trim().length > 0) {
+      normalized.contentBase64 = entry.contentBase64.trim();
+    }
     return normalized;
   });
   return { files };
@@ -394,6 +456,13 @@ async function fetchMarketplaceSkillFileBlob(apiBase, slug, file) {
   const arrayBuffer = await response.arrayBuffer();
   return Buffer.from(arrayBuffer);
 }
+function decodeMarketplaceFileContent(path, contentBase64) {
+  const normalized = contentBase64.replace(/\s+/g, "");
+  if (!normalized || normalized.length % 4 !== 0 || !/^[A-Za-z0-9+/]+={0,2}$/.test(normalized)) {
+    throw new Error(`Invalid marketplace file contentBase64 for path: ${path}`);
+  }
+  return Buffer.from(normalized, "base64");
+}
 function resolveSkillFileDownloadUrl(apiBase, slug, file) {
   const fallback = `${apiBase}/api/v1/skills/items/${encodeURIComponent(slug)}/files/blob?path=${encodeURIComponent(file.path)}`;
   if (!file.downloadPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.9.26",
+  "version": "0.9.28",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",