@getcoherent/cli 0.5.15 → 0.6.1

package/dist/index.js

@@ -1,3 +1,11 @@
+import {
+  generateArchitecturePlan,
+  getPageGroup,
+  getPageType,
+  loadPlan,
+  routeToKey,
+  savePlan
+} from "./chunk-INW3BQSX.js";
 import {
   __require
 } from "./chunk-3RG5ZIWI.js";
@@ -1984,8 +1992,8 @@ function fixEscapedClosingQuotes(code) {
 }
 function fixUnescapedLtInJsx(code) {
   let out = code;
-  out = out.replace(/>([^<]*)<(\d)/g, ">$1&lt;$2");
-  out = out.replace(/>([^<]*)<([^/a-zA-Z!{>])/g, ">$1&lt;$2");
+  out = out.replace(/>([^<\n]*)<(\d)/g, ">$1&lt;$2");
+  out = out.replace(/>([^<\n]*)<([^/a-zA-Z!{>\n])/g, ">$1&lt;$2");
   return out;
 }
 
@@ -3745,7 +3753,7 @@ async function createAppRouteGroupLayout(projectPath) {
 }
 
 // src/commands/chat.ts
-import chalk13 from "chalk";
+import chalk14 from "chalk";
 import ora2 from "ora";
 import { resolve as resolve9, relative as relative2, join as join11 } from "path";
 import { existsSync as existsSync16, readFileSync as readFileSync11, mkdirSync as mkdirSync6, readdirSync as readdirSync3 } from "fs";
@@ -3832,7 +3840,7 @@ Please set ${envVar} in your environment or .env file.`);
     }
     if (preferredProvider === "openai") {
       try {
-        const { OpenAIClient } = await import("./openai-provider-FSXSVEYD.js");
+        const { OpenAIClient } = await import("./openai-provider-XUI7ZHUR.js");
         return await OpenAIClient.create(apiKey2, config2?.model);
       } catch (error) {
         if (error.message?.includes("not installed")) {
@@ -3846,7 +3854,7 @@ Error: ${error.message}`
         );
       }
     } else {
-      const { ClaudeClient } = await import("./claude-RFHVT7RC.js");
+      const { ClaudeClient } = await import("./claude-BZ3HSBD3.js");
       return ClaudeClient.create(apiKey2, config2?.model);
     }
   }
@@ -3859,7 +3867,7 @@ Error: ${error.message}`
   switch (provider) {
     case "openai":
       try {
-        const { OpenAIClient } = await import("./openai-provider-FSXSVEYD.js");
+        const { OpenAIClient } = await import("./openai-provider-XUI7ZHUR.js");
         return await OpenAIClient.create(apiKey, config2?.model);
       } catch (error) {
         if (error.message?.includes("not installed")) {
@@ -3873,7 +3881,7 @@ Error: ${error.message}`
         );
       }
     case "claude":
-      const { ClaudeClient } = await import("./claude-RFHVT7RC.js");
+      const { ClaudeClient } = await import("./claude-BZ3HSBD3.js");
       return ClaudeClient.create(apiKey, config2?.model);
     default:
       throw new Error(`Unsupported AI provider: ${provider}`);
@@ -3894,7 +3902,7 @@ var PAGE_TEMPLATES = {
   login: {
     description: "Login page with centered card form",
     sections: [
-      'Centered layout: outer div className="flex min-h-svh flex-col items-center justify-center p-6 md:p-10". Inner div className="w-full max-w-sm".',
+      'Centered layout: outer div className="flex min-h-svh flex-col items-center justify-center p-6 md:p-10". Inner div className="w-full max-w-md".',
       'Card with CardHeader: CardTitle "Sign in" (text-2xl font-bold), CardDescription "Enter your credentials to access your account" (text-sm text-muted-foreground).',
       'CardContent with form: email Input (type="email", placeholder="you@example.com"), password Input (type="password"), a "Forgot password?" link (text-sm text-muted-foreground hover:text-foreground), and a Button "Sign in" (w-full).',
       `CardFooter: text "Don't have an account?" with a Sign up link. All text is text-sm text-muted-foreground.`,
@@ -3915,7 +3923,7 @@ var PAGE_TEMPLATES = {
   register: {
     description: "Registration page with centered card form",
     sections: [
-      'Centered layout: outer div className="flex min-h-svh flex-col items-center justify-center p-6 md:p-10". Inner div className="w-full max-w-sm".',
+      'Centered layout: outer div className="flex min-h-svh flex-col items-center justify-center p-6 md:p-10". Inner div className="w-full max-w-md".',
       'Card with CardHeader: CardTitle "Create an account" (text-2xl font-bold), CardDescription "Enter your details to get started" (text-sm text-muted-foreground).',
       'CardContent with form: name Input, email Input (type="email"), password Input (type="password"), confirm password Input (type="password"), and a Button "Create account" (w-full).',
       'CardFooter: text "Already have an account?" with a Sign in link. All text is text-sm text-muted-foreground.',
@@ -4089,7 +4097,7 @@ var PAGE_TEMPLATES = {
   "reset-password": {
     description: "Reset password page with centered card form",
     sections: [
-      'Centered layout: outer div className="flex min-h-svh flex-col items-center justify-center p-6 md:p-10". Inner div className="w-full max-w-sm".',
+      'Centered layout: outer div className="flex min-h-svh flex-col items-center justify-center p-6 md:p-10". Inner div className="w-full max-w-md".',
       'Card with CardHeader: CardTitle "Reset Password" (text-xl), CardDescription.',
       'CardContent with form: new password Input (type="password"), confirm password Input (type="password"), Button "Reset password" (w-full).',
       'Footer text: "Remember your password?" with Sign in link.',
@@ -4101,6 +4109,7 @@ var PAGE_TEMPLATES = {
 var AUTH_ROUTE_SEGMENTS = /* @__PURE__ */ new Set([
   "login",
   "signin",
+  "sign-in",
   "sign-up",
   "signup",
   "register",
@@ -4197,7 +4206,7 @@ LAYOUT PATTERNS:
 - Stats/KPI grid: grid gap-4 md:grid-cols-2 lg:grid-cols-4
 - Card grid (3 col): grid gap-4 md:grid-cols-3
 - Full-height page: min-h-svh (not min-h-screen)
-- Centered form (login/signup): flex min-h-svh flex-col items-center justify-center p-6 md:p-10 \u2192 div w-full max-w-sm
+- Centered form (login/signup): flex min-h-svh flex-col items-center justify-center p-6 md:p-10 \u2192 div w-full max-w-md
 - Page content wrapper: flex flex-1 flex-col gap-4 p-4 lg:p-6
 - Responsive: primary md: and lg:. Use sm:/xl: only when genuinely needed. Avoid 2xl:. NEVER arbitrary like min-[800px].
 
@@ -4249,12 +4258,11 @@ CONTENT (zero placeholders):
 - NEVER: "Lorem ipsum", "Card content", "Description here"
 - ALWAYS: Real, contextual content. Realistic metric names, values, dates.
 `;
-var DESIGN_QUALITY = `
-## DESIGN QUALITY (apply to EVERY page)
+var DESIGN_QUALITY_COMMON = `
+## DESIGN QUALITY \u2014 COMMON
 
 ### Typography Hierarchy
 - Page headline (h1): text-4xl md:text-5xl lg:text-6xl font-bold tracking-tight leading-[1.1]
-- Landing/marketing hero headline: text-5xl md:text-6xl lg:text-7xl font-bold tracking-tight leading-[1.05]
 - Section titles (h2): text-2xl md:text-3xl font-bold
 - Card titles (h3): text-sm font-semibold (never text-base or text-lg)
 - Body text: text-sm text-muted-foreground leading-relaxed
@@ -4267,6 +4275,29 @@ var DESIGN_QUALITY = `
 - Sections alternate between bg-background and bg-muted/5 for rhythm
 - Section dividers: border-t border-border/10 (subtle, not heavy)
 
+### Buttons with Icons
+- Buttons containing text + icon: ALWAYS use inline-flex items-center gap-2 whitespace-nowrap
+- Icon inside button: h-4 w-4 (never larger), placed AFTER text for arrows, BEFORE text for action icons
+- NEVER let button content wrap to multiple lines \u2014 use whitespace-nowrap on the Button component
+- CTA buttons: use the Button component, NEVER raw <button> or <a> styled as button
+
+### Accent Color Discipline
+- ONE accent color per page (primary or emerald-400)
+- Use for: CTAs, terminal text, check icons, feature icon backgrounds, active states
+- NEVER mix blue + purple + emerald on same page
+- Badge: outline style (border-border/30 bg-transparent) not filled color
+- Status icons: text-emerald-400 for positive, text-red-400 for negative
+
+### Dark Theme Implementation
+- html element: className="dark"
+- Background: use CSS variables from globals.css dark section
+- Text: text-foreground for primary, text-muted-foreground for secondary
+- NEVER hardcode dark colors (bg-gray-900) \u2014 always use semantic tokens
+- Cards and elevated elements: slightly lighter than background (bg-card or bg-zinc-900/50)
+`;
+var DESIGN_QUALITY_MARKETING = `
+## DESIGN QUALITY \u2014 MARKETING PAGES
+
 ### Spacing Rhythm (3 distinct levels)
 - Between sections: py-20 md:py-28 (generous)
 - Within sections (title to content): mb-12 md:mb-16
@@ -4274,11 +4305,8 @@ var DESIGN_QUALITY = `
 - Between cards in grid: gap-5 (tight)
 - NEVER uniform spacing everywhere \u2014 contrast creates rhythm
 
-### Buttons with Icons
-- Buttons containing text + icon: ALWAYS use inline-flex items-center gap-2 whitespace-nowrap
-- Icon inside button: h-4 w-4 (never larger), placed AFTER text for arrows, BEFORE text for action icons
-- NEVER let button content wrap to multiple lines \u2014 use whitespace-nowrap on the Button component
-- CTA buttons: use the Button component, NEVER raw <button> or <a> styled as button
+### Hero headline
+- Landing/marketing hero headline: text-5xl md:text-6xl lg:text-7xl font-bold tracking-tight leading-[1.05]
 
 ### Icons in Feature Cards
 - Wrap in colored container: bg-primary/10 rounded-lg p-2.5
@@ -4294,14 +4322,7 @@ var DESIGN_QUALITY = `
 - Title bar (optional): flex with 3 dots (bg-zinc-700 rounded-full w-2.5 h-2.5) + title text-zinc-500 text-[11px]
 - Copy button: text-zinc-500 hover:text-zinc-300
 
-### Accent Color Discipline
-- ONE accent color per page (primary or emerald-400)
-- Use for: CTAs, terminal text, check icons, feature icon backgrounds, active states
-- NEVER mix blue + purple + emerald on same page
-- Badge: outline style (border-border/30 bg-transparent) not filled color
-- Status icons: text-emerald-400 for positive, text-red-400 for negative
-
-### Hero Section (landing/marketing pages)
+### Hero Section
 - Minimum height: min-h-[80vh] flex items-center justify-center
 - Content: centered, max-w-3xl, flex flex-col items-center text-center gap-8
 - Badge above headline: small, outline, text-xs tracking-wide
@@ -4318,8 +4339,6 @@ var DESIGN_QUALITY = `
 ### Step/Process Sections
 - Numbered steps: circle with border, number inside (w-10 h-10 rounded-full border border-border/30 text-sm)
 - Label above: text-xs font-semibold tracking-widest uppercase text-muted-foreground
-- Each step has a code block showing the command
-- Description below: text-sm text-muted-foreground
 
 ### Footer
 - Minimal: border-t border-border/10, py-10
@@ -4327,13 +4346,80 @@ var DESIGN_QUALITY = `
 - Links: hover:text-foreground transition-colors
 - Layout: flex justify-between on desktop, stack on mobile
 
-### Dark Theme Implementation
-- html element: className="dark"
-- Background: use CSS variables from globals.css dark section
-- Text: text-foreground for primary, text-muted-foreground for secondary
-- NEVER hardcode dark colors (bg-gray-900) \u2014 always use semantic tokens
-- Cards and elevated elements: slightly lighter than background (bg-card or bg-zinc-900/50)
+NEVER include app-style elements (sidebar widgets, data tables, filters) on marketing pages.
+`;
+var DESIGN_QUALITY_APP = `
+## DESIGN QUALITY \u2014 APP PAGES
+
+### Spacing
+- gap-4 md:gap-6 between sections
+- p-4 lg:p-6 content padding
+- Within cards: p-4 to p-6 (compact)
+- Between cards in grid: gap-4 (tight)
+
+### Layout
+- Data tables, card grids, filters, stat rows
+- Page wrapper: flex flex-1 flex-col gap-4 p-4 lg:p-6
+- Stats grid: grid gap-4 md:grid-cols-2 lg:grid-cols-4
+- Content: functional, scannable, data-dense
+
+### Toolbars & Filters
+- Filter row: flex flex-wrap items-center gap-2
+- Search input: MUST use flex-1 to fill remaining horizontal space
+- Filters/selects: fixed width (w-[180px] or auto), do NOT flex-grow
+- On mobile (sm:): search full width, filters wrap to next line
+
+NEVER include marketing sections (hero, pricing, testimonials) on app pages.
+`;
+var DESIGN_QUALITY_AUTH = `
+## DESIGN QUALITY \u2014 AUTH PAGES
+
+### Layout
+- Centered card: flex min-h-svh items-center justify-center p-6 md:p-10
+- Card width: w-full max-w-md
+- No navigation, no section containers, no sidebar
+- Single focused form with clear CTA
+- Card \u2192 CardHeader (title + description) \u2192 CardContent (form) \u2192 CardFooter (link to other auth page)
+
+NEVER include navigation bars, sidebars, or multi-section layouts on auth pages.
+`;
+var DESIGN_QUALITY_CRITICAL = `
+## CRITICAL CODE RULES (violations will be auto-corrected)
+- Every lucide-react icon MUST have className="... shrink-0" to prevent flex squishing
+- Button with asChild wrapping Link: the inner element MUST have className="inline-flex items-center gap-2"
+- NEVER use raw Tailwind colors (bg-blue-500, text-gray-600). ONLY semantic tokens: bg-primary, text-muted-foreground, etc.
+- <Link> and <a> MUST always have an href attribute. Never omit href.
+- CardTitle: NEVER add text-xl, text-2xl, text-lg. CardTitle is text-sm font-medium by default.
 `;
+function getDesignQualityForType(type) {
+  switch (type) {
+    case "marketing":
+      return DESIGN_QUALITY_MARKETING + DESIGN_QUALITY_CRITICAL;
+    case "app":
+      return DESIGN_QUALITY_APP + DESIGN_QUALITY_CRITICAL;
+    case "auth":
+      return DESIGN_QUALITY_AUTH + DESIGN_QUALITY_CRITICAL;
+  }
+}
+function inferPageTypeFromRoute(route) {
+  const slug = route.replace(/^\//, "").split("/")[0] || "";
+  const authSlugs = /* @__PURE__ */ new Set([
+    "login",
+    "register",
+    "sign-up",
+    "signup",
+    "sign-in",
+    "signin",
+    "forgot-password",
+    "reset-password"
+  ]);
+  const marketingSlugs = /* @__PURE__ */ new Set(["pricing", "features", "about", "blog", "contact", "terms", "privacy"]);
+  if (authSlugs.has(slug)) return "auth";
+  if (marketingSlugs.has(slug) || slug === "") return "marketing";
+  return "app";
+}
+var DESIGN_QUALITY = `${DESIGN_QUALITY_COMMON}
+${DESIGN_QUALITY_MARKETING}`;
 var VISUAL_DEPTH = `
 ## VISUAL DEPTH TECHNIQUES (pick 1-3 per page based on context)
 
@@ -5210,7 +5296,7 @@ pageCode rules (shadcn/ui blocks quality):
 - Full Next.js App Router page. Imports from '@/components/ui/...' for registry components.
 - Follow ALL design constraints above: text-sm base, semantic colors only, restricted spacing, weight-based hierarchy.
 - Stat card pattern: Card > CardHeader(flex flex-row items-center justify-between space-y-0 pb-2) > CardTitle(text-sm font-medium) + Icon(size-4 text-muted-foreground) ; CardContent > metric(text-2xl font-bold) + change(text-xs text-muted-foreground).
-- Login/form pattern: outer div(flex min-h-svh flex-col items-center justify-center p-6 md:p-10) > inner div(w-full max-w-sm) > Card with form.
+- Login/form pattern: outer div(flex min-h-svh flex-col items-center justify-center p-6 md:p-10) > inner div(w-full max-w-md) > Card with form.
 - Dashboard pattern: div(space-y-6) > page header(h1 text-2xl font-bold tracking-tight + p text-sm text-muted-foreground) > stats grid(grid gap-4 md:grid-cols-2 lg:grid-cols-4) > content cards. No <main> wrapper \u2014 the layout provides it.
 - No placeholders: real contextual copy only. Use the EXACT text, language, and content from the user's request.
 - IMAGES: For avatar/profile photos, use https://i.pravatar.cc/150?u=<unique-seed> (e.g. ?u=sarah.johnson). For hero/product images, use https://picsum.photos/800/400?random=N. Use standard <img> tags with className, NOT Next.js <Image>. Always provide alt text.
@@ -5335,11 +5421,14 @@ Return valid JSON only, no markdown code fence. Use this shape:
 { "requests": [ ... array of ModificationRequest ... ], "uxRecommendations": "optional markdown or omit key" }
 Legacy: returning only a JSON array of requests is still accepted.`;
 }
-function buildLightweightPagePrompt(pageName, route, styleContext, sharedComponentsSummary) {
+function buildLightweightPagePrompt(pageName, route, styleContext, sharedComponentsSummary, pageType) {
+  const designConstraints = pageType ? getDesignQualityForType(pageType) : "";
   return [
     `Generate complete pageCode for a page called "${pageName}" at route "${route}".`,
     `Output valid TSX with a default export React component.`,
     `Use shadcn/ui components (import from @/components/ui/*). Use Tailwind CSS semantic tokens only.`,
+    pageType ? `PAGE TYPE: ${pageType}` : "",
+    designConstraints,
     styleContext ? `Follow this style context:
 ${styleContext}` : "",
     sharedComponentsSummary ? `Available shared components:
@@ -5989,7 +6078,7 @@ function checkLines(code, pattern, type, message, severity, skipCommentsAndStrin
   }
   return issues;
 }
-function validatePageQuality(code, validRoutes) {
+function validatePageQuality(code, validRoutes, pageType) {
   const issues = [];
   const allLines = code.split("\n");
   const isTerminalContext = (lineNum) => {
@@ -6159,21 +6248,23 @@ function validatePageQuality(code, validRoutes) {
       "warning"
     )
   );
-  const h1Matches = code.match(/<h1[\s>]/g);
-  if (!h1Matches || h1Matches.length === 0) {
-    issues.push({
-      line: 0,
-      type: "NO_H1",
-      message: "Page has no <h1> \u2014 every page should have exactly one h1 heading",
-      severity: "warning"
-    });
-  } else if (h1Matches.length > 1) {
-    issues.push({
-      line: 0,
-      type: "MULTIPLE_H1",
-      message: `Page has ${h1Matches.length} <h1> elements \u2014 use exactly one per page`,
-      severity: "warning"
-    });
+  if (pageType !== "auth") {
+    const h1Matches = code.match(/<h1[\s>]/g);
+    if (!h1Matches || h1Matches.length === 0) {
+      issues.push({
+        line: 0,
+        type: "NO_H1",
+        message: "Page has no <h1> \u2014 every page should have exactly one h1 heading",
+        severity: "warning"
+      });
+    } else if (h1Matches.length > 1) {
+      issues.push({
+        line: 0,
+        type: "MULTIPLE_H1",
+        message: `Page has ${h1Matches.length} <h1> elements \u2014 use exactly one per page`,
+        severity: "warning"
+      });
+    }
   }
   const headingLevels = [...code.matchAll(/<h([1-6])[\s>]/g)].map((m) => parseInt(m[1]));
   const hasCardContext = /\bCard\b|\bCardTitle\b|\bCardHeader\b/.test(code);
@@ -6347,6 +6438,24 @@ function validatePageQuality(code, validRoutes) {
   issues.push(...detectComponentIssues(code));
   return issues;
 }
+function resolveHref(linkText, context) {
+  if (!context) return "/";
+  const text = linkText.trim().toLowerCase();
+  if (context.linkMap) {
+    for (const [label, route] of Object.entries(context.linkMap)) {
+      if (label.toLowerCase() === text) return route;
+    }
+  }
+  if (context.knownRoutes) {
+    const cleaned = text.replace(/^(back\s+to|go\s+to|view\s+all|see\s+all|return\s+to)\s+/i, "").trim();
+    for (const route of context.knownRoutes) {
+      const slug = route.split("/").filter(Boolean).pop() || "";
+      const routeName = slug.replace(/[-_]/g, " ");
+      if (routeName && cleaned === routeName) return route;
+    }
+  }
+  return "/";
+}
 function replaceRawColors(classes, colorMap) {
   let changed = false;
   let result = classes;
@@ -6439,7 +6548,7 @@ function replaceRawColors(classes, colorMap) {
   });
   return { result, changed };
 }
-async function autoFixCode(code) {
+async function autoFixCode(code, context) {
   const fixes = [];
   let fixed = code;
   const beforeQuoteFix = fixed;
@@ -6449,11 +6558,36 @@ async function autoFixCode(code) {
     fixes.push("fixed escaped closing quotes in strings");
   }
   const beforeEntityFix = fixed;
-  fixed = fixed.replace(/&lt;=/g, "<=");
-  fixed = fixed.replace(/&gt;=/g, ">=");
-  fixed = fixed.replace(/&amp;&amp;/g, "&&");
-  fixed = fixed.replace(/([\w)\]])\s*&lt;\s*([\w(])/g, "$1 < $2");
-  fixed = fixed.replace(/([\w)\]])\s*&gt;\s*([\w(])/g, "$1 > $2");
+  const isInsideAttrValue = (line, idx) => {
+    let inQuote = false;
+    let inAttr = false;
+    for (let i = 0; i < idx; i++) {
+      if (line[i] === "=" && line[i + 1] === '"') {
+        inAttr = true;
+        inQuote = true;
+        i++;
+      } else if (inAttr && line[i] === '"') {
+        inAttr = false;
+        inQuote = false;
+      }
+    }
+    return inQuote;
+  };
+  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}`
+    );
+    return l;
+  }).join("\n");
   if (fixed !== beforeEntityFix) {
     fixes.push("Fixed syntax issues");
   }
@@ -6801,9 +6935,14 @@ ${selectImport}`
     fixes.push("added inline-flex to Button asChild children (base-ui compat)");
   }
   const beforeLinkHrefFix = fixed;
-  fixed = fixed.replace(/<(Link|a)\b(?![^>]*\bhref\s*=)([^>]*)>/g, '<$1 href="/"$2>');
+  fixed = fixed.replace(/<(Link|a)\b(?![^>]*\bhref\s*=)([^>]*)>([\s\S]*?)<\/\1>/g, (_match, tag, attrs, children) => {
+    const textContent = children.replace(/<[^>]*>/g, "").trim();
+    const href = resolveHref(textContent, context);
+    return `<${tag} href="${href}"${attrs}>${children}</${tag}>`;
+  });
+  fixed = fixed.replace(/<(Link|a)\b(?![^>]*\bhref\s*=)([^>]*)\/?>/g, '<$1 href="/"$2>');
   if (fixed !== beforeLinkHrefFix) {
-    fixes.push('added href="/" to <Link>/<a> missing href');
+    fixes.push("added href to <Link>/<a> missing href");
   }
   const { code: fixedByRules, fixes: ruleFixes } = applyComponentRules(fixed);
   if (ruleFixes.length > 0) {
@@ -6928,7 +7067,16 @@ import { DesignSystemManager as DesignSystemManager3, loadManifest as loadManife
 import chalk8 from "chalk";
 var MARKETING_ROUTES = /* @__PURE__ */ new Set(["", "landing", "pricing", "about", "contact", "blog", "features"]);
 var MIN_ANCHOR_PAGE_CODE_CHARS = 120;
-var AUTH_ROUTE_SLUGS = /* @__PURE__ */ new Set(["login", "register", "forgot-password", "reset-password", "sign-up"]);
+var AUTH_ROUTE_SLUGS = /* @__PURE__ */ new Set([
+  "login",
+  "signin",
+  "sign-in",
+  "register",
+  "sign-up",
+  "signup",
+  "forgot-password",
+  "reset-password"
+]);
 function inferRouteUsesAuthSegment(route) {
   const slug = route.replace(/^\//, "").split("/")[0] || "";
   return AUTH_ROUTE_SLUGS.has(slug);
@@ -6950,34 +7098,42 @@ function isMarketingRoute(route) {
   const slug = route.replace(/^\//, "").split("/")[0] || "";
   return MARKETING_ROUTES.has(slug);
 }
-function routeToFsPath(projectRoot, route, isAuth) {
+function routeToFsPath(projectRoot, route, isAuthOrPlan) {
+  const plan = typeof isAuthOrPlan === "object" ? isAuthOrPlan : void 0;
+  const isAuth = typeof isAuthOrPlan === "boolean" ? isAuthOrPlan : false;
   const slug = route.replace(/^\//, "");
-  if (isAuth) {
-    return resolve5(projectRoot, "app", "(auth)", slug || "login", "page.tsx");
-  }
-  if (!slug) {
-    return resolve5(projectRoot, "app", "page.tsx");
-  }
-  if (isMarketingRoute(route)) {
-    return resolve5(projectRoot, "app", slug, "page.tsx");
+  if (!slug) return resolve5(projectRoot, "app", "page.tsx");
+  if (plan) {
+    const group = getPageGroup(route, plan);
+    if (group) return resolve5(projectRoot, "app", `(${group.id})`, slug, "page.tsx");
   }
+  if (isAuth) return resolve5(projectRoot, "app", "(auth)", slug || "login", "page.tsx");
+  if (isMarketingRoute(route)) return resolve5(projectRoot, "app", slug, "page.tsx");
   return resolve5(projectRoot, "app", "(app)", slug, "page.tsx");
 }
-function routeToRelPath(route, isAuth) {
+function routeToRelPath(route, isAuthOrPlan) {
+  const plan = typeof isAuthOrPlan === "object" ? isAuthOrPlan : void 0;
+  const isAuth = typeof isAuthOrPlan === "boolean" ? isAuthOrPlan : false;
   const slug = route.replace(/^\//, "");
-  if (isAuth) {
-    return `app/(auth)/${slug || "login"}/page.tsx`;
-  }
-  if (!slug) {
-    return "app/page.tsx";
-  }
-  if (isMarketingRoute(route)) {
-    return `app/${slug}/page.tsx`;
+  if (!slug) return "app/page.tsx";
+  if (plan) {
+    const group = getPageGroup(route, plan);
+    if (group) return `app/(${group.id})/${slug}/page.tsx`;
   }
+  if (isAuth) return `app/(auth)/${slug || "login"}/page.tsx`;
+  if (isMarketingRoute(route)) return `app/${slug}/page.tsx`;
   return `app/(app)/${slug}/page.tsx`;
 }
+var AUTH_SYNONYMS = {
+  "/register": "/signup",
+  "/registration": "/signup",
+  "/sign-up": "/signup",
+  "/signin": "/login",
+  "/sign-in": "/login"
+};
 function deduplicatePages(pages) {
-  const normalize = (route) => route.replace(/\/$/, "").replace(/s$/, "").replace(/ue$/, "");
+  const canonicalize = (route) => AUTH_SYNONYMS[route] || route;
+  const normalize = (route) => canonicalize(route).replace(/\/$/, "").replace(/s$/, "").replace(/ue$/, "");
   const seen = /* @__PURE__ */ new Map();
   return pages.filter((page, idx) => {
     const norm = normalize(page.route);
@@ -6998,13 +7154,24 @@ function extractComponentIdsFromCode(code) {
   }
   return ids;
 }
-async function warnInlineDuplicates(projectRoot, pageName, pageCode, manifest) {
+async function warnInlineDuplicates(projectRoot, pageName, route, pageCode, manifest, plan) {
   const sectionOrWidget = manifest.shared.filter((e) => e.type === "section" || e.type === "widget");
   if (sectionOrWidget.length === 0) return;
+  const plannedForPage = plan ? new Set(plan.sharedComponents.filter((c) => c.usedBy.includes(route)).map((c) => c.name)) : null;
   for (const e of sectionOrWidget) {
+    if (plannedForPage && !plannedForPage.has(e.name)) continue;
     const kebab = e.file.replace(/^components\/shared\//, "").replace(/\.tsx$/, "");
     const hasImport = pageCode.includes(`@/components/shared/${kebab}`);
     if (hasImport) continue;
+    if (plannedForPage) {
+      console.log(
+        chalk8.yellow(
+          `
+\u26A0 Page "${pageName}" should use shared component ${e.name} (per architecture plan) but it's not imported. Import from @/components/shared/${kebab}`
+        )
+      );
+      continue;
+    }
     const sameNameAsTag = new RegExp(`<\\/?${e.name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s>]`).test(pageCode);
     if (sameNameAsTag) {
       console.log(
@@ -7115,8 +7282,8 @@ ${currentCode}
 
 // src/commands/chat/request-parser.ts
 var AUTH_FLOW_PATTERNS = {
-  "/login": ["/register", "/forgot-password"],
-  "/signin": ["/register", "/forgot-password"],
+  "/login": ["/signup", "/forgot-password"],
+  "/signin": ["/signup", "/forgot-password"],
   "/signup": ["/login"],
   "/register": ["/login"],
   "/forgot-password": ["/login", "/reset-password"],
@@ -7159,14 +7326,19 @@ function extractInternalLinks(code) {
 function inferRelatedPages(plannedPages) {
   const plannedRoutes = new Set(plannedPages.map((p) => p.route));
   const inferred = [];
-  for (const { route } of plannedPages) {
+  const queue = [...plannedPages];
+  let i = 0;
+  while (i < queue.length) {
+    const { route } = queue[i++];
     const authRelated = AUTH_FLOW_PATTERNS[route];
     if (authRelated) {
       for (const rel of authRelated) {
         if (!plannedRoutes.has(rel)) {
           const slug = rel.slice(1);
           const name = slug.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
-          inferred.push({ id: slug, name, route: rel });
+          const page = { id: slug, name, route: rel };
+          inferred.push(page);
+          queue.push(page);
           plannedRoutes.add(rel);
         }
       }
@@ -7176,6 +7348,7 @@ function inferRelatedPages(plannedPages) {
         for (const rel of rule.related) {
           if (!plannedRoutes.has(rel.route)) {
             inferred.push(rel);
+            queue.push(rel);
             plannedRoutes.add(rel.route);
           }
         }
@@ -7203,7 +7376,7 @@ function extractPageNamesFromMessage(message) {
     settings: "/settings",
     account: "/account",
     "personal account": "/account",
-    registration: "/registration",
+    registration: "/signup",
     signup: "/signup",
     "sign up": "/signup",
     login: "/login",
@@ -7616,6 +7789,7 @@ async function pMap(items, fn, concurrency = 3) {
 }
 
 // src/commands/chat/split-generator.ts
+import chalk9 from "chalk";
 function buildExistingPagesContext(config2) {
   const pages = config2.pages || [];
   const analyzed = pages.filter((p) => p.pageAnalysis);
@@ -7712,6 +7886,21 @@ Before implementing any section, check this list. Import and use matching compon
 
 ${sharedComponentsSummary}`;
 }
+function formatPlanSummary(plan) {
+  if (plan.groups.length === 0) return "";
+  const groupLines = plan.groups.map((g) => `  Group "${g.id}" (layout: ${g.layout}): ${g.pages.join(", ")}`);
+  const compLines = plan.sharedComponents.map(
+    (c) => `  ${c.name} (${c.type}) \u2014 ${c.description}; usedBy: ${c.usedBy.join(", ")}`
+  );
+  const parts = [`ARCHITECTURE PLAN:
+Groups:
+${groupLines.join("\n")}`];
+  if (compLines.length > 0) {
+    parts.push(`Shared Components:
+${compLines.join("\n")}`);
+  }
+  return parts.join("\n");
+}
 async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts) {
   let pageNames = [];
   spinner.start("Phase 1/5 \u2014 Planning pages...");
@@ -7745,7 +7934,7 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
   }
   if (pageNames.length === 0) {
     spinner.fail("Could not determine pages to create");
-    return [];
+    return { requests: [], plan: null };
   }
   pageNames = deduplicatePages(pageNames);
   const hasHomePage = pageNames.some((p) => p.route === "/");
@@ -7767,7 +7956,41 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
   const allRoutes = pageNames.map((p) => p.route).join(", ");
   const allPagesList = pageNames.map((p) => `${p.name} (${p.route})`).join(", ");
   const inferredNote = inferred.length > 0 ? ` (${inferred.length} auto-inferred)` : "";
-  spinner.succeed(`Phase 1/5 \u2014 Found ${pageNames.length} pages${inferredNote}: ${allPagesList}`);
+  spinner.succeed(`Phase 1/6 \u2014 Found ${pageNames.length} pages${inferredNote}: ${allPagesList}`);
+  let plan = null;
+  if (parseOpts.projectRoot) {
+    spinner.start("Phase 2/6 \u2014 Generating architecture plan...");
+    try {
+      const ai = await createAIProvider(provider ?? "auto");
+      const layoutHint = modCtx.config.navigation?.type || null;
+      plan = await generateArchitecturePlan(pageNames, message, ai, layoutHint);
+      if (plan) {
+        const groupsSummary = plan.groups.map((g) => `${g.id} (${g.layout}, ${g.pages.length} pages)`).join(", ");
+        const sharedSummary = plan.sharedComponents.length > 0 ? plan.sharedComponents.map((c) => `${c.name} \u2192 ${c.usedBy.join(", ")}`).join(" | ") : "";
+        const totalPages = plan.groups.reduce((sum, g) => sum + g.pages.length, 0);
+        spinner.succeed(`Phase 2/6 \u2014 Architecture plan created`);
+        console.log(chalk9.dim(`  Groups: ${groupsSummary}`));
+        if (sharedSummary) console.log(chalk9.dim(`  Shared: ${sharedSummary}`));
+        console.log(chalk9.dim(`  Total: ${totalPages} pages, ${plan.sharedComponents.length} shared components`));
+        if (plan.sharedComponents.length > 0 && parseOpts.projectRoot) {
+          const allDeps = new Set(plan.sharedComponents.flatMap((c) => c.shadcnDeps));
+          if (allDeps.size > 0) {
+            const componentProvider = getComponentProvider();
+            for (const dep of allDeps) {
+              try {
+                await componentProvider.installComponent(dep, parseOpts.projectRoot);
+              } catch {
+              }
+            }
+          }
+        }
+      } else {
+        spinner.warn("Phase 2/6 \u2014 Plan generation failed (continuing without plan)");
+      }
+    } catch {
+      spinner.warn("Phase 2/6 \u2014 Plan generation failed (continuing without plan)");
+    }
+  }
   const homeIdx = pageNames.findIndex((p) => p.route === "/");
   const homePage = homeIdx !== -1 ? pageNames[homeIdx] : pageNames[0];
   const remainingPages = pageNames.filter((_, i) => i !== (homeIdx !== -1 ? homeIdx : 0));
@@ -7781,12 +8004,12 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
     if (existingCode) {
       reusedExistingAnchor = true;
       homePageCode = existingCode;
-      spinner.start(`Phase 2/5 \u2014 Loading ${homePage.name} from disk (style anchor)...`);
-      spinner.succeed(`Phase 2/5 \u2014 Reused existing ${homePage.name} page (skipped AI regeneration)`);
+      spinner.start(`Phase 3/6 \u2014 Loading ${homePage.name} from disk (style anchor)...`);
+      spinner.succeed(`Phase 3/6 \u2014 Reused existing ${homePage.name} page (skipped AI regeneration)`);
     }
   }
   if (!reusedExistingAnchor) {
-    spinner.start(`Phase 2/5 \u2014 Generating ${homePage.name} page (sets design direction)...`);
+    spinner.start(`Phase 3/6 \u2014 Generating ${homePage.name} page (sets design direction)...`);
     try {
       const homeResult = await parseModification(
         `Create ONE page called "${homePage.name}" at route "${homePage.route}". Context: ${message}. This REPLACES the default placeholder page \u2014 generate a complete, content-rich landing page for the project described above. Generate complete pageCode. Include a branded site-wide <header> with navigation links to ALL these pages: ${allPagesList}. Use these EXACT routes in navigation: ${allRoutes}. Include a <footer> at the bottom. Make it visually polished \u2014 this page sets the design direction for the entire site. Do not generate other pages.`,
@@ -7808,73 +8031,102 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
         changes: { id: homePage.id, name: homePage.name, route: homePage.route }
       };
     }
-    spinner.succeed(`Phase 2/5 \u2014 ${homePage.name} page generated`);
+    spinner.succeed(`Phase 3/6 \u2014 ${homePage.name} page generated`);
   }
-  spinner.start("Phase 3/5 \u2014 Extracting design patterns...");
+  spinner.start("Phase 4/6 \u2014 Extracting design patterns...");
   const styleContext = homePageCode ? extractStyleContext(homePageCode) : "";
   if (styleContext) {
     const lineCount = styleContext.split("\n").length - 1;
     const source = reusedExistingAnchor ? `${homePage.name} (existing file)` : homePage.name;
-    spinner.succeed(`Phase 3/5 \u2014 Extracted ${lineCount} style patterns from ${source}`);
+    spinner.succeed(`Phase 4/6 \u2014 Extracted ${lineCount} style patterns from ${source}`);
   } else {
-    spinner.succeed("Phase 3/5 \u2014 No style patterns extracted (anchor page had no code)");
+    spinner.succeed("Phase 4/6 \u2014 No style patterns extracted (anchor page had no code)");
   }
-  if (remainingPages.length >= 2 && homePageCode && projectRoot) {
-    const manifest = await loadManifest5(projectRoot);
-    const shouldSkip = reusedExistingAnchor && manifest.shared.some((e) => e.type !== "layout");
-    if (!shouldSkip) {
-      spinner.start("Phase 3.5/5 \u2014 Extracting shared components...");
+  if (remainingPages.length >= 2 && projectRoot) {
+    if (plan && plan.sharedComponents.length > 0) {
+      spinner.start(`Phase 4.5/6 \u2014 Generating ${plan.sharedComponents.length} shared components from plan...`);
       try {
-        const extraction = await extractSharedComponents(homePageCode, projectRoot, provider ?? "auto");
-        parseOpts.sharedComponentsSummary = extraction.summary;
-        if (extraction.components.length > 0) {
-          const names = extraction.components.map((c) => c.name).join(", ");
-          spinner.succeed(`Phase 3.5/5 \u2014 Extracted ${extraction.components.length} shared components (${names})`);
+        const { generateSharedComponentsFromPlan } = await import("./plan-generator-IS3YDZUW.js");
+        const generated = await generateSharedComponentsFromPlan(
+          plan,
+          styleContext,
+          projectRoot,
+          await createAIProvider(provider ?? "auto")
+        );
+        if (generated.length > 0) {
+          const updatedManifest = await loadManifest5(projectRoot);
+          parseOpts.sharedComponentsSummary = buildSharedComponentsSummary(updatedManifest);
+          const names = generated.map((c) => c.name).join(", ");
+          spinner.succeed(`Phase 4.5/6 \u2014 Generated ${generated.length} shared components (${names})`);
         } else {
-          spinner.succeed("Phase 3.5/5 \u2014 No shared components extracted");
+          spinner.succeed("Phase 4.5/6 \u2014 No shared components generated");
         }
       } catch {
-        spinner.warn("Phase 3.5/5 \u2014 Could not extract shared components (continuing without)");
+        spinner.warn("Phase 4.5/6 \u2014 Could not generate shared components (continuing without)");
+      }
+    } else if (homePageCode) {
+      const manifest = await loadManifest5(projectRoot);
+      const shouldSkip = reusedExistingAnchor && manifest.shared.some((e) => e.type !== "layout");
+      if (!shouldSkip) {
+        spinner.start("Phase 4.5/6 \u2014 Extracting shared components (legacy)...");
+        try {
+          const extraction = await extractSharedComponents(homePageCode, projectRoot, provider ?? "auto");
+          parseOpts.sharedComponentsSummary = extraction.summary;
+          if (extraction.components.length > 0) {
+            const names = extraction.components.map((c) => c.name).join(", ");
+            spinner.succeed(`Phase 4.5/6 \u2014 Extracted ${extraction.components.length} shared components (${names})`);
+          } else {
+            spinner.succeed("Phase 4.5/6 \u2014 No shared components extracted");
+          }
+        } catch {
+          spinner.warn("Phase 4.5/6 \u2014 Could not extract shared components (continuing without)");
+        }
       }
     }
   }
   if (remainingPages.length === 0) {
-    return homeRequest ? [homeRequest] : [];
+    return { requests: homeRequest ? [homeRequest] : [], plan };
   }
-  spinner.start(`Phase 4/5 \u2014 Generating ${remainingPages.length} pages in parallel...`);
+  spinner.start(`Phase 5/6 \u2014 Generating ${remainingPages.length} pages in parallel...`);
   const sharedLayoutNote = "Header and Footer are shared components rendered by the root layout. Do NOT include any site-wide <header>, <nav>, or <footer> in this page. Start with the main content directly.";
   const sharedComponentsNote = buildSharedComponentsNote(parseOpts.sharedComponentsSummary);
   const routeNote = `EXISTING ROUTES in this project: ${allRoutes}. All internal links MUST point to one of these routes. If a target doesn't exist, use href="#".`;
   const alignmentNote = 'CRITICAL LAYOUT RULE: Every <section> must wrap its content in a container div matching the header width. Use the EXACT same container classes as shown in the style context (e.g. className="container max-w-6xl px-4" or className="max-w-6xl mx-auto px-4"). Inner content can use narrower max-w for text centering, but the outer section container MUST match.';
+  const planSummaryNote = plan ? formatPlanSummary(plan) : "";
   const existingPagesContext = buildExistingPagesContext(modCtx.config);
   const AI_CONCURRENCY = 3;
-  let phase4Done = 0;
+  let phase5Done = 0;
   const remainingRequests = await pMap(
     remainingPages,
     async ({ name, id, route }) => {
       const isAuth = isAuthRoute(route) || isAuthRoute(name);
-      const authNote = isAuth ? 'For this auth page: use centered card layout with outer div className="flex min-h-svh flex-col items-center justify-center p-6 md:p-10" and inner div className="w-full max-w-sm". Do NOT use section containers or full-width wrappers. The auth layout provides centering \u2014 just output the card content.' : void 0;
+      const pageType = plan ? getPageType(route, plan) : inferPageTypeFromRoute(route);
+      const designConstraints = getDesignQualityForType(pageType);
+      const authNote = isAuth ? 'For this auth page: use centered card layout with outer div className="flex min-h-svh flex-col items-center justify-center p-6 md:p-10" and inner div className="w-full max-w-md". Do NOT use section containers or full-width wrappers. The auth layout provides centering \u2014 just output the card content.' : void 0;
       const prompt = [
         `Create ONE page called "${name}" at route "${route}".`,
         `Context: ${message}.`,
         `Generate complete pageCode for this single page only. Do not generate other pages.`,
+        `PAGE TYPE: ${pageType}`,
+        designConstraints,
         sharedLayoutNote,
         sharedComponentsNote,
         routeNote,
         alignmentNote,
         authNote,
+        planSummaryNote,
         existingPagesContext,
         styleContext
       ].filter(Boolean).join("\n\n");
       try {
         const result = await parseModification(prompt, modCtx, provider, parseOpts);
-        phase4Done++;
-        spinner.text = `Phase 4/5 \u2014 ${phase4Done}/${remainingPages.length} pages generated...`;
+        phase5Done++;
+        spinner.text = `Phase 5/6 \u2014 ${phase5Done}/${remainingPages.length} pages generated...`;
         const codePage = result.requests.find((r) => r.type === "add-page");
         return codePage || { type: "add-page", target: "new", changes: { id, name, route } };
       } catch {
-        phase4Done++;
-        spinner.text = `Phase 4/5 \u2014 ${phase4Done}/${remainingPages.length} pages generated...`;
+        phase5Done++;
+        spinner.text = `Phase 5/6 \u2014 ${phase5Done}/${remainingPages.length} pages generated...`;
         return { type: "add-page", target: "new", changes: { id, name, route } };
       }
     },
@@ -7889,18 +8141,18 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
       const pageName = page.name || page.id || "page";
       const pageRoute = page.route || `/${pageName.toLowerCase()}`;
       try {
+        const retryPageType = plan ? getPageType(pageRoute, plan) : inferPageTypeFromRoute(pageRoute);
         const lightweightPrompt = buildLightweightPagePrompt(
           pageName,
           pageRoute,
           styleContext || "",
-          parseOpts.sharedComponentsSummary
-        );
-        const retryResult = await parseModification(
-          lightweightPrompt,
-          modCtx,
-          provider,
-          { ...parseOpts, lightweight: true }
+          parseOpts.sharedComponentsSummary,
+          retryPageType
         );
+        const retryResult = await parseModification(lightweightPrompt, modCtx, provider, {
+          ...parseOpts,
+          lightweight: true
+        });
         const codePage = retryResult.requests.find((r) => r.type === "add-page");
         if (codePage && codePage.changes?.pageCode) {
           const idx = allRequests.indexOf(req);
@@ -7911,8 +8163,8 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
     }
   }
   const withCode = allRequests.filter((r) => r.changes?.pageCode).length;
-  spinner.succeed(`Phase 4/5 \u2014 Generated ${allRequests.length} pages (${withCode} with full code)`);
-  return allRequests;
+  spinner.succeed(`Phase 5/6 \u2014 Generated ${allRequests.length} pages (${withCode} with full code)`);
+  return { requests: allRequests, plan };
 }
 var SharedExtractionItemSchema = z.object({
   name: z.string().min(2).max(50),
@@ -8026,7 +8278,7 @@ function extractAppNameFromPrompt(prompt) {
 import { resolve as resolve7 } from "path";
 import { mkdir as mkdir4 } from "fs/promises";
 import { dirname as dirname6 } from "path";
-import chalk11 from "chalk";
+import chalk12 from "chalk";
 import {
   getTemplateForPageType,
   loadManifest as loadManifest6,
@@ -8047,7 +8299,7 @@ import {
   TailwindConfigGenerator
 } from "@getcoherent/core";
 import { integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout2, generateSharedComponent as generateSharedComponent3 } from "@getcoherent/core";
-import chalk9 from "chalk";
+import chalk10 from "chalk";
 
 // src/utils/file-hashes.ts
 import { createHash } from "crypto";
@@ -8151,7 +8403,7 @@ async function canOverwriteShared(projectRoot, componentFile, storedHashes) {
   if (!storedHash) return true;
   const edited = await isManuallyEdited(filePath, storedHash);
   if (edited) {
-    console.log(chalk9.yellow(`  \u26A0 Skipping ${componentFile} \u2014 manually edited since last generation`));
+    console.log(chalk10.yellow(`  \u26A0 Skipping ${componentFile} \u2014 manually edited since last generation`));
   }
   return !edited;
 }
@@ -8214,7 +8466,7 @@ async function regenerateLayout(config2, projectRoot, options = { navChanged: fa
     await ensureAppRouteGroupLayout(projectRoot, config2.navigation?.type, options.navChanged);
   } catch (err) {
     if (process.env.COHERENT_DEBUG === "1") {
-      console.log(chalk9.dim("Layout integration warning:", err));
+      console.log(chalk10.dim("Layout integration warning:", err));
     }
   }
 }
@@ -8282,6 +8534,59 @@ export default function AppLayout({
 }
 `;
 }
+function buildGroupLayoutCode(layout, _pages) {
+  if (layout === "sidebar" || layout === "both") {
+    return `import { Sidebar } from '@/components/shared/sidebar'
+
+export default function GroupLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return (
+    <div className="flex min-h-[calc(100vh-3.5rem)]">
+      <Sidebar />
+      <main className="flex-1 px-4 sm:px-6 lg:px-8 py-6">
+        {children}
+      </main>
+    </div>
+  )
+}
+`;
+  }
+  if (layout === "none") {
+    return `export default function GroupLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return <>{children}</>
+}
+`;
+  }
+  return `export default function GroupLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return (
+    <main className="mx-auto w-full max-w-7xl px-4 sm:px-6 lg:px-8 py-6">
+      {children}
+    </main>
+  )
+}
+`;
+}
+async function ensurePlanGroupLayouts(projectRoot, plan) {
+  const { mkdir: mkdirAsync } = await import("fs/promises");
+  for (const group of plan.groups) {
+    const groupDir = resolve6(projectRoot, "app", `(${group.id})`);
+    await mkdirAsync(groupDir, { recursive: true });
+    const layoutPath = resolve6(groupDir, "layout.tsx");
+    const code = buildGroupLayoutCode(group.layout, group.pages);
+    await writeFile(layoutPath, code);
+  }
+}
 async function regenerateFiles(modified, config2, projectRoot, options = { navChanged: false }) {
   const componentIds = /* @__PURE__ */ new Set();
   const pageIds = /* @__PURE__ */ new Set();
@@ -8299,7 +8604,7 @@ async function regenerateFiles(modified, config2, projectRoot, options = { navCh
     });
     const sharedInstalled = await scanAndInstallSharedDeps(projectRoot);
     if (sharedInstalled.length > 0 && process.env.COHERENT_DEBUG === "1") {
-      console.log(chalk9.dim(`  Auto-installed shared deps: ${sharedInstalled.join(", ")}`));
+      console.log(chalk10.dim(`  Auto-installed shared deps: ${sharedInstalled.join(", ")}`));
     }
   }
   if (componentIds.size > 0) {
@@ -8356,7 +8661,7 @@ function extractBalancedTag(source, tagName) {
 }
 
 // src/commands/chat/reporting.ts
-import chalk10 from "chalk";
+import chalk11 from "chalk";
 function extractImportsFrom(code, fromPath) {
   const escaped = fromPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const regex = new RegExp(`import\\s*\\{([^}]+)\\}\\s*from\\s*['"\`]${escaped}[^'"\`]*['"\`]`, "g");
@@ -8378,27 +8683,27 @@ function printPostGenerationReport(opts) {
   const iconCount = extractImportsFrom(code, "lucide-react").length;
   const hasInstalled = postFixes.some((f) => f.startsWith("Installed:"));
   const syntaxStatus = postFixes.length > 0 ? postFixes.some((f) => f.includes("metadata")) ? "fixed (escaped metadata quotes) \u2714" : "fixed \u2714" : "valid \u2714";
-  console.log(chalk10.green(`
+  console.log(chalk11.green(`
 \u2705 Page "${pageTitle}" ${action} at ${filePath}
 `));
   if (uiComponents.length > 0) {
-    console.log(chalk10.dim(`  Components:  ${uiComponents.join(", ")} (from @/components/ui)`));
+    console.log(chalk11.dim(`  Components:  ${uiComponents.join(", ")} (from @/components/ui)`));
   }
   if (inCodeShared.length > 0) {
-    console.log(chalk10.dim(`  Shared:      ${inCodeShared.map((s) => `${s.id} (${s.name})`).join(", ")}`));
+    console.log(chalk11.dim(`  Shared:      ${inCodeShared.map((s) => `${s.id} (${s.name})`).join(", ")}`));
   }
   if (layoutShared.length > 0) {
-    console.log(chalk10.dim(`  Layout:      ${layoutShared.map((l) => `${l.id} (${l.name})`).join(", ")} via layout.tsx`));
+    console.log(chalk11.dim(`  Layout:      ${layoutShared.map((l) => `${l.id} (${l.name})`).join(", ")} via layout.tsx`));
   }
   if (iconCount > 0) {
-    console.log(chalk10.dim(`  Icons:       ${iconCount} from lucide-react`));
+    console.log(chalk11.dim(`  Icons:       ${iconCount} from lucide-react`));
   }
   if (hasInstalled) {
-    console.log(chalk10.dim("  Dependencies: installed \u2714"));
+    console.log(chalk11.dim("  Dependencies: installed \u2714"));
   }
-  console.log(chalk10.dim(`  Syntax:      ${syntaxStatus}`));
+  console.log(chalk11.dim(`  Syntax:      ${syntaxStatus}`));
   if (route) {
-    console.log(chalk10.cyan(`
+    console.log(chalk11.cyan(`
   Preview: http://localhost:3000${route}`));
   }
   console.log("");
@@ -8406,35 +8711,35 @@ function printPostGenerationReport(opts) {
 function printSharedComponentReport(opts) {
   const { id, name, file, instruction, postFixes = [] } = opts;
   const syntaxStatus = postFixes.length > 0 ? "fixed \u2714" : "valid \u2714";
-  console.log(chalk10.green(`
+  console.log(chalk11.green(`
 \u2705 Updated ${id} (${name}) at ${file}
 `));
   if (instruction) {
     const snippet = instruction.length > 60 ? instruction.slice(0, 57) + "..." : instruction;
-    console.log(chalk10.dim(`  Changed:     ${snippet}`));
+    console.log(chalk11.dim(`  Changed:     ${snippet}`));
   }
-  console.log(chalk10.dim("  Affects:    all pages via layout.tsx"));
-  console.log(chalk10.dim(`  Syntax:     ${syntaxStatus}`));
+  console.log(chalk11.dim("  Affects:    all pages via layout.tsx"));
+  console.log(chalk11.dim(`  Syntax:     ${syntaxStatus}`));
   console.log("");
 }
 function printLinkSharedReport(opts) {
   const { sharedId, sharedName, pageTarget, route, postFixes = [] } = opts;
   const syntaxStatus = postFixes.length > 0 ? "fixed \u2714" : "valid \u2714";
-  console.log(chalk10.green(`
+  console.log(chalk11.green(`
 \u2705 Linked ${sharedId} (${sharedName}) to page "${pageTarget}"
 `));
-  console.log(chalk10.dim(`  Syntax:     ${syntaxStatus}`));
-  console.log(chalk10.cyan(`  Preview: http://localhost:3000${route}`));
+  console.log(chalk11.dim(`  Syntax:     ${syntaxStatus}`));
+  console.log(chalk11.cyan(`  Preview: http://localhost:3000${route}`));
   console.log("");
 }
 function printPromoteAndLinkReport(opts) {
   const { id, name, file, usedInFiles, postFixes = [] } = opts;
   const syntaxStatus = postFixes.length > 0 ? "fixed \u2714" : "valid \u2714";
-  console.log(chalk10.green(`
+  console.log(chalk11.green(`
 \u2705 Created ${id} (${name}) at ${file}
 `));
-  console.log(chalk10.dim(`  Linked to:  ${usedInFiles.length} page(s)`));
-  console.log(chalk10.dim(`  Syntax:     ${syntaxStatus}`));
+  console.log(chalk11.dim(`  Linked to:  ${usedInFiles.length} page(s)`));
+  console.log(chalk11.dim(`  Syntax:     ${syntaxStatus}`));
   console.log("");
 }
 function showPreview(requests, results, config2, preflightInstalledNames) {
@@ -8452,23 +8757,23 @@ function showPreview(requests, results, config2, preflightInstalledNames) {
   const modifiedSharedComponents = successfulPairs.filter(({ request }) => request.type === "modify-layout-block");
   const modifiedPages = successfulPairs.filter(({ request }) => request.type === "update-page");
   const tokenChanges = successfulPairs.filter(({ request }) => request.type === "update-token");
-  console.log(chalk10.bold.cyan("\n\u{1F4CB} Changes Applied:\n"));
+  console.log(chalk11.bold.cyan("\n\u{1F4CB} Changes Applied:\n"));
   if (preflightInstalledNames && preflightInstalledNames.length > 0) {
-    console.log(chalk10.cyan("\u{1F50D} Pre-flight check: Installed missing components:"));
+    console.log(chalk11.cyan("\u{1F50D} Pre-flight check: Installed missing components:"));
     preflightInstalledNames.forEach((name) => {
-      console.log(chalk10.green(`   \u2728 Auto-installed ${name}`));
+      console.log(chalk11.green(`   \u2728 Auto-installed ${name}`));
     });
     console.log("");
   }
   if (addedComponents.length > 0) {
     const names = addedComponents.map(({ request }) => request.changes.name).filter(Boolean);
-    console.log(chalk10.green("\u{1F4E6} Components:"));
-    console.log(chalk10.white(`   \u2728 Auto-installed: ${names.join(", ")}`));
+    console.log(chalk11.green("\u{1F4E6} Components:"));
+    console.log(chalk11.white(`   \u2728 Auto-installed: ${names.join(", ")}`));
   }
   if (customComponents.length > 0) {
     const names = customComponents.map(({ request }) => request.changes.name).filter(Boolean);
-    if (addedComponents.length === 0) console.log(chalk10.green("\u{1F4E6} Components:"));
-    console.log(chalk10.white(`   \u2728 Created: ${names.join(", ")}`));
+    if (addedComponents.length === 0) console.log(chalk11.green("\u{1F4E6} Components:"));
+    console.log(chalk11.white(`   \u2728 Created: ${names.join(", ")}`));
   }
   const usedComponentIds = /* @__PURE__ */ new Set();
   addedPages.forEach(({ request }) => {
@@ -8483,71 +8788,73 @@ function showPreview(requests, results, config2, preflightInstalledNames) {
   ]);
   const reusedIds = [...usedComponentIds].filter((id) => !newComponentIds.has(id));
   if (reusedIds.length > 0) {
-    if (addedComponents.length === 0 && customComponents.length === 0) console.log(chalk10.green("\u{1F4E6} Components:"));
-    console.log(chalk10.white(`   \u{1F504} Reused: ${reusedIds.join(", ")}`));
+    if (addedComponents.length === 0 && customComponents.length === 0) console.log(chalk11.green("\u{1F4E6} Components:"));
+    console.log(chalk11.white(`   \u{1F504} Reused: ${reusedIds.join(", ")}`));
   }
   if (addedComponents.length > 0 || customComponents.length > 0 || reusedIds.length > 0) {
     console.log("");
   }
   if (addedPages.length > 0) {
-    console.log(chalk10.green("\u{1F4C4} Pages Created:"));
+    console.log(chalk11.green("\u{1F4C4} Pages Created:"));
     addedPages.forEach(({ request }) => {
       const page = request.changes;
       const route = page.route || "/";
-      console.log(chalk10.white(`   \u2728 ${page.name || "Page"}`));
-      console.log(chalk10.gray(`      Route: ${route}`));
-      console.log(chalk10.gray(`      Sections: ${page.sections?.length ?? 0}`));
+      console.log(chalk11.white(`   \u2728 ${page.name || "Page"}`));
+      console.log(chalk11.gray(`      Route: ${route}`));
+      const configPage = config2.pages?.find((p) => p.id === page.id || p.route === (page.route || "/"));
+      const sectionCount = configPage?.pageAnalysis?.sections?.length ?? page.sections?.length ?? 0;
+      console.log(chalk11.gray(`      Sections: ${sectionCount}`));
     });
     console.log("");
   }
   if (modifiedComponents.length > 0 || modifiedSharedComponents.length > 0 || modifiedPages.length > 0 || tokenChanges.length > 0) {
-    console.log(chalk10.yellow("\u{1F527} Modified:"));
+    console.log(chalk11.yellow("\u{1F527} Modified:"));
     modifiedComponents.forEach(({ result }) => {
-      console.log(chalk10.white(`   \u2022 ${result.message}`));
+      console.log(chalk11.white(`   \u2022 ${result.message}`));
     });
     modifiedSharedComponents.forEach(({ result }) => {
-      console.log(chalk10.white(`   \u2022 ${result.message}`));
+      console.log(chalk11.white(`   \u2022 ${result.message}`));
     });
     modifiedPages.forEach(({ result }) => {
-      console.log(chalk10.white(`   \u2022 ${result.message}`));
+      console.log(chalk11.white(`   \u2022 ${result.message}`));
     });
     tokenChanges.forEach(({ result }) => {
-      console.log(chalk10.white(`   \u2022 ${result.message}`));
+      console.log(chalk11.white(`   \u2022 ${result.message}`));
     });
     console.log("");
   }
   if (failedPairs.length > 0) {
-    console.log(chalk10.red("\u274C Failed modifications:"));
+    console.log(chalk11.red("\u274C Failed modifications:"));
     failedPairs.forEach(({ result }) => {
-      console.log(chalk10.gray(`   \u2716 ${result.message}`));
+      console.log(chalk11.gray(`   \u2716 ${result.message}`));
     });
     console.log("");
   }
   const successCount = successfulPairs.length;
   const totalCount = results.length;
   if (successCount === totalCount) {
-    console.log(chalk10.green.bold(`\u2705 Success! ${successCount} modification(s) applied
+    console.log(chalk11.green.bold(`\u2705 Success! ${successCount} modification(s) applied
 `));
   } else {
-    console.log(chalk10.yellow.bold(`\u26A0\uFE0F  Partial success: ${successCount}/${totalCount} modification(s) applied
+    console.log(chalk11.yellow.bold(`\u26A0\uFE0F  Partial success: ${successCount}/${totalCount} modification(s) applied
 `));
   }
   if (addedPages.length > 0) {
     const firstPage = addedPages[0].request.changes;
     const route = firstPage?.route || "/";
-    console.log(chalk10.cyan("\u{1F680} What's next:\n"));
-    console.log(chalk10.white("   \u{1F4FA} View in browser:"));
-    console.log(chalk10.cyan("      coherent preview"));
-    console.log(chalk10.gray(`      \u2192 Opens http://localhost:3000${route}
+    console.log(chalk11.cyan("\u{1F680} What's next:\n"));
+    console.log(chalk11.white("   \u{1F4FA} View in browser:"));
+    console.log(chalk11.cyan("      coherent preview"));
+    console.log(chalk11.gray(`      \u2192 Opens http://localhost:3000${route}
 `));
-    console.log(chalk10.white("   \u{1F3A8} Customize:"));
-    console.log(chalk10.cyan('      coherent chat "make buttons rounded"'));
-    console.log(chalk10.cyan(`      coherent chat "add hero section to ${firstPage?.name ?? "page"}"`));
+    console.log(chalk11.white("   \u{1F3A8} Customize:"));
+    console.log(chalk11.cyan('      coherent chat "make buttons rounded"'));
+    console.log(chalk11.cyan(`      coherent chat "add hero section to ${firstPage?.name ?? "page"}"`));
     console.log("");
   } else if (successCount > 0) {
-    console.log(chalk10.cyan("\u{1F680} What's next:\n"));
-    console.log(chalk10.white("   \u{1F4FA} Preview changes:"));
-    console.log(chalk10.cyan("      coherent preview\n"));
+    console.log(chalk11.cyan("\u{1F680} What's next:\n"));
+    console.log(chalk11.white("   \u{1F4FA} Preview changes:"));
+    console.log(chalk11.cyan("      coherent preview\n"));
   }
 }
 function getChangeDescription(request, config2) {
@@ -8696,8 +9003,8 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
       const newCode = await ai.editSharedComponentCode(currentCode, instruction, resolved.name);
       const { fixedCode, fixes } = await validateAndFixGeneratedCode(projectRoot, newCode, { isPage: false });
       if (fixes.length > 0) {
-        console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
-        fixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
+        console.log(chalk12.dim("  \u{1F527} Post-generation fixes:"));
+        fixes.forEach((f) => console.log(chalk12.dim(`     ${f}`)));
       }
       await writeFile(fullPath, fixedCode);
       printSharedComponentReport({
@@ -8770,8 +9077,8 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
       const newPageCode = await ai.replaceInlineWithShared(pageCode, sharedCode, resolved.name, changes?.blockHint);
       const { fixedCode, fixes } = await validateAndFixGeneratedCode(projectRoot, newPageCode, { isPage: true });
       if (fixes.length > 0) {
-        console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
-        fixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
+        console.log(chalk12.dim("  \u{1F527} Post-generation fixes:"));
+        fixes.forEach((f) => console.log(chalk12.dim(`     ${f}`)));
       }
       await writeFile(pageFilePath, fixedCode);
       const manifest = await loadManifest6(projectRoot);
@@ -8873,8 +9180,8 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
         const newCode = await ai.replaceInlineWithShared(linkPageCode, sharedCode, created.name, blockHint);
         const { fixedCode, fixes } = await validateAndFixGeneratedCode(projectRoot, newCode, { isPage: true });
         if (fixes.length > 0) {
-          console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
-          fixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
+          console.log(chalk12.dim("  \u{1F527} Post-generation fixes:"));
+          fixes.forEach((f) => console.log(chalk12.dim(`     ${f}`)));
         }
         await writeFile(fullPath, fixedCode);
         usedInFiles.push(relPath);
@@ -8965,7 +9272,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
       const aiPageCode = typeof page.pageCode === "string" && page.pageCode.trim() !== "" ? page.pageCode : void 0;
       if (aiPageCode) {
         finalPageCode = aiPageCode;
-        if (DEBUG2) console.log(chalk11.dim(`  [pageCode] Using AI-generated pageCode (user content priority)`));
+        if (DEBUG2) console.log(chalk12.dim(`  [pageCode] Using AI-generated pageCode (user content priority)`));
       } else {
         const inferredType = page.pageType || inferPageType(page.route || "", page.name || "");
         if (inferredType) {
@@ -8980,19 +9287,19 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
               const content = page.structuredContent || getDefaultContent(inferredType, page.name || pageName);
               finalPageCode = templateFn(content, opts);
               if (DEBUG2)
-                console.log(chalk11.dim(`  [template] Used "${inferredType}" template (inferred from route/name)`));
+                console.log(chalk12.dim(`  [template] Used "${inferredType}" template (inferred from route/name)`));
             } catch {
-              if (DEBUG2) console.log(chalk11.dim(`  [template] Failed for "${inferredType}"`));
+              if (DEBUG2) console.log(chalk12.dim(`  [template] Failed for "${inferredType}"`));
             }
           }
         }
       }
       if (!finalPageCode) {
-        console.log(chalk11.yellow(`
+        console.log(chalk12.yellow(`
 \u26A0\uFE0F  Page "${page.name || page.id}" has no generated code \u2014 it will appear empty.`));
-        console.log(chalk11.dim("   This usually means the AI did not produce pageCode for this page."));
+        console.log(chalk12.dim("   This usually means the AI did not produce pageCode for this page."));
         console.log(
-          chalk11.dim(
+          chalk12.dim(
             '   Try running: coherent chat "regenerate the ' + (page.name || page.id) + ' page with full content"'
           )
         );
@@ -9034,7 +9341,13 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
             isPage: true
           });
           let codeToWrite = fixedCode;
-          const { code: autoFixed, fixes: autoFixes } = await autoFixCode(codeToWrite);
+          const currentPlan = projectRoot ? loadPlan(projectRoot) : null;
+          const autoFixCtx = route ? {
+            currentRoute: route,
+            knownRoutes: dsm.getConfig().pages.map((p) => p.route).filter(Boolean),
+            linkMap: currentPlan?.pageNotes[routeToKey(route)]?.links
+          } : void 0;
+          const { code: autoFixed, fixes: autoFixes } = await autoFixCode(codeToWrite, autoFixCtx);
           codeToWrite = autoFixed;
           const hasDashboardPage = dsm.getConfig().pages.some((p) => p.route === "/dashboard");
           if (!hasDashboardPage) {
@@ -9046,7 +9359,9 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
           }
           const { code: layoutStripped, stripped } = stripInlineLayoutElements(codeToWrite);
           codeToWrite = layoutStripped;
-          if (!isMarketingRoute(route) && !isAuthRoute(route)) {
+          const qualityPageType = currentPlan ? getPageType(route, currentPlan) : inferPageTypeFromRoute(route);
+          const pageType = currentPlan ? getPageType(route, currentPlan) : isMarketingRoute(route) ? "marketing" : isAuth ? "auth" : "app";
+          if (pageType === "app") {
             const { code: normalized, fixed: wrapperFixed } = normalizePageWrapper(codeToWrite);
             if (wrapperFixed) {
               codeToWrite = normalized;
@@ -9056,8 +9371,8 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
           const allFixes = [...postFixes, ...autoFixes];
           if (stripped.length > 0) allFixes.push(`stripped inline ${stripped.join(", ")} (layout owns these)`);
           if (allFixes.length > 0) {
-            console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
-            allFixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
+            console.log(chalk12.dim("  \u{1F527} Post-generation fixes:"));
+            allFixes.forEach((f) => console.log(chalk12.dim(`     ${f}`)));
           }
           await writeFile(filePath, codeToWrite);
           const pageIdx = dsm.getConfig().pages.findIndex((p) => p.id === page.id);
@@ -9069,7 +9384,15 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
             pm.updateConfig(cfg);
           }
           const manifestForAudit = await loadManifest6(projectRoot);
-          await warnInlineDuplicates(projectRoot, page.name || page.id || route.slice(1), codeToWrite, manifestForAudit);
+          const planForAudit = loadPlan(projectRoot);
+          await warnInlineDuplicates(
+            projectRoot,
+            page.name || page.id || route.slice(1),
+            route,
+            codeToWrite,
+            manifestForAudit,
+            planForAudit ?? void 0
+          );
           const relFilePath = routeToRelPath(route, isAuth);
           printPostGenerationReport({
             action: "created",
@@ -9082,11 +9405,11 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
             layoutShared: manifestForAudit.shared.filter((c) => c.type === "layout"),
             allShared: manifestForAudit.shared
           });
-          let issues = validatePageQuality(codeToWrite);
+          let issues = validatePageQuality(codeToWrite, void 0, qualityPageType);
           const errors = issues.filter((i) => i.severity === "error");
           if (errors.length >= 2 && aiProvider) {
             console.log(
-              chalk11.yellow(`
+              chalk12.yellow(`
 \u{1F504} ${errors.length} quality errors \u2014 attempting AI fix for ${page.name || page.id}...`)
             );
             try {
@@ -9103,19 +9426,19 @@ Rules:
 - Keep all existing functionality and layout intact`;
                 const fixedCode2 = await ai.editPageCode(codeToWrite, instruction, page.name || page.id || "Page");
                 if (fixedCode2 && fixedCode2.length > 100 && /export\s+default/.test(fixedCode2)) {
-                  const recheck = validatePageQuality(fixedCode2);
+                  const recheck = validatePageQuality(fixedCode2, void 0, qualityPageType);
                   const recheckErrors = recheck.filter((i) => i.severity === "error");
                   if (recheckErrors.length < errors.length) {
                     codeToWrite = fixedCode2;
-                    const { code: reFixed, fixes: reFixes } = await autoFixCode(codeToWrite);
+                    const { code: reFixed, fixes: reFixes } = await autoFixCode(codeToWrite, autoFixCtx);
                     if (reFixes.length > 0) {
                       codeToWrite = reFixed;
                       postFixes.push(...reFixes);
                     }
                     await writeFile(filePath, codeToWrite);
-                    issues = validatePageQuality(codeToWrite);
+                    issues = validatePageQuality(codeToWrite, void 0, qualityPageType);
                     const finalErrors = issues.filter((i) => i.severity === "error").length;
-                    console.log(chalk11.green(`   \u2714 Quality fix: ${errors.length} \u2192 ${finalErrors} errors`));
+                    console.log(chalk12.green(`   \u2714 Quality fix: ${errors.length} \u2192 ${finalErrors} errors`));
                   }
                 }
               }
@@ -9124,15 +9447,15 @@ Rules:
           }
           const report = formatIssues(issues);
           if (report) {
-            console.log(chalk11.yellow(`
+            console.log(chalk12.yellow(`
 \u{1F50D} Quality check for ${page.name || page.id}:`));
-            console.log(chalk11.dim(report));
+            console.log(chalk12.dim(report));
           }
           const consistency = checkDesignConsistency(codeToWrite);
           if (consistency.length > 0) {
-            console.log(chalk11.yellow(`
+            console.log(chalk12.yellow(`
 \u{1F3A8} Design consistency for ${page.name || page.id}:`));
-            consistency.forEach((w) => console.log(chalk11.dim(`   \u26A0 [${w.type}] ${w.message}`)));
+            consistency.forEach((w) => console.log(chalk12.dim(`   \u26A0 [${w.type}] ${w.message}`)));
           }
         }
       }
@@ -9147,9 +9470,9 @@ Rules:
       const changes = request.changes;
       const instruction = originalMessage || (typeof changes?.instruction === "string" ? changes.instruction : void 0);
       let resolvedPageCode = typeof changes?.pageCode === "string" && changes.pageCode.trim() !== "" ? changes.pageCode : void 0;
-      if (DEBUG2 && instruction) console.log(chalk11.dim(`  [update-page] instruction: ${instruction.slice(0, 120)}...`));
+      if (DEBUG2 && instruction) console.log(chalk12.dim(`  [update-page] instruction: ${instruction.slice(0, 120)}...`));
       if (DEBUG2 && resolvedPageCode)
-        console.log(chalk11.dim(`  [update-page] has pageCode (${resolvedPageCode.length} chars)`));
+        console.log(chalk12.dim(`  [update-page] has pageCode (${resolvedPageCode.length} chars)`));
       const configChanges = { ...changes };
       delete configChanges.pageCode;
       delete configChanges.pageType;
@@ -9173,12 +9496,12 @@ Rules:
             try {
               currentCode = await readFile(absPath);
             } catch {
-              if (DEBUG2) console.log(chalk11.dim(`  [update-page] Could not read current file at ${absPath}`));
+              if (DEBUG2) console.log(chalk12.dim(`  [update-page] Could not read current file at ${absPath}`));
             }
             if (currentCode) {
               const ai = await createAIProvider(aiProvider ?? "auto");
               if (ai.editPageCode) {
-                console.log(chalk11.dim("  \u270F\uFE0F  Applying changes to existing page..."));
+                console.log(chalk12.dim("  \u270F\uFE0F  Applying changes to existing page..."));
                 const coreRules = CORE_CONSTRAINTS;
                 const qualityRules = DESIGN_QUALITY;
                 const contextualRules = selectContextualRules(instruction);
@@ -9198,15 +9521,15 @@ ${contextualRules}
 ${routeRules}
 ${pagesCtx}`
                 );
-                if (DEBUG2) console.log(chalk11.dim(`  [update-page] AI returned ${resolvedPageCode.length} chars`));
+                if (DEBUG2) console.log(chalk12.dim(`  [update-page] AI returned ${resolvedPageCode.length} chars`));
                 const editIssues = verifyIncrementalEdit(currentCode, resolvedPageCode);
                 if (editIssues.length > 0) {
-                  console.log(chalk11.yellow(`
+                  console.log(chalk12.yellow(`
 \u26A0 Incremental edit issues for ${pageDef.name || pageDef.id}:`));
-                  editIssues.forEach((issue) => console.log(chalk11.dim(`   [${issue.type}] ${issue.message}`)));
+                  editIssues.forEach((issue) => console.log(chalk12.dim(`   [${issue.type}] ${issue.message}`)));
                 }
               } else {
-                console.log(chalk11.yellow("  \u26A0 AI provider does not support editPageCode"));
+                console.log(chalk12.yellow("  \u26A0 AI provider does not support editPageCode"));
               }
             }
           }
@@ -9234,7 +9557,13 @@ ${pagesCtx}`
               isPage: true
             });
             let codeToWrite = fixedCode;
-            const { code: autoFixed, fixes: autoFixes } = await autoFixCode(codeToWrite);
+            const currentPlan2 = projectRoot ? loadPlan(projectRoot) : null;
+            const autoFixCtx2 = route ? {
+              currentRoute: route,
+              knownRoutes: dsm.getConfig().pages.map((p) => p.route).filter(Boolean),
+              linkMap: currentPlan2?.pageNotes[routeToKey(route)]?.links
+            } : void 0;
+            const { code: autoFixed, fixes: autoFixes } = await autoFixCode(codeToWrite, autoFixCtx2);
             codeToWrite = autoFixed;
             const hasDashboardPage = dsm.getConfig().pages.some((p) => p.route === "/dashboard");
             if (!hasDashboardPage) {
@@ -9246,7 +9575,9 @@ ${pagesCtx}`
             }
             const { code: layoutStripped, stripped } = stripInlineLayoutElements(codeToWrite);
             codeToWrite = layoutStripped;
-            if (!isMarketingRoute(route) && !isAuthRoute(route)) {
+            const qualityPageType2 = currentPlan2 ? getPageType(route, currentPlan2) : inferPageTypeFromRoute(route);
+            const pageType2 = currentPlan2 ? getPageType(route, currentPlan2) : isMarketingRoute(route) ? "marketing" : isAuth ? "auth" : "app";
+            if (pageType2 === "app") {
               const { code: normalized, fixed: wrapperFixed } = normalizePageWrapper(codeToWrite);
               if (wrapperFixed) {
                 codeToWrite = normalized;
@@ -9256,8 +9587,8 @@ ${pagesCtx}`
             const allFixes = [...postFixes, ...autoFixes];
             if (stripped.length > 0) allFixes.push(`stripped inline ${stripped.join(", ")} (layout owns these)`);
             if (allFixes.length > 0) {
-              console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
-              allFixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
+              console.log(chalk12.dim("  \u{1F527} Post-generation fixes:"));
+              allFixes.forEach((f) => console.log(chalk12.dim(`     ${f}`)));
             }
             await writeFile(absPath, codeToWrite);
             const updatePageIdx = dsm.getConfig().pages.findIndex((p) => p.id === pageDef.id);
@@ -9269,11 +9600,14 @@ ${pagesCtx}`
               pm.updateConfig(cfg);
             }
             const manifestForAudit = await loadManifest6(projectRoot);
+            const planForAudit2 = loadPlan(projectRoot);
             await warnInlineDuplicates(
               projectRoot,
               pageDef.name || pageDef.id || route.slice(1),
+              route,
               codeToWrite,
-              manifestForAudit
+              manifestForAudit,
+              planForAudit2 ?? void 0
             );
             const relFilePath = routeToRelPath(route, isAuth);
             printPostGenerationReport({
@@ -9287,28 +9621,34 @@ ${pagesCtx}`
               allShared: manifestForAudit.shared,
               layoutShared: manifestForAudit.shared.filter((c) => c.type === "layout")
             });
-            const issues = validatePageQuality(codeToWrite);
+            const issues = validatePageQuality(codeToWrite, void 0, qualityPageType2);
             const report = formatIssues(issues);
             if (report) {
-              console.log(chalk11.yellow(`
+              console.log(chalk12.yellow(`
 \u{1F50D} Quality check for ${pageDef.name || pageDef.id}:`));
-              console.log(chalk11.dim(report));
+              console.log(chalk12.dim(report));
             }
             const consistency = checkDesignConsistency(codeToWrite);
             if (consistency.length > 0) {
-              console.log(chalk11.yellow(`
+              console.log(chalk12.yellow(`
 \u{1F3A8} Design consistency for ${pageDef.name || pageDef.id}:`));
-              consistency.forEach((w) => console.log(chalk11.dim(`   \u26A0 [${w.type}] ${w.message}`)));
+              consistency.forEach((w) => console.log(chalk12.dim(`   \u26A0 [${w.type}] ${w.message}`)));
             }
           } else {
             try {
               let code = await readFile(absPath);
-              const { code: fixed, fixes } = await autoFixCode(code);
+              const currentPlanForElse = projectRoot ? loadPlan(projectRoot) : null;
+              const autoFixCtxElse = route ? {
+                currentRoute: route,
+                knownRoutes: dsm.getConfig().pages.map((p) => p.route).filter(Boolean),
+                linkMap: currentPlanForElse?.pageNotes[routeToKey(route)]?.links
+              } : void 0;
+              const { code: fixed, fixes } = await autoFixCode(code, autoFixCtxElse);
               if (fixes.length > 0) {
                 code = fixed;
                 await writeFile(absPath, code);
-                console.log(chalk11.dim("  \u{1F527} Auto-fixes applied:"));
-                fixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
+                console.log(chalk12.dim("  \u{1F527} Auto-fixes applied:"));
+                fixes.forEach((f) => console.log(chalk12.dim(`     ${f}`)));
               }
               const relFilePath = routeToRelPath(route, isAuth);
               const manifest = await loadManifest6(projectRoot);
@@ -9322,12 +9662,14 @@ ${pagesCtx}`
                 allShared: manifest.shared,
                 layoutShared: manifest.shared.filter((c) => c.type === "layout")
               });
-              const issues = validatePageQuality(code);
+              const currentPlanForQuality = currentPlanForElse;
+              const pageTypeForQuality = currentPlanForQuality ? getPageType(route, currentPlanForQuality) : inferPageTypeFromRoute(route);
+              const issues = validatePageQuality(code, void 0, pageTypeForQuality);
               const report = formatIssues(issues);
               if (report) {
-                console.log(chalk11.yellow(`
+                console.log(chalk12.yellow(`
 \u{1F50D} Quality check for ${pageDef.name || pageDef.id}:`));
-                console.log(chalk11.dim(report));
+                console.log(chalk12.dim(report));
               }
             } catch {
             }
@@ -9450,7 +9792,7 @@ function hasNavChanged(before, after) {
 }
 
 // src/commands/chat/interactive.ts
-import chalk12 from "chalk";
+import chalk13 from "chalk";
 import { resolve as resolve8 } from "path";
 import { existsSync as existsSync15, readFileSync as readFileSync10, writeFileSync as writeFileSync8, mkdirSync as mkdirSync5 } from "fs";
 import { DesignSystemManager as DesignSystemManager6, ComponentManager as ComponentManager4, loadManifest as loadManifest7 } from "@getcoherent/core";
@@ -9468,7 +9810,7 @@ async function interactiveChat(options, chatCommandFn) {
   const validProviders = ["claude", "openai", "auto"];
   const provider = (options.provider || "auto").toLowerCase();
   if (!validProviders.includes(provider)) {
-    console.error(chalk12.red(`
+    console.error(chalk13.red(`
 \u274C Invalid provider: ${options.provider}`));
     process.exit(1);
   }
@@ -9483,13 +9825,13 @@ async function interactiveChat(options, chatCommandFn) {
   } catch (e) {
     if (DEBUG3) console.error("Failed to load REPL history:", e);
   }
-  console.log(chalk12.cyan("\n\u{1F3A8} Coherent Interactive Mode"));
-  console.log(chalk12.dim("   Type your requests, or use built-in commands."));
-  console.log(chalk12.dim('   Type "help" for available commands, "exit" to quit.\n'));
+  console.log(chalk13.cyan("\n\u{1F3A8} Coherent Interactive Mode"));
+  console.log(chalk13.dim("   Type your requests, or use built-in commands."));
+  console.log(chalk13.dim('   Type "help" for available commands, "exit" to quit.\n'));
   const rl = createInterface({
     input: process.stdin,
     output: process.stdout,
-    prompt: chalk12.cyan("Coherent> "),
+    prompt: chalk13.cyan("Coherent> "),
     history,
     historySize: 200
   });
@@ -9503,37 +9845,37 @@ async function interactiveChat(options, chatCommandFn) {
     const lower = input.toLowerCase();
     if (lower === "exit" || lower === "quit" || lower === "q") {
       saveHistory();
-      console.log(chalk12.dim("\nBye!\n"));
+      console.log(chalk13.dim("\nBye!\n"));
       rl.close();
       process.exit(0);
     }
     if (lower === "help") {
-      console.log(chalk12.bold("\n  Built-in commands:"));
-      console.log(chalk12.white("    components") + chalk12.dim("  \u2014 list shared and UI components"));
-      console.log(chalk12.white("    pages") + chalk12.dim("      \u2014 list all pages"));
-      console.log(chalk12.white("    tokens") + chalk12.dim("     \u2014 show design tokens"));
-      console.log(chalk12.white("    status") + chalk12.dim("     \u2014 project summary"));
-      console.log(chalk12.white("    help") + chalk12.dim("       \u2014 this help"));
-      console.log(chalk12.white("    exit") + chalk12.dim("       \u2014 quit interactive mode"));
-      console.log(chalk12.bold("\n  Target shortcuts:"));
-      console.log(chalk12.white("    @ComponentName <msg>") + chalk12.dim(" \u2014 target a shared component"));
-      console.log(chalk12.white("    @/route <msg>") + chalk12.dim("         \u2014 target a page by route"));
-      console.log(chalk12.dim("\n  Anything else is sent to AI as a modification request.\n"));
+      console.log(chalk13.bold("\n  Built-in commands:"));
+      console.log(chalk13.white("    components") + chalk13.dim("  \u2014 list shared and UI components"));
+      console.log(chalk13.white("    pages") + chalk13.dim("      \u2014 list all pages"));
+      console.log(chalk13.white("    tokens") + chalk13.dim("     \u2014 show design tokens"));
+      console.log(chalk13.white("    status") + chalk13.dim("     \u2014 project summary"));
+      console.log(chalk13.white("    help") + chalk13.dim("       \u2014 this help"));
+      console.log(chalk13.white("    exit") + chalk13.dim("       \u2014 quit interactive mode"));
+      console.log(chalk13.bold("\n  Target shortcuts:"));
+      console.log(chalk13.white("    @ComponentName <msg>") + chalk13.dim(" \u2014 target a shared component"));
+      console.log(chalk13.white("    @/route <msg>") + chalk13.dim("         \u2014 target a page by route"));
+      console.log(chalk13.dim("\n  Anything else is sent to AI as a modification request.\n"));
       rl.prompt();
       return;
     }
     if (lower === "components" || lower === "list components" || lower.includes("what components")) {
       const manifest = await loadManifest7(projectRoot);
       if (manifest.shared.length === 0) {
-        console.log(chalk12.gray("\n  No shared components yet.\n"));
+        console.log(chalk13.gray("\n  No shared components yet.\n"));
       } else {
         console.log("");
         const order = { layout: 0, section: 1, widget: 2 };
         const sorted = [...manifest.shared].sort((a, b) => (order[a.type] ?? 9) - (order[b.type] ?? 9));
         sorted.forEach((entry) => {
-          const usage = entry.usedIn.includes("app/layout.tsx") ? chalk12.green("all pages") : entry.usedIn.length > 0 ? chalk12.gray(entry.usedIn.join(", ")) : chalk12.gray("unused");
+          const usage = entry.usedIn.includes("app/layout.tsx") ? chalk13.green("all pages") : entry.usedIn.length > 0 ? chalk13.gray(entry.usedIn.join(", ")) : chalk13.gray("unused");
           console.log(
-            `  ${chalk12.cyan(entry.id.padEnd(8))} ${chalk12.white(entry.name.padEnd(18))} ${chalk12.gray(entry.type.padEnd(9))} ${usage}`
+            `  ${chalk13.cyan(entry.id.padEnd(8))} ${chalk13.white(entry.name.padEnd(18))} ${chalk13.gray(entry.type.padEnd(9))} ${usage}`
           );
         });
         console.log("");
@@ -9544,11 +9886,11 @@ async function interactiveChat(options, chatCommandFn) {
     if (lower === "pages" || lower === "list pages" || lower.includes("what pages")) {
       const currentConfig = dsm.getConfig();
       if (currentConfig.pages.length === 0) {
-        console.log(chalk12.gray("\n  No pages yet.\n"));
+        console.log(chalk13.gray("\n  No pages yet.\n"));
       } else {
         console.log("");
         currentConfig.pages.forEach((p) => {
-          console.log(`  ${chalk12.white(p.name.padEnd(22))} ${chalk12.gray(p.route)}`);
+          console.log(`  ${chalk13.white(p.name.padEnd(22))} ${chalk13.gray(p.route)}`);
         });
         console.log("");
       }
@@ -9558,10 +9900,10 @@ async function interactiveChat(options, chatCommandFn) {
     if (lower === "status") {
       const currentConfig = dsm.getConfig();
       const manifest = await loadManifest7(projectRoot);
-      console.log(chalk12.bold(`
+      console.log(chalk13.bold(`
   ${currentConfig.name || "Coherent Project"}`));
       console.log(
-        chalk12.dim(
+        chalk13.dim(
           `  Pages: ${currentConfig.pages.length}  |  Shared components: ${manifest.shared.length}  |  UI components: ${cm.getAllComponents().length}
 `
         )
@@ -9572,21 +9914,21 @@ async function interactiveChat(options, chatCommandFn) {
     if (lower === "tokens" || lower === "show tokens" || lower === "design tokens") {
       const currentConfig = dsm.getConfig();
       const t = currentConfig.tokens;
-      console.log(chalk12.bold("\n  Design Tokens\n"));
-      console.log(chalk12.cyan("  Colors (light)"));
+      console.log(chalk13.bold("\n  Design Tokens\n"));
+      console.log(chalk13.cyan("  Colors (light)"));
       for (const [k, v] of Object.entries(t.colors.light)) {
-        console.log(`    ${chalk12.white(k.padEnd(14))} ${chalk12.gray(v)}`);
+        console.log(`    ${chalk13.white(k.padEnd(14))} ${chalk13.gray(v)}`);
       }
-      console.log(chalk12.cyan("\n  Typography"));
-      console.log(`    ${chalk12.white("sans".padEnd(14))} ${chalk12.gray(t.typography.fontFamily.sans)}`);
-      console.log(`    ${chalk12.white("mono".padEnd(14))} ${chalk12.gray(t.typography.fontFamily.mono)}`);
-      console.log(chalk12.cyan("\n  Spacing"));
+      console.log(chalk13.cyan("\n  Typography"));
+      console.log(`    ${chalk13.white("sans".padEnd(14))} ${chalk13.gray(t.typography.fontFamily.sans)}`);
+      console.log(`    ${chalk13.white("mono".padEnd(14))} ${chalk13.gray(t.typography.fontFamily.mono)}`);
+      console.log(chalk13.cyan("\n  Spacing"));
       for (const [k, v] of Object.entries(t.spacing)) {
-        console.log(`    ${chalk12.white(k.padEnd(14))} ${chalk12.gray(v)}`);
+        console.log(`    ${chalk13.white(k.padEnd(14))} ${chalk13.gray(v)}`);
       }
-      console.log(chalk12.cyan("\n  Radius"));
+      console.log(chalk13.cyan("\n  Radius"));
       for (const [k, v] of Object.entries(t.radius)) {
-        console.log(`    ${chalk12.white(k.padEnd(14))} ${chalk12.gray(v)}`);
+        console.log(`    ${chalk13.white(k.padEnd(14))} ${chalk13.gray(v)}`);
       }
       console.log("");
       rl.prompt();
@@ -9608,7 +9950,7 @@ async function interactiveChat(options, chatCommandFn) {
       await dsm.load();
     } catch (err) {
       if (!err._printed) {
-        console.error(chalk12.red(`
+        console.error(chalk13.red(`
   Error: ${err.message}
 `));
       }
@@ -9640,8 +9982,8 @@ async function chatCommand(message, options) {
     process.exit(1);
   };
   if (!message) {
-    console.error(chalk13.red('\n\u274C No message provided. Use: coherent chat "your request"\n'));
-    console.log(chalk13.dim("   Or use interactive mode: coherent chat -i\n"));
+    console.error(chalk14.red('\n\u274C No message provided. Use: coherent chat "your request"\n'));
+    console.log(chalk14.dim("   Or use interactive mode: coherent chat -i\n"));
     bail("No message provided");
   }
   const spinner = ora2("Processing your request...").start();
@@ -9651,7 +9993,7 @@ async function chatCommand(message, options) {
   const migrationGuard = join11(projectRoot, ".coherent", "migration-in-progress");
   if (existsSync16(migrationGuard)) {
     spinner.fail("Migration in progress");
-    console.error(chalk13.red("\n\u274C A migration is in progress. Run `coherent migrate --rollback` to undo first."));
+    console.error(chalk14.red("\n\u274C A migration is in progress. Run `coherent migrate --rollback` to undo first."));
     bail("Migration in progress");
   }
   const validProviders = ["claude", "openai", "auto"];
@@ -9661,20 +10003,20 @@ async function chatCommand(message, options) {
     releaseLock = await acquireProjectLock(projectRoot);
     if (!validProviders.includes(provider)) {
       spinner.fail("Invalid provider");
-      console.error(chalk13.red(`
+      console.error(chalk14.red(`
 \u274C Invalid provider: ${options.provider}`));
-      console.log(chalk13.dim(`Valid options: ${validProviders.join(", ")}`));
+      console.log(chalk14.dim(`Valid options: ${validProviders.join(", ")}`));
       bail(`Invalid provider: ${options.provider}`);
     }
     spinner.text = "Loading design system configuration...";
     const config2 = await loadConfig(configPath);
     if (config2.coherentVersion && config2.coherentVersion !== CLI_VERSION2) {
       spinner.stop();
-      console.log(chalk13.yellow("\n\u26A0\uFE0F  Version mismatch detected\n"));
-      console.log(chalk13.gray("   Project created with: ") + chalk13.white(`v${config2.coherentVersion}`));
-      console.log(chalk13.gray("   Current CLI version: ") + chalk13.white(`v${CLI_VERSION2}`));
-      console.log(chalk13.cyan("\n   \u{1F4A1} Run `coherent update` to apply latest changes to your project.\n"));
-      console.log(chalk13.dim("   Continuing anyway...\n"));
+      console.log(chalk14.yellow("\n\u26A0\uFE0F  Version mismatch detected\n"));
+      console.log(chalk14.gray("   Project created with: ") + chalk14.white(`v${config2.coherentVersion}`));
+      console.log(chalk14.gray("   Current CLI version: ") + chalk14.white(`v${CLI_VERSION2}`));
+      console.log(chalk14.cyan("\n   \u{1F4A1} Run `coherent update` to apply latest changes to your project.\n"));
+      console.log(chalk14.dim("   Continuing anyway...\n"));
       spinner.start("Loading design system configuration...");
     }
     if (needsGlobalsFix(projectRoot)) {
@@ -9701,9 +10043,9 @@ async function chatCommand(message, options) {
         const done = await setDefaultDarkTheme(projectRoot);
         spinner.stop();
         if (done) {
-          console.log(chalk13.green("\n\u2705 Default theme set to dark. Reload the app to see changes.\n"));
+          console.log(chalk14.green("\n\u2705 Default theme set to dark. Reload the app to see changes.\n"));
         } else {
-          console.log(chalk13.yellow("\n\u26A0\uFE0F  Could not update layout (app/layout.tsx not found).\n"));
+          console.log(chalk14.yellow("\n\u26A0\uFE0F  Could not update layout (app/layout.tsx not found).\n"));
         }
         return;
       }
@@ -9719,10 +10061,10 @@ async function chatCommand(message, options) {
           dsm.updateConfig(cfg);
           dsm.save();
           spinner.stop();
-          console.log(chalk13.green("\n\u2705 Default theme set to light. Reload the app to see changes.\n"));
+          console.log(chalk14.green("\n\u2705 Default theme set to light. Reload the app to see changes.\n"));
         } catch {
           spinner.stop();
-          console.log(chalk13.yellow("\n\u26A0\uFE0F  Could not update layout (app/layout.tsx not found).\n"));
+          console.log(chalk14.yellow("\n\u26A0\uFE0F  Could not update layout (app/layout.tsx not found).\n"));
         }
         return;
       }
@@ -9732,7 +10074,7 @@ async function chatCommand(message, options) {
           const { created, id } = await ensureThemeToggle(projectRoot);
           spinner.stop();
           console.log(
-            chalk13.green(
+            chalk14.green(
               `
 \u2705 ${created ? `Created ${id} (ThemeToggle) and added to layout` : "ThemeToggle already present; layout updated"}.
 `
@@ -9740,7 +10082,7 @@ async function chatCommand(message, options) {
           );
         } catch (e) {
           spinner.fail("Failed to add theme toggle");
-          if (e instanceof Error) console.error(chalk13.red("\n\u274C " + e.message + "\n"));
+          if (e instanceof Error) console.error(chalk14.red("\n\u274C " + e.message + "\n"));
         }
         return;
       }
@@ -9756,12 +10098,12 @@ async function chatCommand(message, options) {
       manifest = { ...manifest, shared: validShared };
       await saveManifest2(project.root, manifest);
       if (DEBUG4) {
-        console.log(chalk13.dim(`[pre-gen] Cleaned ${cleaned} orphaned component(s) from manifest`));
+        console.log(chalk14.dim(`[pre-gen] Cleaned ${cleaned} orphaned component(s) from manifest`));
       }
     }
     const sharedComponentsSummary = buildSharedComponentsSummary(manifest);
     if (DEBUG4 && sharedComponentsSummary) {
-      console.log(chalk13.dim("[add-page] sharedComponentsSummary in prompt:\n" + sharedComponentsSummary));
+      console.log(chalk14.dim("[add-page] sharedComponentsSummary in prompt:\n" + sharedComponentsSummary));
     }
     let requests;
     let uxRecommendations;
@@ -9773,7 +10115,12 @@ async function chatCommand(message, options) {
     ) || []).length >= SPLIT_THRESHOLD;
     if (multiPageHint) {
       try {
-        requests = await splitGeneratePages(spinner, message, modCtx, provider, parseOpts);
+        const splitResult = await splitGeneratePages(spinner, message, modCtx, provider, parseOpts);
+        requests = splitResult.requests;
+        if (splitResult.plan && projectRoot) {
+          savePlan(projectRoot, splitResult.plan);
+          await ensurePlanGroupLayouts(projectRoot, splitResult.plan);
+        }
         uxRecommendations = void 0;
       } catch {
         spinner.warn("Split generation encountered an issue \u2014 trying page-by-page...");
@@ -9846,7 +10193,12 @@ async function chatCommand(message, options) {
         if (isTruncated || isJsonError) {
           spinner.warn("Response too large \u2014 splitting into smaller requests...");
           try {
-            requests = await splitGeneratePages(spinner, message, modCtx, provider, parseOpts);
+            const splitResult = await splitGeneratePages(spinner, message, modCtx, provider, parseOpts);
+            requests = splitResult.requests;
+            if (splitResult.plan && projectRoot) {
+              savePlan(projectRoot, splitResult.plan);
+              await ensurePlanGroupLayouts(projectRoot, splitResult.plan);
+            }
             uxRecommendations = void 0;
           } catch {
             throw firstError;
@@ -9858,10 +10210,10 @@ async function chatCommand(message, options) {
     }
     if (requests.length === 0) {
       spinner.fail("No modifications found in your request");
-      console.log(chalk13.yellow("\n\u{1F4A1} Try being more specific, e.g.:"));
-      console.log(chalk13.dim('  - "make buttons blue"'));
-      console.log(chalk13.dim('  - "add a pricing page"'));
-      console.log(chalk13.dim('  - "change primary color to green"'));
+      console.log(chalk14.yellow("\n\u{1F4A1} Try being more specific, e.g.:"));
+      console.log(chalk14.dim('  - "make buttons blue"'));
+      console.log(chalk14.dim('  - "add a pricing page"'));
+      console.log(chalk14.dim('  - "change primary color to green"'));
       return;
     }
     spinner.succeed(`Parsed ${requests.length} modification(s)`);
@@ -9869,11 +10221,11 @@ async function chatCommand(message, options) {
     normalizedRequests = normalizedRequests.map((req) => {
       const result = normalizeRequest(req, dsm.getConfig());
       if ("error" in result) {
-        console.log(chalk13.yellow(`  \u26A0 Skipped: ${result.error}`));
+        console.log(chalk14.yellow(`  \u26A0 Skipped: ${result.error}`));
         return null;
       }
       if (result.type !== req.type) {
-        console.log(chalk13.dim(`  \u2139 Adjusted: ${req.type} \u2192 ${result.type} (target: ${req.target})`));
+        console.log(chalk14.dim(`  \u2139 Adjusted: ${req.type} \u2192 ${result.type} (target: ${req.target})`));
       }
       return result;
     }).filter((r) => r !== null);
@@ -9929,13 +10281,13 @@ async function chatCommand(message, options) {
         }
       }
       if (DEBUG4) {
-        console.log(chalk13.gray(`
+        console.log(chalk14.gray(`
 [DEBUG] Pre-flight analysis for page "${page.name || page.route}": `));
-        console.log(chalk13.gray(`  Page sections: ${page.sections?.length || 0}`));
+        console.log(chalk14.gray(`  Page sections: ${page.sections?.length || 0}`));
         if (page.sections?.[0]?.props?.fields) {
-          console.log(chalk13.gray(`  First section has ${page.sections[0].props.fields.length} fields`));
+          console.log(chalk14.gray(`  First section has ${page.sections[0].props.fields.length} fields`));
           page.sections[0].props.fields.forEach((f, i) => {
-            console.log(chalk13.gray(`    Field ${i}: component=${f.component}`));
+            console.log(chalk14.gray(`    Field ${i}: component=${f.component}`));
           });
         }
       }
@@ -9958,8 +10310,8 @@ async function chatCommand(message, options) {
     const INVALID_COMPONENT_IDS = /* @__PURE__ */ new Set(["ui", "shared", "lib", "utils", "hooks", "app", "components"]);
     for (const id of INVALID_COMPONENT_IDS) allNeededComponentIds.delete(id);
     if (DEBUG4) {
-      console.log(chalk13.gray("\n[DEBUG] Pre-flight analysis (consolidated):"));
-      console.log(chalk13.gray(`  All needed components: ${Array.from(allNeededComponentIds).join(", ")}`));
+      console.log(chalk14.gray("\n[DEBUG] Pre-flight analysis (consolidated):"));
+      console.log(chalk14.gray(`  All needed components: ${Array.from(allNeededComponentIds).join(", ")}`));
       console.log("");
     }
     const missingComponents = [];
@@ -9967,59 +10319,59 @@ async function chatCommand(message, options) {
       const isRegistered = !!cm.read(componentId);
       const filePath = join11(projectRoot, "components", "ui", `${componentId}.tsx`);
       const fileExists = existsSync16(filePath);
-      if (DEBUG4) console.log(chalk13.gray(`    Checking ${componentId}: registered=${isRegistered} file=${fileExists}`));
+      if (DEBUG4) console.log(chalk14.gray(`    Checking ${componentId}: registered=${isRegistered} file=${fileExists}`));
       if (!isRegistered || !fileExists) {
         missingComponents.push(componentId);
       }
     }
     if (missingComponents.length > 0) {
       spinner.stop();
-      console.log(chalk13.cyan("\n\u{1F50D} Pre-flight check: Installing missing components...\n"));
+      console.log(chalk14.cyan("\n\u{1F50D} Pre-flight check: Installing missing components...\n"));
       const provider2 = getComponentProvider();
       for (const componentId of missingComponents) {
         if (DEBUG4) {
-          console.log(chalk13.gray(`    [DEBUG] Trying to install: ${componentId}`));
-          console.log(chalk13.gray(`    [DEBUG] provider.has(${componentId}): ${provider2.has(componentId)}`));
+          console.log(chalk14.gray(`    [DEBUG] Trying to install: ${componentId}`));
+          console.log(chalk14.gray(`    [DEBUG] provider.has(${componentId}): ${provider2.has(componentId)}`));
         }
         if (provider2.has(componentId)) {
           try {
             const result = await provider2.installComponent(componentId, projectRoot);
-            if (DEBUG4) console.log(chalk13.gray(`    [DEBUG] installComponent result: ${result.success}`));
+            if (DEBUG4) console.log(chalk14.gray(`    [DEBUG] installComponent result: ${result.success}`));
             if (result.success && result.componentDef) {
               if (!cm.read(componentId)) {
                 if (DEBUG4)
                   console.log(
-                    chalk13.gray(`    [DEBUG] Registering ${result.componentDef.id} (${result.componentDef.name})`)
+                    chalk14.gray(`    [DEBUG] Registering ${result.componentDef.id} (${result.componentDef.name})`)
                   );
                 const regResult = await cm.register(result.componentDef);
                 if (DEBUG4) {
                   console.log(
-                    chalk13.gray(
+                    chalk14.gray(
                       `    [DEBUG] Register result: ${regResult.success ? "SUCCESS" : "FAILED"}${!regResult.success && regResult.message ? ` - ${regResult.message}` : ""}`
                     )
                   );
                 }
                 if (regResult.success) {
                   preflightInstalledIds.push(result.componentDef.id);
-                  console.log(chalk13.green(`   \u2728 Auto-installed ${result.componentDef.name} component`));
+                  console.log(chalk14.green(`   \u2728 Auto-installed ${result.componentDef.name} component`));
                   dsm.updateConfig(regResult.config);
                   cm.updateConfig(regResult.config);
                   pm.updateConfig(regResult.config);
                 }
               } else {
                 preflightInstalledIds.push(result.componentDef.id);
-                console.log(chalk13.green(`   \u2728 Re-installed ${result.componentDef.name} component (file was missing)`));
+                console.log(chalk14.green(`   \u2728 Re-installed ${result.componentDef.name} component (file was missing)`));
               }
             }
           } catch (error) {
-            console.log(chalk13.red(`   \u274C Failed to install ${componentId}:`));
-            console.log(chalk13.red(`      ${error instanceof Error ? error.message : error}`));
+            console.log(chalk14.red(`   \u274C Failed to install ${componentId}:`));
+            console.log(chalk14.red(`      ${error instanceof Error ? error.message : error}`));
             if (error instanceof Error && error.stack) {
-              console.log(chalk13.gray(`      ${error.stack.split("\n")[1]}`));
+              console.log(chalk14.gray(`      ${error.stack.split("\n")[1]}`));
             }
           }
         } else {
-          console.log(chalk13.yellow(`   \u26A0\uFE0F  Component ${componentId} not available`));
+          console.log(chalk14.yellow(`   \u26A0\uFE0F  Component ${componentId} not available`));
         }
       }
       console.log("");
@@ -10030,11 +10382,11 @@ async function chatCommand(message, options) {
     const toInstallNpm = [...neededPkgs].filter((p) => !installedPkgs.has(p));
     if (toInstallNpm.length > 0) {
       spinner.stop();
-      console.log(chalk13.cyan(`
+      console.log(chalk14.cyan(`
 \u{1F4E6} Auto-installing missing dependencies: ${toInstallNpm.join(", ")}
 `));
       const ok = await installPackages(projectRoot, toInstallNpm);
-      if (!ok) console.log(chalk13.yellow(`   Run manually: npm install ${toInstallNpm.join(" ")}
+      if (!ok) console.log(chalk14.yellow(`   Run manually: npm install ${toInstallNpm.join(" ")}
 `));
       spinner.start("Applying modifications...");
     }
@@ -10045,7 +10397,7 @@ async function chatCommand(message, options) {
         if (componentId && preflightComponentIds.has(componentId)) {
           if (DEBUG4) {
             console.log(
-              chalk13.gray(`[DEBUG] Filtered duplicate add-component: ${componentId} (already installed in pre-flight)`)
+              chalk14.gray(`[DEBUG] Filtered duplicate add-component: ${componentId} (already installed in pre-flight)`)
             );
           }
           return false;
@@ -10054,11 +10406,11 @@ async function chatCommand(message, options) {
       return true;
     });
     if (DEBUG4 && preflightComponentIds.size > 0) {
-      console.log(chalk13.gray(`[DEBUG] Remaining requests after filtering: ${normalizedRequests.length}`));
+      console.log(chalk14.gray(`[DEBUG] Remaining requests after filtering: ${normalizedRequests.length}`));
     }
     try {
       createBackup(projectRoot);
-      if (DEBUG4) console.log(chalk13.dim("[backup] Created snapshot"));
+      if (DEBUG4) console.log(chalk14.dim("[backup] Created snapshot"));
     } catch {
     }
     const navBefore = takeNavSnapshot(
@@ -10113,10 +10465,10 @@ async function chatCommand(message, options) {
       const SCAFFOLD_AI_LIMIT = 10;
       if (missingRoutes.length > 0 && missingRoutes.length <= SCAFFOLD_AI_LIMIT) {
         spinner.stop();
-        console.log(chalk13.cyan(`
+        console.log(chalk14.cyan(`
 \u{1F517} Auto-scaffolding ${missingRoutes.length} linked page(s)...`));
         console.log(
-          chalk13.dim(
+          chalk14.dim(
             `   (${missingRoutes.length} additional AI call(s) \u2014 disable with settings.autoScaffold: false in config)
 `
           )
@@ -10153,7 +10505,7 @@ async function chatCommand(message, options) {
             }
           } catch (err) {
             scaffoldSpinner.warn(`  Could not scaffold "${pageName}" (${linkedRoute}) \u2014 skipped`);
-            if (DEBUG4) console.log(chalk13.dim(`    ${err instanceof Error ? err.message : "unknown error"}`));
+            if (DEBUG4) console.log(chalk14.dim(`    ${err instanceof Error ? err.message : "unknown error"}`));
           }
         }
         console.log("");
@@ -10161,7 +10513,7 @@ async function chatCommand(message, options) {
       } else if (missingRoutes.length > SCAFFOLD_AI_LIMIT) {
         spinner.stop();
         console.log(
-          chalk13.yellow(
+          chalk14.yellow(
             `
 \u26A0 Found ${missingRoutes.length} linked pages \u2014 creating placeholder pages (too many for AI generation).`
           )
@@ -10190,7 +10542,7 @@ async function chatCommand(message, options) {
           scaffoldedPages.push({ route: linkedRoute, name: `${pageName} (placeholder)` });
         }
         console.log(
-          chalk13.cyan(`   Created ${missingRoutes.length} placeholder pages. Use \`coherent chat\` to fill them.
+          chalk14.cyan(`   Created ${missingRoutes.length} placeholder pages. Use \`coherent chat\` to fill them.
 `)
         );
         spinner.start("Finalizing...");
@@ -10218,9 +10570,9 @@ async function chatCommand(message, options) {
         }
       }
       if (linkIssues.length > 0) {
-        console.log(chalk13.yellow("\n\u{1F517} Broken internal links:"));
+        console.log(chalk14.yellow("\n\u{1F517} Broken internal links:"));
         for (const { page, message: message2 } of linkIssues) {
-          console.log(chalk13.dim(`   ${page}: ${message2}`));
+          console.log(chalk14.dim(`   ${page}: ${message2}`));
         }
       }
     }
@@ -10233,7 +10585,7 @@ async function chatCommand(message, options) {
       if (latestConfig.theme.defaultMode !== targetMode) {
         latestConfig.theme.defaultMode = targetMode;
         dsm.updateConfig(latestConfig);
-        if (DEBUG4) console.log(chalk13.dim(`  [theme] Set defaultMode to "${targetMode}"`));
+        if (DEBUG4) console.log(chalk14.dim(`  [theme] Set defaultMode to "${targetMode}"`));
       }
       const layoutPath = resolve9(projectRoot, "app", "layout.tsx");
       try {
@@ -10241,11 +10593,11 @@ async function chatCommand(message, options) {
         if (targetMode === "dark" && !layoutCode.includes('className="dark"')) {
           layoutCode = layoutCode.replace(/<html\s+lang="en"/, '<html lang="en" className="dark"');
           await writeFile(layoutPath, layoutCode);
-          console.log(chalk13.dim(`  \u{1F319} Applied dark theme to layout`));
+          console.log(chalk14.dim(`  \u{1F319} Applied dark theme to layout`));
         } else if (targetMode === "light" && layoutCode.includes('className="dark"')) {
           layoutCode = layoutCode.replace(' className="dark"', "");
           await writeFile(layoutPath, layoutCode);
-          console.log(chalk13.dim(`  \u2600\uFE0F Applied light theme to layout`));
+          console.log(chalk14.dim(`  \u2600\uFE0F Applied light theme to layout`));
         }
       } catch {
       }
@@ -10277,7 +10629,7 @@ async function chatCommand(message, options) {
     }
     const finalDeps = await scanAndInstallSharedDeps(projectRoot);
     if (finalDeps.length > 0) {
-      console.log(chalk13.dim(`  Auto-installed shared deps: ${finalDeps.join(", ")}`));
+      console.log(chalk14.dim(`  Auto-installed shared deps: ${finalDeps.join(", ")}`));
     }
     try {
       fixGlobalsCss(projectRoot, updatedConfig);
@@ -10301,7 +10653,7 @@ async function chatCommand(message, options) {
       }
       await saveHashes(projectRoot, updatedHashes);
     } catch {
-      if (DEBUG4) console.log(chalk13.dim("[hashes] Could not save file hashes"));
+      if (DEBUG4) console.log(chalk14.dim("[hashes] Could not save file hashes"));
     }
     const successfulPairs = normalizedRequests.map((request, index) => ({ request, result: results[index] })).filter(({ result }) => result.success);
     if (successfulPairs.length > 0) {
@@ -10318,9 +10670,9 @@ async function chatCommand(message, options) {
     const preflightNames = preflightInstalledIds.map((id) => updatedConfig.components.find((c) => c.id === id)?.name).filter(Boolean);
     showPreview(normalizedRequests, results, updatedConfig, preflightNames);
     if (scaffoldedPages.length > 0) {
-      console.log(chalk13.cyan("\u{1F517} Auto-scaffolded linked pages:"));
+      console.log(chalk14.cyan("\u{1F517} Auto-scaffolded linked pages:"));
       scaffoldedPages.forEach(({ route, name }) => {
-        console.log(chalk13.white(`   \u2728 ${name} \u2192 ${route}`));
+        console.log(chalk14.white(`   \u2728 ${name} \u2192 ${route}`));
       });
       console.log("");
     }
@@ -10342,58 +10694,58 @@ ${uxRecommendations}
           );
         }
         await appendFile(recPath, section);
-        console.log(chalk13.cyan("\n\u{1F4CB} UX Recommendations:"));
+        console.log(chalk14.cyan("\n\u{1F4CB} UX Recommendations:"));
         for (const line of uxRecommendations.split("\n").filter(Boolean)) {
-          console.log(chalk13.dim(`   ${line}`));
+          console.log(chalk14.dim(`   ${line}`));
         }
-        console.log(chalk13.dim("   \u2192 Saved to /design-system/docs/recommendations"));
+        console.log(chalk14.dim("   \u2192 Saved to /design-system/docs/recommendations"));
       } catch (e) {
         console.log(
-          chalk13.yellow("\n\u26A0\uFE0F  Could not write recommendations.md: " + (e instanceof Error ? e.message : String(e)))
+          chalk14.yellow("\n\u26A0\uFE0F  Could not write recommendations.md: " + (e instanceof Error ? e.message : String(e)))
         );
-        console.log(chalk13.dim("Recommendations:\n") + uxRecommendations);
+        console.log(chalk14.dim("Recommendations:\n") + uxRecommendations);
       }
     }
   } catch (error) {
     spinner.fail("Chat command failed");
-    console.error(chalk13.red("\n\u2716 Chat command failed"));
+    console.error(chalk14.red("\n\u2716 Chat command failed"));
     const zodError = error;
     const issues = zodError.issues || error.errors;
     if (issues && Array.isArray(issues)) {
-      console.log(chalk13.yellow("\n\u26A0\uFE0F  AI generated incomplete data. Missing or invalid fields:"));
+      console.log(chalk14.yellow("\n\u26A0\uFE0F  AI generated incomplete data. Missing or invalid fields:"));
       issues.forEach((err) => {
-        console.log(chalk13.gray(`   \u2022 ${err.path.join(".")}: ${err.message}`));
+        console.log(chalk14.gray(`   \u2022 ${err.path.join(".")}: ${err.message}`));
       });
-      console.log(chalk13.cyan("\n\u{1F4A1} Try being more specific, e.g.:"));
-      console.log(chalk13.white('   coherent chat "add a dashboard page with hero section using Button component"'));
-      console.log(chalk13.white('   coherent chat "add pricing page"'));
+      console.log(chalk14.cyan("\n\u{1F4A1} Try being more specific, e.g.:"));
+      console.log(chalk14.white('   coherent chat "add a dashboard page with hero section using Button component"'));
+      console.log(chalk14.white('   coherent chat "add pricing page"'));
     } else if (error instanceof Error) {
-      console.error(chalk13.red(error.message));
+      console.error(chalk14.red(error.message));
       if (error.message.includes("Unterminated string") || error.message.includes("Unexpected end of JSON") || error.message.includes("Failed to parse modification") && error.message.includes("JSON")) {
         console.log(
-          chalk13.yellow("\n\u{1F4A1} The AI response was too large or contained invalid JSON. Try splitting your request:")
+          chalk14.yellow("\n\u{1F4A1} The AI response was too large or contained invalid JSON. Try splitting your request:")
         );
-        console.log(chalk13.white('   coherent chat "add dashboard page with stats and recent activity"'));
-        console.log(chalk13.white('   coherent chat "add account page"'));
-        console.log(chalk13.white('   coherent chat "add settings page"'));
+        console.log(chalk14.white('   coherent chat "add dashboard page with stats and recent activity"'));
+        console.log(chalk14.white('   coherent chat "add account page"'));
+        console.log(chalk14.white('   coherent chat "add settings page"'));
       } else if (error.message.includes("API key not found") || error.message.includes("ANTHROPIC_API_KEY") || error.message.includes("OPENAI_API_KEY")) {
         const isOpenAI = error.message.includes("OpenAI") || typeof provider !== "undefined" && provider === "openai";
         const providerName = isOpenAI ? "OpenAI" : "Anthropic Claude";
         const envVar = isOpenAI ? "OPENAI_API_KEY" : "ANTHROPIC_API_KEY";
         const url = isOpenAI ? "https://platform.openai.com" : "https://console.anthropic.com";
-        console.log(chalk13.yellow("\n\u{1F4A1} Setup Instructions:"));
-        console.log(chalk13.dim(`  1. Get your ${providerName} API key from: ${url}`));
-        console.log(chalk13.dim("  2. Create a .env file in the current directory:"));
-        console.log(chalk13.cyan(`     echo "${envVar}=your_key_here" > .env`));
-        console.log(chalk13.dim("  3. Or export it in your shell:"));
-        console.log(chalk13.cyan(`     export ${envVar}=your_key_here`));
+        console.log(chalk14.yellow("\n\u{1F4A1} Setup Instructions:"));
+        console.log(chalk14.dim(`  1. Get your ${providerName} API key from: ${url}`));
+        console.log(chalk14.dim("  2. Create a .env file in the current directory:"));
+        console.log(chalk14.cyan(`     echo "${envVar}=your_key_here" > .env`));
+        console.log(chalk14.dim("  3. Or export it in your shell:"));
+        console.log(chalk14.cyan(`     export ${envVar}=your_key_here`));
         if (isOpenAI) {
-          console.log(chalk13.dim('\n  Also ensure "openai" package is installed:'));
-          console.log(chalk13.cyan("     npm install openai"));
+          console.log(chalk14.dim('\n  Also ensure "openai" package is installed:'));
+          console.log(chalk14.cyan("     npm install openai"));
         }
       }
     } else {
-      console.error(chalk13.red("Unknown error occurred"));
+      console.error(chalk14.red("Unknown error occurred"));
     }
     console.log("");
     if (options._throwOnError) {
@@ -10406,7 +10758,7 @@ ${uxRecommendations}
 }
 
 // src/commands/preview.ts
-import chalk14 from "chalk";
+import chalk15 from "chalk";
 import ora3 from "ora";
 import { spawn } from "child_process";
 import { existsSync as existsSync19, rmSync as rmSync3, readFileSync as readFileSync14, writeFileSync as writeFileSync10, readdirSync as readdirSync5 } from "fs";
@@ -10746,13 +11098,13 @@ async function handleFileChange(projectRoot, filePath) {
     return;
   }
   const config2 = getWatcherConfig(projectRoot);
-  const chalk33 = (await import("chalk")).default;
+  const chalk34 = (await import("chalk")).default;
   if (config2.autoInstall) {
     const missing = findMissingPackagesInCode(content, projectRoot);
     if (missing.length > 0) {
       const ok = await installPackages(projectRoot, missing);
       if (ok) {
-        console.log(chalk33.cyan(`
+        console.log(chalk34.cyan(`
   \u{1F527} Auto-installed: ${missing.join(", ")} (needed by ${relativePath})`));
       }
     }
@@ -10761,12 +11113,12 @@ async function handleFileChange(projectRoot, filePath) {
     const fixed = sanitizeMetadataStrings(ensureUseClientIfNeeded(content));
     if (fixed !== content) {
       writeFileSync9(filePath, fixed, "utf-8");
-      console.log(chalk33.cyan(`  \u{1F527} Auto-fixed syntax in ${relativePath}`));
+      console.log(chalk34.cyan(`  \u{1F527} Auto-fixed syntax in ${relativePath}`));
     }
   }
   if (config2.warnNativeElements && hasNativeElements(content)) {
-    console.log(chalk33.yellow(`  \u26A0 ${relativePath}: uses native HTML elements (<button>, <select>, etc.)`));
-    console.log(chalk33.dim("    Use components from @/components/ui/ instead"));
+    console.log(chalk34.yellow(`  \u26A0 ${relativePath}: uses native HTML elements (<button>, <select>, etc.)`));
+    console.log(chalk34.dim("    Use components from @/components/ui/ instead"));
   }
   if (config2.warnSharedReuse) {
     let manifest;
@@ -10779,8 +11131,8 @@ async function handleFileChange(projectRoot, filePath) {
       const dupes = findInlineDuplicatesOfShared(content, manifest);
       for (const d of dupes) {
         const importPath = d.file.replace(/\.tsx$/, "").replace(/^components\/shared\//, "");
-        console.log(chalk33.yellow(`  \u26A0 ${relativePath}: has inline code similar to ${d.cid} (${d.name})`));
-        console.log(chalk33.dim(`    Consider: import { ${d.name} } from "@/components/shared/${importPath}"`));
+        console.log(chalk34.yellow(`  \u26A0 ${relativePath}: has inline code similar to ${d.cid} (${d.name})`));
+        console.log(chalk34.dim(`    Consider: import { ${d.name} } from "@/components/shared/${importPath}"`));
       }
     }
   }
@@ -10789,7 +11141,7 @@ async function handleFileDelete(projectRoot, filePath) {
   const relativePath = relative4(projectRoot, filePath).replace(/\\/g, "/");
   if (!relativePath.startsWith("components/") || relativePath.startsWith("components/ui/")) return;
   try {
-    const chalk33 = (await import("chalk")).default;
+    const chalk34 = (await import("chalk")).default;
     const manifest = await loadManifest9(projectRoot);
     const orphaned = manifest.shared.find((s) => s.file === relativePath);
     if (orphaned) {
@@ -10798,7 +11150,7 @@ async function handleFileDelete(projectRoot, filePath) {
         shared: manifest.shared.filter((s) => s.id !== orphaned.id)
       };
       await saveManifest3(projectRoot, cleaned);
-      console.log(chalk33.cyan(`
+      console.log(chalk34.cyan(`
   \u{1F5D1} Auto-removed ${orphaned.id} (${orphaned.name}) \u2014 file deleted`));
       await writeCursorRules(projectRoot);
     }
@@ -10810,7 +11162,7 @@ async function detectNewComponent(projectRoot, filePath) {
   if (!relativePath.startsWith("components/") || relativePath.startsWith("components/ui/")) return;
   if (!relativePath.endsWith(".tsx") && !relativePath.endsWith(".jsx")) return;
   try {
-    const chalk33 = (await import("chalk")).default;
+    const chalk34 = (await import("chalk")).default;
     const manifest = await loadManifest9(projectRoot);
     const alreadyRegistered = manifest.shared.some((s) => s.file === relativePath);
     if (alreadyRegistered) return;
@@ -10819,9 +11171,9 @@ async function detectNewComponent(projectRoot, filePath) {
     if (exports.length > 0) {
       const alreadyByName = exports.every((n) => manifest.shared.some((s) => s.name === n));
       if (!alreadyByName) {
-        console.log(chalk33.cyan(`
+        console.log(chalk34.cyan(`
   \u2139 New component detected: ${exports[0]} in ${relativePath}`));
-        console.log(chalk33.dim("    Register with: coherent sync"));
+        console.log(chalk34.dim("    Register with: coherent sync"));
       }
     }
   } catch {
@@ -10908,17 +11260,17 @@ function clearStaleCache(projectRoot) {
   const nextDir = join14(projectRoot, ".next");
   if (existsSync19(nextDir)) {
     rmSync3(nextDir, { recursive: true, force: true });
-    console.log(chalk14.dim("   \u2714 Cleared stale build cache"));
+    console.log(chalk15.dim("   \u2714 Cleared stale build cache"));
   }
 }
 async function preflightDependencyCheck(projectRoot) {
   const missing = await findMissingPackages(projectRoot);
   if (missing.length === 0) return;
-  console.log(chalk14.cyan(`
+  console.log(chalk15.cyan(`
    Auto-installing missing dependencies: ${missing.join(", ")}`));
   const ok = await installPackages(projectRoot, missing);
-  if (ok) console.log(chalk14.dim("   \u2714 Installed"));
-  else console.log(chalk14.yellow(`   Run manually: npm install ${missing.join(" ")}`));
+  if (ok) console.log(chalk15.dim("   \u2714 Installed"));
+  else console.log(chalk15.yellow(`   Run manually: npm install ${missing.join(" ")}`));
 }
 async function listPageFiles(appDir) {
   const out = [];
@@ -10942,7 +11294,7 @@ async function validateSyntax(projectRoot) {
     const fixed = fixUnescapedLtInJsx(sanitizeMetadataStrings(ensureUseClientIfNeeded(content)));
     if (fixed !== content) {
       writeFileSync10(file, fixed, "utf-8");
-      console.log(chalk14.dim(`   \u2714 Auto-fixed syntax: ${file.replace(projectRoot, ".").replace(/^\.[/\\]/, "")}`));
+      console.log(chalk15.dim(`   \u2714 Auto-fixed syntax: ${file.replace(projectRoot, ".").replace(/^\.[/\\]/, "")}`));
     }
   }
 }
@@ -10984,7 +11336,7 @@ async function fixMissingComponentExports(projectRoot) {
         try {
           const result = await provider.installComponent(componentId, projectRoot);
           if (result.success) {
-            console.log(chalk14.dim(`   \u2714 Installed missing ${componentId}.tsx`));
+            console.log(chalk15.dim(`   \u2714 Installed missing ${componentId}.tsx`));
           }
         } catch {
         }
@@ -10996,7 +11348,7 @@ async function fixMissingComponentExports(projectRoot) {
           mkdirSync10(uiDir, { recursive: true });
           const newContent = await generator.generate(def);
           writeFileSync10(componentFile, newContent, "utf-8");
-          console.log(chalk14.dim(`   \u2714 Created missing ${componentId}.tsx`));
+          console.log(chalk15.dim(`   \u2714 Created missing ${componentId}.tsx`));
         } catch {
         }
       }
@@ -11019,7 +11371,7 @@ async function fixMissingComponentExports(projectRoot) {
       try {
         const result = await provider.installComponent(componentId, projectRoot, { force: true });
         if (result.success) {
-          console.log(chalk14.dim(`   \u2714 Reinstalled ${componentId}.tsx (added missing exports: ${missing.join(", ")})`));
+          console.log(chalk15.dim(`   \u2714 Reinstalled ${componentId}.tsx (added missing exports: ${missing.join(", ")})`));
         }
       } catch {
       }
@@ -11029,7 +11381,7 @@ async function fixMissingComponentExports(projectRoot) {
       try {
         const newContent = await generator.generate(def);
         writeFileSync10(componentFile, newContent, "utf-8");
-        console.log(chalk14.dim(`   \u2714 Regenerated ${componentId}.tsx (added missing exports: ${missing.join(", ")})`));
+        console.log(chalk15.dim(`   \u2714 Regenerated ${componentId}.tsx (added missing exports: ${missing.join(", ")})`));
       } catch {
       }
     }
@@ -11088,14 +11440,14 @@ async function healthCheck(port) {
   try {
     const res = await fetch(`http://localhost:${port}`);
     if (res.status === 200) {
-      console.log(chalk14.green(`
+      console.log(chalk15.green(`
 \u2705 Preview healthy at http://localhost:${port}`));
     } else {
-      console.log(chalk14.yellow(`
+      console.log(chalk15.yellow(`
 \u26A0 Preview returned ${res.status}. Run: coherent fix`));
     }
   } catch {
-    console.log(chalk14.yellow(`
+    console.log(chalk15.yellow(`
 \u26A0 Preview not responding. Run: coherent fix`));
   }
 }
@@ -11134,29 +11486,29 @@ function launchWithMonitoring(projectRoot, restarts) {
         const shadcnId = extractShadcnComponentFromModuleNotFound(msg);
         if (shadcnId && !installingSet.has(shadcnId)) {
           installingSet.add(shadcnId);
-          console.log(chalk14.yellow(`
+          console.log(chalk15.yellow(`
 \u26A0 Missing component detected: ${shadcnId}`));
-          console.log(chalk14.cyan("  Auto-installing..."));
+          console.log(chalk15.cyan("  Auto-installing..."));
           autoInstallShadcnComponent(shadcnId, projectRoot).then((ok) => {
             if (ok) {
-              console.log(chalk14.green(`  \u2714 Installed ${shadcnId}.tsx. Restarting...`));
+              console.log(chalk15.green(`  \u2714 Installed ${shadcnId}.tsx. Restarting...`));
               intentionalRestart = true;
               server.kill("SIGTERM");
               launchWithMonitoring(projectRoot, restarts + 1).then(resolvePromise).catch(rejectPromise);
             } else {
-              console.log(chalk14.red(`  \u2716 Could not install ${shadcnId}. Run: npx shadcn@latest add ${shadcnId}`));
+              console.log(chalk15.red(`  \u2716 Could not install ${shadcnId}. Run: npx shadcn@latest add ${shadcnId}`));
             }
           });
         } else if (!shadcnId) {
           const pkg = extractPackageFromModuleNotFound(msg);
           if (pkg && !installingSet.has(pkg)) {
             installingSet.add(pkg);
-            console.log(chalk14.yellow(`
+            console.log(chalk15.yellow(`
 \u26A0 Missing package detected: ${pkg}`));
-            console.log(chalk14.cyan("  Auto-installing..."));
+            console.log(chalk15.cyan("  Auto-installing..."));
             installPackages(projectRoot, [pkg]).then((ok) => {
               if (ok) {
-                console.log(chalk14.green(`  \u2714 Installed ${pkg}. Restarting...`));
+                console.log(chalk15.green(`  \u2714 Installed ${pkg}. Restarting...`));
                 intentionalRestart = true;
                 server.kill("SIGTERM");
                 launchWithMonitoring(projectRoot, restarts + 1).then(resolvePromise).catch(rejectPromise);
@@ -11166,19 +11518,19 @@ function launchWithMonitoring(projectRoot, restarts) {
         }
       }
       if (msg.includes("Failed to compile")) {
-        console.log(chalk14.yellow("\n\u26A0 Compilation error detected."));
-        console.log(chalk14.dim('  Hint: run "coherent fix" in another terminal to auto-fix'));
-        console.log(chalk14.dim('  Or:  coherent chat "fix the broken page"'));
+        console.log(chalk15.yellow("\n\u26A0 Compilation error detected."));
+        console.log(chalk15.dim('  Hint: run "coherent fix" in another terminal to auto-fix'));
+        console.log(chalk15.dim('  Or:  coherent chat "fix the broken page"'));
       }
     });
     server.on("exit", (code) => {
       if (intentionalRestart) return;
       if (code !== 0 && code !== null) {
-        console.log(chalk14.red(`
+        console.log(chalk15.red(`
 \u274C Dev server exited with code ${code}`));
-        console.log(chalk14.dim('   Check the output above. Fix and run "coherent preview" again.\n'));
+        console.log(chalk15.dim('   Check the output above. Fix and run "coherent preview" again.\n'));
       } else {
-        console.log(chalk14.dim("\n\u{1F44B} Dev server stopped"));
+        console.log(chalk15.dim("\n\u{1F44B} Dev server stopped"));
       }
       process.exit(code ?? 0);
     });
@@ -11187,7 +11539,7 @@ function launchWithMonitoring(projectRoot, restarts) {
     });
     const shutdown = () => {
       closeWatcher();
-      console.log(chalk14.dim("\n\n\u{1F6D1} Stopping dev server..."));
+      console.log(chalk15.dim("\n\n\u{1F6D1} Stopping dev server..."));
       server.kill("SIGTERM");
     };
     process.on("SIGINT", shutdown);
@@ -11199,9 +11551,9 @@ async function openBrowser(url) {
     const open = await import("open");
     await open.default(url);
   } catch (error) {
-    console.log(chalk14.yellow(`
+    console.log(chalk15.yellow(`
 \u26A0\uFE0F  Could not open browser automatically`));
-    console.log(chalk14.dim(`   Please open ${url} manually`));
+    console.log(chalk15.dim(`   Please open ${url} manually`));
   }
 }
 function startDevServer(projectRoot) {
@@ -11232,8 +11584,8 @@ async function previewCommand() {
   try {
     if (!checkProjectInitialized(projectRoot)) {
       spinner.fail("Project not initialized");
-      console.log(chalk14.red("\n\u274C Project not found"));
-      console.log(chalk14.dim('Run "coherent init" first to create a project.'));
+      console.log(chalk15.red("\n\u274C Project not found"));
+      console.log(chalk15.dim('Run "coherent init" first to create a project.'));
       process.exit(1);
     }
     spinner.text = "Checking dependencies...";
@@ -11241,16 +11593,16 @@ async function previewCommand() {
       spinner.warn("Dependencies not installed");
       const pm = getPackageManager(projectRoot);
       const installCommand = pm === "pnpm" ? "pnpm install" : "npm install";
-      console.log(chalk14.yellow("\n\u26A0\uFE0F  Dependencies not installed"));
-      console.log(chalk14.cyan(`
+      console.log(chalk15.yellow("\n\u26A0\uFE0F  Dependencies not installed"));
+      console.log(chalk15.cyan(`
    Running ${installCommand}...
 `));
       const ok = await runInstall(projectRoot);
       if (!ok) {
-        console.error(chalk14.red('\n\u274C Install failed. Fix errors above and run "coherent preview" again.\n'));
+        console.error(chalk15.red('\n\u274C Install failed. Fix errors above and run "coherent preview" again.\n'));
         process.exit(1);
       }
-      console.log(chalk14.green("\n\u2705 Dependencies installed\n"));
+      console.log(chalk15.green("\n\u2705 Dependencies installed\n"));
     } else {
       spinner.succeed("Project ready");
     }
@@ -11273,27 +11625,27 @@ async function previewCommand() {
     await fixMissingComponentExports(projectRoot);
     await backfillPageAnalysis(projectRoot);
     spinner.succeed("Project ready");
-    console.log(chalk14.dim("  \u{1F4A1} Edited files manually? Run `coherent sync` to update the Design System.\n"));
-    console.log(chalk14.blue("\n\u{1F680} Starting Next.js dev server...\n"));
+    console.log(chalk15.dim("  \u{1F4A1} Edited files manually? Run `coherent sync` to update the Design System.\n"));
+    console.log(chalk15.blue("\n\u{1F680} Starting Next.js dev server...\n"));
     await launchWithMonitoring(projectRoot, 0);
   } catch (error) {
     spinner.fail("Failed to start dev server");
     if (error instanceof Error) {
-      console.error(chalk14.red(`
+      console.error(chalk15.red(`
 \u274C ${error.message}`));
       if (error.message.includes("package.json")) {
-        console.log(chalk14.yellow("\n\u{1F4A1} Tip: Make sure you're in a Coherent project directory."));
-        console.log(chalk14.dim('   Run "coherent init" to create a new project.'));
+        console.log(chalk15.yellow("\n\u{1F4A1} Tip: Make sure you're in a Coherent project directory."));
+        console.log(chalk15.dim('   Run "coherent init" to create a new project.'));
       }
     } else {
-      console.error(chalk14.red("Unknown error occurred"));
+      console.error(chalk15.red("Unknown error occurred"));
     }
     process.exit(1);
   }
 }
 
 // src/commands/export.ts
-import chalk15 from "chalk";
+import chalk16 from "chalk";
 import ora4 from "ora";
 import { spawn as spawn2 } from "child_process";
 import { existsSync as existsSync20, rmSync as rmSync4, readdirSync as readdirSync6 } from "fs";
@@ -11572,7 +11924,7 @@ async function exportCommand(options = {}) {
     const missingDeps = await findMissingDepsInExport(outputDir);
     if (missingDeps.length > 0) {
       console.log(
-        chalk15.yellow(
+        chalk16.yellow(
           "\n\u26A0\uFE0F  Warning: exported code imports packages not in package.json: " + missingDeps.join(", ") + "\n   Add them to dependencies and run npm install in the export dir.\n"
         )
       );
@@ -11588,7 +11940,7 @@ async function exportCommand(options = {}) {
     spinner.succeed("Dependencies installed");
     await ensureReadmeDeploySection(outputDir);
     await patchNextConfigForExport(outputDir);
-    console.log(chalk15.dim("\n   Tip: run `coherent check` before export to catch quality issues.\n"));
+    console.log(chalk16.dim("\n   Tip: run `coherent check` before export to catch quality issues.\n"));
     let buildOk = false;
     if (doBuild) {
       spinner.start("Running next build...");
@@ -11598,7 +11950,7 @@ async function exportCommand(options = {}) {
         spinner.succeed("Build: success");
       } catch (e) {
         spinner.fail("Build failed");
-        if (e instanceof Error) console.error(chalk15.red(e.message));
+        if (e instanceof Error) console.error(chalk16.red(e.message));
       }
     } else {
       buildOk = true;
@@ -11606,23 +11958,23 @@ async function exportCommand(options = {}) {
     const pageCount = await countPages(outputDir);
     const componentCount = countComponents(outputDir);
     spinner.stop();
-    console.log(chalk15.green("\n\u2705 Exported to " + outputDir + "\n"));
-    console.log(chalk15.blue("   Pages: " + pageCount));
-    console.log(chalk15.blue("   Components: " + componentCount + " (base + shared)"));
-    console.log(chalk15.blue("   Build: " + (doBuild ? buildOk ? "success" : "failed" : "skipped (--no-build)")));
+    console.log(chalk16.green("\n\u2705 Exported to " + outputDir + "\n"));
+    console.log(chalk16.blue("   Pages: " + pageCount));
+    console.log(chalk16.blue("   Components: " + componentCount + " (base + shared)"));
+    console.log(chalk16.blue("   Build: " + (doBuild ? buildOk ? "success" : "failed" : "skipped (--no-build)")));
     console.log("");
-    console.log(chalk15.dim("   Deploy: npx vercel " + outputDir));
-    console.log(chalk15.dim("       or: npx netlify deploy --dir " + outputDir + "/.next"));
+    console.log(chalk16.dim("   Deploy: npx vercel " + outputDir));
+    console.log(chalk16.dim("       or: npx netlify deploy --dir " + outputDir + "/.next"));
     console.log("");
   } catch (error) {
     spinner.fail("Export failed");
-    if (error instanceof Error) console.error(chalk15.red("\n\u274C " + error.message));
+    if (error instanceof Error) console.error(chalk16.red("\n\u274C " + error.message));
     process.exit(1);
   }
 }
 
 // src/commands/status.ts
-import chalk16 from "chalk";
+import chalk17 from "chalk";
 import { basename } from "path";
 import { DesignSystemManager as DesignSystemManager9 } from "@getcoherent/core";
 function countTokens(tokens) {
@@ -11646,58 +11998,58 @@ async function statusCommand() {
   try {
     const project = findConfig();
     if (!project) {
-      console.log(chalk16.yellow("\u26A0\uFE0F  Not in a Coherent project\n"));
+      console.log(chalk17.yellow("\u26A0\uFE0F  Not in a Coherent project\n"));
       console.log("Initialize a project:");
-      console.log(chalk16.white("  $ coherent init\n"));
+      console.log(chalk17.white("  $ coherent init\n"));
       return;
     }
-    console.log(chalk16.cyan("\n\u2728 Current Project\n"));
-    console.log(chalk16.gray("\u{1F4C1} Location: ") + chalk16.white(project.root));
-    console.log(chalk16.gray("\u{1F4C4} Config: ") + chalk16.white(basename(project.configPath)));
+    console.log(chalk17.cyan("\n\u2728 Current Project\n"));
+    console.log(chalk17.gray("\u{1F4C1} Location: ") + chalk17.white(project.root));
+    console.log(chalk17.gray("\u{1F4C4} Config: ") + chalk17.white(basename(project.configPath)));
     console.log("");
     try {
       const manager = new DesignSystemManager9(project.configPath);
       await manager.load();
       const config2 = manager.getConfig();
-      console.log(chalk16.cyan("\u{1F4CA} Statistics:\n"));
+      console.log(chalk17.cyan("\u{1F4CA} Statistics:\n"));
       const pageCount = Array.isArray(config2.pages) ? config2.pages.length : Object.keys(config2.pages || {}).length;
-      console.log(chalk16.gray("   Pages: ") + chalk16.white(String(pageCount)));
+      console.log(chalk17.gray("   Pages: ") + chalk17.white(String(pageCount)));
       const componentCount = Array.isArray(config2.components) ? config2.components.length : Object.keys(config2.components || {}).length;
-      console.log(chalk16.gray("   Components: ") + chalk16.white(String(componentCount)));
+      console.log(chalk17.gray("   Components: ") + chalk17.white(String(componentCount)));
       const tokenCount = countTokens(config2.tokens);
-      console.log(chalk16.gray("   Design tokens: ") + chalk16.white(String(tokenCount)));
+      console.log(chalk17.gray("   Design tokens: ") + chalk17.white(String(tokenCount)));
       console.log("");
       const recent = readRecentChanges(project.root);
       if (recent.length > 0) {
-        console.log(chalk16.cyan("\u{1F4DD} Recent changes:\n"));
+        console.log(chalk17.cyan("\u{1F4DD} Recent changes:\n"));
         recent.slice(0, 5).forEach((change) => {
           const ago = formatTimeAgo(change.timestamp);
-          console.log(chalk16.gray("   \u2022 ") + chalk16.white(change.description) + chalk16.gray(` (${ago})`));
+          console.log(chalk17.gray("   \u2022 ") + chalk17.white(change.description) + chalk17.gray(` (${ago})`));
         });
         console.log("");
       }
-      console.log(chalk16.cyan("\u{1F680} Quick actions:\n"));
-      console.log(chalk16.white('   $ coherent chat "add new page"'));
-      console.log(chalk16.white("   $ coherent preview"));
-      console.log(chalk16.white("   $ coherent export"));
+      console.log(chalk17.cyan("\u{1F680} Quick actions:\n"));
+      console.log(chalk17.white('   $ coherent chat "add new page"'));
+      console.log(chalk17.white("   $ coherent preview"));
+      console.log(chalk17.white("   $ coherent export"));
       console.log("");
     } catch (error) {
-      console.error(chalk16.red("Error loading config:"));
+      console.error(chalk17.red("Error loading config:"));
       if (error instanceof Error) {
-        console.error(chalk16.red(`   ${error.message}`));
+        console.error(chalk17.red(`   ${error.message}`));
       } else {
-        console.error(chalk16.red("   Unknown error"));
+        console.error(chalk17.red("   Unknown error"));
       }
       console.log("");
     }
   } catch (error) {
-    console.error(chalk16.red("\u274C Command failed:"), error instanceof Error ? error.message : "Unknown error");
+    console.error(chalk17.red("\u274C Command failed:"), error instanceof Error ? error.message : "Unknown error");
     process.exit(1);
   }
 }
 
 // src/commands/regenerate-docs.ts
-import chalk17 from "chalk";
+import chalk18 from "chalk";
 import ora5 from "ora";
 import { DesignSystemManager as DesignSystemManager10 } from "@getcoherent/core";
 import { ProjectScaffolder as ProjectScaffolder2 } from "@getcoherent/core";
@@ -11705,9 +12057,9 @@ async function regenerateDocsCommand() {
   try {
     const project = findConfig();
     if (!project) {
-      console.log(chalk17.yellow("\u26A0\uFE0F  Not in a Coherent project\n"));
+      console.log(chalk18.yellow("\u26A0\uFE0F  Not in a Coherent project\n"));
       console.log("Run this command from a project root that has design-system.config.ts");
-      console.log(chalk17.white("  $ coherent init   # in an empty folder first\n"));
+      console.log(chalk18.white("  $ coherent init   # in an empty folder first\n"));
       process.exit(1);
     }
     const spinner = ora5("Regenerating documentation pages...").start();
@@ -11719,23 +12071,23 @@ async function regenerateDocsCommand() {
       await scaffolder.generateDocsPages();
       spinner.succeed("Documentation pages updated");
       console.log(
-        chalk17.gray(
+        chalk18.gray(
           "\nUpdated: app/design-system/docs/ (layout, page, components, tokens, for-designers, recommendations)\n"
         )
       );
     } catch (err) {
       spinner.fail("Failed to regenerate docs");
-      console.error(chalk17.red(err instanceof Error ? err.message : String(err)));
+      console.error(chalk18.red(err instanceof Error ? err.message : String(err)));
       process.exit(1);
     }
   } catch (error) {
-    console.error(chalk17.red("\u274C Command failed:"), error instanceof Error ? error.message : "Unknown error");
+    console.error(chalk18.red("\u274C Command failed:"), error instanceof Error ? error.message : "Unknown error");
     process.exit(1);
   }
 }
 
 // src/commands/fix.ts
-import chalk18 from "chalk";
+import chalk19 from "chalk";
 import { readdirSync as readdirSync7, readFileSync as readFileSync15, existsSync as existsSync21, writeFileSync as writeFileSync11, rmSync as rmSync5, mkdirSync as mkdirSync7 } from "fs";
 import { resolve as resolve12, join as join16 } from "path";
 import {
@@ -11787,31 +12139,31 @@ async function fixCommand(opts = {}) {
   const fixes = [];
   const remaining = [];
   if (dryRun) {
-    console.log(chalk18.cyan("\ncoherent fix --dry-run\n"));
+    console.log(chalk19.cyan("\ncoherent fix --dry-run\n"));
   } else {
-    console.log(chalk18.cyan("\ncoherent fix\n"));
+    console.log(chalk19.cyan("\ncoherent fix\n"));
   }
   if (!skipCache) {
     const nextDir = join16(projectRoot, ".next");
     if (existsSync21(nextDir)) {
       if (!dryRun) rmSync5(nextDir, { recursive: true, force: true });
       fixes.push("Cleared build cache");
-      console.log(chalk18.green("  \u2714 Cleared build cache"));
+      console.log(chalk19.green("  \u2714 Cleared build cache"));
     }
   }
   const missingPkgs = await findMissingPackages(projectRoot);
   if (missingPkgs.length > 0) {
     if (dryRun) {
       fixes.push(`Would install packages: ${missingPkgs.join(", ")}`);
-      console.log(chalk18.green(`  \u2714 Would install packages: ${missingPkgs.join(", ")}`));
+      console.log(chalk19.green(`  \u2714 Would install packages: ${missingPkgs.join(", ")}`));
     } else {
       const ok = await installPackages(projectRoot, missingPkgs);
       if (ok) {
         fixes.push(`Installed missing packages: ${missingPkgs.join(", ")}`);
-        console.log(chalk18.green(`  \u2714 Installed missing packages: ${missingPkgs.join(", ")}`));
+        console.log(chalk19.green(`  \u2714 Installed missing packages: ${missingPkgs.join(", ")}`));
       } else {
         remaining.push(`Failed to install: ${missingPkgs.join(", ")}. Run: npm install ${missingPkgs.join(" ")}`);
-        console.log(chalk18.yellow(`  \u26A0 Could not install: ${missingPkgs.join(", ")}`));
+        console.log(chalk19.yellow(`  \u26A0 Could not install: ${missingPkgs.join(", ")}`));
       }
     }
   }
@@ -11848,7 +12200,7 @@ async function fixCommand(opts = {}) {
     if (toInstall.length > 0) {
       if (dryRun) {
         fixes.push(`Would install components: ${toInstall.join(", ")}`);
-        console.log(chalk18.green(`  \u2714 Would install components: ${toInstall.join(", ")}`));
+        console.log(chalk19.green(`  \u2714 Would install components: ${toInstall.join(", ")}`));
       } else {
         let installed = 0;
         for (const componentId of toInstall) {
@@ -11877,14 +12229,14 @@ async function fixCommand(opts = {}) {
             installed++;
           } catch (err) {
             console.log(
-              chalk18.yellow(`  \u26A0 Failed to install ${componentId}: ${err instanceof Error ? err.message : "unknown"}`)
+              chalk19.yellow(`  \u26A0 Failed to install ${componentId}: ${err instanceof Error ? err.message : "unknown"}`)
             );
           }
         }
         if (installed > 0) {
           await dsm.save();
           fixes.push(`Installed missing components: ${toInstall.join(", ")}`);
-          console.log(chalk18.green(`  \u2714 Installed missing components: ${toInstall.join(", ")}`));
+          console.log(chalk19.green(`  \u2714 Installed missing components: ${toInstall.join(", ")}`));
         }
       }
     }
@@ -11904,7 +12256,7 @@ async function fixCommand(opts = {}) {
   if (syntaxFixed > 0) {
     const verb = dryRun ? "Would fix" : "Fixed";
     fixes.push(`${verb} syntax in ${syntaxFixed} file(s)`);
-    console.log(chalk18.green(`  \u2714 ${verb} syntax: ${syntaxFixed} file(s) (use client, metadata, quotes)`));
+    console.log(chalk19.green(`  \u2714 ${verb} syntax: ${syntaxFixed} file(s) (use client, metadata, quotes)`));
   }
   if (!skipQuality) {
     let qualityFixCount = 0;
@@ -11922,7 +12274,7 @@ async function fixCommand(opts = {}) {
       const uniqueFixes = [...new Set(qualityFixDetails)];
       const verb = dryRun ? "Would fix" : "Fixed";
       fixes.push(`${verb} quality in ${qualityFixCount} file(s)`);
-      console.log(chalk18.green(`  \u2714 ${verb} ${uniqueFixes.length} quality issue type(s): ${uniqueFixes.join(", ")}`));
+      console.log(chalk19.green(`  \u2714 ${verb} ${uniqueFixes.length} quality issue type(s): ${uniqueFixes.join(", ")}`));
     }
   }
   let totalErrors = 0;
@@ -11967,13 +12319,13 @@ async function fixCommand(opts = {}) {
           if (dryRun) {
             fixes.push(`Would update ${o.id} path to ${newPath}`);
           } else {
-            console.log(chalk18.green(`  \u2714 Updated ${o.id} (${o.name}) path \u2192 ${newPath}`));
+            console.log(chalk19.green(`  \u2714 Updated ${o.id} (${o.name}) path \u2192 ${newPath}`));
           }
         } else {
           if (dryRun) {
             fixes.push(`Would remove orphaned ${o.id} (${o.name})`);
           } else {
-            console.log(chalk18.green(`  \u2714 Removed orphaned ${o.id} (${o.name}) \u2014 file missing`));
+            console.log(chalk19.green(`  \u2714 Removed orphaned ${o.id} (${o.name}) \u2014 file missing`));
           }
         }
       }
@@ -11986,7 +12338,7 @@ async function fixCommand(opts = {}) {
         entry.usedIn = fullActual;
         manifestModified = true;
         if (!dryRun) {
-          console.log(chalk18.green(`  \u2714 Updated ${entry.id} usedIn: ${fullActual.join(", ") || "none"}`));
+          console.log(chalk19.green(`  \u2714 Updated ${entry.id} usedIn: ${fullActual.join(", ") || "none"}`));
         }
       }
     }
@@ -12004,7 +12356,7 @@ async function fixCommand(opts = {}) {
           createdAt: (/* @__PURE__ */ new Date()).toISOString()
         });
         manifest.nextId++;
-        console.log(chalk18.green(`  \u2714 Registered ${id} (${comp.name}) from ${comp.file}`));
+        console.log(chalk19.green(`  \u2714 Registered ${id} (${comp.name}) from ${comp.file}`));
       } else {
         fixes.push(`Would register ${comp.name} from ${comp.file}`);
       }
@@ -12024,33 +12376,33 @@ async function fixCommand(opts = {}) {
   } catch {
   }
   if (fixes.length === 0 && totalErrors === 0 && totalWarnings === 0 && remaining.length === 0) {
-    console.log(chalk18.green("\n  \u2705 Everything looks good \u2014 no issues found\n"));
-    console.log(chalk18.cyan("  Run: coherent preview\n"));
+    console.log(chalk19.green("\n  \u2705 Everything looks good \u2014 no issues found\n"));
+    console.log(chalk19.cyan("  Run: coherent preview\n"));
     return;
   }
   if (fixes.length > 0) console.log("");
   if (totalErrors > 0 || totalWarnings > 0 || remaining.length > 0) {
-    console.log(chalk18.dim("  \u2500".repeat(25)));
-    console.log(chalk18.yellow(`
+    console.log(chalk19.dim("  \u2500".repeat(25)));
+    console.log(chalk19.yellow(`
   Remaining (need manual fix or AI):`));
     for (const { path: path4, report } of fileIssues) {
-      console.log(chalk18.dim(`  \u{1F4C4} ${path4}`));
+      console.log(chalk19.dim(`  \u{1F4C4} ${path4}`));
       console.log(report);
     }
     for (const r of remaining) {
-      console.log(chalk18.yellow(`  \u26A0 ${r}`));
+      console.log(chalk19.yellow(`  \u26A0 ${r}`));
     }
     console.log("");
     const parts = [];
-    if (totalErrors > 0) parts.push(chalk18.red(`\u274C ${totalErrors} error(s)`));
-    if (totalWarnings > 0) parts.push(chalk18.yellow(`\u26A0 ${totalWarnings} warning(s)`));
+    if (totalErrors > 0) parts.push(chalk19.red(`\u274C ${totalErrors} error(s)`));
+    if (totalWarnings > 0) parts.push(chalk19.yellow(`\u26A0 ${totalWarnings} warning(s)`));
     if (parts.length > 0) console.log(`  ${parts.join("  ")}`);
   }
-  console.log(chalk18.cyan("\n  Run: coherent preview\n"));
+  console.log(chalk19.cyan("\n  Run: coherent preview\n"));
 }
 
 // src/commands/check.ts
-import chalk19 from "chalk";
+import chalk20 from "chalk";
 import { resolve as resolve13 } from "path";
 import { readdirSync as readdirSync8, readFileSync as readFileSync16, statSync as statSync2, existsSync as existsSync22 } from "fs";
 import { loadManifest as loadManifest11 } from "@getcoherent/core";
@@ -12098,7 +12450,7 @@ async function checkCommand(opts = {}) {
     const appDir = resolve13(projectRoot, "app");
     const files = findTsxFiles(appDir);
     result.pages.total = files.length;
-    if (!opts.json) console.log(chalk19.cyan("\n  \u{1F4C4} Pages") + chalk19.dim(` (${files.length} scanned)
+    if (!opts.json) console.log(chalk20.cyan("\n  \u{1F4C4} Pages") + chalk20.dim(` (${files.length} scanned)
 `));
     const autoFixableTypes = /* @__PURE__ */ new Set([
       "RAW_COLOR",
@@ -12128,7 +12480,7 @@ async function checkCommand(opts = {}) {
       result.autoFixable += fileAutoFixable;
       if (filteredIssues.length === 0) {
         result.pages.clean++;
-        if (!opts.json) console.log(chalk19.green(`  \u2714 ${relativePath}`) + chalk19.dim(" \u2014 clean"));
+        if (!opts.json) console.log(chalk20.green(`  \u2714 ${relativePath}`) + chalk20.dim(" \u2014 clean"));
         continue;
       }
       if (errors > 0) result.pages.withErrors++;
@@ -12141,9 +12493,9 @@ async function checkCommand(opts = {}) {
       });
       if (!opts.json) {
         const parts = [];
-        if (errors > 0) parts.push(chalk19.red(`${errors} error(s)`));
-        if (warnings > 0) parts.push(chalk19.yellow(`${warnings} warning(s)`));
-        console.log(chalk19.yellow(`  \u26A0 ${relativePath}`) + chalk19.dim(` \u2014 ${parts.join(", ")}`));
+        if (errors > 0) parts.push(chalk20.red(`${errors} error(s)`));
+        if (warnings > 0) parts.push(chalk20.yellow(`${warnings} warning(s)`));
+        console.log(chalk20.yellow(`  \u26A0 ${relativePath}`) + chalk20.dim(` \u2014 ${parts.join(", ")}`));
         console.log(formatIssues(filteredIssues));
       }
     }
@@ -12169,15 +12521,15 @@ async function checkCommand(opts = {}) {
       }
     }
     if (!opts.json && result.links.broken.length > 0) {
-      console.log(chalk19.yellow(`
-  \u{1F517} Internal Links`) + chalk19.dim(` (${result.links.total} scanned)
+      console.log(chalk20.yellow(`
+  \u{1F517} Internal Links`) + chalk20.dim(` (${result.links.total} scanned)
 `));
       for (const b of result.links.broken) {
-        console.log(chalk19.red(`  \u2717 ${b.file}:${b.line}`) + chalk19.dim(` \u2192 ${b.href} (route does not exist)`));
+        console.log(chalk20.red(`  \u2717 ${b.file}:${b.line}`) + chalk20.dim(` \u2192 ${b.href} (route does not exist)`));
       }
     } else if (!opts.json && result.links.total > 0) {
-      console.log(chalk19.green(`
-  \u{1F517} Internal Links`) + chalk19.dim(` \u2014 all ${result.links.total} links resolve \u2713`));
+      console.log(chalk20.green(`
+  \u{1F517} Internal Links`) + chalk20.dim(` \u2014 all ${result.links.total} links resolve \u2713`));
     }
     try {
       const manifest = await loadManifest11(project.root);
@@ -12186,7 +12538,7 @@ async function checkCommand(opts = {}) {
           const fullPath = resolve13(project.root, entry.file);
           if (!existsSync22(fullPath)) {
             result.pages.withErrors++;
-            if (!opts.json) console.log(chalk19.red(`
+            if (!opts.json) console.log(chalk20.red(`
   \u2717 Missing shared component file: ${entry.id} (${entry.file})`));
           }
         }
@@ -12198,8 +12550,8 @@ async function checkCommand(opts = {}) {
     try {
       const manifest = await loadManifest11(projectRoot);
       if (!opts.json && manifest.shared.length > 0) {
-        console.log(chalk19.cyan(`
-  \u{1F9E9} Shared Components`) + chalk19.dim(` (${manifest.shared.length} registered)
+        console.log(chalk20.cyan(`
+  \u{1F9E9} Shared Components`) + chalk20.dim(` (${manifest.shared.length} registered)
 `));
       }
       let consistent = 0;
@@ -12213,8 +12565,8 @@ async function checkCommand(opts = {}) {
         if (!fileExists) {
           _orphaned++;
           if (!opts.json) {
-            console.log(chalk19.red(`  \u274C ${entry.id} (${entry.name}) \u2014 file missing: ${entry.file}`));
-            console.log(chalk19.dim(`     Fix: coherent fix  or  coherent sync`));
+            console.log(chalk20.red(`  \u274C ${entry.id} (${entry.name}) \u2014 file missing: ${entry.file}`));
+            console.log(chalk20.dim(`     Fix: coherent fix  or  coherent sync`));
           }
           continue;
         }
@@ -12225,11 +12577,11 @@ async function checkCommand(opts = {}) {
             _nameMismatch++;
             if (!opts.json) {
               console.log(
-                chalk19.yellow(
+                chalk20.yellow(
                   `  \u26A0 ${entry.id} \u2014 manifest name "${entry.name}" doesn't match export "${actualExports[0]}"`
                 )
               );
-              console.log(chalk19.dim(`     Fix: coherent sync`));
+              console.log(chalk20.dim(`     Fix: coherent sync`));
             }
           }
         } catch {
@@ -12244,35 +12596,35 @@ async function checkCommand(opts = {}) {
         if (totalUsage === 0) {
           unused++;
           if (!opts.json) {
-            console.log(chalk19.blue(`  \u2139 ${entry.id} (${entry.name}) \u2014 registered but not used anywhere`));
-            console.log(chalk19.dim(`     Remove: coherent components shared remove ${entry.id}`));
+            console.log(chalk20.blue(`  \u2139 ${entry.id} (${entry.name}) \u2014 registered but not used anywhere`));
+            console.log(chalk20.dim(`     Remove: coherent components shared remove ${entry.id}`));
           }
         } else {
           consistent++;
           const usageDesc = inLayout ? `layout + ${actualUsedIn.length} page(s)` : `${actualUsedIn.length} page(s)`;
           if (!opts.json) {
-            const staleNote = isStale ? chalk19.yellow(" [usedIn stale]") : "";
-            console.log(chalk19.green(`  \u2714 ${entry.id} (${entry.name})`) + chalk19.dim(` \u2014 ${usageDesc}`) + staleNote);
+            const staleNote = isStale ? chalk20.yellow(" [usedIn stale]") : "";
+            console.log(chalk20.green(`  \u2714 ${entry.id} (${entry.name})`) + chalk20.dim(` \u2014 ${usageDesc}`) + staleNote);
           }
         }
       }
       const unregistered = findUnregisteredComponents(projectRoot, manifest);
       if (unregistered.length > 0 && !opts.json) {
-        console.log(chalk19.cyan(`
+        console.log(chalk20.cyan(`
   \u{1F4E6} Unregistered components found:`));
         for (const comp of unregistered) {
-          console.log(chalk19.blue(`  \u2139 ${comp.name}`) + chalk19.dim(` \u2014 ${comp.file} (not in manifest)`));
-          console.log(chalk19.dim(`     Register: coherent sync`));
+          console.log(chalk20.blue(`  \u2139 ${comp.name}`) + chalk20.dim(` \u2014 ${comp.file} (not in manifest)`));
+          console.log(chalk20.dim(`     Register: coherent sync`));
         }
       }
       const inlineDupes = findInlineDuplicates(projectRoot, manifest);
       if (inlineDupes.length > 0 && !opts.json) {
-        console.log(chalk19.cyan(`
+        console.log(chalk20.cyan(`
   \u{1F50D} Inline duplicates:`));
         for (const dup of inlineDupes) {
-          console.log(chalk19.yellow(`  \u26A0 ${dup.pageFile}`) + chalk19.dim(` has inline ${dup.componentName}`));
+          console.log(chalk20.yellow(`  \u26A0 ${dup.pageFile}`) + chalk20.dim(` has inline ${dup.componentName}`));
           console.log(
-            chalk19.dim(
+            chalk20.dim(
               `     Use shared: import { ${dup.componentName} } from "@/${dup.sharedFile.replace(".tsx", "")}"`
             )
           );
@@ -12299,24 +12651,24 @@ async function checkCommand(opts = {}) {
     console.log(JSON.stringify(result, null, 2));
     return;
   }
-  console.log(chalk19.dim("\n  " + "\u2500".repeat(50)));
+  console.log(chalk20.dim("\n  " + "\u2500".repeat(50)));
   const summaryParts = [];
   if (!skipPages) {
-    summaryParts.push(`${chalk19.green(`${result.pages.clean} clean`)} pages`);
-    if (result.pages.withErrors > 0) summaryParts.push(chalk19.red(`${result.pages.withErrors} with errors`));
-    if (result.pages.withWarnings > 0) summaryParts.push(chalk19.yellow(`${result.pages.withWarnings} with warnings`));
+    summaryParts.push(`${chalk20.green(`${result.pages.clean} clean`)} pages`);
+    if (result.pages.withErrors > 0) summaryParts.push(chalk20.red(`${result.pages.withErrors} with errors`));
+    if (result.pages.withWarnings > 0) summaryParts.push(chalk20.yellow(`${result.pages.withWarnings} with warnings`));
   }
   if (!skipShared && result.shared.total > 0) {
     summaryParts.push(`${result.shared.consistent} healthy shared`);
     if (result.shared.unused > 0) summaryParts.push(`${result.shared.unused} unused`);
   }
   if (result.links.broken.length > 0) {
-    summaryParts.push(chalk19.red(`${result.links.broken.length} broken link(s)`));
+    summaryParts.push(chalk20.red(`${result.links.broken.length} broken link(s)`));
   }
   console.log(`
   ${summaryParts.join(" | ")}`);
   if (result.autoFixable > 0) {
-    console.log(chalk19.cyan(`
+    console.log(chalk20.cyan(`
   Auto-fixable: ${result.autoFixable} issues. Run: coherent fix`));
   }
   console.log("");
@@ -12325,21 +12677,21 @@ async function checkCommand(opts = {}) {
 }
 
 // src/commands/repair.ts
-import chalk20 from "chalk";
+import chalk21 from "chalk";
 async function repairCommand() {
-  console.log(chalk20.dim("  \u2139\uFE0F  `coherent repair` is deprecated \u2014 use `coherent fix` instead\n"));
+  console.log(chalk21.dim("  \u2139\uFE0F  `coherent repair` is deprecated \u2014 use `coherent fix` instead\n"));
   await fixCommand();
 }
 
 // src/commands/doctor.ts
-import chalk21 from "chalk";
+import chalk22 from "chalk";
 async function doctorCommand() {
-  console.log(chalk21.dim("  \u2139\uFE0F  `coherent doctor` is deprecated \u2014 use `coherent fix` instead\n"));
+  console.log(chalk22.dim("  \u2139\uFE0F  `coherent doctor` is deprecated \u2014 use `coherent fix` instead\n"));
   await fixCommand();
 }
 
 // src/commands/rules.ts
-import chalk22 from "chalk";
+import chalk23 from "chalk";
 async function rulesCommand() {
   try {
     const result = await regenerateCursorRules();
@@ -12350,31 +12702,31 @@ async function rulesCommand() {
     if (result.sharedCount !== void 0) parts.push(`${result.sharedCount} shared components`);
     if (result.tokenKeys !== void 0) parts.push(`${result.tokenKeys} design token keys`);
     const summary = parts.length > 0 ? ` (${parts.join(", ")})` : "";
-    console.log(chalk22.green(`\u2714 Updated .cursorrules and CLAUDE.md${summary}
+    console.log(chalk23.green(`\u2714 Updated .cursorrules and CLAUDE.md${summary}
 `));
   } catch (error) {
-    console.error(chalk22.red("\u274C Command failed:"), error instanceof Error ? error.message : "Unknown error");
+    console.error(chalk23.red("\u274C Command failed:"), error instanceof Error ? error.message : "Unknown error");
     process.exit(1);
   }
 }
 
 // src/commands/validate.ts
-import chalk23 from "chalk";
+import chalk24 from "chalk";
 async function validateCommand() {
-  console.log(chalk23.dim("  \u2139\uFE0F  `coherent validate` is deprecated \u2014 use `coherent check` instead\n"));
+  console.log(chalk24.dim("  \u2139\uFE0F  `coherent validate` is deprecated \u2014 use `coherent check` instead\n"));
   await checkCommand({ pages: true });
 }
 
 // src/commands/audit.ts
-import chalk24 from "chalk";
+import chalk25 from "chalk";
 async function auditCommand(options) {
-  console.log(chalk24.dim("  \u2139\uFE0F  `coherent audit` is deprecated \u2014 use `coherent check` instead\n"));
+  console.log(chalk25.dim("  \u2139\uFE0F  `coherent audit` is deprecated \u2014 use `coherent check` instead\n"));
   await checkCommand({ shared: true, json: options.json });
 }
 
 // src/commands/components.ts
 import { Command } from "commander";
-import chalk25 from "chalk";
+import chalk26 from "chalk";
 import {
   DesignSystemManager as DesignSystemManager12,
   ComponentManager as ComponentManager7,
@@ -12425,9 +12777,9 @@ function createComponentsCommand() {
       console.log(JSON.stringify({ shared: manifest.shared, ui: installed2 }, null, 2));
       return;
     }
-    console.log(chalk25.bold("\n\u{1F4E6} Shared Components"));
+    console.log(chalk26.bold("\n\u{1F4E6} Shared Components"));
     if (manifest.shared.length === 0) {
-      console.log(chalk25.gray("   None yet. Generate pages with header/footer to create them.\n"));
+      console.log(chalk26.gray("   None yet. Generate pages with header/footer to create them.\n"));
     } else {
       const order = { layout: 0, section: 1, widget: 2 };
       const sorted = [...manifest.shared].sort(
@@ -12435,9 +12787,9 @@ function createComponentsCommand() {
       );
       console.log("");
       sorted.forEach((entry) => {
-        const usage = entry.usedIn.length === 0 ? chalk25.gray("unused") : entry.usedIn.includes("app/layout.tsx") ? chalk25.green("all pages") : chalk25.gray(entry.usedIn.join(", "));
+        const usage = entry.usedIn.length === 0 ? chalk26.gray("unused") : entry.usedIn.includes("app/layout.tsx") ? chalk26.green("all pages") : chalk26.gray(entry.usedIn.join(", "));
         console.log(
-          `   ${chalk25.cyan(entry.id.padEnd(8))} ${chalk25.white(entry.name.padEnd(18))} ${chalk25.gray(entry.type.padEnd(9))} ${usage}`
+          `   ${chalk26.cyan(entry.id.padEnd(8))} ${chalk26.white(entry.name.padEnd(18))} ${chalk26.gray(entry.type.padEnd(9))} ${usage}`
         );
       });
       console.log("");
@@ -12446,24 +12798,24 @@ function createComponentsCommand() {
     const availableShadcn = listShadcnComponents();
     const installedIds = new Set(installed.map((c) => c.id));
     const notInstalled = availableShadcn.filter((id) => !installedIds.has(id));
-    console.log(chalk25.bold("\u{1F9E9} UI Components (shadcn)"));
+    console.log(chalk26.bold("\u{1F9E9} UI Components (shadcn)"));
     if (installed.length === 0) {
-      console.log(chalk25.gray("   None installed yet.\n"));
+      console.log(chalk26.gray("   None installed yet.\n"));
     } else {
       const names = installed.map((c) => c.name).sort();
-      console.log(chalk25.green(`   Installed (${names.length}): `) + chalk25.white(names.join(", ")));
+      console.log(chalk26.green(`   Installed (${names.length}): `) + chalk26.white(names.join(", ")));
     }
     if (notInstalled.length > 0) {
-      console.log(chalk25.gray(`   Available (${notInstalled.length}):  `) + chalk25.gray(notInstalled.join(", ")));
+      console.log(chalk26.gray(`   Available (${notInstalled.length}):  `) + chalk26.gray(notInstalled.join(", ")));
     }
     console.log("");
-    console.log(chalk25.cyan("\u{1F4A1} Commands:"));
-    console.log(chalk25.white('   coherent chat "add a testimonial component"'));
-    console.log(chalk25.white('   coherent chat --component "Header" "add a search button"'));
+    console.log(chalk26.cyan("\u{1F4A1} Commands:"));
+    console.log(chalk26.white('   coherent chat "add a testimonial component"'));
+    console.log(chalk26.white('   coherent chat --component "Header" "add a search button"'));
     console.log("");
   });
   cmd.command("add <name>").description("Install a specific component").action(async (name) => {
-    console.log(chalk25.yellow(`
+    console.log(chalk26.yellow(`
 \u{1F4A1} Use: coherent chat "add ${name} component"
 `));
   });
@@ -12476,25 +12828,25 @@ function createComponentsCommand() {
       console.log(JSON.stringify(manifest, null, 2));
       return;
     }
-    console.log(chalk25.bold("\n\u{1F4E6} Shared Components\n"));
+    console.log(chalk26.bold("\n\u{1F4E6} Shared Components\n"));
     if (manifest.shared.length === 0) {
-      console.log(chalk25.yellow("   No shared components yet.\n"));
-      console.log(chalk25.gray('   Create via chat: coherent chat "add a page with header and footer"\n'));
+      console.log(chalk26.yellow("   No shared components yet.\n"));
+      console.log(chalk26.gray('   Create via chat: coherent chat "add a page with header and footer"\n'));
       return;
     }
     const order = { layout: 0, section: 1, widget: 2 };
     const sorted = [...manifest.shared].sort((a, b) => order[a.type] - order[b.type] || a.name.localeCompare(b.name));
     sorted.forEach((entry) => {
-      const usedIn = entry.usedIn.length === 0 ? chalk25.gray("(not used yet)") : entry.usedIn.length === 1 && entry.usedIn[0] === "app/layout.tsx" ? chalk25.gray("layout.tsx (all pages)") : chalk25.gray(`used in: ${entry.usedIn.join(", ")}`);
-      console.log(chalk25.cyan(`  ${entry.id}`), chalk25.white(entry.name), chalk25.gray(entry.type));
+      const usedIn = entry.usedIn.length === 0 ? chalk26.gray("(not used yet)") : entry.usedIn.length === 1 && entry.usedIn[0] === "app/layout.tsx" ? chalk26.gray("layout.tsx (all pages)") : chalk26.gray(`used in: ${entry.usedIn.join(", ")}`);
+      console.log(chalk26.cyan(`  ${entry.id}`), chalk26.white(entry.name), chalk26.gray(entry.type));
       if (opts.verbose) {
-        console.log(chalk25.gray(`    file: ${entry.file}`));
-        if (entry.description) console.log(chalk25.gray(`    ${entry.description}`));
+        console.log(chalk26.gray(`    file: ${entry.file}`));
+        if (entry.description) console.log(chalk26.gray(`    ${entry.description}`));
       }
-      console.log(chalk25.gray(`    ${usedIn}`));
+      console.log(chalk26.gray(`    ${usedIn}`));
       console.log("");
     });
-    console.log(chalk25.cyan("\u{1F4A1} Modify by ID:"), chalk25.white('coherent chat "in CID-001 add a search button"\n'));
+    console.log(chalk26.cyan("\u{1F4A1} Modify by ID:"), chalk26.white('coherent chat "in CID-001 add a search button"\n'));
   });
   sharedCmd.command("add <name>").description("Create a shared component (layout/section/widget) and register in manifest").option("-t, --type <type>", "Type: layout | section | widget", "layout").option("-d, --description <desc>", "Description").action(async (name, opts) => {
     const project = findConfig();
@@ -12506,12 +12858,12 @@ function createComponentsCommand() {
       description: opts.description,
       usedIn: type === "layout" ? ["app/layout.tsx"] : []
     });
-    console.log(chalk25.green(`
+    console.log(chalk26.green(`
 \u2705 Created ${result.id} (${result.name}) at ${result.file}
 `));
     if (type === "layout") {
       const updated = await integrateSharedLayoutIntoRootLayout3(project.root);
-      if (updated) console.log(chalk25.cyan("   Updated app/layout.tsx to use shared layout components.\n"));
+      if (updated) console.log(chalk26.cyan("   Updated app/layout.tsx to use shared layout components.\n"));
     }
     const sharedPagePath = resolve14(project.root, "app/design-system/shared/page.tsx");
     if (!existsSync23(sharedPagePath)) {
@@ -12521,23 +12873,23 @@ function createComponentsCommand() {
         const config2 = dsm.getConfig();
         const written = await writeDesignSystemFiles(project.root, config2, { sharedOnly: true });
         if (written.length > 0) {
-          console.log(chalk25.cyan("   Added Design System shared pages: /design-system/shared\n"));
+          console.log(chalk26.cyan("   Added Design System shared pages: /design-system/shared\n"));
         }
       } catch (e) {
-        if (process.env.COHERENT_DEBUG === "1") console.error(chalk25.dim("DS shared pages write failed:"), e);
+        if (process.env.COHERENT_DEBUG === "1") console.error(chalk26.dim("DS shared pages write failed:"), e);
       }
     }
     try {
       await writeCursorRules(project.root);
     } catch (e) {
-      if (process.env.COHERENT_DEBUG === "1") console.error(chalk25.dim("Could not update .cursorrules:"), e);
+      if (process.env.COHERENT_DEBUG === "1") console.error(chalk26.dim("Could not update .cursorrules:"), e);
     }
   });
   return cmd;
 }
 
 // src/commands/import-cmd.ts
-import chalk26 from "chalk";
+import chalk27 from "chalk";
 import ora6 from "ora";
 import { writeFile as writeFile7, mkdir as mkdir7 } from "fs/promises";
 import { resolve as resolve15, join as join18, dirname as dirname9 } from "path";
@@ -12642,25 +12994,25 @@ function createImportCommand() {
 }
 async function importFigmaAction(urlOrKey, opts) {
   if (typeof urlOrKey !== "string" || !urlOrKey.trim()) {
-    console.error(chalk26.red("\n\u274C Figma URL or file key is required.\n"));
-    console.log(chalk26.dim("  Usage: coherent import figma <url-or-key> --token <your-token>\n"));
+    console.error(chalk27.red("\n\u274C Figma URL or file key is required.\n"));
+    console.log(chalk27.dim("  Usage: coherent import figma <url-or-key> --token <your-token>\n"));
     process.exit(1);
   }
   const token = opts.token ?? process.env.FIGMA_ACCESS_TOKEN ?? process.env.FIGMA_TOKEN;
   if (!token || typeof token !== "string") {
-    console.error(chalk26.red("\n\u274C Figma token required.\n"));
-    console.log(chalk26.dim("  Use: coherent import figma <url-or-key> --token <your-token>"));
-    console.log(chalk26.dim("  Or set FIGMA_ACCESS_TOKEN or FIGMA_TOKEN in your environment.\n"));
-    console.log(chalk26.dim("  Get a token: Figma \u2192 Settings \u2192 Personal access tokens.\n"));
+    console.error(chalk27.red("\n\u274C Figma token required.\n"));
+    console.log(chalk27.dim("  Use: coherent import figma <url-or-key> --token <your-token>"));
+    console.log(chalk27.dim("  Or set FIGMA_ACCESS_TOKEN or FIGMA_TOKEN in your environment.\n"));
+    console.log(chalk27.dim("  Get a token: Figma \u2192 Settings \u2192 Personal access tokens.\n"));
     process.exit(1);
   }
   const generatePages = opts.pages !== false;
   const dryRun = Boolean(opts.dryRun);
   const fileKey = FigmaClient.extractFileKey(urlOrKey);
   if (!fileKey) {
-    console.error(chalk26.red("\n\u274C Invalid Figma URL or file key.\n"));
-    console.log(chalk26.dim("  Use a URL like: https://www.figma.com/file/ABC123/MyDesign"));
-    console.log(chalk26.dim("  Or the file key: ABC123\n"));
+    console.error(chalk27.red("\n\u274C Invalid Figma URL or file key.\n"));
+    console.log(chalk27.dim("  Use a URL like: https://www.figma.com/file/ABC123/MyDesign"));
+    console.log(chalk27.dim("  Or the file key: ABC123\n"));
     process.exit(1);
   }
   const project = findConfig();
@@ -12837,7 +13189,7 @@ export const config = ${JSON.stringify(fullConfig, null, 2)} as const
       try {
         await writeCursorRules(projectRoot);
       } catch (e) {
-        if (process.env.COHERENT_DEBUG === "1") console.error(chalk26.dim("Could not update .cursorrules:"), e);
+        if (process.env.COHERENT_DEBUG === "1") console.error(chalk27.dim("Could not update .cursorrules:"), e);
       }
     } else {
       stats.filesWritten.push(DESIGN_SYSTEM_CONFIG_PATH);
@@ -12847,7 +13199,7 @@ export const config = ${JSON.stringify(fullConfig, null, 2)} as const
   } catch (err) {
     spinner.fail("Import failed");
     const message = err instanceof Error ? err.message : String(err);
-    console.error(chalk26.red("\n\u274C " + message + "\n"));
+    console.error(chalk27.red("\n\u274C " + message + "\n"));
     process.exit(1);
   }
 }
@@ -12855,36 +13207,36 @@ function printReport(stats, opts) {
   const { dryRun, generatePages, fileName } = opts;
   console.log("");
   if (dryRun) {
-    console.log(chalk26.yellow("\u2550\u2550\u2550 Dry run (no files written) \u2550\u2550\u2550"));
+    console.log(chalk27.yellow("\u2550\u2550\u2550 Dry run (no files written) \u2550\u2550\u2550"));
     console.log("");
   }
-  console.log(chalk26.green("\u2705 Figma import complete"));
+  console.log(chalk27.green("\u2705 Figma import complete"));
   console.log("");
-  console.log(chalk26.cyan("  Statistics"));
-  console.log(chalk26.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-  console.log(chalk26.blue(`   File: ${fileName}`));
-  console.log(chalk26.blue(`   Color styles: ${stats.colorStyles}`));
-  console.log(chalk26.blue(`   Text styles: ${stats.textStyles}`));
+  console.log(chalk27.cyan("  Statistics"));
+  console.log(chalk27.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+  console.log(chalk27.blue(`   File: ${fileName}`));
+  console.log(chalk27.blue(`   Color styles: ${stats.colorStyles}`));
+  console.log(chalk27.blue(`   Text styles: ${stats.textStyles}`));
   console.log(
-    chalk26.blue(`   Components: ${stats.componentsTotal} (${stats.baseCount} \u2192 base, ${stats.sharedCount} \u2192 shared)`)
+    chalk27.blue(`   Components: ${stats.componentsTotal} (${stats.baseCount} \u2192 base, ${stats.sharedCount} \u2192 shared)`)
   );
-  console.log(chalk26.blue(`   Pages: ${stats.pagesGenerated}${!generatePages ? " (skipped by --no-pages)" : ""}`));
-  console.log(chalk26.blue(`   design-system.config: ${stats.configUpdated ? "updated" : "\u2014"}`));
-  console.log(chalk26.blue(`   Layout (Header/Footer): ${stats.layoutIntegrated ? "integrated" : "\u2014"}`));
-  console.log(chalk26.blue(`   DS viewer files: ${stats.dsFilesWritten}`));
+  console.log(chalk27.blue(`   Pages: ${stats.pagesGenerated}${!generatePages ? " (skipped by --no-pages)" : ""}`));
+  console.log(chalk27.blue(`   design-system.config: ${stats.configUpdated ? "updated" : "\u2014"}`));
+  console.log(chalk27.blue(`   Layout (Header/Footer): ${stats.layoutIntegrated ? "integrated" : "\u2014"}`));
+  console.log(chalk27.blue(`   DS viewer files: ${stats.dsFilesWritten}`));
   console.log(
-    chalk26.blue(`   Total files ${dryRun ? "that would be written" : "written"}: ${stats.filesWritten.length}`)
+    chalk27.blue(`   Total files ${dryRun ? "that would be written" : "written"}: ${stats.filesWritten.length}`)
   );
   console.log("");
   if (stats.filesWritten.length > 0 && stats.filesWritten.length <= 30) {
-    console.log(chalk26.dim("  Files:"));
-    stats.filesWritten.forEach((f) => console.log(chalk26.dim(`    ${f}`)));
+    console.log(chalk27.dim("  Files:"));
+    stats.filesWritten.forEach((f) => console.log(chalk27.dim(`    ${f}`)));
     console.log("");
   }
 }
 
 // src/commands/ds.ts
-import chalk27 from "chalk";
+import chalk28 from "chalk";
 import ora7 from "ora";
 import { DesignSystemManager as DesignSystemManager14 } from "@getcoherent/core";
 async function dsRegenerateCommand() {
@@ -12899,16 +13251,16 @@ async function dsRegenerateCommand() {
     const config2 = dsm.getConfig();
     const written = await writeDesignSystemFiles(project.root, config2);
     spinner.succeed(`Regenerated ${written.length} Design System file(s)`);
-    console.log(chalk27.gray("   app/design-system/* and app/api/design-system/*\n"));
-    console.log(chalk27.cyan("   Open /design-system in the app to view.\n"));
+    console.log(chalk28.gray("   app/design-system/* and app/api/design-system/*\n"));
+    console.log(chalk28.cyan("   Open /design-system in the app to view.\n"));
   } catch (error) {
-    console.error(chalk27.red("\u274C Command failed:"), error instanceof Error ? error.message : "Unknown error");
+    console.error(chalk28.red("\u274C Command failed:"), error instanceof Error ? error.message : "Unknown error");
     process.exit(1);
   }
 }
 
 // src/commands/update.ts
-import chalk28 from "chalk";
+import chalk29 from "chalk";
 import ora8 from "ora";
 import { readFileSync as readFileSync17, existsSync as existsSync25 } from "fs";
 import { join as join19 } from "path";
@@ -12960,14 +13312,14 @@ async function updateCommand(opts) {
     const projectVersion = config2.coherentVersion || "0.0.0";
     if (compareSemver(projectVersion, CLI_VERSION4) === 0) {
       spinner.succeed("Project is already up to date");
-      console.log(chalk28.gray(`   Version: v${CLI_VERSION4}
+      console.log(chalk29.gray(`   Version: v${CLI_VERSION4}
 `));
       return;
     }
     if (compareSemver(projectVersion, CLI_VERSION4) > 0) {
       spinner.warn("Project was created with a newer CLI version");
-      console.log(chalk28.yellow(`   Project: v${projectVersion} \u2192 CLI: v${CLI_VERSION4}`));
-      console.log(chalk28.yellow("   Update your CLI: npm install -g @getcoherent/cli@latest\n"));
+      console.log(chalk29.yellow(`   Project: v${projectVersion} \u2192 CLI: v${CLI_VERSION4}`));
+      console.log(chalk29.yellow("   Update your CLI: npm install -g @getcoherent/cli@latest\n"));
       return;
     }
     const report = {
@@ -13013,36 +13365,36 @@ async function updateCommand(opts) {
 }
 function printReport2(report) {
   const from = report.fromVersion ? `v${report.fromVersion}` : "unknown";
-  console.log(chalk28.green(`
+  console.log(chalk29.green(`
 \u2714 Project updated: ${from} \u2192 v${report.toVersion}
 `));
   if (report.overlayFiles > 0) {
-    console.log(chalk28.white(`  \u2714 Regenerated platform overlay (${report.overlayFiles} files)`));
+    console.log(chalk29.white(`  \u2714 Regenerated platform overlay (${report.overlayFiles} files)`));
   }
   if (report.migrationsApplied.length > 0) {
     for (const desc of report.migrationsApplied) {
-      console.log(chalk28.white(`  \u2714 Migrated config: ${desc}`));
+      console.log(chalk29.white(`  \u2714 Migrated config: ${desc}`));
     }
   }
   if (report.rulesUpdated) {
-    console.log(chalk28.white("  \u2714 Updated .cursorrules and CLAUDE.md"));
+    console.log(chalk29.white("  \u2714 Updated .cursorrules and CLAUDE.md"));
   }
   if (report.missingCssVars.length > 0) {
     console.log("");
-    console.log(chalk28.yellow("  \u26A0 New CSS variables available in globals.css:"));
+    console.log(chalk29.yellow("  \u26A0 New CSS variables available in globals.css:"));
     for (const v of report.missingCssVars.slice(0, 10)) {
-      console.log(chalk28.gray(`    ${v}`));
+      console.log(chalk29.gray(`    ${v}`));
     }
     if (report.missingCssVars.length > 10) {
-      console.log(chalk28.gray(`    ... and ${report.missingCssVars.length - 10} more`));
+      console.log(chalk29.gray(`    ... and ${report.missingCssVars.length - 10} more`));
     }
     console.log("");
-    console.log(chalk28.cyan("  To add them automatically:"));
-    console.log(chalk28.white("    coherent update --patch-globals\n"));
+    console.log(chalk29.cyan("  To add them automatically:"));
+    console.log(chalk29.white("    coherent update --patch-globals\n"));
   }
   console.log("");
-  console.log(chalk28.dim("  Your pages and components were NOT modified."));
-  console.log(chalk28.dim("  Run `coherent check` to check existing pages against new rules.\n"));
+  console.log(chalk29.dim("  Your pages and components were NOT modified."));
+  console.log(chalk29.dim("  Run `coherent check` to check existing pages against new rules.\n"));
 }
 var EXPECTED_CSS_VARS = [
   "--background",
@@ -13126,7 +13478,7 @@ function patchGlobalsCss(projectRoot, missingVars) {
 }
 
 // src/commands/undo.ts
-import chalk29 from "chalk";
+import chalk30 from "chalk";
 async function undoCommand(options) {
   try {
     const project = findConfig();
@@ -13135,41 +13487,41 @@ async function undoCommand(options) {
     const backups = listBackups(projectRoot);
     if (options.list) {
       if (backups.length === 0) {
-        console.log(chalk29.yellow("No backups found."));
+        console.log(chalk30.yellow("No backups found."));
         return;
       }
-      console.log(chalk29.bold("\n\u{1F4E6} Available backups:\n"));
+      console.log(chalk30.bold("\n\u{1F4E6} Available backups:\n"));
       for (const b of backups) {
         const date = new Date(b.timestamp);
         const timeStr = date.toLocaleString();
-        console.log(chalk29.white(`  ${b.name}`));
-        console.log(chalk29.dim(`    ${timeStr} \u2014 ${b.files} file(s)`));
+        console.log(chalk30.white(`  ${b.name}`));
+        console.log(chalk30.dim(`    ${timeStr} \u2014 ${b.files} file(s)`));
         console.log();
       }
       return;
     }
     if (backups.length === 0) {
-      console.log(chalk29.yellow("No backups found. Nothing to undo."));
+      console.log(chalk30.yellow("No backups found. Nothing to undo."));
       return;
     }
     const latest = backups[0];
     const ok = restoreBackup(projectRoot, latest.name);
     if (!ok) {
-      console.log(chalk29.red("Failed to restore backup."));
+      console.log(chalk30.red("Failed to restore backup."));
       return;
     }
-    console.log(chalk29.green("\n\u2705 Restored to previous state:\n"));
-    console.log(chalk29.dim(`  Snapshot: ${new Date(latest.timestamp).toLocaleString()}`));
-    console.log(chalk29.dim(`  Files:    ${latest.files} restored`));
-    console.log(chalk29.cyan("\n  Run: coherent preview\n"));
+    console.log(chalk30.green("\n\u2705 Restored to previous state:\n"));
+    console.log(chalk30.dim(`  Snapshot: ${new Date(latest.timestamp).toLocaleString()}`));
+    console.log(chalk30.dim(`  Files:    ${latest.files} restored`));
+    console.log(chalk30.cyan("\n  Run: coherent preview\n"));
   } catch (error) {
-    console.error(chalk29.red("\u274C Undo failed:"), error instanceof Error ? error.message : "Unknown error");
+    console.error(chalk30.red("\u274C Undo failed:"), error instanceof Error ? error.message : "Unknown error");
     process.exit(1);
   }
 }
 
 // src/commands/sync.ts
-import chalk30 from "chalk";
+import chalk31 from "chalk";
 import ora9 from "ora";
 import { existsSync as existsSync26, readFileSync as readFileSync18 } from "fs";
 import { join as join20, relative as relative5, dirname as dirname10 } from "path";
@@ -13407,7 +13759,7 @@ async function syncCommand(options = {}) {
   const doTokens = runAll || options.tokens === true;
   const doComponents = runAll || options.components === true;
   const doPatterns = runAll || options.patterns === true;
-  if (dryRun) console.log(chalk30.yellow("  [dry-run] No files will be written\n"));
+  if (dryRun) console.log(chalk31.yellow("  [dry-run] No files will be written\n"));
   const spinner = ora9("Scanning project files...").start();
   try {
     const appDir = join20(project.root, "app");
@@ -13548,84 +13900,84 @@ async function syncCommand(options = {}) {
       spinner.succeed("Updated .cursorrules and CLAUDE.md");
     }
     console.log("");
-    console.log(chalk30.green(`\u2705 Design System ${dryRun ? "analyzed" : "synced"} with actual code
+    console.log(chalk31.green(`\u2705 Design System ${dryRun ? "analyzed" : "synced"} with actual code
 `));
-    console.log(chalk30.blue("\u{1F4C4} Pages:"));
+    console.log(chalk31.blue("\u{1F4C4} Pages:"));
     for (const page of discoveredPages) {
       const a = analyzePageCode(page.code);
       const comps = Object.entries(a.componentUsage || {}).filter(([, c]) => c > 0).map(([n]) => n);
-      console.log(chalk30.gray(`   ${page.route} \u2014 ${page.name}`));
-      if (comps.length > 0) console.log(chalk30.gray(`     Components: ${comps.join(", ")}`));
-      if (a.sections?.length) console.log(chalk30.gray(`     Sections: ${a.sections.map((s) => s.name).join(", ")}`));
+      console.log(chalk31.gray(`   ${page.route} \u2014 ${page.name}`));
+      if (comps.length > 0) console.log(chalk31.gray(`     Components: ${comps.join(", ")}`));
+      if (a.sections?.length) console.log(chalk31.gray(`     Sections: ${a.sections.map((s) => s.name).join(", ")}`));
     }
     if (doTokens && extractedTokens) {
       console.log("");
-      console.log(chalk30.blue("\u{1F3A8} Design Tokens (from globals.css):"));
+      console.log(chalk31.blue("\u{1F3A8} Design Tokens (from globals.css):"));
       const lc = Object.keys(extractedTokens.colors.light).length;
       const dc = Object.keys(extractedTokens.colors.dark).length;
-      console.log(chalk30.gray(`   Light: ${lc} variables | Dark: ${dc} variables`));
-      console.log(chalk30.gray(`   Default mode: ${extractedTokens.defaultMode}`));
-      if (extractedTokens.radius) console.log(chalk30.gray(`   Border radius: ${extractedTokens.radius}`));
+      console.log(chalk31.gray(`   Light: ${lc} variables | Dark: ${dc} variables`));
+      console.log(chalk31.gray(`   Default mode: ${extractedTokens.defaultMode}`));
+      if (extractedTokens.radius) console.log(chalk31.gray(`   Border radius: ${extractedTokens.radius}`));
     }
     if (doComponents && reconcileResult) {
       console.log("");
-      console.log(chalk30.blue("\u{1F9E9} Shared Components:"));
+      console.log(chalk31.blue("\u{1F9E9} Shared Components:"));
       for (const r of reconcileResult.removed) {
-        console.log(chalk30.red(`   \u{1F5D1} Removed ${r.id} (${r.name}) \u2014 ${r.reason}`));
+        console.log(chalk31.red(`   \u{1F5D1} Removed ${r.id} (${r.name}) \u2014 ${r.reason}`));
       }
       for (const u of reconcileResult.updated) {
-        console.log(chalk30.cyan(`   \u{1F4DD} Updated ${u.id} ${u.field}: ${u.from} \u2192 ${u.to}`));
+        console.log(chalk31.cyan(`   \u{1F4DD} Updated ${u.id} ${u.field}: ${u.from} \u2192 ${u.to}`));
       }
       for (const a of reconcileResult.added) {
-        console.log(chalk30.green(`   \u2728 Added ${a.id} (${a.name}) \u2014 ${a.file} (${a.type})`));
+        console.log(chalk31.green(`   \u2728 Added ${a.id} (${a.name}) \u2014 ${a.file} (${a.type})`));
       }
       for (const w of reconcileResult.warnings) {
-        console.log(chalk30.yellow(`   \u26A0 ${w.message}`));
-        console.log(chalk30.dim(`     ${w.suggestion}`));
+        console.log(chalk31.yellow(`   \u26A0 ${w.message}`));
+        console.log(chalk31.dim(`     ${w.suggestion}`));
       }
       if (reconcileResult.removed.length === 0 && reconcileResult.updated.length === 0 && reconcileResult.added.length === 0 && reconcileResult.warnings.length === 0) {
-        console.log(chalk30.gray("   All components consistent \u2713"));
+        console.log(chalk31.gray("   All components consistent \u2713"));
       }
     }
     if (doPatterns && Object.keys(stylePatterns).length > 0) {
       console.log("");
-      console.log(chalk30.blue("\u{1F4D0} Style Patterns:"));
-      if (stylePatterns.card) console.log(chalk30.gray(`   Cards: ${stylePatterns.card.slice(0, 80)}`));
-      if (stylePatterns.section) console.log(chalk30.gray(`   Sections: ${stylePatterns.section}`));
-      if (stylePatterns.terminal) console.log(chalk30.gray(`   Terminal: ${stylePatterns.terminal.slice(0, 80)}`));
-      if (stylePatterns.iconContainer) console.log(chalk30.gray(`   Icons: ${stylePatterns.iconContainer.slice(0, 80)}`));
+      console.log(chalk31.blue("\u{1F4D0} Style Patterns:"));
+      if (stylePatterns.card) console.log(chalk31.gray(`   Cards: ${stylePatterns.card.slice(0, 80)}`));
+      if (stylePatterns.section) console.log(chalk31.gray(`   Sections: ${stylePatterns.section}`));
+      if (stylePatterns.terminal) console.log(chalk31.gray(`   Terminal: ${stylePatterns.terminal.slice(0, 80)}`));
+      if (stylePatterns.iconContainer) console.log(chalk31.gray(`   Icons: ${stylePatterns.iconContainer.slice(0, 80)}`));
       if (stylePatterns.heroHeadline)
-        console.log(chalk30.gray(`   Hero headline: ${stylePatterns.heroHeadline.slice(0, 80)}`));
+        console.log(chalk31.gray(`   Hero headline: ${stylePatterns.heroHeadline.slice(0, 80)}`));
       if (stylePatterns.sectionTitle)
-        console.log(chalk30.gray(`   Section title: ${stylePatterns.sectionTitle.slice(0, 80)}`));
+        console.log(chalk31.gray(`   Section title: ${stylePatterns.sectionTitle.slice(0, 80)}`));
     }
     const tokenUsage = extractActualTokenUsage(allPageCode);
     if (tokenUsage.colors.length > 0) {
       console.log("");
-      console.log(chalk30.blue("\u{1F3F7}\uFE0F  Actual token usage (from classNames):"));
+      console.log(chalk31.blue("\u{1F3F7}\uFE0F  Actual token usage (from classNames):"));
       console.log(
-        chalk30.gray(
+        chalk31.gray(
           `   Colors: ${tokenUsage.colors.slice(0, 12).join(", ")}${tokenUsage.colors.length > 12 ? ` (+${tokenUsage.colors.length - 12})` : ""}`
         )
       );
       console.log(
-        chalk30.gray(
+        chalk31.gray(
           `   Typography: ${tokenUsage.typography.slice(0, 8).join(", ")}${tokenUsage.typography.length > 8 ? ` (+${tokenUsage.typography.length - 8})` : ""}`
         )
       );
-      console.log(chalk30.gray(`   Radius: ${tokenUsage.borderRadius.join(", ")}`));
+      console.log(chalk31.gray(`   Radius: ${tokenUsage.borderRadius.join(", ")}`));
     }
     const reusable = extractReusablePatterns(allPageCode);
     if (reusable.length > 0) {
       console.log("");
-      console.log(chalk30.blue(`\u{1F501} Repeating patterns (${reusable.length} \u2014 potential reusable components):`));
+      console.log(chalk31.blue(`\u{1F501} Repeating patterns (${reusable.length} \u2014 potential reusable components):`));
       for (const p of reusable.slice(0, 5)) {
-        console.log(chalk30.gray(`   \xD7${p.count}: ${p.sample}${p.sample.length < p.pattern.length ? "..." : ""}`));
+        console.log(chalk31.gray(`   \xD7${p.count}: ${p.sample}${p.sample.length < p.pattern.length ? "..." : ""}`));
       }
     }
     console.log("");
     if (!dryRun) {
-      console.log(chalk30.cyan("   Open /design-system in the app to see the updated view."));
+      console.log(chalk31.cyan("   Open /design-system in the app to see the updated view."));
     }
     console.log("");
   } catch (err) {
@@ -13636,7 +13988,7 @@ async function syncCommand(options = {}) {
 }
 
 // src/commands/migrate.ts
-import chalk31 from "chalk";
+import chalk32 from "chalk";
 import ora10 from "ora";
 import { existsSync as existsSync27, mkdirSync as mkdirSync8, cpSync, rmSync as rmSync6, writeFileSync as writeFileSync12, readFileSync as readFileSync19, readdirSync as readdirSync9 } from "fs";
 import { join as join21 } from "path";
@@ -13713,13 +14065,13 @@ async function migrateAction(options) {
   }
   const guard = guardPath(projectRoot);
   if (existsSync27(guard)) {
-    console.log(chalk31.yellow("A migration is already in progress."));
-    console.log(chalk31.dim("Run `coherent migrate --rollback` to undo, or delete .coherent/migration-in-progress"));
+    console.log(chalk32.yellow("A migration is already in progress."));
+    console.log(chalk32.dim("Run `coherent migrate --rollback` to undo, or delete .coherent/migration-in-progress"));
     return;
   }
   const uiDir = join21(projectRoot, "components", "ui");
   if (!existsSync27(uiDir)) {
-    console.log(chalk31.yellow("No components/ui directory found. Nothing to migrate."));
+    console.log(chalk32.yellow("No components/ui directory found. Nothing to migrate."));
     return;
   }
   const provider = getComponentProvider();
@@ -13727,16 +14079,16 @@ async function migrateAction(options) {
   const files = readdirSync9(uiDir).filter((f) => f.endsWith(".tsx"));
   const migratable = files.map((f) => f.replace(".tsx", "")).filter((id) => managedIds.has(id));
   if (migratable.length === 0) {
-    console.log(chalk31.green("All components are already up to date."));
+    console.log(chalk32.green("All components are already up to date."));
     return;
   }
-  console.log(chalk31.cyan(`
+  console.log(chalk32.cyan(`
 Found ${migratable.length} component(s) to migrate:`));
   for (const id of migratable) {
-    console.log(chalk31.dim(`  - ${id}`));
+    console.log(chalk32.dim(`  - ${id}`));
   }
   if (options.dryRun) {
-    console.log(chalk31.yellow("\n[dry-run] No changes applied."));
+    console.log(chalk32.yellow("\n[dry-run] No changes applied."));
     return;
   }
   const spinner = ora10("Migrating components...").start();
@@ -13753,12 +14105,12 @@ Found ${migratable.length} component(s) to migrate:`));
       if (result.success) {
         migrated++;
       } else {
-        console.warn(chalk31.yellow(`  \u26A0 Failed to migrate ${id}`));
+        console.warn(chalk32.yellow(`  \u26A0 Failed to migrate ${id}`));
       }
     }
     clearGuard(projectRoot);
     spinner.succeed(`Migrated ${migrated}/${migratable.length} components to real shadcn/ui`);
-    console.log(chalk31.dim(`  Backup saved to: ${backup}`));
+    console.log(chalk32.dim(`  Backup saved to: ${backup}`));
   } catch (err) {
     spinner.fail("Migration failed \u2014 rolling back");
     rollback(projectRoot);
@@ -13770,7 +14122,7 @@ Found ${migratable.length} component(s) to migrate:`));
 import { existsSync as existsSync28, mkdirSync as mkdirSync9, readFileSync as readFileSync20, writeFileSync as writeFileSync13 } from "fs";
 import { join as join22 } from "path";
 import { homedir } from "os";
-import chalk32 from "chalk";
+import chalk33 from "chalk";
 import { CLI_VERSION as CLI_VERSION5 } from "@getcoherent/core";
 var DEBUG5 = process.env.COHERENT_DEBUG === "1";
 var PACKAGE_NAME = "@getcoherent/cli";
@@ -13841,8 +14193,8 @@ async function checkForUpdates() {
 }
 function printUpdateNotice(latest) {
   console.log(
-    chalk32.yellow(`
-  \u2B06  Update available: v${CLI_VERSION5} \u2192 v${latest}`) + chalk32.dim(`
+    chalk33.yellow(`
+  \u2B06  Update available: v${CLI_VERSION5} \u2192 v${latest}`) + chalk33.dim(`
      Run: npm update -g ${PACKAGE_NAME}
 `)
   );