@getcoherent/cli 0.6.19 → 0.6.21

package/dist/{chunk-CF4377B7.js → chunk-VKGZRKWD.js}

@@ -613,12 +613,12 @@ function resolveHref(linkText, context) {
 function replaceRawColors(classes, colorMap) {
   let changed = false;
   let result = classes;
-  const accentColorRe = /\b((?:(?:hover|focus|active|group-hover|focus-visible|focus-within):)?)(bg|text|border|ring|outline|from|to|via)-(emerald|blue|violet|indigo|purple|teal|cyan|sky|rose|amber|red|green|yellow|pink|orange|fuchsia|lime)-(\d+)\b/g;
+  const accentColorRe = /\b((?:(?:hover|focus|active|group-hover|focus-visible|focus-within):)?)(bg|text|border|ring|outline|from|to|via)-(emerald|blue|violet|indigo|purple|teal|cyan|sky|rose|amber|red|green|yellow|pink|orange|fuchsia|lime)-(\d+)(?:\/\d+)?\b/g;
   result = result.replace(accentColorRe, (m, statePrefix, prefix, color, shade) => {
-    const bare = m.replace(statePrefix, "");
-    if (colorMap[bare]) {
+    const bareNoOpacity = m.replace(statePrefix, "").replace(/\/\d+$/, "");
+    if (colorMap[bareNoOpacity]) {
       changed = true;
-      return statePrefix + colorMap[bare];
+      return statePrefix + colorMap[bareNoOpacity];
     }
     const n = parseInt(shade);
     const isDestructive = color === "red";
@@ -648,12 +648,12 @@ function replaceRawColors(classes, colorMap) {
     }
     return m;
   });
-  const neutralColorRe = /\b((?:(?:hover|focus|active|group-hover|focus-visible|focus-within):)?)(bg|text|border|ring|outline)-(zinc|slate|gray|neutral|stone)-(\d+)\b/g;
+  const neutralColorRe = /\b((?:(?:hover|focus|active|group-hover|focus-visible|focus-within):)?)(bg|text|border|ring|outline)-(zinc|slate|gray|neutral|stone)-(\d+)(?:\/\d+)?\b/g;
   result = result.replace(neutralColorRe, (m, statePrefix, prefix, _color, shade) => {
-    const bare = m.replace(statePrefix, "");
-    if (colorMap[bare]) {
+    const bareNoOpacity = m.replace(statePrefix, "").replace(/\/\d+$/, "");
+    if (colorMap[bareNoOpacity]) {
       changed = true;
-      return statePrefix + colorMap[bare];
+      return statePrefix + colorMap[bareNoOpacity];
     }
     const n = parseInt(shade);
     if (prefix === "bg") {
@@ -936,11 +936,19 @@ ${selectImport}`
       for (const m of fixed.matchAll(/import\s*\{([^}]+)\}\s*from\s*["'](?!lucide-react)([^"']+)["']/g)) {
         m[1].split(",").map((s) => s.trim()).filter(Boolean).forEach((n) => nonLucideImports.add(n));
       }
-      const iconNames = lucideImportMatch[1].split(",").map((s) => s.trim()).filter(Boolean);
-      const duplicates = iconNames.filter((name) => nonLucideImports.has(name));
+      const rawIconEntries = lucideImportMatch[1].split(",").map((s) => s.trim()).filter(Boolean);
+      const iconNames = rawIconEntries.map((entry) => {
+        const parts = entry.split(/\s+as\s+/);
+        return parts[0].trim();
+      });
+      const duplicates = rawIconEntries.filter((entry) => {
+        const alias = entry.split(/\s+as\s+/).pop().trim();
+        return nonLucideImports.has(alias);
+      });
       let newImport = lucideImportMatch[1];
       for (const dup of duplicates) {
-        newImport = newImport.replace(new RegExp(`\\b${dup}\\b,?\\s*`), "");
+        const escaped = dup.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        newImport = newImport.replace(new RegExp(`${escaped},?\\s*`), "");
         fixes.push(`removed ${dup} from lucide import (conflicts with UI component import)`);
       }
       const ICON_ALIASES = {

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   formatIssues,
   validatePageQuality,
   verifyIncrementalEdit
-} from "./chunk-CF4377B7.js";
+} from "./chunk-VKGZRKWD.js";
 import {
   generateArchitecturePlan,
   getPageGroup,
@@ -5879,11 +5879,13 @@ function verifyReusePlan(generatedCode, plan) {
 }
 
 // src/commands/chat/split-generator.ts
+var MAX_EXISTING_PAGES_CONTEXT = 10;
 function buildExistingPagesContext(config2) {
   const pages = config2.pages || [];
   const analyzed = pages.filter((p) => p.pageAnalysis);
   if (analyzed.length === 0) return "";
-  const lines = analyzed.map((p) => {
+  const capped = analyzed.slice(0, MAX_EXISTING_PAGES_CONTEXT);
+  const lines = capped.map((p) => {
     return summarizePageAnalysis(p.name || p.id, p.route, p.pageAnalysis);
   });
   let ctx = `EXISTING PAGES CONTEXT:
@@ -5983,12 +5985,15 @@ var RELEVANT_TYPES = {
 function buildTieredComponentsPrompt(manifest, pageType) {
   if (manifest.shared.length === 0) return void 0;
   const relevantTypes = new Set(RELEVANT_TYPES[pageType] || RELEVANT_TYPES.app);
-  const level1Lines = manifest.shared.map((e) => {
+  const level1Lines = manifest.shared.slice(0, 20).map((e) => {
     const desc = e.description ? ` \u2014 ${e.description}` : "";
     return `- ${e.id} ${e.name} (${e.type})${desc}`;
   });
+  if (manifest.shared.length > 20) {
+    level1Lines.push(`- ... and ${manifest.shared.length - 20} more (import by name)`);
+  }
   const relevantComponents = manifest.shared.filter((e) => relevantTypes.has(e.type));
-  const level2Blocks = relevantComponents.filter((e) => e.propsInterface || e.usageExample).map((e) => {
+  const level2Blocks = relevantComponents.filter((e) => e.propsInterface || e.usageExample).slice(0, 8).map((e) => {
     const importPath = e.file.replace(/^components\/shared\//, "").replace(/\.tsx$/, "");
     const lines = [`### ${e.name} (${e.id})`];
     if (e.propsInterface) lines.push(`Props: ${e.propsInterface}`);
@@ -6063,10 +6068,14 @@ function readExistingAppPageForReference(projectRoot, plan) {
       if (note.type !== "app") continue;
       for (const group of ["(app)", "(admin)", "(dashboard)"]) {
         const filePath = resolve6(projectRoot, "app", group, key, "page.tsx");
-        if (existsSync14(filePath)) {
-          const code = readFileSync9(filePath, "utf-8");
-          const lines = code.split("\n");
-          return lines.slice(0, 60).join("\n");
+        try {
+          if (existsSync14(filePath)) {
+            const code = readFileSync9(filePath, "utf-8");
+            const lines = code.split("\n");
+            return lines.slice(0, 60).join("\n");
+          }
+        } catch {
+          continue;
         }
       }
     }
@@ -6281,7 +6290,11 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
         changes: { id: homePage.id, name: homePage.name, route: homePage.route }
       };
     }
-    spinner.succeed(`Phase 3/6 \u2014 ${homePage.name} page generated`);
+    if (homePageCode) {
+      spinner.succeed(`Phase 3/6 \u2014 ${homePage.name} page generated`);
+    } else {
+      spinner.warn(`Phase 3/6 \u2014 ${homePage.name} page generated (no code \u2014 AI may have failed)`);
+    }
   }
   spinner.start("Phase 4/6 \u2014 Extracting design patterns...");
   const styleContext = homePageCode ? extractStyleContext(homePageCode) : "";
@@ -6411,6 +6424,7 @@ ${existingAppPageCode}
         `Create ONE page called "${name}" at route "${route}".`,
         `Context: ${message}.`,
         `Generate complete pageCode for this single page only. Do not generate other pages.`,
+        `FORBIDDEN in pageCode: <header>, <nav>, <footer>, site-wide navigation, copyright footers. The layout provides all of these.`,
         `PAGE TYPE: ${pageType}`,
         designConstraints,
         layoutNote,
@@ -6521,7 +6535,11 @@ Keep all existing functionality. Only add imports and replace inline duplicates.
     }
   }
   const withCode = allRequests.filter((r) => r.changes?.pageCode).length;
-  spinner.succeed(`Phase 5/6 \u2014 Generated ${allRequests.length} pages (${withCode} with full code)`);
+  if (withCode === 0) {
+    spinner.warn(`Phase 5/6 \u2014 Generated ${allRequests.length} pages (0 with full code \u2014 AI may have failed)`);
+  } else {
+    spinner.succeed(`Phase 5/6 \u2014 Generated ${allRequests.length} pages (${withCode} with full code)`);
+  }
   return { requests: allRequests, plan };
 }
 var SharedExtractionItemSchema = z.object({
@@ -7083,7 +7101,8 @@ function printPostGenerationReport(opts) {
   if (inCodeShared.length > 0) {
     console.log(chalk10.dim(`  Shared:      ${inCodeShared.map((s) => `${s.id} (${s.name})`).join(", ")}`));
   }
-  if (layoutShared.length > 0) {
+  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`));
   }
   if (iconCount > 0) {
@@ -7287,21 +7306,30 @@ function getChangeDescription(request, config2) {
 
 // src/commands/chat/modification-handler.ts
 var DEBUG2 = process.env.COHERENT_DEBUG === "1";
+function isSiteWideHeader(block) {
+  return /<Link\b/.test(block) || /<a\s+href/.test(block) || /<nav\b/.test(block);
+}
+function isSiteWideFooter(block) {
+  return /©|&copy;|All rights|<Link\b/.test(block) || /<a\s+href/.test(block) && block.split("<a ").length >= 3;
+}
+function isSiteWideNav(block) {
+  return /<Link\b/.test(block) || /<a\s+href/.test(block) && block.split(/<a\s+href/).length >= 3;
+}
 function stripInlineLayoutElements(code) {
   let result = code;
   const stripped = [];
   const headerBlock = extractBalancedTag(result, "header");
-  if (headerBlock) {
+  if (headerBlock && isSiteWideHeader(headerBlock)) {
     result = result.replace(headerBlock, "");
     stripped.push("header");
   }
   const navBlock = extractBalancedTag(result, "nav");
-  if (navBlock) {
+  if (navBlock && isSiteWideNav(navBlock)) {
     result = result.replace(navBlock, "");
     stripped.push("nav");
   }
   const footerBlock = extractBalancedTag(result, "footer");
-  if (footerBlock) {
+  if (footerBlock && isSiteWideFooter(footerBlock)) {
     result = result.replace(footerBlock, "");
     stripped.push("footer");
   }
@@ -7444,7 +7472,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
         };
       }
       const readPlan = projectRoot ? loadPlan(projectRoot) : null;
-      const pageFilePath = routeToFsPath(projectRoot, route, readPlan || false);
+      const pageFilePath = routeToFsPath(projectRoot, route, readPlan || isAuthRoute(route));
       let pageCode;
       try {
         pageCode = await readFile(pageFilePath);
@@ -7475,8 +7503,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
       await writeFile(pageFilePath, fixedCode);
       const manifest = await loadManifest6(projectRoot);
       const usedIn = manifest.shared.find((e) => e.id === resolved.id)?.usedIn ?? [];
-      const routePath = route.replace(/^\//, "");
-      const filePathRel = routePath ? `app/${routePath}/page.tsx` : "app/page.tsx";
+      const filePathRel = routeToRelPath(route, readPlan || isAuthRoute(route));
       if (!usedIn.includes(filePathRel)) {
         const nextManifest = updateUsedIn(manifest, resolved.id, [...usedIn, filePathRel]);
         await saveManifest2(projectRoot, nextManifest);
@@ -7516,13 +7543,11 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
         };
       }
       const allPagesToLink = [sourcePageName, ...targetPages];
+      const promotePlan = projectRoot ? loadPlan(projectRoot) : null;
       const routeToPath = (nameOrRoute) => {
-        if (nameOrRoute.startsWith("/")) {
-          return routeToRelPath(nameOrRoute, false);
-        }
-        const p = config2.pages.find((x) => x.name?.toLowerCase() === nameOrRoute.toLowerCase() || x.id === nameOrRoute);
-        if (!p?.route) return null;
-        return routeToRelPath(p.route, false);
+        const route = nameOrRoute.startsWith("/") ? nameOrRoute : config2.pages.find((x) => x.name?.toLowerCase() === nameOrRoute.toLowerCase() || x.id === nameOrRoute)?.route;
+        if (!route) return null;
+        return routeToRelPath(route, promotePlan || isAuthRoute(route));
       };
       const sourcePath = routeToPath(sourcePageName);
       if (!sourcePath) {
@@ -8503,7 +8528,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-BX3T5X6Z.js");
+      const { autoFixCode: autoFixCode2 } = await import("./quality-validator-P572ZUW5.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}.

package/dist/{quality-validator-BX3T5X6Z.js → quality-validator-P572ZUW5.js}

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

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.6.19",
+  "version": "0.6.21",
   "description": "CLI interface for Coherent Design Method",
   "type": "module",
   "main": "./dist/index.js",