@matchkit.io/cli 0.1.2 → 0.1.4

package/dist/commands/pull.js

@@ -6,11 +6,41 @@ import { readConfig, configExists, writeConfig, createDefaultConfig } from "../u
 import { getApiKey, authFetch, API_BASE_URL } from "../utils/auth.js";
 // Marker used to detect MatchKit-managed AI rules files
 const MATCHKIT_MARKER = "<!-- managed:matchkit -->";
+/**
+ * Read registry.json from the extracted skill directory and build
+ * a markdown import map table for AI rules files.
+ */
+function buildImportMap(fullSkillDir) {
+    const registryPath = join(fullSkillDir, "registry.json");
+    if (!existsSync(registryPath))
+        return "";
+    try {
+        const registry = JSON.parse(readFileSync(registryPath, "utf-8"));
+        const lines = [];
+        for (const comp of registry.components) {
+            if (!comp.exportName || !comp.file)
+                continue;
+            // Skip non-component entries (layouts, patterns)
+            if (comp.type === "registry:layout" || comp.type === "registry:pattern")
+                continue;
+            const file = comp.file.replace(/\.tsx$/, "");
+            const exports = Array.isArray(comp.exportName) ? comp.exportName : [comp.exportName];
+            const importStr = `{ ${exports.join(", ")} }`;
+            lines.push(`| ${comp.name} | \`import ${importStr} from "@/components/ui/${file}"\` |`);
+        }
+        if (lines.length === 0)
+            return "";
+        return `\n### Component imports — use these EXACT names:\n\n| Component | Import |\n|-----------|--------|\n${lines.join("\n")}\n`;
+    }
+    catch {
+        return "";
+    }
+}
 /**
  * Build the content for AI rules files.
  * This is the mandatory instruction set that tells AI tools to use the design system.
  */
-function buildAiRulesContent(skillDir, theme) {
+function buildAiRulesContent(skillDir, theme, importMap) {
     return `${MATCHKIT_MARKER}
 # MatchKit Design System — ${theme}-ui
 
@@ -54,17 +84,17 @@ A full design system is installed at \`${skillDir}/\`. You MUST use it for ALL U
 | \`globals.css\` | Complete Tailwind v4 CSS with all tokens |
 | \`tokens/*.json\` | Design token values |
 | \`patterns/*.md\` | Responsive, dark mode, a11y, composition patterns |
-`;
+${importMap}`;
 }
 /**
  * Build Cursor .mdc format content (has YAML frontmatter with alwaysApply).
  */
-function buildCursorMdcContent(skillDir, theme) {
+function buildCursorMdcContent(skillDir, theme, importMap) {
     return `---
 description: MatchKit ${theme}-ui design system — mandatory rules for all UI work
 alwaysApply: true
 ---
-${buildAiRulesContent(skillDir, theme)}`;
+${buildAiRulesContent(skillDir, theme, importMap)}`;
 }
 /**
  * Write AI rules files to the project root.
@@ -72,8 +102,10 @@ ${buildAiRulesContent(skillDir, theme)}`;
  * Returns the list of files that were written.
  */
 function writeAiRulesFiles(cwd, skillDir, theme) {
-    const content = buildAiRulesContent(skillDir, theme);
-    const cursorMdcContent = buildCursorMdcContent(skillDir, theme);
+    const fullSkillDir = join(cwd, skillDir);
+    const importMap = buildImportMap(fullSkillDir);
+    const content = buildAiRulesContent(skillDir, theme, importMap);
+    const cursorMdcContent = buildCursorMdcContent(skillDir, theme, importMap);
     const written = [];
     const targets = [
         { path: "CLAUDE.md", label: "CLAUDE.md", content },
@@ -106,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
@@ -211,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.2",
+  "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",