@matchkit.io/cli 0.1.4 → 0.1.6

package/dist/commands/pull.js

@@ -23,10 +23,25 @@ function buildImportMap(fullSkillDir) {
             // Skip non-component entries (layouts, patterns)
             if (comp.type === "registry:layout" || comp.type === "registry:pattern")
                 continue;
-            const file = comp.file.replace(/\.tsx$/, "");
+            // Strip directory prefix from file path (e.g. "components/button.tsx" → "button")
+            const basename = comp.file.replace(/^(components|lib)\//, "").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}"\` |`);
+            // Use the registry category to determine the correct import prefix:
+            //   lib    → @/lib/{name}           (utils.ts)
+            //   layout → @/components/layout/{name}  (sidebar-nav, top-bar, page-header)
+            //   ui/chart/other → @/components/ui/{name}   (everything else)
+            let importPath;
+            if (comp.category === "lib") {
+                importPath = `@/lib/${basename}`;
+            }
+            else if (comp.category === "layout") {
+                importPath = `@/components/layout/${basename}`;
+            }
+            else {
+                importPath = `@/components/ui/${basename}`;
+            }
+            lines.push(`| ${comp.name} | \`import ${importStr} from "${importPath}"\` |`);
         }
         if (lines.length === 0)
             return "";
@@ -62,6 +77,9 @@ A full design system is installed at \`${skillDir}/\`. You MUST use it for ALL U
    export function cn(...inputs: ClassValue[]) { return twMerge(clsx(inputs)); }
    \`\`\`
 5. **Copy component files** from \`${skillDir}/components/\` to \`src/components/ui/\` as needed
+6. **Copy layout files** from \`${skillDir}/layouts/\` to \`src/components/layout/\` as needed (sidebar-nav, top-bar, page-header)
+7. **Read \`${skillDir}/layouts/app-shell.tsx\`** — reference implementation showing how to compose the app shell
+8. **Read the .tsx source** of any component before using it — the file contains the exact props interface
 
 ### Rules — follow these at ALL times:
 
@@ -70,8 +88,10 @@ A full design system is installed at \`${skillDir}/\`. You MUST use it for ALL U
 - **NEVER** hardcode hex colors, pixel spacing, or font sizes — use CSS variables from \`globals.css\`
 - **NEVER** improvise a component if one already exists in the registry
 - **NEVER** modify files inside \`${skillDir}/\` — it is the upstream source of truth
-- **ALWAYS** use \`@/components/ui/{name}\` import paths for design system components
+- **ALWAYS** use \`@/components/ui/{name}\` import paths for UI components
+- **ALWAYS** use \`@/components/layout/{name}\` import paths for layout components (sidebar-nav, top-bar, page-header)
 - **ALWAYS** use \`@/lib/utils\` for the \`cn()\` helper
+- **ALWAYS** read the component .tsx source to see its props interface before using it — do NOT guess props
 
 ### Available resources in \`${skillDir}/\`:
 

package/dist/index.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 import { Command } from "commander";
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
 import { initCommand } from "./commands/init.js";
 import { addCommand } from "./commands/add.js";
 import { listCommand } from "./commands/list.js";
@@ -7,11 +10,13 @@ import { diffCommand } from "./commands/diff.js";
 import { loginCommand } from "./commands/login.js";
 import { pullCommand } from "./commands/pull.js";
 import { statusCommand } from "./commands/status.js";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const pkg = JSON.parse(readFileSync(join(__dirname, "..", "package.json"), "utf-8"));
 const program = new Command();
 program
     .name("matchkit")
     .description("MatchKit — style-agnostic design system CLI")
-    .version("0.1.4");
+    .version(pkg.version);
 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.4",
+  "version": "0.1.6",
   "description": "CLI for MatchKit design system skills. Init projects, add components, manage your design system.",
   "type": "module",
   "main": "dist/index.js",