@matchkit.io/cli 0.1.3 → 0.1.4

package/dist/commands/pull.js

@@ -138,6 +138,37 @@ function writeAiRulesFiles(cwd, skillDir, theme) {
     }
     return written;
 }
+/**
+ * Detect if ZIP paths share a common prefix that matches the skillDir.
+ * e.g., if skillDir is ".claude/skills/glass-ui" and ZIP paths start with
+ * ".claude/skills/glass-ui/components/...", return ".claude/skills/glass-ui/"
+ * so we can strip it and avoid double nesting.
+ *
+ * Returns the prefix string (with trailing slash) or null if paths are flat.
+ */
+function detectPrefix(paths, skillDir) {
+    if (paths.length === 0)
+        return null;
+    // Normalize skillDir: remove leading/trailing slashes, then add trailing slash
+    const normalized = skillDir.replace(/^\/+|\/+$/g, "") + "/";
+    // Check if most paths start with the skillDir prefix
+    const matchCount = paths.filter((p) => p.startsWith(normalized)).length;
+    // If >50% of paths match, it's a prefixed ZIP
+    if (matchCount > paths.length / 2) {
+        return normalized;
+    }
+    // Also check for .claude/skills/<theme>-ui/ pattern in case skillDir differs
+    const firstPath = paths[0];
+    const match = firstPath.match(/^(\.claude\/skills\/[^/]+\/)/);
+    if (match) {
+        const candidatePrefix = match[1];
+        const prefixCount = paths.filter((p) => p.startsWith(candidatePrefix)).length;
+        if (prefixCount > paths.length / 2) {
+            return candidatePrefix;
+        }
+    }
+    return null;
+}
 export async function pullCommand(options) {
     p.intro(pc.bold("matchkit pull"));
     // Check auth
@@ -243,12 +274,22 @@ export async function pullCommand(options) {
         if (!existsSync(fullSkillDir)) {
             mkdirSync(fullSkillDir, { recursive: true });
         }
+        // Detect if ZIP paths are prefixed with a skill directory
+        // (e.g., ".claude/skills/glass-ui/components/..." vs "components/...")
+        // The server may include the full skillDir prefix — we need to strip it
+        // so files land directly in fullSkillDir, not double-nested.
+        const allPaths = Object.keys(zip.files).filter((p) => !zip.files[p].dir);
+        const skillDirPrefix = detectPrefix(allPaths, config.skillDir);
         let fileCount = 0;
         for (const [path, entry] of Object.entries(zip.files)) {
             if (entry.dir)
                 continue;
+            // Strip the detected prefix to avoid double nesting
+            const relativePath = skillDirPrefix && path.startsWith(skillDirPrefix)
+                ? path.slice(skillDirPrefix.length)
+                : path;
             const content = await entry.async("string");
-            const fullPath = join(fullSkillDir, path);
+            const fullPath = join(fullSkillDir, relativePath);
             const dir = dirname(fullPath);
             if (!existsSync(dir)) {
                 mkdirSync(dir, { recursive: true });

package/dist/index.js

@@ -11,7 +11,7 @@ const program = new Command();
 program
     .name("matchkit")
     .description("MatchKit — style-agnostic design system CLI")
-    .version("0.1.2");
+    .version("0.1.4");
 program
     .command("init")
     .description("Initialize a MatchKit design system in your project")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matchkit.io/cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "CLI for MatchKit design system skills. Init projects, add components, manage your design system.",
   "type": "module",
   "main": "dist/index.js",