@getcoherent/cli 0.6.23 → 0.6.25

package/dist/{chunk-SKQRPBPF.js → chunk-H644LLXJ.js}

@@ -679,6 +679,10 @@ function replaceRawColors(classes, colorMap) {
 async function autoFixCode(code, context) {
   const fixes = [];
   let fixed = code;
+  if (!fixed.includes("\n") && fixed.includes("\\n")) {
+    fixed = fixed.replace(/\\n/g, "\n");
+    fixes.push("unescaped literal \\n to real newlines");
+  }
   const beforeQuoteFix = fixed;
   fixed = fixed.replace(/\\'(\s*[}\],])/g, "'$1");
   fixed = fixed.replace(/(:\s*'.+)\\'(\s*)$/gm, "$1'$2");
@@ -703,17 +707,9 @@ async function autoFixCode(code, context) {
   };
   fixed = fixed.split("\n").map((line) => {
     let l = line;
-    l = l.replace(/&lt;=/g, (m, offset) => isInsideAttrValue(line, offset) ? m : "<=");
-    l = l.replace(/&gt;=/g, (m, offset) => isInsideAttrValue(line, offset) ? m : ">=");
-    l = l.replace(/&amp;&amp;/g, (m, offset) => isInsideAttrValue(line, offset) ? m : "&&");
-    l = l.replace(
-      /([\w)\]])\s*&lt;\s*([\w(])/g,
-      (m, p1, p2, offset) => isInsideAttrValue(line, offset) ? m : `${p1} < ${p2}`
-    );
-    l = l.replace(
-      /([\w)\]])\s*&gt;\s*([\w(])/g,
-      (m, p1, p2, offset) => isInsideAttrValue(line, offset) ? m : `${p1} > ${p2}`
-    );
+    l = l.replace(/&lt;/g, (m, offset) => isInsideAttrValue(line, offset) ? m : "<");
+    l = l.replace(/&gt;/g, (m, offset) => isInsideAttrValue(line, offset) ? m : ">");
+    l = l.replace(/&amp;/g, (m, offset) => isInsideAttrValue(line, offset) ? m : "&");
     return l;
   }).join("\n");
   if (fixed !== beforeEntityFix) {
@@ -807,6 +803,123 @@ ${fixed}`;
     }
     fixes.push("<button> \u2192 <Button> (with import)");
   }
+  if (/<input\b[^>]*(?:\/>|>)/i.test(fixed) && !fixed.includes('type="hidden"')) {
+    const inputLines = fixed.split("\n");
+    let hasReplacedInput = false;
+    for (let i = 0; i < inputLines.length; i++) {
+      if (!/<input\b/i.test(inputLines[i])) continue;
+      if (inputLines[i].includes('type="hidden"') || inputLines[i].includes("type='hidden'")) continue;
+      inputLines[i] = inputLines[i].replace(/<input\b/gi, "<Input");
+      hasReplacedInput = true;
+    }
+    if (hasReplacedInput) {
+      fixed = inputLines.join("\n");
+      const hasInputImport = /import\s.*\bInput\b.*from\s+['"]@\/components\/ui\/input['"]/.test(fixed);
+      if (!hasInputImport) {
+        const lastImportIdx = fixed.lastIndexOf("\nimport ");
+        if (lastImportIdx !== -1) {
+          const lineEnd = fixed.indexOf("\n", lastImportIdx + 1);
+          fixed = fixed.slice(0, lineEnd + 1) + "import { Input } from '@/components/ui/input'\n" + fixed.slice(lineEnd + 1);
+        } else {
+          const hasUseClient2 = /^['"]use client['"]/.test(fixed.trim());
+          const insertAfter2 = hasUseClient2 ? fixed.indexOf("\n") + 1 : 0;
+          fixed = fixed.slice(0, insertAfter2) + "import { Input } from '@/components/ui/input'\n" + fixed.slice(insertAfter2);
+        }
+      }
+      fixes.push("<input> \u2192 <Input> (with import)");
+    }
+  }
+  const compositeComponents = {
+    select: [
+      "Select",
+      "SelectContent",
+      "SelectItem",
+      "SelectTrigger",
+      "SelectValue",
+      "SelectGroup",
+      "SelectLabel",
+      "SelectSeparator",
+      "SelectScrollUpButton",
+      "SelectScrollDownButton"
+    ],
+    dialog: [
+      "Dialog",
+      "DialogContent",
+      "DialogDescription",
+      "DialogFooter",
+      "DialogHeader",
+      "DialogTitle",
+      "DialogTrigger",
+      "DialogClose",
+      "DialogOverlay",
+      "DialogPortal"
+    ],
+    dropdown_menu: [
+      "DropdownMenu",
+      "DropdownMenuContent",
+      "DropdownMenuItem",
+      "DropdownMenuLabel",
+      "DropdownMenuSeparator",
+      "DropdownMenuTrigger",
+      "DropdownMenuCheckboxItem",
+      "DropdownMenuGroup",
+      "DropdownMenuRadioGroup",
+      "DropdownMenuRadioItem",
+      "DropdownMenuShortcut",
+      "DropdownMenuSub",
+      "DropdownMenuSubContent",
+      "DropdownMenuSubTrigger"
+    ],
+    table: ["Table", "TableBody", "TableCaption", "TableCell", "TableFooter", "TableHead", "TableHeader", "TableRow"],
+    tabs: ["Tabs", "TabsContent", "TabsList", "TabsTrigger"],
+    card: ["Card", "CardContent", "CardDescription", "CardFooter", "CardHeader", "CardTitle"],
+    alert_dialog: [
+      "AlertDialog",
+      "AlertDialogAction",
+      "AlertDialogCancel",
+      "AlertDialogContent",
+      "AlertDialogDescription",
+      "AlertDialogFooter",
+      "AlertDialogHeader",
+      "AlertDialogTitle",
+      "AlertDialogTrigger"
+    ],
+    popover: ["Popover", "PopoverContent", "PopoverTrigger"],
+    command: [
+      "Command",
+      "CommandDialog",
+      "CommandEmpty",
+      "CommandGroup",
+      "CommandInput",
+      "CommandItem",
+      "CommandList",
+      "CommandSeparator",
+      "CommandShortcut"
+    ],
+    form: ["Form", "FormControl", "FormDescription", "FormField", "FormItem", "FormLabel", "FormMessage"]
+  };
+  const beforeSubImportFix = fixed;
+  for (const [uiName, allExports] of Object.entries(compositeComponents)) {
+    const importPath = `@/components/ui/${uiName.replace(/_/g, "-")}`;
+    const importRe = new RegExp(`import\\s*\\{([^}]+)\\}\\s*from\\s*['"]${importPath.replace(/[-/]/g, "\\$&")}['"]`);
+    const importMatch = fixed.match(importRe);
+    if (!importMatch) continue;
+    const imported = new Set(
+      importMatch[1].split(",").map((s) => s.trim()).filter(Boolean)
+    );
+    const usedInCode = allExports.filter((e) => {
+      if (imported.has(e)) return false;
+      return new RegExp(`<${e}[\\s/>]`).test(fixed) || new RegExp(`</${e}>`).test(fixed);
+    });
+    if (usedInCode.length > 0) {
+      const merged = [...imported, ...usedInCode];
+      const newImport = `import { ${merged.join(", ")} } from '${importPath}'`;
+      fixed = fixed.replace(importRe, newImport);
+    }
+  }
+  if (fixed !== beforeSubImportFix) {
+    fixes.push("added missing sub-imports for composite components");
+  }
   const colorMap = {
     "bg-zinc-950": "bg-background",
     "bg-zinc-900": "bg-background",

package/dist/{chunk-FAV3UHFM.js → chunk-IYLHC4RC.js}

@@ -236,6 +236,29 @@ function loadPlan(projectRoot) {
 function toKebabCase(name) {
   return name.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
 }
+function extractPropsInterface(code, componentName) {
+  const interfaceRe = new RegExp(`interface\\s+${componentName}Props\\s*\\{([^}]+)\\}`, "s");
+  const match = code.match(interfaceRe);
+  if (match) {
+    return match[1].split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("//")).join("; ");
+  }
+  const typeRe = new RegExp(`type\\s+${componentName}Props\\s*=\\s*\\{([^}]+)\\}`, "s");
+  const typeMatch = code.match(typeRe);
+  if (typeMatch) {
+    return typeMatch[1].split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("//")).join("; ");
+  }
+  return void 0;
+}
+function extractUsageExample(code, componentName) {
+  const funcMatch = code.match(new RegExp(`export function ${componentName}\\s*\\(\\{([^}]+)\\}`, "s"));
+  if (!funcMatch) return void 0;
+  const props = funcMatch[1].split(",").map((p) => p.split(":")[0].trim()).filter(Boolean);
+  const example = props.map((p) => {
+    if (p.startsWith("...")) return `${p.slice(3)}={{}}`;
+    return `${p}={...}`;
+  }).join(" ");
+  return `<${componentName} ${example} />`;
+}
 async function generateSharedComponentsFromPlan(plan, styleContext, projectRoot, aiProvider) {
   if (plan.sharedComponents.length === 0) return [];
   const componentSpecs = plan.sharedComponents.map(
@@ -297,6 +320,8 @@ Return JSON with { requests: [{ type: "add-page", changes: { name: "ComponentNam
   }
   for (const comp of results) {
     const planned = plan.sharedComponents.find((c) => c.name === comp.name);
+    const propsInterface = extractPropsInterface(comp.code, comp.name);
+    const usageExample = extractUsageExample(comp.code, comp.name);
     await generateSharedComponent(projectRoot, {
       name: comp.name,
       type: planned?.type ?? "section",
@@ -304,7 +329,9 @@ Return JSON with { requests: [{ type: "add-page", changes: { name: "ComponentNam
       description: planned?.description,
       usedIn: planned?.usedBy ?? [],
       source: "generated",
-      overwrite: true
+      overwrite: true,
+      propsInterface,
+      usageExample
     });
   }
   return results;

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   formatIssues,
   validatePageQuality,
   verifyIncrementalEdit
-} from "./chunk-SKQRPBPF.js";
+} from "./chunk-H644LLXJ.js";
 import {
   generateArchitecturePlan,
   getPageGroup,
@@ -16,7 +16,7 @@ import {
   routeToKey,
   savePlan,
   updateArchitecturePlan
-} from "./chunk-FAV3UHFM.js";
+} from "./chunk-IYLHC4RC.js";
 import {
   CORE_CONSTRAINTS,
   DESIGN_QUALITY,
@@ -6315,7 +6315,7 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
     if (plan && plan.sharedComponents.length > 0) {
       spinner.start(`Phase 4.5/6 \u2014 Generating ${plan.sharedComponents.length} shared components from plan...`);
       try {
-        const { generateSharedComponentsFromPlan } = await import("./plan-generator-5I6BPEVL.js");
+        const { generateSharedComponentsFromPlan } = await import("./plan-generator-BHDEJGMY.js");
         const generated = await generateSharedComponentsFromPlan(
           plan,
           styleContext,
@@ -6775,7 +6775,7 @@ async function regeneratePage(pageId, config2, projectRoot) {
   const code = await generator.generate(page, appType);
   const route = page.route || "/";
   const isAuth = isAuthRoute(route) || isAuthRoute(page.name || page.id || "");
-  const { loadPlan: loadPlanForPath } = await import("./plan-generator-5I6BPEVL.js");
+  const { loadPlan: loadPlanForPath } = await import("./plan-generator-BHDEJGMY.js");
   const planForPath = loadPlanForPath(projectRoot);
   const filePath = routeToFsPath(projectRoot, route, planForPath || isAuth);
   await mkdir3(dirname5(filePath), { recursive: true });
@@ -7091,7 +7091,17 @@ function extractImportsFrom(code, fromPath) {
   return [...new Set(results)];
 }
 function printPostGenerationReport(opts) {
-  const { action, pageTitle, filePath, code, route, postFixes = [], layoutShared = [], allShared = [] } = opts;
+  const {
+    action,
+    pageTitle,
+    filePath,
+    code,
+    route,
+    postFixes = [],
+    layoutShared = [],
+    allShared = [],
+    groupLayout
+  } = opts;
   const uiComponents = extractImportsFrom(code, "@/components/ui");
   const sharedImportNames = extractImportsFrom(code, "@/components/shared/");
   const inCodeShared = allShared.filter((s) => sharedImportNames.some((n) => n === s.name));
@@ -7108,8 +7118,10 @@ function printPostGenerationReport(opts) {
     console.log(chalk10.dim(`  Shared:      ${inCodeShared.map((s) => `${s.id} (${s.name})`).join(", ")}`));
   }
   const isAuthPage = route && (/^\/(login|signin|signup|register|forgot-password|reset-password)\b/.test(route) || filePath.includes("(auth)"));
-  if (layoutShared.length > 0 && !isAuthPage) {
-    console.log(chalk10.dim(`  Layout:      ${layoutShared.map((l) => `${l.id} (${l.name})`).join(", ")} via layout.tsx`));
+  const isSidebarPage = groupLayout === "sidebar" || filePath.includes("(app)");
+  const filteredLayout = isAuthPage ? [] : isSidebarPage ? layoutShared.filter((l) => /sidebar/i.test(l.name)) : layoutShared;
+  if (filteredLayout.length > 0) {
+    console.log(chalk10.dim(`  Layout:      ${filteredLayout.map((l) => `${l.id} (${l.name})`).join(", ")} via layout.tsx`));
   }
   if (iconCount > 0) {
     console.log(chalk10.dim(`  Icons:       ${iconCount} from lucide-react`));
@@ -8534,7 +8546,7 @@ async function chatCommand(message, options) {
       spinner.start(`Creating shared component: ${componentName}...`);
       const { createAIProvider: createAIProvider2 } = await import("./ai-provider-CGSIYFZT.js");
       const { generateSharedComponent: generateSharedComponent7 } = await import("@getcoherent/core");
-      const { autoFixCode: autoFixCode2 } = await import("./quality-validator-OX25OLIR.js");
+      const { autoFixCode: autoFixCode2 } = await import("./quality-validator-VDQXXDAV.js");
       const { extractPropsInterface, extractDependencies } = await import("./component-extractor-VYJLT5NR.js");
       const aiProvider = await createAIProvider2(provider ?? "auto");
       const prompt = `Generate a React component called "${componentName}". Description: ${message}.
@@ -9001,9 +9013,10 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
       }
     }
     try {
-      const { validateReuse } = await import("./reuse-validator-HC4LZEKF.js");
+      const { validateReuse } = await import("./reuse-validator-XR2ZEYC4.js");
       const { inferPageTypeFromRoute: inferPageTypeFromRoute2 } = await import("./design-constraints-EIP2XM7T.js");
       const manifest2 = await loadManifest8(projectRoot);
+      const reuseplan = projectRoot ? loadPlan(projectRoot) : null;
       if (manifest2.shared.length > 0) {
         for (const request of normalizedRequests) {
           if (request.type !== "add-page") continue;
@@ -9012,7 +9025,8 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
           if (!pageCode) continue;
           const route = changes.route || "";
           const pageType = inferPageTypeFromRoute2(route);
-          const warnings = validateReuse(manifest2, pageCode, pageType);
+          const planned = reuseplan ? new Set(reuseplan.sharedComponents.filter((c) => c.usedBy.includes(route)).map((c) => c.name)) : void 0;
+          const warnings = validateReuse(manifest2, pageCode, pageType, void 0, planned);
           for (const w of warnings) {
             console.log(chalk13.yellow(`  \u26A0 ${w.message}`));
           }
@@ -11400,7 +11414,7 @@ async function checkCommand(opts = {}) {
   }
   if (!skipShared) {
     try {
-      const { validateReuse } = await import("./reuse-validator-HC4LZEKF.js");
+      const { validateReuse } = await import("./reuse-validator-XR2ZEYC4.js");
       const { inferPageTypeFromRoute: inferPageTypeFromRoute2 } = await import("./design-constraints-EIP2XM7T.js");
       const manifest = await loadManifest11(projectRoot);
       const appDir = resolve14(projectRoot, "app");

package/dist/{plan-generator-5I6BPEVL.js → plan-generator-BHDEJGMY.js}

@@ -11,7 +11,7 @@ import {
   routeToKey,
   savePlan,
   updateArchitecturePlan
-} from "./chunk-FAV3UHFM.js";
+} from "./chunk-IYLHC4RC.js";
 import "./chunk-5AHG4NNX.js";
 import "./chunk-3RG5ZIWI.js";
 export {

package/dist/{quality-validator-OX25OLIR.js → quality-validator-VDQXXDAV.js}

@@ -4,7 +4,7 @@ import {
   formatIssues,
   validatePageQuality,
   verifyIncrementalEdit
-} from "./chunk-SKQRPBPF.js";
+} from "./chunk-H644LLXJ.js";
 import "./chunk-3RG5ZIWI.js";
 export {
   autoFixCode,

package/dist/{reuse-validator-HC4LZEKF.js → reuse-validator-XR2ZEYC4.js}

@@ -6,11 +6,12 @@ var RELEVANT_TYPES = {
   auth: /* @__PURE__ */ new Set(["form", "feedback"]),
   marketing: /* @__PURE__ */ new Set(["section", "layout"])
 };
-function validateReuse(manifest, generatedCode, pageType, newComponents) {
+function validateReuse(manifest, generatedCode, pageType, newComponents, plannedComponentNames) {
   const warnings = [];
   const relevantTypes = RELEVANT_TYPES[pageType] || RELEVANT_TYPES.app;
   for (const comp of manifest.shared) {
     if (!relevantTypes.has(comp.type)) continue;
+    if (plannedComponentNames && !plannedComponentNames.has(comp.name)) continue;
     const isImported = generatedCode.includes(`from '@/components/shared/`) && (generatedCode.includes(`{ ${comp.name} }`) || generatedCode.includes(`{ ${comp.name},`));
     if (!isImported) {
       warnings.push({

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.6.23",
+  "version": "0.6.25",
   "description": "CLI interface for Coherent Design Method",
   "type": "module",
   "main": "./dist/index.js",
@@ -43,7 +43,7 @@
     "ora": "^7.0.1",
     "prompts": "^2.4.2",
     "zod": "^3.22.4",
-    "@getcoherent/core": "0.6.23"
+    "@getcoherent/core": "0.6.25"
   },
   "devDependencies": {
     "@types/node": "^20.11.0",