itismyskillmarket 1.3.32 → 1.3.34

package/dist/index.js

@@ -1608,7 +1608,7 @@ async function verifySkill(skillName) {
 
 // src/commands/ui.ts
 import { createServer } from "http";
-import { readFileSync as readFileSync2, existsSync as existsSync3, mkdirSync, rmSync } from "fs";
+import { readFileSync as readFileSync2, existsSync as existsSync3, mkdirSync, rmSync, readdirSync, renameSync } from "fs";
 import { join as join3, extname, dirname, basename } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import AdmZip from "adm-zip";
@@ -2607,10 +2607,8 @@ API_ROUTES.POST["/api/upload"] = async (req, res, _url) => {
     });
     let skillName = "";
     let pkgInfo = {};
-    let pkgEntryRelativePath = "";
     if (pkgEntry) {
       try {
-        pkgEntryRelativePath = normalizeEntryName(pkgEntry.entryName);
         pkgInfo = JSON.parse(pkgEntry.getData().toString("utf-8"));
         skillName = pkgInfo.skillmarket?.id || pkgInfo.name?.replace(/^@[^/]+\//, "") || "";
       } catch {
@@ -2631,14 +2629,20 @@ API_ROUTES.POST["/api/upload"] = async (req, res, _url) => {
     }
     mkdirSync(skillDir, { recursive: true });
     zip.extractAllTo(skillDir, true);
-    const skillMdExists = existsSync3(join3(skillDir, "SKILL.md")) || entries.some((e) => e.entryName.endsWith("SKILL.md"));
-    let pkgJsonPath = join3(skillDir, "package.json");
-    if (pkgEntryRelativePath) {
-      const extractedPkgPath = join3(skillDir, pkgEntryRelativePath);
-      if (existsSync3(extractedPkgPath)) {
-        pkgJsonPath = extractedPkgPath;
+    const extractedItems = readdirSync(skillDir, { withFileTypes: true });
+    const subDirs = extractedItems.filter((i) => i.isDirectory());
+    const files = extractedItems.filter((i) => !i.isDirectory());
+    if (subDirs.length === 1 && files.length === 0) {
+      const subDirPath = join3(skillDir, subDirs[0].name);
+      const subItems = readdirSync(subDirPath, { withFileTypes: true });
+      for (const item of subItems) {
+        renameSync(join3(subDirPath, item.name), join3(skillDir, item.name));
       }
+      rmSync(subDirPath, { recursive: true, force: true });
     }
+    const skillMdPath = findFileSync(skillDir, "SKILL.md");
+    const skillMdExists = skillMdPath !== null;
+    const pkgJsonPath = findFileSync(skillDir, "package.json") || join3(skillDir, "package.json");
     if (existsSync3(pkgJsonPath)) {
       try {
         pkgInfo = JSON.parse(readFileSync2(pkgJsonPath, "utf-8"));
@@ -2701,6 +2705,22 @@ API_ROUTES.POST["/api/upload/action"] = async (req, res, _url) => {
     jsonResponse(res, 500, { error: String(err) });
   }
 };
+function findFileSync(dir, filename) {
+  try {
+    const items = readdirSync(dir, { withFileTypes: true });
+    for (const item of items) {
+      const fullPath = join3(dir, item.name);
+      if (item.isDirectory()) {
+        const found = findFileSync(fullPath, filename);
+        if (found) return found;
+      } else if (item.name === filename) {
+        return fullPath;
+      }
+    }
+  } catch {
+  }
+  return null;
+}
 function serveStaticFile(res, filePath) {
   if (!existsSync3(filePath)) {
     res.writeHead(404, { "Content-Type": "text/plain" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itismyskillmarket",
-  "version": "1.3.32",
+  "version": "1.3.34",
   "description": "Cross-platform skill manager for AI coding tools",
   "type": "module",
   "bin": {