@getcoherent/cli 0.5.2 → 0.5.4

package/dist/index.js

@@ -362,6 +362,7 @@ function createMinimalConfig() {
       }
     },
     settings: {
+      initialized: false,
       appType: "multi-page",
       framework: "next",
       typescript: true,
@@ -2427,8 +2428,8 @@ async function createAppRouteGroupLayout(projectPath) {
 // src/commands/chat.ts
 import chalk13 from "chalk";
 import ora2 from "ora";
-import { resolve as resolve9 } from "path";
-import { existsSync as existsSync16, readFileSync as readFileSync10, mkdirSync as mkdirSync6 } from "fs";
+import { resolve as resolve9, relative as relative2 } from "path";
+import { existsSync as existsSync16, readFileSync as readFileSync10, mkdirSync as mkdirSync6, readdirSync as readdirSync2 } from "fs";
 import {
   DesignSystemManager as DesignSystemManager7,
   ComponentManager as ComponentManager4,
@@ -4516,6 +4517,7 @@ pageCode rules (shadcn/ui blocks quality):
 - BUTTON + LINK: The Button component supports asChild prop. To make a button that navigates, use <Button asChild><Link href="/path"><Plus className="size-4" /> Label</Link></Button>. Never nest <button> inside <Link> or vice versa without asChild.
 - Hover/focus on every interactive element (hover:bg-muted, focus-visible:ring-2 focus-visible:ring-ring).
 - LANGUAGE: Match the language of the user's request. English request \u2192 English page. Russian request \u2192 Russian page. Never switch languages.
+- NEVER use native HTML <select> or <option>. Always use Select, SelectTrigger, SelectValue, SelectContent, SelectItem from @/components/ui/select.
 
 NEXT.JS APP ROUTER RULE (CRITICAL \u2014 invalid code fails to compile):
 - "use client" and export const metadata are FORBIDDEN in the same file.
@@ -4605,6 +4607,26 @@ FEW-SHOT EXAMPLE \u2014 correct stat card in pageCode (follow this pattern exact
 \`\`\`
 Key: CardTitle is text-sm font-medium (NOT text-lg). Metric is text-2xl font-bold. Subtext is text-xs text-muted-foreground. Icon is size-4 text-muted-foreground.
 
+SURGICAL MODIFICATION RULES (CRITICAL for incremental edits):
+- When modifying an existing page, return the COMPLETE page code
+- Change ONLY the specific section, component, or element the user requested
+- Do NOT modify imports unless the change requires new imports
+- Do NOT change state variables, event handlers, or data in unrelated sections
+- Do NOT restyle sections the user did not mention
+- Preserve all existing className values on unchanged elements
+- If the user asks to change a "section" or "block", identify it by heading, content, or position
+
+Component Promotion Rules:
+- When the user asks to "make X a shared component" or "reuse X across pages":
+  - Use request type "promote-and-link"
+  - Extract the JSX block into a separate component file
+  - Replace inline code with the component import on all specified pages
+
+Global Component Change Rules:
+- When the user asks to change "all cards" or "every button" or similar:
+  - If the pattern is already a shared component, modify the shared component file
+  - If the pattern is inline across pages, first promote it to a shared component, then modify it
+
 OPTIONAL UX RECOMMENDATIONS:
 If you see opportunities to improve UX (accessibility, layout, consistency, responsiveness, visual hierarchy), add a short markdown block in "uxRecommendations". Otherwise omit it.
 
@@ -4712,8 +4734,8 @@ async function ensureAuthRouteGroup(projectRoot) {
   const guardPath = join6(projectRoot, "app", "ShowWhenNotAuthRoute.tsx");
   const rootLayoutPath = join6(projectRoot, "app", "layout.tsx");
   if (!existsSync9(authLayoutPath)) {
-    const { mkdir: mkdir7 } = await import("fs/promises");
-    await mkdir7(join6(projectRoot, "app", "(auth)"), { recursive: true });
+    const { mkdir: mkdir8 } = await import("fs/promises");
+    await mkdir8(join6(projectRoot, "app", "(auth)"), { recursive: true });
     await writeFile2(authLayoutPath, AUTH_LAYOUT, "utf-8");
   }
   if (!existsSync9(guardPath)) {
@@ -5021,1663 +5043,1789 @@ function fixGlobalsCss(projectRoot, config2) {
   writeFileSync7(layoutPath, layoutContent, "utf-8");
 }
 
-// src/commands/chat/utils.ts
-import { resolve as resolve5 } from "path";
-import { existsSync as existsSync13, readFileSync as readFileSync8 } from "fs";
-import { DesignSystemManager as DesignSystemManager3, loadManifest as loadManifest4 } from "@getcoherent/core";
-import chalk8 from "chalk";
-var MARKETING_ROUTES = /* @__PURE__ */ new Set(["", "landing", "pricing", "about", "contact", "blog", "features"]);
-function isMarketingRoute(route) {
-  const slug = route.replace(/^\//, "").split("/")[0] || "";
-  return MARKETING_ROUTES.has(slug);
-}
-function routeToFsPath(projectRoot, route, isAuth) {
-  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");
-  }
-  return resolve5(projectRoot, "app", "(app)", slug, "page.tsx");
-}
-function routeToRelPath(route, isAuth) {
-  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`;
-  }
-  return `app/(app)/${slug}/page.tsx`;
-}
-function deduplicatePages(pages) {
-  const normalize = (route) => route.replace(/\/$/, "").replace(/s$/, "").replace(/ue$/, "");
-  const seen = /* @__PURE__ */ new Map();
-  return pages.filter((page, idx) => {
-    const norm = normalize(page.route);
-    if (seen.has(norm)) return false;
-    seen.set(norm, idx);
-    return true;
-  });
-}
-function extractComponentIdsFromCode(code) {
-  const ids = /* @__PURE__ */ new Set();
-  const allMatches = code.matchAll(/@\/components\/((?:ui\/)?[a-z0-9-]+)/g);
-  for (const m of allMatches) {
-    if (!m[1]) continue;
-    let id = m[1];
-    if (id.startsWith("ui/")) id = id.slice(3);
-    if (id === "shared" || id.startsWith("shared/")) continue;
-    if (id) ids.add(id);
+// src/utils/quality-validator.ts
+var RAW_COLOR_RE = /(?:bg|text|border)-(gray|blue|red|green|yellow|purple|pink|indigo|orange|slate|zinc|stone|neutral|emerald|teal|cyan|sky|violet|fuchsia|rose|amber|lime)-\d+/g;
+var HEX_IN_CLASS_RE = /className="[^"]*#[0-9a-fA-F]{3,8}[^"]*"/g;
+var TEXT_BASE_RE = /\btext-base\b/g;
+var HEAVY_SHADOW_RE = /\bshadow-(md|lg|xl|2xl)\b/g;
+var SM_BREAKPOINT_RE = /\bsm:/g;
+var XL_BREAKPOINT_RE = /\bxl:/g;
+var XXL_BREAKPOINT_RE = /\b2xl:/g;
+var LARGE_CARD_TITLE_RE = /CardTitle[^>]*className="[^"]*text-(lg|xl|2xl)/g;
+var RAW_BUTTON_RE = /<button\b/g;
+var RAW_INPUT_RE = /<input\b/g;
+var RAW_SELECT_RE = /<select\b/g;
+var NATIVE_CHECKBOX_RE = /<input[^>]*type\s*=\s*["']checkbox["']/g;
+var NATIVE_TABLE_RE = /<table\b/g;
+var PLACEHOLDER_PATTERNS = [
+  />\s*Lorem ipsum\b/i,
+  />\s*Card content\s*</i,
+  />\s*Your (?:text|content) here\s*</i,
+  />\s*Description\s*</,
+  />\s*Title\s*</,
+  /placeholder\s*text/i
+];
+var GENERIC_BUTTON_LABELS = />\s*(Submit|OK|Click here|Press here|Go)\s*</i;
+var IMG_WITHOUT_ALT_RE = /<img\b(?![^>]*\balt\s*=)[^>]*>/g;
+var INPUT_TAG_RE = /<(?:Input|input)\b[^>]*>/g;
+var LABEL_FOR_RE = /<Label\b[^>]*htmlFor\s*=/;
+function isInsideCommentOrString(line, matchIndex) {
+  const commentIdx = line.indexOf("//");
+  if (commentIdx !== -1 && commentIdx < matchIndex) return true;
+  let inSingle = false;
+  let inDouble = false;
+  let inTemplate = false;
+  for (let i = 0; i < matchIndex; i++) {
+    const ch = line[i];
+    const prev = i > 0 ? line[i - 1] : "";
+    if (prev === "\\") continue;
+    if (ch === "'" && !inDouble && !inTemplate) inSingle = !inSingle;
+    if (ch === '"' && !inSingle && !inTemplate) inDouble = !inDouble;
+    if (ch === "`" && !inSingle && !inDouble) inTemplate = !inTemplate;
   }
-  return ids;
+  return inSingle || inDouble || inTemplate;
 }
-async function warnInlineDuplicates(projectRoot, pageName, pageCode, manifest) {
-  const sectionOrWidget = manifest.shared.filter((e) => e.type === "section" || e.type === "widget");
-  if (sectionOrWidget.length === 0) return;
-  for (const e of sectionOrWidget) {
-    const kebab = e.file.replace(/^components\/shared\//, "").replace(/\.tsx$/, "");
-    const hasImport = pageCode.includes(`@/components/shared/${kebab}`);
-    if (hasImport) continue;
-    const sameNameAsTag = new RegExp(`<\\/?${e.name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s>]`).test(pageCode);
-    if (sameNameAsTag) {
-      console.log(
-        chalk8.yellow(
-          `
-\u26A0 Page "${pageName}" contains inline code similar to ${e.id} (${e.name}). Consider using the shared component instead.`
-        )
-      );
-      continue;
-    }
-    try {
-      const fullPath = resolve5(projectRoot, e.file);
-      const sharedSnippet = (await readFile(fullPath)).slice(0, 600);
-      const sharedTokens = new Set(sharedSnippet.match(/\b[a-zA-Z0-9-]{4,}\b/g) ?? []);
-      const pageTokens = pageCode.match(/\b[a-zA-Z0-9-]+\b/g) ?? [];
-      let overlap = 0;
-      for (const t of sharedTokens) {
-        if (pageTokens.includes(t)) overlap++;
+function checkLines(code, pattern, type, message, severity, skipCommentsAndStrings = false) {
+  const issues = [];
+  const lines = code.split("\n");
+  let inBlockComment = false;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    if (skipCommentsAndStrings) {
+      if (inBlockComment) {
+        const endIdx = line.indexOf("*/");
+        if (endIdx !== -1) {
+          inBlockComment = false;
+        }
+        continue;
       }
-      if (overlap >= 12 && sharedTokens.size >= 10) {
-        console.log(
-          chalk8.yellow(
-            `
-\u26A0 Page "${pageName}" contains inline code similar to ${e.id} (${e.name}). Consider using the shared component instead.`
-          )
-        );
+      const blockStart = line.indexOf("/*");
+      if (blockStart !== -1 && !line.includes("*/")) {
+        inBlockComment = true;
+        continue;
       }
-    } catch {
-    }
-  }
-}
-async function loadConfig(configPath) {
-  if (!existsSync13(configPath)) {
-    throw new Error(
-      `Design system config not found at ${configPath}
-Run "coherent init" first to create a project.`
-    );
-  }
-  const manager = new DesignSystemManager3(configPath);
-  await manager.load();
-  return manager.getConfig();
-}
-function requireProject() {
-  const project = findConfig();
-  if (!project) {
-    exitNotCoherent();
-  }
-  warnIfVolatile(project.root);
-  return project;
-}
-async function resolveTargetFlags(message, options, config2, projectRoot) {
-  if (options.component) {
-    const manifest = await loadManifest4(projectRoot);
-    const target = options.component;
-    const entry = manifest.shared.find(
-      (s) => s.name.toLowerCase() === target.toLowerCase() || s.id.toLowerCase() === target.toLowerCase()
-    );
-    if (entry) {
-      const filePath = resolve5(projectRoot, entry.file);
-      let currentCode = "";
-      if (existsSync13(filePath)) {
-        currentCode = readFileSync8(filePath, "utf-8");
+      let m;
+      pattern.lastIndex = 0;
+      while ((m = pattern.exec(line)) !== null) {
+        if (!isInsideCommentOrString(line, m.index)) {
+          issues.push({ line: i + 1, type, message, severity });
+          break;
+        }
       }
-      const codeSnippet = currentCode ? `
-
-Current code of ${entry.name}:
-\`\`\`tsx
-${currentCode}
-\`\`\`` : "";
-      return `Modify the shared component ${entry.name} (${entry.id}, file: ${entry.file}): ${message}. Read the current code below and apply the requested changes. Return the full updated component code as pageCode.${codeSnippet}`;
-    }
-    console.log(chalk8.yellow(`
-\u26A0\uFE0F  Component "${target}" not found in shared components.`));
-    console.log(chalk8.dim("   Available: " + manifest.shared.map((s) => `${s.id} ${s.name}`).join(", ")));
-    console.log(chalk8.dim("   Proceeding with message as-is...\n"));
-  }
-  if (options.page) {
-    const target = options.page;
-    const page = config2.pages.find(
-      (p) => p.name.toLowerCase() === target.toLowerCase() || p.id.toLowerCase() === target.toLowerCase() || p.route === target || p.route === "/" + target
-    );
-    if (page) {
-      const relPath = page.route === "/" ? "app/page.tsx" : `app${page.route}/page.tsx`;
-      const filePath = resolve5(projectRoot, relPath);
-      let currentCode = "";
-      if (existsSync13(filePath)) {
-        currentCode = readFileSync8(filePath, "utf-8");
+    } else {
+      pattern.lastIndex = 0;
+      if (pattern.test(line)) {
+        issues.push({ line: i + 1, type, message, severity });
       }
-      const codeSnippet = currentCode ? `
-
-Current code of ${page.name} page:
-\`\`\`tsx
-${currentCode}
-\`\`\`` : "";
-      return `Update page "${page.name}" (id: ${page.id}, route: ${page.route}, file: ${relPath}): ${message}. Read the current code below and apply the requested changes.${codeSnippet}`;
     }
-    console.log(chalk8.yellow(`
-\u26A0\uFE0F  Page "${target}" not found.`));
-    console.log(chalk8.dim("   Available: " + config2.pages.map((p) => `${p.id} (${p.route})`).join(", ")));
-    console.log(chalk8.dim("   Proceeding with message as-is...\n"));
-  }
-  if (options.token) {
-    const target = options.token;
-    return `Change design token "${target}": ${message}. Update the token value in design-system.config.ts and ensure globals.css reflects the change.`;
   }
-  return message;
+  return issues;
 }
-
-// src/commands/chat/request-parser.ts
-var AUTH_FLOW_PATTERNS = {
-  "/login": ["/register", "/forgot-password"],
-  "/signin": ["/register", "/forgot-password"],
-  "/signup": ["/login"],
-  "/register": ["/login"],
-  "/forgot-password": ["/login", "/reset-password"],
-  "/reset-password": ["/login"]
-};
-var PAGE_RELATIONSHIP_RULES = [
-  {
-    trigger: /\/(products|catalog|marketplace|listings|shop|store)\b/i,
-    related: [{ id: "product-detail", name: "Product Detail", route: "/products/[id]" }]
-  },
-  {
-    trigger: /\/(blog|news|articles|posts)\b/i,
-    related: [{ id: "article-detail", name: "Article", route: "/blog/[slug]" }]
-  },
-  {
-    trigger: /\/(campaigns|ads|ad-campaigns)\b/i,
-    related: [{ id: "campaign-detail", name: "Campaign Detail", route: "/campaigns/[id]" }]
-  },
-  {
-    trigger: /\/(dashboard|admin)\b/i,
-    related: [{ id: "settings", name: "Settings", route: "/settings" }]
-  },
-  {
-    trigger: /\/pricing\b/i,
-    related: [{ id: "checkout", name: "Checkout", route: "/checkout" }]
-  }
-];
-function extractInternalLinks(code) {
-  const links = /* @__PURE__ */ new Set();
-  const hrefRe = /href\s*=\s*["'](\/[a-z0-9/-]*)["']/gi;
-  let m;
-  while ((m = hrefRe.exec(code)) !== null) {
-    const route = m[1];
-    if (route === "/" || route.startsWith("/design-system") || route.startsWith("/#") || route.startsWith("/api"))
-      continue;
-    links.add(route);
-  }
-  return [...links];
-}
-function inferRelatedPages(plannedPages) {
-  const plannedRoutes = new Set(plannedPages.map((p) => p.route));
-  const inferred = [];
-  for (const { route } of plannedPages) {
-    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 });
-          plannedRoutes.add(rel);
-        }
-      }
-    }
-    for (const rule of PAGE_RELATIONSHIP_RULES) {
-      if (rule.trigger.test(route)) {
-        for (const rel of rule.related) {
-          if (!plannedRoutes.has(rel.route)) {
-            inferred.push(rel);
-            plannedRoutes.add(rel.route);
-          }
-        }
-      }
-    }
-  }
-  return inferred;
-}
-function impliesFullWebsite(message) {
-  return /\b(create|build|make|design)\b.{0,80}\b(website|web\s*site|web\s*app|application|app|platform|portal|marketplace|site)\b/i.test(
-    message
-  );
-}
-function extractPageNamesFromMessage(message) {
-  const pages = [];
-  const known = {
-    home: "/",
-    landing: "/",
-    dashboard: "/dashboard",
-    about: "/about",
-    "about us": "/about",
-    contact: "/contact",
-    contacts: "/contacts",
-    pricing: "/pricing",
-    settings: "/settings",
-    account: "/account",
-    "personal account": "/account",
-    registration: "/registration",
-    signup: "/signup",
-    "sign up": "/signup",
-    login: "/login",
-    "sign in": "/login",
-    catalogue: "/catalogue",
-    catalog: "/catalog",
-    blog: "/blog",
-    portfolio: "/portfolio",
-    features: "/features",
-    services: "/services",
-    faq: "/faq",
-    team: "/team"
+function validatePageQuality(code, validRoutes) {
+  const issues = [];
+  const allLines = code.split("\n");
+  const isTerminalContext = (lineNum) => {
+    const start = Math.max(0, lineNum - 20);
+    const nearby = allLines.slice(start, lineNum).join(" ");
+    if (/font-mono/.test(allLines[lineNum - 1] || "")) return true;
+    if (/bg-zinc-950|bg-zinc-900/.test(nearby) && /font-mono/.test(nearby)) return true;
+    return false;
   };
-  const lower = message.toLowerCase();
-  for (const [key, route] of Object.entries(known)) {
-    if (lower.includes(key)) {
-      const name = key.split(" ").map((w) => w[0].toUpperCase() + w.slice(1)).join(" ");
-      const id = route.slice(1) || "home";
-      if (!pages.some((p) => p.route === route)) {
-        pages.push({ name, id, route });
+  issues.push(
+    ...checkLines(
+      code,
+      RAW_COLOR_RE,
+      "RAW_COLOR",
+      "Raw Tailwind color detected \u2014 use semantic tokens (bg-primary, text-muted-foreground, etc.)",
+      "error"
+    ).filter((issue) => !isTerminalContext(issue.line))
+  );
+  issues.push(
+    ...checkLines(
+      code,
+      HEX_IN_CLASS_RE,
+      "HEX_IN_CLASS",
+      "Hex color in className \u2014 use CSS variables via semantic tokens",
+      "error"
+    )
+  );
+  issues.push(
+    ...checkLines(code, TEXT_BASE_RE, "TEXT_BASE", "text-base detected \u2014 use text-sm as base font size", "warning")
+  );
+  issues.push(
+    ...checkLines(code, HEAVY_SHADOW_RE, "HEAVY_SHADOW", "Heavy shadow detected \u2014 use shadow-sm or none", "warning")
+  );
+  issues.push(
+    ...checkLines(
+      code,
+      SM_BREAKPOINT_RE,
+      "SM_BREAKPOINT",
+      "sm: breakpoint \u2014 consider if md:/lg: is sufficient",
+      "info"
+    )
+  );
+  issues.push(
+    ...checkLines(
+      code,
+      XL_BREAKPOINT_RE,
+      "XL_BREAKPOINT",
+      "xl: breakpoint \u2014 consider if md:/lg: is sufficient",
+      "info"
+    )
+  );
+  issues.push(
+    ...checkLines(
+      code,
+      XXL_BREAKPOINT_RE,
+      "XXL_BREAKPOINT",
+      "2xl: breakpoint \u2014 rarely needed, consider xl: instead",
+      "warning"
+    )
+  );
+  issues.push(
+    ...checkLines(
+      code,
+      LARGE_CARD_TITLE_RE,
+      "LARGE_CARD_TITLE",
+      "Large text on CardTitle \u2014 use text-sm font-medium",
+      "warning"
+    )
+  );
+  const codeLines = code.split("\n");
+  issues.push(
+    ...checkLines(
+      code,
+      RAW_BUTTON_RE,
+      "NATIVE_BUTTON",
+      "Native <button> \u2014 use Button from @/components/ui/button",
+      "error",
+      true
+    ).filter((issue) => {
+      const nearby = codeLines.slice(Math.max(0, issue.line - 1), issue.line + 5).join(" ");
+      if (nearby.includes("aria-label")) return false;
+      if (/onClick=\{.*copy/i.test(nearby)) return false;
+      return true;
+    })
+  );
+  issues.push(
+    ...checkLines(
+      code,
+      RAW_SELECT_RE,
+      "NATIVE_SELECT",
+      "Native <select> \u2014 use Select from @/components/ui/select",
+      "error",
+      true
+    )
+  );
+  issues.push(
+    ...checkLines(
+      code,
+      NATIVE_CHECKBOX_RE,
+      "NATIVE_CHECKBOX",
+      'Native <input type="checkbox"> \u2014 use Switch or Checkbox from @/components/ui/switch or @/components/ui/checkbox',
+      "error",
+      true
+    )
+  );
+  issues.push(
+    ...checkLines(
+      code,
+      NATIVE_TABLE_RE,
+      "NATIVE_TABLE",
+      "Native <table> \u2014 use Table, TableHeader, TableBody, etc. from @/components/ui/table",
+      "warning",
+      true
+    )
+  );
+  const hasInputImport = /import\s.*Input.*from\s+['"]@\/components\/ui\//.test(code);
+  if (!hasInputImport) {
+    issues.push(
+      ...checkLines(
+        code,
+        RAW_INPUT_RE,
+        "RAW_INPUT",
+        "Raw <input> element \u2014 import and use Input from @/components/ui/input",
+        "warning",
+        true
+      )
+    );
+  }
+  for (const pattern of PLACEHOLDER_PATTERNS) {
+    const lines = code.split("\n");
+    for (let i = 0; i < lines.length; i++) {
+      if (pattern.test(lines[i])) {
+        issues.push({
+          line: i + 1,
+          type: "PLACEHOLDER",
+          message: "Placeholder content detected \u2014 use real contextual content",
+          severity: "error"
+        });
       }
     }
   }
-  return pages;
-}
-function normalizeRequest(request, config2) {
-  const changes = request.changes;
-  const VALID_TYPES = [
-    "update-token",
-    "add-component",
-    "modify-component",
-    "add-layout-block",
-    "modify-layout-block",
-    "add-page",
-    "update-page",
-    "update-navigation",
-    "link-shared",
-    "promote-and-link"
-  ];
-  if (!VALID_TYPES.includes(request.type)) {
-    return { error: `Unknown action "${request.type}". Valid: ${VALID_TYPES.join(", ")}` };
+  const hasGrid = /\bgrid\b/.test(code);
+  const hasResponsive = /\bmd:|lg:/.test(code);
+  if (hasGrid && !hasResponsive) {
+    issues.push({
+      line: 0,
+      type: "NO_RESPONSIVE",
+      message: "Grid layout without responsive breakpoints (md: or lg:)",
+      severity: "warning"
+    });
   }
-  const findPage = (target) => config2.pages.find(
-    (p) => p.id === target || p.route === target || p.name?.toLowerCase() === String(target).toLowerCase()
-  );
-  switch (request.type) {
-    case "update-page": {
-      const page = findPage(request.target);
-      if (!page && changes?.pageCode) {
-        const targetStr = String(request.target);
-        const id = targetStr.replace(/^\//, "") || "home";
-        return {
-          ...request,
-          type: "add-page",
-          target: "new",
-          changes: {
-            id,
-            name: changes.name || id.charAt(0).toUpperCase() + id.slice(1) || "Home",
-            route: targetStr.startsWith("/") ? targetStr : `/${targetStr}`,
-            ...changes
-          }
-        };
-      }
-      if (!page) {
-        const available = config2.pages.map((p) => `${p.name} (${p.route})`).join(", ");
-        return { error: `Page "${request.target}" not found. Available: ${available || "none"}` };
-      }
-      if (page.id !== request.target) {
-        return { ...request, target: page.id };
-      }
-      break;
-    }
-    case "add-page": {
-      if (!changes) break;
-      let route = changes.route || "";
-      if (route && !route.startsWith("/")) route = `/${route}`;
-      if (route) changes.route = route;
-      const existingByRoute = config2.pages.find((p) => p.route === route);
-      if (existingByRoute && route) {
-        return {
-          ...request,
-          type: "update-page",
-          target: existingByRoute.id
-        };
-      }
-      if (!changes.id && changes.name) {
-        changes.id = String(changes.name).toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
-      }
-      if (!changes.id && route) {
-        changes.id = route.replace(/^\//, "") || "home";
-      }
-      break;
-    }
-    case "modify-component": {
-      const componentId = request.target;
-      const existingComp = config2.components.find((c) => c.id === componentId);
-      if (!existingComp) {
-        return {
-          ...request,
-          type: "add-component",
-          target: "new"
-        };
-      }
-      if (changes) {
-        if (typeof changes.id === "string" && changes.id !== componentId) {
-          const targetExists = config2.components.some((c) => c.id === changes.id);
-          if (!targetExists) {
-            return { ...request, type: "add-component", target: "new" };
-          }
-          return {
-            error: `Cannot change component "${componentId}" to "${changes.id}" \u2014 "${changes.id}" already exists.`
-          };
-        }
-        if (typeof changes.name === "string") {
-          const newName = changes.name.toLowerCase();
-          const curName = existingComp.name.toLowerCase();
-          const curId = componentId.toLowerCase();
-          const nameOk = newName === curName || newName === curId || newName.includes(curId) || curId.includes(newName);
-          if (!nameOk) {
-            delete changes.name;
-          }
-        }
-      }
-      break;
-    }
-    case "add-component": {
-      if (changes) {
-        const shadcn = changes.shadcnComponent;
-        const id = changes.id;
-        if (shadcn && id && id !== shadcn) {
-          changes.id = shadcn;
-        }
-      }
-      break;
-    }
-    case "link-shared": {
-      if (changes) {
-        const page = findPage(request.target);
-        if (!page) {
-          const available = config2.pages.map((p) => `${p.name} (${p.route})`).join(", ");
-          return { error: `Page "${request.target}" not found for link-shared. Available: ${available || "none"}` };
-        }
-        if (page.id !== request.target) {
-          return { ...request, target: page.id };
-        }
-      }
-      break;
-    }
-    case "promote-and-link": {
-      const sourcePage = findPage(request.target);
-      if (!sourcePage) {
-        const available = config2.pages.map((p) => `${p.name} (${p.route})`).join(", ");
-        return {
-          error: `Source page "${request.target}" not found for promote-and-link. Available: ${available || "none"}`
-        };
-      }
-      if (sourcePage.id !== request.target) {
-        return { ...request, target: sourcePage.id };
-      }
+  issues.push(
+    ...checkLines(
+      code,
+      IMG_WITHOUT_ALT_RE,
+      "MISSING_ALT",
+      '<img> without alt attribute \u2014 add descriptive alt or alt="" for decorative images',
+      "error"
+    )
+  );
+  issues.push(
+    ...checkLines(
+      code,
+      GENERIC_BUTTON_LABELS,
+      "GENERIC_BUTTON_TEXT",
+      'Generic button text \u2014 use specific verb ("Save changes", "Delete account")',
+      "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"
+    });
+  }
+  const headingLevels = [...code.matchAll(/<h([1-6])[\s>]/g)].map((m) => parseInt(m[1]));
+  for (let i = 1; i < headingLevels.length; i++) {
+    if (headingLevels[i] > headingLevels[i - 1] + 1) {
+      issues.push({
+        line: 0,
+        type: "SKIPPED_HEADING",
+        message: `Heading level skipped: h${headingLevels[i - 1]} \u2192 h${headingLevels[i]} \u2014 don't skip levels`,
+        severity: "warning"
+      });
       break;
     }
   }
-  return request;
-}
-function applyDefaults(request) {
-  if (request.type === "add-page" && request.changes && typeof request.changes === "object") {
-    const changes = request.changes;
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const name = changes.name || "New Page";
-    let id = changes.id || name.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
-    if (!/^[a-z]/.test(id)) id = `page-${id}`;
-    const route = changes.route || `/${id}`;
-    const hasPageCode = typeof changes.pageCode === "string" && changes.pageCode.trim() !== "";
-    const base = {
-      id,
-      name,
-      route: route.startsWith("/") ? route : `/${route}`,
-      layout: changes.layout || "centered",
-      title: changes.title || name,
-      description: changes.description || `${name} page`,
-      createdAt: changes.createdAt || now,
-      updatedAt: changes.updatedAt || now,
-      requiresAuth: changes.requiresAuth ?? false,
-      noIndex: changes.noIndex ?? false
-    };
-    const sections = Array.isArray(changes.sections) ? changes.sections.map((section, idx) => ({
-      id: section.id || `section-${idx}`,
-      name: section.name || `Section ${idx + 1}`,
-      componentId: section.componentId || "button",
-      order: typeof section.order === "number" ? section.order : idx,
-      props: section.props || {}
-    })) : [];
-    return {
-      ...request,
-      changes: {
-        ...base,
-        sections,
-        ...hasPageCode ? { pageCode: changes.pageCode, generatedWithPageCode: true } : {},
-        ...changes.pageType ? { pageType: changes.pageType } : {},
-        ...changes.structuredContent ? { structuredContent: changes.structuredContent } : {}
-      }
-    };
+  const hasLabelImport = /import\s.*Label.*from\s+['"]@\/components\/ui\//.test(code);
+  const inputCount = (code.match(INPUT_TAG_RE) || []).length;
+  const labelForCount = (code.match(LABEL_FOR_RE) || []).length;
+  if (hasLabelImport && inputCount > 0 && labelForCount === 0) {
+    issues.push({
+      line: 0,
+      type: "MISSING_LABEL",
+      message: "Inputs found but no Label with htmlFor \u2014 every input must have a visible label",
+      severity: "error"
+    });
   }
-  if (request.type === "add-component" && request.changes && typeof request.changes === "object") {
-    const changes = request.changes;
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const validSizeNames = ["xs", "sm", "md", "lg", "xl"];
-    let normalizedVariants = [];
-    if (Array.isArray(changes.variants)) {
-      normalizedVariants = changes.variants.map((v) => {
-        if (typeof v === "string") return { name: v, className: "" };
-        if (v && typeof v === "object" && "name" in v) {
-          return {
-            name: v.name,
-            className: v.className ?? ""
-          };
-        }
-        return { name: "default", className: "" };
-      });
-    }
-    let normalizedSizes = [];
-    if (Array.isArray(changes.sizes)) {
-      normalizedSizes = changes.sizes.map((s) => {
-        if (typeof s === "string") {
-          const name = validSizeNames.includes(s) ? s : "md";
-          return { name, className: "" };
-        }
-        if (s && typeof s === "object" && "name" in s) {
-          const raw = s.name;
-          const name = validSizeNames.includes(raw) ? raw : "md";
-          return { name, className: s.className ?? "" };
-        }
-        return { name: "md", className: "" };
-      });
-    }
-    return {
-      ...request,
-      changes: {
-        ...changes,
-        variants: normalizedVariants,
-        sizes: normalizedSizes,
-        createdAt: now,
-        updatedAt: now
-      }
-    };
+  if (!hasLabelImport && inputCount > 0 && !/<label\b/i.test(code)) {
+    issues.push({
+      line: 0,
+      type: "MISSING_LABEL",
+      message: "Inputs found but no Label component \u2014 import Label and add htmlFor on each input",
+      severity: "error"
+    });
   }
-  if (request.type === "modify-component" && request.changes && typeof request.changes === "object") {
-    const changes = request.changes;
-    const validSizeNames = ["xs", "sm", "md", "lg", "xl"];
-    let normalizedVariants;
-    if (Array.isArray(changes.variants)) {
-      normalizedVariants = changes.variants.map((v) => {
-        if (typeof v === "string") return { name: v, className: "" };
-        if (v && typeof v === "object" && "name" in v) {
-          return {
-            name: v.name,
-            className: v.className ?? ""
-          };
-        }
-        return { name: "default", className: "" };
-      });
-    }
-    let normalizedSizes;
-    if (Array.isArray(changes.sizes)) {
-      normalizedSizes = changes.sizes.map((s) => {
-        if (typeof s === "string") {
-          const name = validSizeNames.includes(s) ? s : "md";
-          return { name, className: "" };
-        }
-        if (s && typeof s === "object" && "name" in s) {
-          const raw = s.name;
-          const name = validSizeNames.includes(raw) ? raw : "md";
-          return { name, className: s.className ?? "" };
-        }
-        return { name: "md", className: "" };
-      });
-    }
-    return {
-      ...request,
-      changes: {
-        ...changes,
-        ...normalizedVariants !== void 0 && { variants: normalizedVariants },
-        ...normalizedSizes !== void 0 && { sizes: normalizedSizes }
-      }
-    };
+  const hasPlaceholder = /placeholder\s*=/.test(code);
+  if (hasPlaceholder && inputCount > 0 && labelForCount === 0 && !/<label\b/i.test(code) && !/<Label\b/.test(code)) {
+    issues.push({
+      line: 0,
+      type: "PLACEHOLDER_ONLY_LABEL",
+      message: "Inputs use placeholder only \u2014 add visible Label with htmlFor (placeholder is not a substitute)",
+      severity: "error"
+    });
   }
-  return request;
-}
-
-// src/utils/page-analyzer.ts
-var FORM_COMPONENTS = /* @__PURE__ */ new Set(["Input", "Textarea", "Label", "Select", "Checkbox", "Switch"]);
-var VISUAL_WORDS = /\b(grid lines?|glow|radial|gradient|blur|shadow|overlay|animation|particles?|dots?|vertical|horizontal|decorat|behind|background|divider|spacer|wrapper|container|inner|outer|absolute|relative|translate|opacity|z-index|transition)\b/i;
-function analyzePageCode(code) {
-  return {
-    sections: extractSections(code),
-    componentUsage: extractComponentUsage(code),
-    iconCount: extractIconCount(code),
-    layoutPattern: inferLayoutPattern(code),
-    hasForm: detectFormUsage(code),
-    analyzedAt: (/* @__PURE__ */ new Date()).toISOString()
-  };
-}
-function extractSections(code) {
-  const sections = [];
-  const seen = /* @__PURE__ */ new Set();
-  const commentRe = /\{\/\*\s*(.+?)\s*\*\/\}/g;
-  let m;
-  while ((m = commentRe.exec(code)) !== null) {
-    const raw = m[1].trim();
-    const name = raw.replace(/[─━—–]+/g, "").replace(/\s*section\s*$/i, "").replace(/^section\s*:\s*/i, "").trim();
-    if (!name || name.length <= 1 || name.length >= 40) continue;
-    if (seen.has(name.toLowerCase())) continue;
-    const wordCount = name.split(/\s+/).length;
-    if (wordCount > 5) continue;
-    if (/[{}()=<>;:`"']/.test(name)) continue;
-    if (/^[a-z]/.test(name) && wordCount > 2) continue;
-    if (VISUAL_WORDS.test(name)) continue;
-    seen.add(name.toLowerCase());
-    sections.push({ name, order: sections.length });
+  const hasInteractive = /<Button\b|<button\b|<a\b/.test(code);
+  const hasFocusVisible = /focus-visible:/.test(code);
+  const usesShadcnButton = /import\s.*Button.*from\s+['"]@\/components\/ui\//.test(code);
+  if (hasInteractive && !hasFocusVisible && !usesShadcnButton) {
+    issues.push({
+      line: 0,
+      type: "MISSING_FOCUS_VISIBLE",
+      message: "Interactive elements without focus-visible styles \u2014 add focus-visible:ring-2 focus-visible:ring-ring",
+      severity: "info"
+    });
   }
-  if (sections.length === 0) {
-    const sectionTagRe = /<section[^>]*>[\s\S]*?<h[12][^>]*>\s*([^<]+)/g;
-    while ((m = sectionTagRe.exec(code)) !== null) {
-      const name = m[1].trim();
-      if (name && name.length > 1 && name.length < 40 && !seen.has(name.toLowerCase())) {
-        seen.add(name.toLowerCase());
-        sections.push({ name, order: sections.length });
+  const hasTableOrList = /<Table\b|<table\b|\.map\s*\(|<ul\b|<ol\b/.test(code);
+  const hasEmptyCheck = /\.length\s*[=!]==?\s*0|\.length\s*>\s*0|\.length\s*<\s*1|No\s+\w+\s+found|empty|no results|EmptyState|empty state/i.test(
+    code
+  );
+  if (hasTableOrList && !hasEmptyCheck) {
+    issues.push({
+      line: 0,
+      type: "NO_EMPTY_STATE",
+      message: "List/table/grid without empty state handling \u2014 add friendly message + primary action",
+      severity: "warning"
+    });
+  }
+  const hasDataFetching = /fetch\s*\(|useQuery|useSWR|useEffect\s*\([^)]*fetch|getData|loadData/i.test(code);
+  const hasLoadingPattern = /skeleton|Skeleton|spinner|Spinner|isLoading|loading|Loading/.test(code);
+  if (hasDataFetching && !hasLoadingPattern) {
+    issues.push({
+      line: 0,
+      type: "NO_LOADING_STATE",
+      message: "Page with data fetching but no loading/skeleton pattern \u2014 add skeleton or spinner",
+      severity: "warning"
+    });
+  }
+  const hasGenericError = /Something went wrong|"Error"|'Error'|>Error<\//.test(code) || /error\.message\s*\|\|\s*["']Error["']/.test(code);
+  if (hasGenericError) {
+    issues.push({
+      line: 0,
+      type: "EMPTY_ERROR_MESSAGE",
+      message: "Generic error message detected \u2014 use what happened + why + what to do next",
+      severity: "warning"
+    });
+  }
+  const hasDestructive = /variant\s*=\s*["']destructive["']|Delete|Remove/.test(code);
+  const hasConfirm = /AlertDialog|Dialog.*confirm|confirm\s*\(|onConfirm|are you sure/i.test(code);
+  if (hasDestructive && !hasConfirm) {
+    issues.push({
+      line: 0,
+      type: "DESTRUCTIVE_NO_CONFIRM",
+      message: "Destructive action without confirmation dialog \u2014 add confirm before execution",
+      severity: "warning"
+    });
+  }
+  const hasFormSubmit = /<form\b|onSubmit|type\s*=\s*["']submit["']/.test(code);
+  const hasFeedback = /toast|success|error|Saved|Saving|saving|setError|setSuccess/i.test(code);
+  if (hasFormSubmit && !hasFeedback) {
+    issues.push({
+      line: 0,
+      type: "FORM_NO_FEEDBACK",
+      message: 'Form with submit but no success/error feedback pattern \u2014 add "Saving..." then "Saved" or error',
+      severity: "info"
+    });
+  }
+  const hasNav = /<nav\b|NavLink|navigation|sidebar.*link|Sidebar.*link/i.test(code);
+  const hasActiveState = /pathname|active|current|aria-current|data-active/.test(code);
+  if (hasNav && !hasActiveState) {
+    issues.push({
+      line: 0,
+      type: "NAV_NO_ACTIVE_STATE",
+      message: "Navigation without active/current page indicator \u2014 add active state for current route",
+      severity: "info"
+    });
+  }
+  if (validRoutes && validRoutes.length > 0) {
+    const routeSet = new Set(validRoutes);
+    routeSet.add("#");
+    const lines = code.split("\n");
+    const linkHrefRe = /href\s*=\s*["'](\/[a-z0-9/-]*)["']/gi;
+    for (let i = 0; i < lines.length; i++) {
+      let match;
+      while ((match = linkHrefRe.exec(lines[i])) !== null) {
+        const target = match[1];
+        if (target === "/" || target.startsWith("/design-system") || target.startsWith("/api") || target.startsWith("/#"))
+          continue;
+        if (!routeSet.has(target)) {
+          issues.push({
+            line: i + 1,
+            type: "BROKEN_INTERNAL_LINK",
+            message: `Link to "${target}" \u2014 route does not exist in project`,
+            severity: "warning"
+          });
+        }
       }
     }
   }
-  return sections;
+  return issues;
 }
-function extractComponentUsage(code) {
-  const usage = {};
-  const importRe = /import\s*\{([^}]+)\}\s*from\s*['"]@\/components\/ui\/[^'"]+['"]/g;
-  const importedComponents = [];
-  let m;
-  while ((m = importRe.exec(code)) !== null) {
-    const names = m[1].split(",").map((s) => s.trim()).filter(Boolean);
-    importedComponents.push(...names);
+async function autoFixCode(code) {
+  const fixes = [];
+  let fixed = code;
+  const beforeQuoteFix = fixed;
+  fixed = fixed.replace(/(:\s*'.+)\\'(\s*)$/gm, "$1'$2");
+  if (fixed !== beforeQuoteFix) {
+    fixes.push("fixed escaped closing quotes in strings");
   }
-  for (const comp of importedComponents) {
-    const re = new RegExp(`<${comp}[\\s/>]`, "g");
-    const matches = code.match(re);
-    usage[comp] = matches ? matches.length : 0;
+  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");
+  if (fixed !== beforeEntityFix) {
+    fixes.push("Fixed syntax issues");
   }
-  return usage;
-}
-function extractIconCount(code) {
-  const m = code.match(/import\s*\{([^}]+)\}\s*from\s*['"]lucide-react['"]/);
-  if (!m) return 0;
-  return m[1].split(",").map((s) => s.trim()).filter(Boolean).length;
-}
-function inferLayoutPattern(code) {
-  const funcBodyMatch = code.match(/return\s*\(\s*(<[^]*)/s);
-  const topLevel = funcBodyMatch ? funcBodyMatch[1].slice(0, 500) : code.slice(0, 800);
-  if (/grid-cols|grid\s+md:grid-cols|grid\s+lg:grid-cols/.test(topLevel)) return "grid";
-  if (/sidebar|aside/.test(topLevel)) return "sidebar";
-  if (/max-w-\d|mx-auto|container/.test(topLevel)) return "centered";
-  if (/min-h-screen|min-h-svh/.test(topLevel)) return "full-width";
-  return "unknown";
-}
-function detectFormUsage(code) {
-  const importRe = /import\s*\{([^}]+)\}\s*from\s*['"]@\/components\/ui\/[^'"]+['"]/g;
-  let m;
-  while ((m = importRe.exec(code)) !== null) {
-    const names = m[1].split(",").map((s) => s.trim());
-    if (names.some((n) => FORM_COMPONENTS.has(n))) return true;
+  const beforeLtFix = fixed;
+  fixed = fixed.replace(/>([^<{}\n]*)<(\d)/g, ">$1&lt;$2");
+  fixed = fixed.replace(/>([^<{}\n]*)<([^/a-zA-Z!{>\n])/g, ">$1&lt;$2");
+  if (fixed !== beforeLtFix) {
+    fixes.push("escaped < in JSX text content");
   }
-  return false;
-}
-function summarizePageAnalysis(pageName, route, analysis) {
-  const parts = [`${pageName} (${route})`];
-  if (analysis.sections && analysis.sections.length > 0) {
-    parts.push(`sections: ${analysis.sections.map((s) => s.name).join(", ")}`);
+  if (/className="[^"]*\btext-base\b[^"]*"/.test(fixed)) {
+    fixed = fixed.replace(/className="([^"]*)\btext-base\b([^"]*)"/g, 'className="$1text-sm$2"');
+    fixes.push("text-base \u2192 text-sm");
   }
-  if (analysis.componentUsage) {
-    const entries = Object.entries(analysis.componentUsage).filter(([, c]) => c > 0);
-    if (entries.length > 0) {
-      parts.push(`uses: ${entries.map(([n, c]) => `${n}(${c})`).join(", ")}`);
-    }
+  if (/CardTitle[^>]*className="[^"]*text-(lg|xl|2xl)/.test(fixed)) {
+    fixed = fixed.replace(/(CardTitle[^>]*className="[^"]*)text-(lg|xl|2xl)\b/g, "$1");
+    fixes.push("large text in CardTitle \u2192 removed");
   }
-  if (analysis.layoutPattern && analysis.layoutPattern !== "unknown") {
-    parts.push(`layout: ${analysis.layoutPattern}`);
+  if (/className="[^"]*\bshadow-(md|lg|xl|2xl)\b[^"]*"/.test(fixed)) {
+    fixed = fixed.replace(/className="([^"]*)\bshadow-(md|lg|xl|2xl)\b([^"]*)"/g, 'className="$1shadow-sm$3"');
+    fixes.push("heavy shadow \u2192 shadow-sm");
   }
-  if (analysis.hasForm) parts.push("has-form");
-  return `- ${parts.join(". ")}`;
-}
+  const hasHooks = /\b(useState|useEffect|useRef|useCallback|useMemo|useReducer|useContext)\b/.test(fixed);
+  const hasEvents = /\b(onClick|onChange|onSubmit|onBlur|onFocus|onKeyDown|onKeyUp|onMouseEnter|onMouseLeave|onScroll|onInput)\s*[={]/.test(
+    fixed
+  );
+  const hasUseClient = /^['"]use client['"]/.test(fixed.trim());
+  if ((hasHooks || hasEvents) && !hasUseClient) {
+    fixed = `'use client'
 
-// src/utils/concurrency.ts
-async function pMap(items, fn, concurrency = 3) {
-  const results = new Array(items.length);
-  let nextIndex = 0;
-  async function worker() {
-    while (nextIndex < items.length) {
-      const i = nextIndex++;
-      results[i] = await fn(items[i], i);
-    }
+${fixed}`;
+    fixes.push('added "use client" (client features detected)');
   }
-  const workers = Array.from({ length: Math.min(concurrency, items.length) }, () => worker());
-  await Promise.all(workers);
-  return results;
-}
-
-// src/commands/chat/split-generator.ts
-function buildExistingPagesContext(config2) {
-  const pages = config2.pages || [];
-  const analyzed = pages.filter((p) => p.pageAnalysis);
-  if (analyzed.length === 0) return "";
-  const lines = analyzed.map((p) => {
-    return summarizePageAnalysis(p.name || p.id, p.route, p.pageAnalysis);
-  });
-  let ctx = `EXISTING PAGES CONTEXT:
-${lines.join("\n")}
-
-Use consistent component choices, spacing, and layout patterns across all pages. Match the style and structure of existing pages.`;
-  const sp = config2.stylePatterns;
-  if (sp && typeof sp === "object") {
-    const parts = [];
-    if (sp.card) parts.push(`Cards: ${sp.card}`);
-    if (sp.section) parts.push(`Sections: ${sp.section}`);
-    if (sp.terminal) parts.push(`Terminal blocks: ${sp.terminal}`);
-    if (sp.iconContainer) parts.push(`Icon containers: ${sp.iconContainer}`);
-    if (sp.heroHeadline) parts.push(`Hero headline: ${sp.heroHeadline}`);
-    if (sp.sectionTitle) parts.push(`Section title: ${sp.sectionTitle}`);
-    if (parts.length > 0) {
-      ctx += `
-
-PROJECT STYLE PATTERNS (from sync \u2014 match these exactly):
-${parts.join("\n")}`;
+  if (/^['"]use client['"]/.test(fixed.trim()) && /\bexport\s+const\s+metadata\s*:\s*Metadata\s*=\s*\{/.test(fixed)) {
+    const metaMatch = fixed.match(/\bexport\s+const\s+metadata\s*:\s*Metadata\s*=\s*\{/);
+    if (metaMatch) {
+      const start = fixed.indexOf(metaMatch[0]);
+      const open = fixed.indexOf("{", start);
+      let depth = 1, i = open + 1;
+      while (i < fixed.length && depth > 0) {
+        if (fixed[i] === "{") depth++;
+        else if (fixed[i] === "}") depth--;
+        i++;
+      }
+      const tail = fixed.slice(i);
+      const semi = tail.match(/^\s*;/);
+      const removeEnd = semi ? i + (semi.index + semi[0].length) : i;
+      fixed = (fixed.slice(0, start) + fixed.slice(removeEnd)).replace(/\n{3,}/g, "\n\n").trim();
+      fixes.push('removed metadata export (conflicts with "use client")');
     }
   }
-  return ctx;
-}
-function extractStyleContext(pageCode) {
-  const unique = (arr) => [...new Set(arr)];
-  const cardClasses = (pageCode.match(/className="[^"]*(?:rounded|border|shadow|bg-card)[^"]*"/g) || []).map((m) => m.replace(/className="|"/g, "")).filter((c) => c.includes("rounded") || c.includes("border") || c.includes("card"));
-  const sectionSpacing = unique(pageCode.match(/py-\d+(?:\s+md:py-\d+)?/g) || []);
-  const headingStyles = unique(pageCode.match(/text-(?:\d*xl|lg)\s+font-(?:bold|semibold|medium)/g) || []);
-  const colorPatterns = unique(
-    (pageCode.match(
-      /(?:text|bg|border)-(?:primary|secondary|muted|accent|card|destructive|foreground|background)\S*/g
-    ) || []).concat(
-      pageCode.match(
-        /(?:text|bg|border)-(?:emerald|blue|violet|rose|amber|zinc|slate|gray|green|red|orange|indigo|purple|teal|cyan)\S*/g
-      ) || []
-    )
-  );
-  const iconPatterns = unique(pageCode.match(/(?:rounded-\S+\s+)?p-\d+(?:\.\d+)?\s*(?:bg-\S+)?/g) || []).filter(
-    (p) => p.includes("bg-") || p.includes("rounded")
-  );
-  const buttonPatterns = unique(
-    (pageCode.match(/className="[^"]*(?:hover:|active:)[^"]*"/g) || []).map((m) => m.replace(/className="|"/g, "")).filter((c) => c.includes("px-") || c.includes("py-") || c.includes("rounded"))
-  );
-  const bgPatterns = unique(pageCode.match(/bg-(?:muted|card|background|zinc|slate|gray)\S*/g) || []);
-  const gapPatterns = unique(pageCode.match(/gap-\d+/g) || []);
-  const gridPatterns = unique(pageCode.match(/grid-cols-\d+|md:grid-cols-\d+|lg:grid-cols-\d+/g) || []);
-  const containerPatterns = unique(pageCode.match(/container\s+max-w-\S+|max-w-\d+xl\s+mx-auto/g) || []);
-  const lines = [];
-  if (containerPatterns.length > 0) {
-    lines.push(`Container (MUST match for alignment with header/footer): ${containerPatterns[0]} px-4`);
+  const lines = fixed.split("\n");
+  let hasReplacedButton = false;
+  for (let i = 0; i < lines.length; i++) {
+    if (!/<button\b/.test(lines[i])) continue;
+    if (lines[i].includes("aria-label")) continue;
+    if (/onClick=\{.*copy/i.test(lines[i])) continue;
+    const block = lines.slice(i, i + 5).join(" ");
+    if (block.includes("aria-label") || /onClick=\{.*copy/i.test(block)) continue;
+    lines[i] = lines[i].replace(/<button\b/g, "<Button");
+    hasReplacedButton = true;
   }
-  if (cardClasses.length > 0) lines.push(`Cards: ${unique(cardClasses).slice(0, 4).join(" | ")}`);
-  if (sectionSpacing.length > 0) lines.push(`Section spacing: ${sectionSpacing.join(", ")}`);
-  if (headingStyles.length > 0) lines.push(`Headings: ${headingStyles.join(", ")}`);
-  if (colorPatterns.length > 0) lines.push(`Colors: ${colorPatterns.slice(0, 15).join(", ")}`);
-  if (iconPatterns.length > 0) lines.push(`Icon containers: ${iconPatterns.slice(0, 4).join(" | ")}`);
-  if (buttonPatterns.length > 0) lines.push(`Buttons: ${buttonPatterns.slice(0, 3).join(" | ")}`);
-  if (bgPatterns.length > 0) lines.push(`Section backgrounds: ${bgPatterns.slice(0, 6).join(", ")}`);
-  if (gapPatterns.length > 0) lines.push(`Gaps: ${gapPatterns.join(", ")}`);
-  if (gridPatterns.length > 0) lines.push(`Grids: ${gridPatterns.join(", ")}`);
-  if (lines.length === 0) return "";
-  return `STYLE CONTEXT (match these patterns exactly for visual consistency with the Home page):
-${lines.map((l) => `  - ${l}`).join("\n")}`;
-}
-async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts) {
-  let pageNames = [];
-  spinner.start("Phase 1/4 \u2014 Planning pages...");
-  try {
-    const planResult = await parseModification(message, modCtx, provider, { ...parseOpts, planOnly: true });
-    const pageReqs = planResult.requests.filter((r) => r.type === "add-page");
-    pageNames = pageReqs.map((r) => {
-      const c = r.changes;
-      const name = c.name || c.id || "page";
-      const id = c.id || name.toLowerCase().replace(/\s+/g, "-");
-      const route = c.route || `/${id}`;
-      return { name, id, route };
+  if (hasReplacedButton) {
+    fixed = lines.join("\n");
+    fixed = fixed.replace(/<\/button>/g, (_match, _offset) => {
+      return "</Button>";
     });
-  } catch {
-    spinner.text = "AI plan failed \u2014 extracting pages from your request...";
-  }
-  if (pageNames.length === 0) {
-    pageNames = extractPageNamesFromMessage(message);
-  }
-  if (pageNames.length === 0) {
-    spinner.fail("Could not determine pages to create");
-    return [];
-  }
-  pageNames = deduplicatePages(pageNames);
-  const hasHomePage = pageNames.some((p) => p.route === "/");
-  if (!hasHomePage) {
-    const userPages = (modCtx.config.pages || []).filter(
-      (p) => p.id !== "home" && p.id !== "new" && p.route !== "/"
-    );
-    const isFreshProject = userPages.length === 0;
-    if (isFreshProject || impliesFullWebsite(message)) {
-      pageNames.unshift({ name: "Home", id: "home", route: "/" });
+    const openCount = (fixed.match(/<Button\b/g) || []).length;
+    const closeCount = (fixed.match(/<\/Button>/g) || []).length;
+    if (closeCount > openCount) {
+      let excess = closeCount - openCount;
+      fixed = fixed.replace(/<\/Button>/g, (m) => {
+        if (excess > 0) {
+          excess--;
+          return "</button>";
+        }
+        return m;
+      });
     }
-  }
-  const existingRoutes = new Set((modCtx.config.pages || []).map((p) => p.route).filter(Boolean));
-  const inferred = inferRelatedPages(pageNames).filter((p) => !existingRoutes.has(p.route));
-  if (inferred.length > 0) {
-    pageNames.push(...inferred);
-    pageNames = deduplicatePages(pageNames);
-  }
-  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/4 \u2014 Found ${pageNames.length} pages${inferredNote}: ${allPagesList}`);
-  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));
-  spinner.start(`Phase 2/4 \u2014 Generating ${homePage.name} page (sets design direction)...`);
-  let homeRequest = null;
-  let homePageCode = "";
-  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.`,
-      modCtx,
-      provider,
-      parseOpts
-    );
-    const codePage = homeResult.requests.find((r) => r.type === "add-page");
-    if (codePage) {
-      homeRequest = codePage;
-      homePageCode = codePage.changes?.pageCode || "";
+    const hasButtonImport = /import\s.*\bButton\b.*from\s+['"]@\/components\/ui\/button['"]/.test(fixed);
+    if (!hasButtonImport) {
+      const lastImportIdx = fixed.lastIndexOf("\nimport ");
+      if (lastImportIdx !== -1) {
+        const lineEnd = fixed.indexOf("\n", lastImportIdx + 1);
+        fixed = fixed.slice(0, lineEnd + 1) + "import { Button } from '@/components/ui/button'\n" + fixed.slice(lineEnd + 1);
+      } else {
+        const insertAfter = hasUseClient ? fixed.indexOf("\n") + 1 : 0;
+        fixed = fixed.slice(0, insertAfter) + "import { Button } from '@/components/ui/button'\n" + fixed.slice(insertAfter);
+      }
     }
-  } catch {
-  }
-  if (!homeRequest) {
-    homeRequest = {
-      type: "add-page",
-      target: "new",
-      changes: { id: homePage.id, name: homePage.name, route: homePage.route }
-    };
-  }
-  spinner.succeed(`Phase 2/4 \u2014 ${homePage.name} page generated`);
-  spinner.start("Phase 3/4 \u2014 Extracting design patterns...");
-  const styleContext = homePageCode ? extractStyleContext(homePageCode) : "";
-  if (styleContext) {
-    const lineCount = styleContext.split("\n").length - 1;
-    spinner.succeed(`Phase 3/4 \u2014 Extracted ${lineCount} style patterns from ${homePage.name}`);
-  } else {
-    spinner.succeed("Phase 3/4 \u2014 No style patterns extracted (Home page had no code)");
-  }
-  if (remainingPages.length === 0) {
-    return [homeRequest];
+    fixes.push("<button> \u2192 <Button> (with import)");
   }
-  spinner.start(`Phase 4/4 \u2014 Generating ${remainingPages.length} pages in parallel...`);
-  const sharedNote = "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 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 existingPagesContext = buildExistingPagesContext(modCtx.config);
-  const AI_CONCURRENCY = 3;
-  let phase4Done = 0;
-  const remainingRequests = await pMap(
-    remainingPages,
-    async ({ name, id, route }) => {
-      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.`,
-        sharedNote,
-        routeNote,
-        alignmentNote,
-        existingPagesContext,
-        styleContext
-      ].filter(Boolean).join("\n\n");
-      try {
-        const result = await parseModification(prompt, modCtx, provider, parseOpts);
-        phase4Done++;
-        spinner.text = `Phase 4/4 \u2014 ${phase4Done}/${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/4 \u2014 ${phase4Done}/${remainingPages.length} pages generated...`;
-        return { type: "add-page", target: "new", changes: { id, name, route } };
-      }
-    },
-    AI_CONCURRENCY
-  );
-  const allRequests = [homeRequest, ...remainingRequests];
-  const withCode = allRequests.filter((r) => r.changes?.pageCode).length;
-  spinner.succeed(`Phase 4/4 \u2014 Generated ${allRequests.length} pages (${withCode} with full code)`);
-  return allRequests;
-}
-
-// src/commands/chat/modification-handler.ts
-import { resolve as resolve7 } from "path";
-import { mkdir as mkdir3 } from "fs/promises";
-import { dirname as dirname6 } from "path";
-import chalk11 from "chalk";
-import {
-  getTemplateForPageType,
-  loadManifest as loadManifest5,
-  saveManifest,
-  updateUsedIn,
-  findSharedComponentByIdOrName,
-  generateSharedComponent as generateSharedComponent3
-} from "@getcoherent/core";
-
-// src/utils/quality-validator.ts
-var RAW_COLOR_RE = /(?:bg|text|border)-(gray|blue|red|green|yellow|purple|pink|indigo|orange|slate|zinc|stone|neutral|emerald|teal|cyan|sky|violet|fuchsia|rose|amber|lime)-\d+/g;
-var HEX_IN_CLASS_RE = /className="[^"]*#[0-9a-fA-F]{3,8}[^"]*"/g;
-var TEXT_BASE_RE = /\btext-base\b/g;
-var HEAVY_SHADOW_RE = /\bshadow-(md|lg|xl|2xl)\b/g;
-var SM_BREAKPOINT_RE = /\bsm:/g;
-var XL_BREAKPOINT_RE = /\bxl:/g;
-var XXL_BREAKPOINT_RE = /\b2xl:/g;
-var LARGE_CARD_TITLE_RE = /CardTitle[^>]*className="[^"]*text-(lg|xl|2xl)/g;
-var RAW_BUTTON_RE = /<button\b/g;
-var RAW_INPUT_RE = /<input\b/g;
-var RAW_SELECT_RE = /<select\b/g;
-var NATIVE_CHECKBOX_RE = /<input[^>]*type\s*=\s*["']checkbox["']/g;
-var NATIVE_TABLE_RE = /<table\b/g;
-var PLACEHOLDER_PATTERNS = [
-  />\s*Lorem ipsum\b/i,
-  />\s*Card content\s*</i,
-  />\s*Your (?:text|content) here\s*</i,
-  />\s*Description\s*</,
-  />\s*Title\s*</,
-  /placeholder\s*text/i
-];
-var GENERIC_BUTTON_LABELS = />\s*(Submit|OK|Click here|Press here|Go)\s*</i;
-var IMG_WITHOUT_ALT_RE = /<img\b(?![^>]*\balt\s*=)[^>]*>/g;
-var INPUT_TAG_RE = /<(?:Input|input)\b[^>]*>/g;
-var LABEL_FOR_RE = /<Label\b[^>]*htmlFor\s*=/;
-function isInsideCommentOrString(line, matchIndex) {
-  const commentIdx = line.indexOf("//");
-  if (commentIdx !== -1 && commentIdx < matchIndex) return true;
-  let inSingle = false;
-  let inDouble = false;
-  let inTemplate = false;
-  for (let i = 0; i < matchIndex; i++) {
-    const ch = line[i];
-    const prev = i > 0 ? line[i - 1] : "";
-    if (prev === "\\") continue;
-    if (ch === "'" && !inDouble && !inTemplate) inSingle = !inSingle;
-    if (ch === '"' && !inSingle && !inTemplate) inDouble = !inDouble;
-    if (ch === "`" && !inSingle && !inDouble) inTemplate = !inTemplate;
-  }
-  return inSingle || inDouble || inTemplate;
-}
-function checkLines(code, pattern, type, message, severity, skipCommentsAndStrings = false) {
-  const issues = [];
-  const lines = code.split("\n");
-  let inBlockComment = false;
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    if (skipCommentsAndStrings) {
-      if (inBlockComment) {
-        const endIdx = line.indexOf("*/");
-        if (endIdx !== -1) {
-          inBlockComment = false;
+  const colorMap = {
+    "bg-zinc-950": "bg-background",
+    "bg-zinc-900": "bg-background",
+    "bg-slate-950": "bg-background",
+    "bg-slate-900": "bg-background",
+    "bg-gray-950": "bg-background",
+    "bg-gray-900": "bg-background",
+    "bg-zinc-800": "bg-muted",
+    "bg-slate-800": "bg-muted",
+    "bg-gray-800": "bg-muted",
+    "bg-zinc-100": "bg-muted",
+    "bg-slate-100": "bg-muted",
+    "bg-gray-100": "bg-muted",
+    "bg-white": "bg-background",
+    "bg-black": "bg-background",
+    "text-white": "text-foreground",
+    "text-black": "text-foreground",
+    "text-zinc-100": "text-foreground",
+    "text-zinc-200": "text-foreground",
+    "text-slate-100": "text-foreground",
+    "text-gray-100": "text-foreground",
+    "text-zinc-400": "text-muted-foreground",
+    "text-zinc-500": "text-muted-foreground",
+    "text-slate-400": "text-muted-foreground",
+    "text-slate-500": "text-muted-foreground",
+    "text-gray-400": "text-muted-foreground",
+    "text-gray-500": "text-muted-foreground",
+    "border-zinc-700": "border-border",
+    "border-zinc-800": "border-border",
+    "border-slate-700": "border-border",
+    "border-gray-700": "border-border",
+    "border-zinc-200": "border-border",
+    "border-slate-200": "border-border",
+    "border-gray-200": "border-border"
+  };
+  const isCodeContext = (classes) => /\bfont-mono\b/.test(classes) || /\bbg-zinc-950\b/.test(classes) || /\bbg-zinc-900\b/.test(classes);
+  const isInsideTerminalBlock = (offset) => {
+    const preceding = fixed.slice(Math.max(0, offset - 600), offset);
+    if (!/(bg-zinc-950|bg-zinc-900)/.test(preceding)) return false;
+    if (!/font-mono/.test(preceding)) return false;
+    const lastClose = Math.max(preceding.lastIndexOf("</div>"), preceding.lastIndexOf("</section>"));
+    const lastTerminal = Math.max(preceding.lastIndexOf("bg-zinc-950"), preceding.lastIndexOf("bg-zinc-900"));
+    return lastTerminal > lastClose;
+  };
+  let hadColorFix = false;
+  fixed = fixed.replace(/className="([^"]*)"/g, (fullMatch, classes, offset) => {
+    if (isCodeContext(classes)) return fullMatch;
+    if (isInsideTerminalBlock(offset)) return fullMatch;
+    let result = classes;
+    const accentColorRe = /\b(bg|text|border)-(emerald|blue|violet|indigo|purple|teal|cyan|sky|rose|amber|red|green|yellow|pink|orange|fuchsia|lime)-(\d+)\b/g;
+    result = result.replace(accentColorRe, (m, prefix, color, shade) => {
+      if (colorMap[m]) {
+        hadColorFix = true;
+        return colorMap[m];
+      }
+      const n = parseInt(shade);
+      const isDestructive = color === "red";
+      if (prefix === "bg") {
+        if (n >= 500 && n <= 700) {
+          hadColorFix = true;
+          return isDestructive ? "bg-destructive" : "bg-primary";
+        }
+        if (n >= 100 && n <= 200) {
+          hadColorFix = true;
+          return isDestructive ? "bg-destructive/10" : "bg-primary/10";
+        }
+        if (n >= 300 && n <= 400) {
+          hadColorFix = true;
+          return isDestructive ? "bg-destructive/20" : "bg-primary/20";
+        }
+        if (n >= 800) {
+          hadColorFix = true;
+          return "bg-muted";
         }
-        continue;
       }
-      const blockStart = line.indexOf("/*");
-      if (blockStart !== -1 && !line.includes("*/")) {
-        inBlockComment = true;
-        continue;
+      if (prefix === "text") {
+        if (n >= 400 && n <= 600) {
+          hadColorFix = true;
+          return isDestructive ? "text-destructive" : "text-primary";
+        }
+        if (n >= 100 && n <= 300) {
+          hadColorFix = true;
+          return "text-foreground";
+        }
+        if (n >= 700) {
+          hadColorFix = true;
+          return "text-foreground";
+        }
       }
-      let m;
-      pattern.lastIndex = 0;
-      while ((m = pattern.exec(line)) !== null) {
-        if (!isInsideCommentOrString(line, m.index)) {
-          issues.push({ line: i + 1, type, message, severity });
-          break;
+      if (prefix === "border") {
+        hadColorFix = true;
+        return isDestructive ? "border-destructive" : "border-primary";
+      }
+      return m;
+    });
+    const neutralColorRe = /\b(bg|text|border)-(zinc|slate|gray|neutral|stone)-(\d+)\b/g;
+    result = result.replace(neutralColorRe, (m, prefix, _color, shade) => {
+      if (colorMap[m]) {
+        hadColorFix = true;
+        return colorMap[m];
+      }
+      const n = parseInt(shade);
+      if (prefix === "bg") {
+        if (n >= 800) {
+          hadColorFix = true;
+          return "bg-background";
+        }
+        if (n >= 100 && n <= 300) {
+          hadColorFix = true;
+          return "bg-muted";
         }
       }
-    } else {
-      pattern.lastIndex = 0;
-      if (pattern.test(line)) {
-        issues.push({ line: i + 1, type, message, severity });
+      if (prefix === "text") {
+        if (n >= 100 && n <= 300) {
+          hadColorFix = true;
+          return "text-foreground";
+        }
+        if (n >= 400 && n <= 600) {
+          hadColorFix = true;
+          return "text-muted-foreground";
+        }
+      }
+      if (prefix === "border") {
+        hadColorFix = true;
+        return "border-border";
+      }
+      return m;
+    });
+    if (result !== classes) return `className="${result}"`;
+    return fullMatch;
+  });
+  if (hadColorFix) fixes.push("raw colors \u2192 semantic tokens");
+  const selectRe = /<select\b[^>]*>([\s\S]*?)<\/select>/g;
+  let hadSelectFix = false;
+  fixed = fixed.replace(selectRe, (_match, inner) => {
+    const options = [];
+    const optionRe = /<option\s+value="([^"]*)"[^>]*>([^<]*)<\/option>/g;
+    let optMatch;
+    while ((optMatch = optionRe.exec(inner)) !== null) {
+      options.push({ value: optMatch[1], label: optMatch[2] });
+    }
+    if (options.length === 0) return _match;
+    hadSelectFix = true;
+    const items = options.map((o) => `            <SelectItem value="${o.value}">${o.label}</SelectItem>`).join("\n");
+    return `<Select>
+          <SelectTrigger>
+            <SelectValue placeholder="Select..." />
+          </SelectTrigger>
+          <SelectContent>
+${items}
+          </SelectContent>
+        </Select>`;
+  });
+  if (hadSelectFix) {
+    fixes.push("<select> \u2192 shadcn Select");
+    const selectImport = `import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select'`;
+    if (!/from\s+['"]@\/components\/ui\/select['"]/.test(fixed)) {
+      const replaced = fixed.replace(
+        /(import\s+\{[^}]*\}\s+from\s+['"]@\/components\/ui\/[^'"]+['"])/,
+        `$1
+${selectImport}`
+      );
+      if (replaced !== fixed) {
+        fixed = replaced;
+      } else {
+        fixed = selectImport + "\n" + fixed;
       }
     }
   }
-  return issues;
-}
-function validatePageQuality(code, validRoutes) {
-  const issues = [];
-  const allLines = code.split("\n");
-  const isTerminalContext = (lineNum) => {
-    const start = Math.max(0, lineNum - 20);
-    const nearby = allLines.slice(start, lineNum).join(" ");
-    if (/font-mono/.test(allLines[lineNum - 1] || "")) return true;
-    if (/bg-zinc-950|bg-zinc-900/.test(nearby) && /font-mono/.test(nearby)) return true;
-    return false;
-  };
-  issues.push(
-    ...checkLines(
-      code,
-      RAW_COLOR_RE,
-      "RAW_COLOR",
-      "Raw Tailwind color detected \u2014 use semantic tokens (bg-primary, text-muted-foreground, etc.)",
-      "error"
-    ).filter((issue) => !isTerminalContext(issue.line))
-  );
-  issues.push(
-    ...checkLines(
-      code,
-      HEX_IN_CLASS_RE,
-      "HEX_IN_CLASS",
-      "Hex color in className \u2014 use CSS variables via semantic tokens",
-      "error"
-    )
-  );
-  issues.push(
-    ...checkLines(code, TEXT_BASE_RE, "TEXT_BASE", "text-base detected \u2014 use text-sm as base font size", "warning")
-  );
-  issues.push(
-    ...checkLines(code, HEAVY_SHADOW_RE, "HEAVY_SHADOW", "Heavy shadow detected \u2014 use shadow-sm or none", "warning")
-  );
-  issues.push(
-    ...checkLines(
-      code,
-      SM_BREAKPOINT_RE,
-      "SM_BREAKPOINT",
-      "sm: breakpoint \u2014 consider if md:/lg: is sufficient",
-      "info"
-    )
-  );
-  issues.push(
-    ...checkLines(
-      code,
-      XL_BREAKPOINT_RE,
-      "XL_BREAKPOINT",
-      "xl: breakpoint \u2014 consider if md:/lg: is sufficient",
-      "info"
-    )
-  );
-  issues.push(
-    ...checkLines(
-      code,
-      XXL_BREAKPOINT_RE,
-      "XXL_BREAKPOINT",
-      "2xl: breakpoint \u2014 rarely needed, consider xl: instead",
-      "warning"
-    )
-  );
-  issues.push(
-    ...checkLines(
-      code,
-      LARGE_CARD_TITLE_RE,
-      "LARGE_CARD_TITLE",
-      "Large text on CardTitle \u2014 use text-sm font-medium",
-      "warning"
-    )
-  );
-  const codeLines = code.split("\n");
-  issues.push(
-    ...checkLines(
-      code,
-      RAW_BUTTON_RE,
-      "NATIVE_BUTTON",
-      "Native <button> \u2014 use Button from @/components/ui/button",
-      "error",
-      true
-    ).filter((issue) => {
-      const nearby = codeLines.slice(Math.max(0, issue.line - 1), issue.line + 5).join(" ");
-      if (nearby.includes("aria-label")) return false;
-      if (/onClick=\{.*copy/i.test(nearby)) return false;
-      return true;
-    })
-  );
-  issues.push(
-    ...checkLines(
-      code,
-      RAW_SELECT_RE,
-      "NATIVE_SELECT",
-      "Native <select> \u2014 use Select from @/components/ui/select",
-      "error",
-      true
-    )
-  );
-  issues.push(
-    ...checkLines(
-      code,
-      NATIVE_CHECKBOX_RE,
-      "NATIVE_CHECKBOX",
-      'Native <input type="checkbox"> \u2014 use Switch or Checkbox from @/components/ui/switch or @/components/ui/checkbox',
-      "error",
-      true
-    )
-  );
-  issues.push(
-    ...checkLines(
-      code,
-      NATIVE_TABLE_RE,
-      "NATIVE_TABLE",
-      "Native <table> \u2014 use Table, TableHeader, TableBody, etc. from @/components/ui/table",
-      "warning",
-      true
-    )
-  );
-  const hasInputImport = /import\s.*Input.*from\s+['"]@\/components\/ui\//.test(code);
-  if (!hasInputImport) {
-    issues.push(
-      ...checkLines(
-        code,
-        RAW_INPUT_RE,
-        "RAW_INPUT",
-        "Raw <input> element \u2014 import and use Input from @/components/ui/input",
-        "warning",
-        true
-      )
-    );
+  const lucideImportMatch = fixed.match(/import\s*\{([^}]+)\}\s*from\s*["']lucide-react["']/);
+  if (lucideImportMatch) {
+    let lucideExports = null;
+    try {
+      const { createRequire } = await import("module");
+      const require2 = createRequire(process.cwd() + "/package.json");
+      const lr = require2("lucide-react");
+      lucideExports = new Set(Object.keys(lr).filter((k) => /^[A-Z]/.test(k)));
+    } catch {
+    }
+    if (lucideExports) {
+      const nonLucideImports = /* @__PURE__ */ new Set();
+      for (const m of fixed.matchAll(/import\s*\{([^}]+)\}\s*from\s*["'](?!lucide-react)([^"']+)["']/g)) {
+        m[1].split(",").map((s) => s.trim()).filter(Boolean).forEach((n) => nonLucideImports.add(n));
+      }
+      const iconNames = lucideImportMatch[1].split(",").map((s) => s.trim()).filter(Boolean);
+      const duplicates = iconNames.filter((name) => nonLucideImports.has(name));
+      let newImport = lucideImportMatch[1];
+      for (const dup of duplicates) {
+        newImport = newImport.replace(new RegExp(`\\b${dup}\\b,?\\s*`), "");
+        fixes.push(`removed ${dup} from lucide import (conflicts with UI component import)`);
+      }
+      const invalid = iconNames.filter((name) => !lucideExports.has(name) && !nonLucideImports.has(name));
+      if (invalid.length > 0) {
+        const fallback = "Circle";
+        for (const bad of invalid) {
+          const re = new RegExp(`\\b${bad}\\b`, "g");
+          newImport = newImport.replace(re, fallback);
+          fixed = fixed.replace(re, fallback);
+        }
+        fixes.push(`invalid lucide icons \u2192 ${fallback}: ${invalid.join(", ")}`);
+      }
+      if (duplicates.length > 0 || invalid.length > 0) {
+        const importedNames = [
+          ...new Set(
+            newImport.split(",").map((s) => s.trim()).filter(Boolean)
+          )
+        ];
+        const originalImportLine = lucideImportMatch[0];
+        fixed = fixed.replace(originalImportLine, `import { ${importedNames.join(", ")} } from "lucide-react"`);
+      }
+    }
   }
-  for (const pattern of PLACEHOLDER_PATTERNS) {
-    const lines = code.split("\n");
-    for (let i = 0; i < lines.length; i++) {
-      if (pattern.test(lines[i])) {
-        issues.push({
-          line: i + 1,
-          type: "PLACEHOLDER",
-          message: "Placeholder content detected \u2014 use real contextual content",
-          severity: "error"
-        });
+  const lucideImportMatch2 = fixed.match(/import\s*\{([^}]+)\}\s*from\s*["']lucide-react["']/);
+  if (lucideImportMatch2) {
+    let lucideExports2 = null;
+    try {
+      const { createRequire } = await import("module");
+      const req = createRequire(process.cwd() + "/package.json");
+      const lr = req("lucide-react");
+      lucideExports2 = new Set(Object.keys(lr).filter((k) => /^[A-Z]/.test(k)));
+    } catch {
+    }
+    if (lucideExports2) {
+      const allImportedNames = /* @__PURE__ */ new Set();
+      for (const m of fixed.matchAll(/import\s*\{([^}]+)\}\s*from/g)) {
+        m[1].split(",").map((s) => s.trim()).filter(Boolean).forEach((n) => allImportedNames.add(n));
+      }
+      for (const m of fixed.matchAll(/import\s+([A-Z]\w+)\s+from/g)) {
+        allImportedNames.add(m[1]);
+      }
+      const lucideImported = new Set(
+        lucideImportMatch2[1].split(",").map((s) => s.trim()).filter(Boolean)
+      );
+      const jsxIconRefs = [...new Set([...fixed.matchAll(/<([A-Z][a-zA-Z]*Icon)\s/g)].map((m) => m[1]))];
+      const missing = [];
+      for (const ref of jsxIconRefs) {
+        if (allImportedNames.has(ref)) continue;
+        if (fixed.includes(`function ${ref}`) || fixed.includes(`const ${ref}`)) continue;
+        const baseName = ref.replace(/Icon$/, "");
+        if (lucideExports2.has(ref)) {
+          missing.push(ref);
+          lucideImported.add(ref);
+        } else if (lucideExports2.has(baseName)) {
+          const re = new RegExp(`\\b${ref}\\b`, "g");
+          fixed = fixed.replace(re, baseName);
+          missing.push(baseName);
+          lucideImported.add(baseName);
+          fixes.push(`renamed ${ref} \u2192 ${baseName} (lucide-react)`);
+        } else {
+          const fallback = "Circle";
+          const re = new RegExp(`\\b${ref}\\b`, "g");
+          fixed = fixed.replace(re, fallback);
+          lucideImported.add(fallback);
+          fixes.push(`unknown icon ${ref} \u2192 ${fallback}`);
+        }
+      }
+      if (missing.length > 0) {
+        const allNames = [...lucideImported];
+        const origLine = lucideImportMatch2[0];
+        fixed = fixed.replace(origLine, `import { ${allNames.join(", ")} } from "lucide-react"`);
+        fixes.push(`added missing lucide imports: ${missing.join(", ")}`);
       }
     }
   }
-  const hasGrid = /\bgrid\b/.test(code);
-  const hasResponsive = /\bmd:|lg:/.test(code);
-  if (hasGrid && !hasResponsive) {
+  fixed = fixed.replace(/className="([^"]*)"/g, (_match, inner) => {
+    const cleaned = inner.replace(/\s{2,}/g, " ").trim();
+    return `className="${cleaned}"`;
+  });
+  let imgCounter = 1;
+  const beforeImgFix = fixed;
+  fixed = fixed.replace(/["']\/api\/placeholder\/(\d+)\/(\d+)["']/g, (_m, w, h) => {
+    return `"https://picsum.photos/${w}/${h}?random=${imgCounter++}"`;
+  });
+  fixed = fixed.replace(/["']\/placeholder-avatar[^"']*["']/g, () => {
+    return `"https://i.pravatar.cc/150?u=user${imgCounter++}"`;
+  });
+  fixed = fixed.replace(/["']https?:\/\/via\.placeholder\.com\/(\d+)x?(\d*)(?:\/[^"']*)?\/?["']/g, (_m, w, h) => {
+    const height = h || w;
+    return `"https://picsum.photos/${w}/${height}?random=${imgCounter++}"`;
+  });
+  fixed = fixed.replace(/["']\/images\/[^"']+\.(?:jpg|jpeg|png|webp|gif)["']/g, () => {
+    return `"https://picsum.photos/800/400?random=${imgCounter++}"`;
+  });
+  fixed = fixed.replace(/["']\/placeholder[^"']*\.(?:jpg|jpeg|png|webp)["']/g, () => {
+    return `"https://picsum.photos/800/400?random=${imgCounter++}"`;
+  });
+  if (fixed !== beforeImgFix) {
+    fixes.push("placeholder images \u2192 working URLs (picsum/pravatar)");
+  }
+  return { code: fixed, fixes };
+}
+function formatIssues(issues) {
+  if (issues.length === 0) return "";
+  const errors = issues.filter((i) => i.severity === "error");
+  const warnings = issues.filter((i) => i.severity === "warning");
+  const infos = issues.filter((i) => i.severity === "info");
+  const lines = [];
+  if (errors.length > 0) {
+    lines.push(`  \u274C ${errors.length} error(s):`);
+    for (const e of errors) {
+      lines.push(`     L${e.line}: [${e.type}] ${e.message}`);
+    }
+  }
+  if (warnings.length > 0) {
+    lines.push(`  \u26A0\uFE0F  ${warnings.length} warning(s):`);
+    for (const w of warnings) {
+      lines.push(`     L${w.line}: [${w.type}] ${w.message}`);
+    }
+  }
+  if (infos.length > 0) {
+    lines.push(`  \u2139\uFE0F  ${infos.length} info:`);
+    for (const i of infos) {
+      lines.push(`     L${i.line}: [${i.type}] ${i.message}`);
+    }
+  }
+  return lines.join("\n");
+}
+function checkDesignConsistency(code) {
+  const warnings = [];
+  const hexPattern = /\[#[0-9a-fA-F]{3,8}\]/g;
+  for (const match of code.matchAll(hexPattern)) {
+    warnings.push({
+      type: "hardcoded-color",
+      message: `Hardcoded color ${match[0]} \u2014 use a design token (e.g., bg-primary) instead`
+    });
+  }
+  const spacingPattern = /[pm][trblxy]?-\[\d+px\]/g;
+  for (const match of code.matchAll(spacingPattern)) {
+    warnings.push({
+      type: "arbitrary-spacing",
+      message: `Arbitrary spacing ${match[0]} \u2014 use Tailwind spacing scale instead`
+    });
+  }
+  return warnings;
+}
+function verifyIncrementalEdit(before, after) {
+  const issues = [];
+  const hookPattern = /\buse[A-Z]\w+\s*\(/;
+  if (hookPattern.test(after) && !after.includes("'use client'") && !after.includes('"use client"')) {
     issues.push({
-      line: 0,
-      type: "NO_RESPONSIVE",
-      message: "Grid layout without responsive breakpoints (md: or lg:)",
-      severity: "warning"
+      type: "missing-use-client",
+      message: 'Code uses React hooks but missing "use client" directive'
     });
   }
-  issues.push(
-    ...checkLines(
-      code,
-      IMG_WITHOUT_ALT_RE,
-      "MISSING_ALT",
-      '<img> without alt attribute \u2014 add descriptive alt or alt="" for decorative images',
-      "error"
-    )
-  );
-  issues.push(
-    ...checkLines(
-      code,
-      GENERIC_BUTTON_LABELS,
-      "GENERIC_BUTTON_TEXT",
-      'Generic button text \u2014 use specific verb ("Save changes", "Delete account")',
-      "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) {
+  if (!after.includes("export default")) {
     issues.push({
-      line: 0,
-      type: "MULTIPLE_H1",
-      message: `Page has ${h1Matches.length} <h1> elements \u2014 use exactly one per page`,
-      severity: "warning"
+      type: "missing-default-export",
+      message: "Missing default export \u2014 page component must have a default export"
     });
   }
-  const headingLevels = [...code.matchAll(/<h([1-6])[\s>]/g)].map((m) => parseInt(m[1]));
-  for (let i = 1; i < headingLevels.length; i++) {
-    if (headingLevels[i] > headingLevels[i - 1] + 1) {
-      issues.push({
-        line: 0,
-        type: "SKIPPED_HEADING",
-        message: `Heading level skipped: h${headingLevels[i - 1]} \u2192 h${headingLevels[i]} \u2014 don't skip levels`,
-        severity: "warning"
-      });
-      break;
-    }
-  }
-  const hasLabelImport = /import\s.*Label.*from\s+['"]@\/components\/ui\//.test(code);
-  const inputCount = (code.match(INPUT_TAG_RE) || []).length;
-  const labelForCount = (code.match(LABEL_FOR_RE) || []).length;
-  if (hasLabelImport && inputCount > 0 && labelForCount === 0) {
-    issues.push({
-      line: 0,
-      type: "MISSING_LABEL",
-      message: "Inputs found but no Label with htmlFor \u2014 every input must have a visible label",
-      severity: "error"
-    });
+  const importRegex = /import\s+\{([^}]+)\}\s+from/g;
+  const beforeImports = /* @__PURE__ */ new Set();
+  const afterImports = /* @__PURE__ */ new Set();
+  for (const match of before.matchAll(importRegex)) {
+    match[1].split(",").forEach((s) => beforeImports.add(s.trim()));
   }
-  if (!hasLabelImport && inputCount > 0 && !/<label\b/i.test(code)) {
-    issues.push({
-      line: 0,
-      type: "MISSING_LABEL",
-      message: "Inputs found but no Label component \u2014 import Label and add htmlFor on each input",
-      severity: "error"
-    });
+  for (const match of after.matchAll(importRegex)) {
+    match[1].split(",").forEach((s) => afterImports.add(s.trim()));
   }
-  const hasPlaceholder = /placeholder\s*=/.test(code);
-  if (hasPlaceholder && inputCount > 0 && labelForCount === 0 && !/<label\b/i.test(code) && !/<Label\b/.test(code)) {
-    issues.push({
-      line: 0,
-      type: "PLACEHOLDER_ONLY_LABEL",
-      message: "Inputs use placeholder only \u2014 add visible Label with htmlFor (placeholder is not a substitute)",
-      severity: "error"
-    });
+  for (const symbol of beforeImports) {
+    if (!afterImports.has(symbol) && symbol.length > 0) {
+      const codeWithoutImports = after.replace(/^import\s+.*$/gm, "");
+      const symbolRegex = new RegExp(`\\b${symbol}\\b`);
+      if (symbolRegex.test(codeWithoutImports)) {
+        issues.push({
+          type: "missing-import",
+          symbol,
+          message: `Import for "${symbol}" was removed but symbol is still used in code`
+        });
+      }
+    }
   }
-  const hasInteractive = /<Button\b|<button\b|<a\b/.test(code);
-  const hasFocusVisible = /focus-visible:/.test(code);
-  const usesShadcnButton = /import\s.*Button.*from\s+['"]@\/components\/ui\//.test(code);
-  if (hasInteractive && !hasFocusVisible && !usesShadcnButton) {
-    issues.push({
-      line: 0,
-      type: "MISSING_FOCUS_VISIBLE",
-      message: "Interactive elements without focus-visible styles \u2014 add focus-visible:ring-2 focus-visible:ring-ring",
-      severity: "info"
-    });
+  return issues;
+}
+
+// src/commands/chat/utils.ts
+import { resolve as resolve5 } from "path";
+import { existsSync as existsSync13, readFileSync as readFileSync8 } from "fs";
+import { DesignSystemManager as DesignSystemManager3, loadManifest as loadManifest4 } from "@getcoherent/core";
+import chalk8 from "chalk";
+var MARKETING_ROUTES = /* @__PURE__ */ new Set(["", "landing", "pricing", "about", "contact", "blog", "features"]);
+function isMarketingRoute(route) {
+  const slug = route.replace(/^\//, "").split("/")[0] || "";
+  return MARKETING_ROUTES.has(slug);
+}
+function routeToFsPath(projectRoot, route, isAuth) {
+  const slug = route.replace(/^\//, "");
+  if (isAuth) {
+    return resolve5(projectRoot, "app", "(auth)", slug || "login", "page.tsx");
   }
-  const hasTableOrList = /<Table\b|<table\b|\.map\s*\(|<ul\b|<ol\b/.test(code);
-  const hasEmptyCheck = /\.length\s*[=!]==?\s*0|\.length\s*>\s*0|\.length\s*<\s*1|No\s+\w+\s+found|empty|no results|EmptyState|empty state/i.test(
-    code
-  );
-  if (hasTableOrList && !hasEmptyCheck) {
-    issues.push({
-      line: 0,
-      type: "NO_EMPTY_STATE",
-      message: "List/table/grid without empty state handling \u2014 add friendly message + primary action",
-      severity: "warning"
-    });
+  if (!slug) {
+    return resolve5(projectRoot, "app", "page.tsx");
   }
-  const hasDataFetching = /fetch\s*\(|useQuery|useSWR|useEffect\s*\([^)]*fetch|getData|loadData/i.test(code);
-  const hasLoadingPattern = /skeleton|Skeleton|spinner|Spinner|isLoading|loading|Loading/.test(code);
-  if (hasDataFetching && !hasLoadingPattern) {
-    issues.push({
-      line: 0,
-      type: "NO_LOADING_STATE",
-      message: "Page with data fetching but no loading/skeleton pattern \u2014 add skeleton or spinner",
-      severity: "warning"
-    });
+  if (isMarketingRoute(route)) {
+    return resolve5(projectRoot, "app", slug, "page.tsx");
   }
-  const hasGenericError = /Something went wrong|"Error"|'Error'|>Error<\//.test(code) || /error\.message\s*\|\|\s*["']Error["']/.test(code);
-  if (hasGenericError) {
-    issues.push({
-      line: 0,
-      type: "EMPTY_ERROR_MESSAGE",
-      message: "Generic error message detected \u2014 use what happened + why + what to do next",
-      severity: "warning"
-    });
+  return resolve5(projectRoot, "app", "(app)", slug, "page.tsx");
+}
+function routeToRelPath(route, isAuth) {
+  const slug = route.replace(/^\//, "");
+  if (isAuth) {
+    return `app/(auth)/${slug || "login"}/page.tsx`;
   }
-  const hasDestructive = /variant\s*=\s*["']destructive["']|Delete|Remove/.test(code);
-  const hasConfirm = /AlertDialog|Dialog.*confirm|confirm\s*\(|onConfirm|are you sure/i.test(code);
-  if (hasDestructive && !hasConfirm) {
-    issues.push({
-      line: 0,
-      type: "DESTRUCTIVE_NO_CONFIRM",
-      message: "Destructive action without confirmation dialog \u2014 add confirm before execution",
-      severity: "warning"
-    });
+  if (!slug) {
+    return "app/page.tsx";
   }
-  const hasFormSubmit = /<form\b|onSubmit|type\s*=\s*["']submit["']/.test(code);
-  const hasFeedback = /toast|success|error|Saved|Saving|saving|setError|setSuccess/i.test(code);
-  if (hasFormSubmit && !hasFeedback) {
-    issues.push({
-      line: 0,
-      type: "FORM_NO_FEEDBACK",
-      message: 'Form with submit but no success/error feedback pattern \u2014 add "Saving..." then "Saved" or error',
-      severity: "info"
-    });
+  if (isMarketingRoute(route)) {
+    return `app/${slug}/page.tsx`;
   }
-  const hasNav = /<nav\b|NavLink|navigation|sidebar.*link|Sidebar.*link/i.test(code);
-  const hasActiveState = /pathname|active|current|aria-current|data-active/.test(code);
-  if (hasNav && !hasActiveState) {
-    issues.push({
-      line: 0,
-      type: "NAV_NO_ACTIVE_STATE",
-      message: "Navigation without active/current page indicator \u2014 add active state for current route",
-      severity: "info"
-    });
+  return `app/(app)/${slug}/page.tsx`;
+}
+function deduplicatePages(pages) {
+  const normalize = (route) => route.replace(/\/$/, "").replace(/s$/, "").replace(/ue$/, "");
+  const seen = /* @__PURE__ */ new Map();
+  return pages.filter((page, idx) => {
+    const norm = normalize(page.route);
+    if (seen.has(norm)) return false;
+    seen.set(norm, idx);
+    return true;
+  });
+}
+function extractComponentIdsFromCode(code) {
+  const ids = /* @__PURE__ */ new Set();
+  const allMatches = code.matchAll(/@\/components\/((?:ui\/)?[a-z0-9-]+)/g);
+  for (const m of allMatches) {
+    if (!m[1]) continue;
+    let id = m[1];
+    if (id.startsWith("ui/")) id = id.slice(3);
+    if (id === "shared" || id.startsWith("shared/")) continue;
+    if (id) ids.add(id);
   }
-  if (validRoutes && validRoutes.length > 0) {
-    const routeSet = new Set(validRoutes);
-    routeSet.add("#");
-    const lines = code.split("\n");
-    const linkHrefRe = /href\s*=\s*["'](\/[a-z0-9/-]*)["']/gi;
-    for (let i = 0; i < lines.length; i++) {
-      let match;
-      while ((match = linkHrefRe.exec(lines[i])) !== null) {
-        const target = match[1];
-        if (target === "/" || target.startsWith("/design-system") || target.startsWith("/api") || target.startsWith("/#"))
-          continue;
-        if (!routeSet.has(target)) {
-          issues.push({
-            line: i + 1,
-            type: "BROKEN_INTERNAL_LINK",
-            message: `Link to "${target}" \u2014 route does not exist in project`,
-            severity: "warning"
-          });
-        }
+  return ids;
+}
+async function warnInlineDuplicates(projectRoot, pageName, pageCode, manifest) {
+  const sectionOrWidget = manifest.shared.filter((e) => e.type === "section" || e.type === "widget");
+  if (sectionOrWidget.length === 0) return;
+  for (const e of sectionOrWidget) {
+    const kebab = e.file.replace(/^components\/shared\//, "").replace(/\.tsx$/, "");
+    const hasImport = pageCode.includes(`@/components/shared/${kebab}`);
+    if (hasImport) continue;
+    const sameNameAsTag = new RegExp(`<\\/?${e.name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s>]`).test(pageCode);
+    if (sameNameAsTag) {
+      console.log(
+        chalk8.yellow(
+          `
+\u26A0 Page "${pageName}" contains inline code similar to ${e.id} (${e.name}). Consider using the shared component instead.`
+        )
+      );
+      continue;
+    }
+    try {
+      const fullPath = resolve5(projectRoot, e.file);
+      const sharedSnippet = (await readFile(fullPath)).slice(0, 600);
+      const sharedTokens = new Set(sharedSnippet.match(/\b[a-zA-Z0-9-]{4,}\b/g) ?? []);
+      const pageTokens = pageCode.match(/\b[a-zA-Z0-9-]+\b/g) ?? [];
+      let overlap = 0;
+      for (const t of sharedTokens) {
+        if (pageTokens.includes(t)) overlap++;
+      }
+      if (overlap >= 12 && sharedTokens.size >= 10) {
+        console.log(
+          chalk8.yellow(
+            `
+\u26A0 Page "${pageName}" contains inline code similar to ${e.id} (${e.name}). Consider using the shared component instead.`
+          )
+        );
       }
+    } catch {
     }
   }
-  return issues;
 }
-async function autoFixCode(code) {
-  const fixes = [];
-  let fixed = code;
-  const beforeQuoteFix = fixed;
-  fixed = fixed.replace(/(:\s*'.+)\\'(\s*)$/gm, "$1'$2");
-  if (fixed !== beforeQuoteFix) {
-    fixes.push("fixed escaped closing quotes in strings");
+async function loadConfig(configPath) {
+  if (!existsSync13(configPath)) {
+    throw new Error(
+      `Design system config not found at ${configPath}
+Run "coherent init" first to create a project.`
+    );
   }
-  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");
-  if (fixed !== beforeEntityFix) {
-    fixes.push("Fixed syntax issues");
-  }
-  const beforeLtFix = fixed;
-  fixed = fixed.replace(/>([^<{}\n]*)<(\d)/g, ">$1&lt;$2");
-  fixed = fixed.replace(/>([^<{}\n]*)<([^/a-zA-Z!{>\n])/g, ">$1&lt;$2");
-  if (fixed !== beforeLtFix) {
-    fixes.push("escaped < in JSX text content");
+  const manager = new DesignSystemManager3(configPath);
+  await manager.load();
+  return manager.getConfig();
+}
+function requireProject() {
+  const project = findConfig();
+  if (!project) {
+    exitNotCoherent();
   }
-  if (/className="[^"]*\btext-base\b[^"]*"/.test(fixed)) {
-    fixed = fixed.replace(/className="([^"]*)\btext-base\b([^"]*)"/g, 'className="$1text-sm$2"');
-    fixes.push("text-base \u2192 text-sm");
+  warnIfVolatile(project.root);
+  return project;
+}
+async function resolveTargetFlags(message, options, config2, projectRoot) {
+  if (options.component) {
+    const manifest = await loadManifest4(projectRoot);
+    const target = options.component;
+    const entry = manifest.shared.find(
+      (s) => s.name.toLowerCase() === target.toLowerCase() || s.id.toLowerCase() === target.toLowerCase()
+    );
+    if (entry) {
+      const filePath = resolve5(projectRoot, entry.file);
+      let currentCode = "";
+      if (existsSync13(filePath)) {
+        currentCode = readFileSync8(filePath, "utf-8");
+      }
+      const codeSnippet = currentCode ? `
+
+Current code of ${entry.name}:
+\`\`\`tsx
+${currentCode}
+\`\`\`` : "";
+      return `Modify the shared component ${entry.name} (${entry.id}, file: ${entry.file}): ${message}. Read the current code below and apply the requested changes. Return the full updated component code as pageCode.${codeSnippet}`;
+    }
+    console.log(chalk8.yellow(`
+\u26A0\uFE0F  Component "${target}" not found in shared components.`));
+    console.log(chalk8.dim("   Available: " + manifest.shared.map((s) => `${s.id} ${s.name}`).join(", ")));
+    console.log(chalk8.dim("   Proceeding with message as-is...\n"));
   }
-  if (/CardTitle[^>]*className="[^"]*text-(lg|xl|2xl)/.test(fixed)) {
-    fixed = fixed.replace(/(CardTitle[^>]*className="[^"]*)text-(lg|xl|2xl)\b/g, "$1");
-    fixes.push("large text in CardTitle \u2192 removed");
+  if (options.page) {
+    const target = options.page;
+    const page = config2.pages.find(
+      (p) => p.name.toLowerCase() === target.toLowerCase() || p.id.toLowerCase() === target.toLowerCase() || p.route === target || p.route === "/" + target
+    );
+    if (page) {
+      const relPath = page.route === "/" ? "app/page.tsx" : `app${page.route}/page.tsx`;
+      const filePath = resolve5(projectRoot, relPath);
+      let currentCode = "";
+      if (existsSync13(filePath)) {
+        currentCode = readFileSync8(filePath, "utf-8");
+      }
+      const codeSnippet = currentCode ? `
+
+Current code of ${page.name} page:
+\`\`\`tsx
+${currentCode}
+\`\`\`` : "";
+      return `Update page "${page.name}" (id: ${page.id}, route: ${page.route}, file: ${relPath}): ${message}. Read the current code below and apply the requested changes.${codeSnippet}`;
+    }
+    console.log(chalk8.yellow(`
+\u26A0\uFE0F  Page "${target}" not found.`));
+    console.log(chalk8.dim("   Available: " + config2.pages.map((p) => `${p.id} (${p.route})`).join(", ")));
+    console.log(chalk8.dim("   Proceeding with message as-is...\n"));
   }
-  if (/className="[^"]*\bshadow-(md|lg|xl|2xl)\b[^"]*"/.test(fixed)) {
-    fixed = fixed.replace(/className="([^"]*)\bshadow-(md|lg|xl|2xl)\b([^"]*)"/g, 'className="$1shadow-sm$3"');
-    fixes.push("heavy shadow \u2192 shadow-sm");
+  if (options.token) {
+    const target = options.token;
+    return `Change design token "${target}": ${message}. Update the token value in design-system.config.ts and ensure globals.css reflects the change.`;
   }
-  const hasHooks = /\b(useState|useEffect|useRef|useCallback|useMemo|useReducer|useContext)\b/.test(fixed);
-  const hasEvents = /\b(onClick|onChange|onSubmit|onBlur|onFocus|onKeyDown|onKeyUp|onMouseEnter|onMouseLeave|onScroll|onInput)\s*[={]/.test(
-    fixed
-  );
-  const hasUseClient = /^['"]use client['"]/.test(fixed.trim());
-  if ((hasHooks || hasEvents) && !hasUseClient) {
-    fixed = `'use client'
+  return message;
+}
 
-${fixed}`;
-    fixes.push('added "use client" (client features detected)');
+// src/commands/chat/request-parser.ts
+var AUTH_FLOW_PATTERNS = {
+  "/login": ["/register", "/forgot-password"],
+  "/signin": ["/register", "/forgot-password"],
+  "/signup": ["/login"],
+  "/register": ["/login"],
+  "/forgot-password": ["/login", "/reset-password"],
+  "/reset-password": ["/login"]
+};
+var PAGE_RELATIONSHIP_RULES = [
+  {
+    trigger: /\/(products|catalog|marketplace|listings|shop|store)\b/i,
+    related: [{ id: "product-detail", name: "Product Detail", route: "/products/[id]" }]
+  },
+  {
+    trigger: /\/(blog|news|articles|posts)\b/i,
+    related: [{ id: "article-detail", name: "Article", route: "/blog/[slug]" }]
+  },
+  {
+    trigger: /\/(campaigns|ads|ad-campaigns)\b/i,
+    related: [{ id: "campaign-detail", name: "Campaign Detail", route: "/campaigns/[id]" }]
+  },
+  {
+    trigger: /\/(dashboard|admin)\b/i,
+    related: [{ id: "settings", name: "Settings", route: "/settings" }]
+  },
+  {
+    trigger: /\/pricing\b/i,
+    related: [{ id: "checkout", name: "Checkout", route: "/checkout" }]
   }
-  if (/^['"]use client['"]/.test(fixed.trim()) && /\bexport\s+const\s+metadata\s*:\s*Metadata\s*=\s*\{/.test(fixed)) {
-    const metaMatch = fixed.match(/\bexport\s+const\s+metadata\s*:\s*Metadata\s*=\s*\{/);
-    if (metaMatch) {
-      const start = fixed.indexOf(metaMatch[0]);
-      const open = fixed.indexOf("{", start);
-      let depth = 1, i = open + 1;
-      while (i < fixed.length && depth > 0) {
-        if (fixed[i] === "{") depth++;
-        else if (fixed[i] === "}") depth--;
-        i++;
+];
+function extractInternalLinks(code) {
+  const links = /* @__PURE__ */ new Set();
+  const hrefRe = /href\s*=\s*["'](\/[a-z0-9/-]*)["']/gi;
+  let m;
+  while ((m = hrefRe.exec(code)) !== null) {
+    const route = m[1];
+    if (route === "/" || route.startsWith("/design-system") || route.startsWith("/#") || route.startsWith("/api"))
+      continue;
+    links.add(route);
+  }
+  return [...links];
+}
+function inferRelatedPages(plannedPages) {
+  const plannedRoutes = new Set(plannedPages.map((p) => p.route));
+  const inferred = [];
+  for (const { route } of plannedPages) {
+    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 });
+          plannedRoutes.add(rel);
+        }
       }
-      const tail = fixed.slice(i);
-      const semi = tail.match(/^\s*;/);
-      const removeEnd = semi ? i + (semi.index + semi[0].length) : i;
-      fixed = (fixed.slice(0, start) + fixed.slice(removeEnd)).replace(/\n{3,}/g, "\n\n").trim();
-      fixes.push('removed metadata export (conflicts with "use client")');
     }
-  }
-  const lines = fixed.split("\n");
-  let hasReplacedButton = false;
-  for (let i = 0; i < lines.length; i++) {
-    if (!/<button\b/.test(lines[i])) continue;
-    if (lines[i].includes("aria-label")) continue;
-    if (/onClick=\{.*copy/i.test(lines[i])) continue;
-    const block = lines.slice(i, i + 5).join(" ");
-    if (block.includes("aria-label") || /onClick=\{.*copy/i.test(block)) continue;
-    lines[i] = lines[i].replace(/<button\b/g, "<Button");
-    hasReplacedButton = true;
-  }
-  if (hasReplacedButton) {
-    fixed = lines.join("\n");
-    fixed = fixed.replace(/<\/button>/g, (_match, _offset) => {
-      return "</Button>";
-    });
-    const openCount = (fixed.match(/<Button\b/g) || []).length;
-    const closeCount = (fixed.match(/<\/Button>/g) || []).length;
-    if (closeCount > openCount) {
-      let excess = closeCount - openCount;
-      fixed = fixed.replace(/<\/Button>/g, (m) => {
-        if (excess > 0) {
-          excess--;
-          return "</button>";
+    for (const rule of PAGE_RELATIONSHIP_RULES) {
+      if (rule.trigger.test(route)) {
+        for (const rel of rule.related) {
+          if (!plannedRoutes.has(rel.route)) {
+            inferred.push(rel);
+            plannedRoutes.add(rel.route);
+          }
         }
-        return m;
-      });
+      }
     }
-    const hasButtonImport = /import\s.*\bButton\b.*from\s+['"]@\/components\/ui\/button['"]/.test(fixed);
-    if (!hasButtonImport) {
-      const lastImportIdx = fixed.lastIndexOf("\nimport ");
-      if (lastImportIdx !== -1) {
-        const lineEnd = fixed.indexOf("\n", lastImportIdx + 1);
-        fixed = fixed.slice(0, lineEnd + 1) + "import { Button } from '@/components/ui/button'\n" + fixed.slice(lineEnd + 1);
-      } else {
-        const insertAfter = hasUseClient ? fixed.indexOf("\n") + 1 : 0;
-        fixed = fixed.slice(0, insertAfter) + "import { Button } from '@/components/ui/button'\n" + fixed.slice(insertAfter);
+  }
+  return inferred;
+}
+function impliesFullWebsite(message) {
+  return /\b(create|build|make|design)\b.{0,80}\b(website|web\s*site|web\s*app|application|app|platform|portal|marketplace|site)\b/i.test(
+    message
+  );
+}
+function extractPageNamesFromMessage(message) {
+  const pages = [];
+  const known = {
+    home: "/",
+    landing: "/",
+    dashboard: "/dashboard",
+    about: "/about",
+    "about us": "/about",
+    contact: "/contact",
+    contacts: "/contacts",
+    pricing: "/pricing",
+    settings: "/settings",
+    account: "/account",
+    "personal account": "/account",
+    registration: "/registration",
+    signup: "/signup",
+    "sign up": "/signup",
+    login: "/login",
+    "sign in": "/login",
+    catalogue: "/catalogue",
+    catalog: "/catalog",
+    blog: "/blog",
+    portfolio: "/portfolio",
+    features: "/features",
+    services: "/services",
+    faq: "/faq",
+    team: "/team"
+  };
+  const lower = message.toLowerCase();
+  for (const [key, route] of Object.entries(known)) {
+    if (lower.includes(key)) {
+      const name = key.split(" ").map((w) => w[0].toUpperCase() + w.slice(1)).join(" ");
+      const id = route.slice(1) || "home";
+      if (!pages.some((p) => p.route === route)) {
+        pages.push({ name, id, route });
       }
     }
-    fixes.push("<button> \u2192 <Button> (with import)");
   }
-  const colorMap = {
-    "bg-zinc-950": "bg-background",
-    "bg-zinc-900": "bg-background",
-    "bg-slate-950": "bg-background",
-    "bg-slate-900": "bg-background",
-    "bg-gray-950": "bg-background",
-    "bg-gray-900": "bg-background",
-    "bg-zinc-800": "bg-muted",
-    "bg-slate-800": "bg-muted",
-    "bg-gray-800": "bg-muted",
-    "bg-zinc-100": "bg-muted",
-    "bg-slate-100": "bg-muted",
-    "bg-gray-100": "bg-muted",
-    "bg-white": "bg-background",
-    "bg-black": "bg-background",
-    "text-white": "text-foreground",
-    "text-black": "text-foreground",
-    "text-zinc-100": "text-foreground",
-    "text-zinc-200": "text-foreground",
-    "text-slate-100": "text-foreground",
-    "text-gray-100": "text-foreground",
-    "text-zinc-400": "text-muted-foreground",
-    "text-zinc-500": "text-muted-foreground",
-    "text-slate-400": "text-muted-foreground",
-    "text-slate-500": "text-muted-foreground",
-    "text-gray-400": "text-muted-foreground",
-    "text-gray-500": "text-muted-foreground",
-    "border-zinc-700": "border-border",
-    "border-zinc-800": "border-border",
-    "border-slate-700": "border-border",
-    "border-gray-700": "border-border",
-    "border-zinc-200": "border-border",
-    "border-slate-200": "border-border",
-    "border-gray-200": "border-border"
-  };
-  const isCodeContext = (classes) => /\bfont-mono\b/.test(classes) || /\bbg-zinc-950\b/.test(classes) || /\bbg-zinc-900\b/.test(classes);
-  const isInsideTerminalBlock = (offset) => {
-    const preceding = fixed.slice(Math.max(0, offset - 600), offset);
-    if (!/(bg-zinc-950|bg-zinc-900)/.test(preceding)) return false;
-    if (!/font-mono/.test(preceding)) return false;
-    const lastClose = Math.max(preceding.lastIndexOf("</div>"), preceding.lastIndexOf("</section>"));
-    const lastTerminal = Math.max(preceding.lastIndexOf("bg-zinc-950"), preceding.lastIndexOf("bg-zinc-900"));
-    return lastTerminal > lastClose;
-  };
-  let hadColorFix = false;
-  fixed = fixed.replace(/className="([^"]*)"/g, (fullMatch, classes, offset) => {
-    if (isCodeContext(classes)) return fullMatch;
-    if (isInsideTerminalBlock(offset)) return fullMatch;
-    let result = classes;
-    const accentColorRe = /\b(bg|text|border)-(emerald|blue|violet|indigo|purple|teal|cyan|sky|rose|amber)-(\d+)\b/g;
-    result = result.replace(accentColorRe, (m, prefix, _color, shade) => {
-      if (colorMap[m]) {
-        hadColorFix = true;
-        return colorMap[m];
+  return pages;
+}
+function normalizeRequest(request, config2) {
+  const changes = request.changes;
+  const VALID_TYPES = [
+    "update-token",
+    "add-component",
+    "modify-component",
+    "add-layout-block",
+    "modify-layout-block",
+    "add-page",
+    "update-page",
+    "update-navigation",
+    "link-shared",
+    "promote-and-link"
+  ];
+  if (!VALID_TYPES.includes(request.type)) {
+    return { error: `Unknown action "${request.type}". Valid: ${VALID_TYPES.join(", ")}` };
+  }
+  const findPage = (target) => config2.pages.find(
+    (p) => p.id === target || p.route === target || p.name?.toLowerCase() === String(target).toLowerCase()
+  );
+  switch (request.type) {
+    case "update-page": {
+      const page = findPage(request.target);
+      if (!page && changes?.pageCode) {
+        const targetStr = String(request.target);
+        const id = targetStr.replace(/^\//, "") || "home";
+        return {
+          ...request,
+          type: "add-page",
+          target: "new",
+          changes: {
+            id,
+            name: changes.name || id.charAt(0).toUpperCase() + id.slice(1) || "Home",
+            route: targetStr.startsWith("/") ? targetStr : `/${targetStr}`,
+            ...changes
+          }
+        };
       }
-      const n = parseInt(shade);
-      if (prefix === "bg") {
-        if (n >= 500 && n <= 700) {
-          hadColorFix = true;
-          return "bg-primary";
-        }
-        if (n >= 100 && n <= 200) {
-          hadColorFix = true;
-          return "bg-primary/10";
-        }
-        if (n >= 800) {
-          hadColorFix = true;
-          return "bg-muted";
-        }
+      if (!page) {
+        const available = config2.pages.map((p) => `${p.name} (${p.route})`).join(", ");
+        return { error: `Page "${request.target}" not found. Available: ${available || "none"}` };
       }
-      if (prefix === "text") {
-        if (n >= 400 && n <= 600) {
-          hadColorFix = true;
-          return "text-primary";
-        }
-        if (n >= 100 && n <= 300) {
-          hadColorFix = true;
-          return "text-foreground";
-        }
+      if (page.id !== request.target) {
+        return { ...request, target: page.id };
       }
-      if (prefix === "border") {
-        hadColorFix = true;
-        return "border-primary";
+      break;
+    }
+    case "add-page": {
+      if (!changes) break;
+      let route = changes.route || "";
+      if (route && !route.startsWith("/")) route = `/${route}`;
+      if (route) changes.route = route;
+      const existingByRoute = config2.pages.find((p) => p.route === route);
+      if (existingByRoute && route) {
+        return {
+          ...request,
+          type: "update-page",
+          target: existingByRoute.id
+        };
       }
-      return m;
-    });
-    const neutralColorRe = /\b(bg|text|border)-(zinc|slate|gray|neutral|stone)-(\d+)\b/g;
-    result = result.replace(neutralColorRe, (m, prefix, _color, shade) => {
-      if (colorMap[m]) {
-        hadColorFix = true;
-        return colorMap[m];
+      if (!changes.id && changes.name) {
+        changes.id = String(changes.name).toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
       }
-      const n = parseInt(shade);
-      if (prefix === "bg") {
-        if (n >= 800) {
-          hadColorFix = true;
-          return "bg-background";
-        }
-        if (n >= 100 && n <= 300) {
-          hadColorFix = true;
-          return "bg-muted";
-        }
+      if (!changes.id && route) {
+        changes.id = route.replace(/^\//, "") || "home";
       }
-      if (prefix === "text") {
-        if (n >= 100 && n <= 300) {
-          hadColorFix = true;
-          return "text-foreground";
+      break;
+    }
+    case "modify-component": {
+      const componentId = request.target;
+      const existingComp = config2.components.find((c) => c.id === componentId);
+      if (!existingComp) {
+        return {
+          ...request,
+          type: "add-component",
+          target: "new"
+        };
+      }
+      if (changes) {
+        if (typeof changes.id === "string" && changes.id !== componentId) {
+          const targetExists = config2.components.some((c) => c.id === changes.id);
+          if (!targetExists) {
+            return { ...request, type: "add-component", target: "new" };
+          }
+          return {
+            error: `Cannot change component "${componentId}" to "${changes.id}" \u2014 "${changes.id}" already exists.`
+          };
         }
-        if (n >= 400 && n <= 600) {
-          hadColorFix = true;
-          return "text-muted-foreground";
+        if (typeof changes.name === "string") {
+          const newName = changes.name.toLowerCase();
+          const curName = existingComp.name.toLowerCase();
+          const curId = componentId.toLowerCase();
+          const nameOk = newName === curName || newName === curId || newName.includes(curId) || curId.includes(newName);
+          if (!nameOk) {
+            delete changes.name;
+          }
         }
       }
-      if (prefix === "border") {
-        hadColorFix = true;
-        return "border-border";
-      }
-      return m;
-    });
-    if (result !== classes) return `className="${result}"`;
-    return fullMatch;
-  });
-  if (hadColorFix) fixes.push("raw colors \u2192 semantic tokens");
-  const lucideImportMatch = fixed.match(/import\s*\{([^}]+)\}\s*from\s*["']lucide-react["']/);
-  if (lucideImportMatch) {
-    let lucideExports = null;
-    try {
-      const { createRequire } = await import("module");
-      const require2 = createRequire(process.cwd() + "/package.json");
-      const lr = require2("lucide-react");
-      lucideExports = new Set(Object.keys(lr).filter((k) => /^[A-Z]/.test(k)));
-    } catch {
+      break;
     }
-    if (lucideExports) {
-      const nonLucideImports = /* @__PURE__ */ new Set();
-      for (const m of fixed.matchAll(/import\s*\{([^}]+)\}\s*from\s*["'](?!lucide-react)([^"']+)["']/g)) {
-        m[1].split(",").map((s) => s.trim()).filter(Boolean).forEach((n) => nonLucideImports.add(n));
-      }
-      const iconNames = lucideImportMatch[1].split(",").map((s) => s.trim()).filter(Boolean);
-      const duplicates = iconNames.filter((name) => nonLucideImports.has(name));
-      let newImport = lucideImportMatch[1];
-      for (const dup of duplicates) {
-        newImport = newImport.replace(new RegExp(`\\b${dup}\\b,?\\s*`), "");
-        fixes.push(`removed ${dup} from lucide import (conflicts with UI component import)`);
-      }
-      const invalid = iconNames.filter((name) => !lucideExports.has(name) && !nonLucideImports.has(name));
-      if (invalid.length > 0) {
-        const fallback = "Circle";
-        for (const bad of invalid) {
-          const re = new RegExp(`\\b${bad}\\b`, "g");
-          newImport = newImport.replace(re, fallback);
-          fixed = fixed.replace(re, fallback);
+    case "add-component": {
+      if (changes) {
+        const shadcn = changes.shadcnComponent;
+        const id = changes.id;
+        if (shadcn && id && id !== shadcn) {
+          changes.id = shadcn;
         }
-        fixes.push(`invalid lucide icons \u2192 ${fallback}: ${invalid.join(", ")}`);
       }
-      if (duplicates.length > 0 || invalid.length > 0) {
-        const importedNames = [
-          ...new Set(
-            newImport.split(",").map((s) => s.trim()).filter(Boolean)
-          )
-        ];
-        const originalImportLine = lucideImportMatch[0];
-        fixed = fixed.replace(originalImportLine, `import { ${importedNames.join(", ")} } from "lucide-react"`);
+      break;
+    }
+    case "link-shared": {
+      if (changes) {
+        const page = findPage(request.target);
+        if (!page) {
+          const available = config2.pages.map((p) => `${p.name} (${p.route})`).join(", ");
+          return { error: `Page "${request.target}" not found for link-shared. Available: ${available || "none"}` };
+        }
+        if (page.id !== request.target) {
+          return { ...request, target: page.id };
+        }
       }
+      break;
     }
-  }
-  const lucideImportMatch2 = fixed.match(/import\s*\{([^}]+)\}\s*from\s*["']lucide-react["']/);
-  if (lucideImportMatch2) {
-    let lucideExports2 = null;
-    try {
-      const { createRequire } = await import("module");
-      const req = createRequire(process.cwd() + "/package.json");
-      const lr = req("lucide-react");
-      lucideExports2 = new Set(Object.keys(lr).filter((k) => /^[A-Z]/.test(k)));
-    } catch {
+    case "promote-and-link": {
+      const sourcePage = findPage(request.target);
+      if (!sourcePage) {
+        const available = config2.pages.map((p) => `${p.name} (${p.route})`).join(", ");
+        return {
+          error: `Source page "${request.target}" not found for promote-and-link. Available: ${available || "none"}`
+        };
+      }
+      if (sourcePage.id !== request.target) {
+        return { ...request, target: sourcePage.id };
+      }
+      break;
     }
-    if (lucideExports2) {
-      const allImportedNames = /* @__PURE__ */ new Set();
-      for (const m of fixed.matchAll(/import\s*\{([^}]+)\}\s*from/g)) {
-        m[1].split(",").map((s) => s.trim()).filter(Boolean).forEach((n) => allImportedNames.add(n));
+  }
+  return request;
+}
+function applyDefaults(request) {
+  if (request.type === "add-page" && request.changes && typeof request.changes === "object") {
+    const changes = request.changes;
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const name = changes.name || "New Page";
+    let id = changes.id || name.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
+    if (!/^[a-z]/.test(id)) id = `page-${id}`;
+    const route = changes.route || `/${id}`;
+    const hasPageCode = typeof changes.pageCode === "string" && changes.pageCode.trim() !== "";
+    const base = {
+      id,
+      name,
+      route: route.startsWith("/") ? route : `/${route}`,
+      layout: changes.layout || "centered",
+      title: changes.title || name,
+      description: changes.description || `${name} page`,
+      createdAt: changes.createdAt || now,
+      updatedAt: changes.updatedAt || now,
+      requiresAuth: changes.requiresAuth ?? false,
+      noIndex: changes.noIndex ?? false
+    };
+    const sections = Array.isArray(changes.sections) ? changes.sections.map((section, idx) => ({
+      id: section.id || `section-${idx}`,
+      name: section.name || `Section ${idx + 1}`,
+      componentId: section.componentId || "button",
+      order: typeof section.order === "number" ? section.order : idx,
+      props: section.props || {}
+    })) : [];
+    return {
+      ...request,
+      changes: {
+        ...base,
+        sections,
+        ...hasPageCode ? { pageCode: changes.pageCode, generatedWithPageCode: true } : {},
+        ...changes.pageType ? { pageType: changes.pageType } : {},
+        ...changes.structuredContent ? { structuredContent: changes.structuredContent } : {}
       }
-      for (const m of fixed.matchAll(/import\s+([A-Z]\w+)\s+from/g)) {
-        allImportedNames.add(m[1]);
+    };
+  }
+  if (request.type === "add-component" && request.changes && typeof request.changes === "object") {
+    const changes = request.changes;
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const validSizeNames = ["xs", "sm", "md", "lg", "xl"];
+    let normalizedVariants = [];
+    if (Array.isArray(changes.variants)) {
+      normalizedVariants = changes.variants.map((v) => {
+        if (typeof v === "string") return { name: v, className: "" };
+        if (v && typeof v === "object" && "name" in v) {
+          return {
+            name: v.name,
+            className: v.className ?? ""
+          };
+        }
+        return { name: "default", className: "" };
+      });
+    }
+    let normalizedSizes = [];
+    if (Array.isArray(changes.sizes)) {
+      normalizedSizes = changes.sizes.map((s) => {
+        if (typeof s === "string") {
+          const name = validSizeNames.includes(s) ? s : "md";
+          return { name, className: "" };
+        }
+        if (s && typeof s === "object" && "name" in s) {
+          const raw = s.name;
+          const name = validSizeNames.includes(raw) ? raw : "md";
+          return { name, className: s.className ?? "" };
+        }
+        return { name: "md", className: "" };
+      });
+    }
+    return {
+      ...request,
+      changes: {
+        ...changes,
+        variants: normalizedVariants,
+        sizes: normalizedSizes,
+        createdAt: now,
+        updatedAt: now
       }
-      const lucideImported = new Set(
-        lucideImportMatch2[1].split(",").map((s) => s.trim()).filter(Boolean)
-      );
-      const jsxIconRefs = [...new Set([...fixed.matchAll(/<([A-Z][a-zA-Z]*Icon)\s/g)].map((m) => m[1]))];
-      const missing = [];
-      for (const ref of jsxIconRefs) {
-        if (allImportedNames.has(ref)) continue;
-        if (fixed.includes(`function ${ref}`) || fixed.includes(`const ${ref}`)) continue;
-        const baseName = ref.replace(/Icon$/, "");
-        if (lucideExports2.has(ref)) {
-          missing.push(ref);
-          lucideImported.add(ref);
-        } else if (lucideExports2.has(baseName)) {
-          const re = new RegExp(`\\b${ref}\\b`, "g");
-          fixed = fixed.replace(re, baseName);
-          missing.push(baseName);
-          lucideImported.add(baseName);
-          fixes.push(`renamed ${ref} \u2192 ${baseName} (lucide-react)`);
-        } else {
-          const fallback = "Circle";
-          const re = new RegExp(`\\b${ref}\\b`, "g");
-          fixed = fixed.replace(re, fallback);
-          lucideImported.add(fallback);
-          fixes.push(`unknown icon ${ref} \u2192 ${fallback}`);
+    };
+  }
+  if (request.type === "modify-component" && request.changes && typeof request.changes === "object") {
+    const changes = request.changes;
+    const validSizeNames = ["xs", "sm", "md", "lg", "xl"];
+    let normalizedVariants;
+    if (Array.isArray(changes.variants)) {
+      normalizedVariants = changes.variants.map((v) => {
+        if (typeof v === "string") return { name: v, className: "" };
+        if (v && typeof v === "object" && "name" in v) {
+          return {
+            name: v.name,
+            className: v.className ?? ""
+          };
+        }
+        return { name: "default", className: "" };
+      });
+    }
+    let normalizedSizes;
+    if (Array.isArray(changes.sizes)) {
+      normalizedSizes = changes.sizes.map((s) => {
+        if (typeof s === "string") {
+          const name = validSizeNames.includes(s) ? s : "md";
+          return { name, className: "" };
+        }
+        if (s && typeof s === "object" && "name" in s) {
+          const raw = s.name;
+          const name = validSizeNames.includes(raw) ? raw : "md";
+          return { name, className: s.className ?? "" };
         }
+        return { name: "md", className: "" };
+      });
+    }
+    return {
+      ...request,
+      changes: {
+        ...changes,
+        ...normalizedVariants !== void 0 && { variants: normalizedVariants },
+        ...normalizedSizes !== void 0 && { sizes: normalizedSizes }
       }
-      if (missing.length > 0) {
-        const allNames = [...lucideImported];
-        const origLine = lucideImportMatch2[0];
-        fixed = fixed.replace(origLine, `import { ${allNames.join(", ")} } from "lucide-react"`);
-        fixes.push(`added missing lucide imports: ${missing.join(", ")}`);
+    };
+  }
+  return request;
+}
+
+// src/utils/page-analyzer.ts
+var FORM_COMPONENTS = /* @__PURE__ */ new Set(["Input", "Textarea", "Label", "Select", "Checkbox", "Switch"]);
+var VISUAL_WORDS = /\b(grid lines?|glow|radial|gradient|blur|shadow|overlay|animation|particles?|dots?|vertical|horizontal|decorat|behind|background|divider|spacer|wrapper|container|inner|outer|absolute|relative|translate|opacity|z-index|transition)\b/i;
+function analyzePageCode(code) {
+  return {
+    sections: extractSections(code),
+    componentUsage: extractComponentUsage(code),
+    iconCount: extractIconCount(code),
+    layoutPattern: inferLayoutPattern(code),
+    hasForm: detectFormUsage(code),
+    analyzedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+}
+function extractSections(code) {
+  const sections = [];
+  const seen = /* @__PURE__ */ new Set();
+  const commentRe = /\{\/\*\s*(.+?)\s*\*\/\}/g;
+  let m;
+  while ((m = commentRe.exec(code)) !== null) {
+    const raw = m[1].trim();
+    const name = raw.replace(/[─━—–]+/g, "").replace(/\s*section\s*$/i, "").replace(/^section\s*:\s*/i, "").trim();
+    if (!name || name.length <= 1 || name.length >= 40) continue;
+    if (seen.has(name.toLowerCase())) continue;
+    const wordCount = name.split(/\s+/).length;
+    if (wordCount > 5) continue;
+    if (/[{}()=<>;:`"']/.test(name)) continue;
+    if (/^[a-z]/.test(name) && wordCount > 2) continue;
+    if (VISUAL_WORDS.test(name)) continue;
+    seen.add(name.toLowerCase());
+    sections.push({ name, order: sections.length });
+  }
+  if (sections.length === 0) {
+    const sectionTagRe = /<section[^>]*>[\s\S]*?<h[12][^>]*>\s*([^<]+)/g;
+    while ((m = sectionTagRe.exec(code)) !== null) {
+      const name = m[1].trim();
+      if (name && name.length > 1 && name.length < 40 && !seen.has(name.toLowerCase())) {
+        seen.add(name.toLowerCase());
+        sections.push({ name, order: sections.length });
       }
     }
   }
-  fixed = fixed.replace(/className="([^"]*)"/g, (_match, inner) => {
-    const cleaned = inner.replace(/\s{2,}/g, " ").trim();
-    return `className="${cleaned}"`;
-  });
-  let imgCounter = 1;
-  const beforeImgFix = fixed;
-  fixed = fixed.replace(/["']\/api\/placeholder\/(\d+)\/(\d+)["']/g, (_m, w, h) => {
-    return `"https://picsum.photos/${w}/${h}?random=${imgCounter++}"`;
-  });
-  fixed = fixed.replace(/["']\/placeholder-avatar[^"']*["']/g, () => {
-    return `"https://i.pravatar.cc/150?u=user${imgCounter++}"`;
-  });
-  fixed = fixed.replace(/["']https?:\/\/via\.placeholder\.com\/(\d+)x?(\d*)(?:\/[^"']*)?\/?["']/g, (_m, w, h) => {
-    const height = h || w;
-    return `"https://picsum.photos/${w}/${height}?random=${imgCounter++}"`;
-  });
-  fixed = fixed.replace(/["']\/images\/[^"']+\.(?:jpg|jpeg|png|webp|gif)["']/g, () => {
-    return `"https://picsum.photos/800/400?random=${imgCounter++}"`;
-  });
-  fixed = fixed.replace(/["']\/placeholder[^"']*\.(?:jpg|jpeg|png|webp)["']/g, () => {
-    return `"https://picsum.photos/800/400?random=${imgCounter++}"`;
-  });
-  if (fixed !== beforeImgFix) {
-    fixes.push("placeholder images \u2192 working URLs (picsum/pravatar)");
+  return sections;
+}
+function extractComponentUsage(code) {
+  const usage = {};
+  const importRe = /import\s*\{([^}]+)\}\s*from\s*['"]@\/components\/ui\/[^'"]+['"]/g;
+  const importedComponents = [];
+  let m;
+  while ((m = importRe.exec(code)) !== null) {
+    const names = m[1].split(",").map((s) => s.trim()).filter(Boolean);
+    importedComponents.push(...names);
+  }
+  for (const comp of importedComponents) {
+    const re = new RegExp(`<${comp}[\\s/>]`, "g");
+    const matches = code.match(re);
+    usage[comp] = matches ? matches.length : 0;
+  }
+  return usage;
+}
+function extractIconCount(code) {
+  const m = code.match(/import\s*\{([^}]+)\}\s*from\s*['"]lucide-react['"]/);
+  if (!m) return 0;
+  return m[1].split(",").map((s) => s.trim()).filter(Boolean).length;
+}
+function inferLayoutPattern(code) {
+  const funcBodyMatch = code.match(/return\s*\(\s*(<[^]*)/s);
+  const topLevel = funcBodyMatch ? funcBodyMatch[1].slice(0, 500) : code.slice(0, 800);
+  if (/grid-cols|grid\s+md:grid-cols|grid\s+lg:grid-cols/.test(topLevel)) return "grid";
+  if (/sidebar|aside/.test(topLevel)) return "sidebar";
+  if (/max-w-\d|mx-auto|container/.test(topLevel)) return "centered";
+  if (/min-h-screen|min-h-svh/.test(topLevel)) return "full-width";
+  return "unknown";
+}
+function detectFormUsage(code) {
+  const importRe = /import\s*\{([^}]+)\}\s*from\s*['"]@\/components\/ui\/[^'"]+['"]/g;
+  let m;
+  while ((m = importRe.exec(code)) !== null) {
+    const names = m[1].split(",").map((s) => s.trim());
+    if (names.some((n) => FORM_COMPONENTS.has(n))) return true;
+  }
+  return false;
+}
+function summarizePageAnalysis(pageName, route, analysis) {
+  const parts = [`${pageName} (${route})`];
+  if (analysis.sections && analysis.sections.length > 0) {
+    parts.push(`sections: ${analysis.sections.map((s) => s.name).join(", ")}`);
+  }
+  if (analysis.componentUsage) {
+    const entries = Object.entries(analysis.componentUsage).filter(([, c]) => c > 0);
+    if (entries.length > 0) {
+      parts.push(`uses: ${entries.map(([n, c]) => `${n}(${c})`).join(", ")}`);
+    }
+  }
+  if (analysis.layoutPattern && analysis.layoutPattern !== "unknown") {
+    parts.push(`layout: ${analysis.layoutPattern}`);
+  }
+  if (analysis.hasForm) parts.push("has-form");
+  return `- ${parts.join(". ")}`;
+}
+
+// src/utils/concurrency.ts
+async function pMap(items, fn, concurrency = 3) {
+  const results = new Array(items.length);
+  let nextIndex = 0;
+  async function worker() {
+    while (nextIndex < items.length) {
+      const i = nextIndex++;
+      results[i] = await fn(items[i], i);
+    }
+  }
+  const workers = Array.from({ length: Math.min(concurrency, items.length) }, () => worker());
+  await Promise.all(workers);
+  return results;
+}
+
+// src/commands/chat/split-generator.ts
+function buildExistingPagesContext(config2) {
+  const pages = config2.pages || [];
+  const analyzed = pages.filter((p) => p.pageAnalysis);
+  if (analyzed.length === 0) return "";
+  const lines = analyzed.map((p) => {
+    return summarizePageAnalysis(p.name || p.id, p.route, p.pageAnalysis);
+  });
+  let ctx = `EXISTING PAGES CONTEXT:
+${lines.join("\n")}
+
+Use consistent component choices, spacing, and layout patterns across all pages. Match the style and structure of existing pages.`;
+  const sp = config2.stylePatterns;
+  if (sp && typeof sp === "object") {
+    const parts = [];
+    if (sp.card) parts.push(`Cards: ${sp.card}`);
+    if (sp.section) parts.push(`Sections: ${sp.section}`);
+    if (sp.terminal) parts.push(`Terminal blocks: ${sp.terminal}`);
+    if (sp.iconContainer) parts.push(`Icon containers: ${sp.iconContainer}`);
+    if (sp.heroHeadline) parts.push(`Hero headline: ${sp.heroHeadline}`);
+    if (sp.sectionTitle) parts.push(`Section title: ${sp.sectionTitle}`);
+    if (parts.length > 0) {
+      ctx += `
+
+PROJECT STYLE PATTERNS (from sync \u2014 match these exactly):
+${parts.join("\n")}`;
+    }
+  }
+  return ctx;
+}
+function extractStyleContext(pageCode) {
+  const unique = (arr) => [...new Set(arr)];
+  const cardClasses = (pageCode.match(/className="[^"]*(?:rounded|border|shadow|bg-card)[^"]*"/g) || []).map((m) => m.replace(/className="|"/g, "")).filter((c) => c.includes("rounded") || c.includes("border") || c.includes("card"));
+  const sectionSpacing = unique(pageCode.match(/py-\d+(?:\s+md:py-\d+)?/g) || []);
+  const headingStyles = unique(pageCode.match(/text-(?:\d*xl|lg)\s+font-(?:bold|semibold|medium)/g) || []);
+  const colorPatterns = unique(
+    (pageCode.match(
+      /(?:text|bg|border)-(?:primary|secondary|muted|accent|card|destructive|foreground|background)\S*/g
+    ) || []).concat(
+      pageCode.match(
+        /(?:text|bg|border)-(?:emerald|blue|violet|rose|amber|zinc|slate|gray|green|red|orange|indigo|purple|teal|cyan)\S*/g
+      ) || []
+    )
+  );
+  const iconPatterns = unique(pageCode.match(/(?:rounded-\S+\s+)?p-\d+(?:\.\d+)?\s*(?:bg-\S+)?/g) || []).filter(
+    (p) => p.includes("bg-") || p.includes("rounded")
+  );
+  const buttonPatterns = unique(
+    (pageCode.match(/className="[^"]*(?:hover:|active:)[^"]*"/g) || []).map((m) => m.replace(/className="|"/g, "")).filter((c) => c.includes("px-") || c.includes("py-") || c.includes("rounded"))
+  );
+  const bgPatterns = unique(pageCode.match(/bg-(?:muted|card|background|zinc|slate|gray)\S*/g) || []);
+  const gapPatterns = unique(pageCode.match(/gap-\d+/g) || []);
+  const gridPatterns = unique(pageCode.match(/grid-cols-\d+|md:grid-cols-\d+|lg:grid-cols-\d+/g) || []);
+  const containerPatterns = unique(pageCode.match(/container\s+max-w-\S+|max-w-\d+xl\s+mx-auto/g) || []);
+  const lines = [];
+  if (containerPatterns.length > 0) {
+    lines.push(`Container (MUST match for alignment with header/footer): ${containerPatterns[0]} px-4`);
+  }
+  if (cardClasses.length > 0) lines.push(`Cards: ${unique(cardClasses).slice(0, 4).join(" | ")}`);
+  if (sectionSpacing.length > 0) lines.push(`Section spacing: ${sectionSpacing.join(", ")}`);
+  if (headingStyles.length > 0) lines.push(`Headings: ${headingStyles.join(", ")}`);
+  if (colorPatterns.length > 0) lines.push(`Colors: ${colorPatterns.slice(0, 15).join(", ")}`);
+  if (iconPatterns.length > 0) lines.push(`Icon containers: ${iconPatterns.slice(0, 4).join(" | ")}`);
+  if (buttonPatterns.length > 0) lines.push(`Buttons: ${buttonPatterns.slice(0, 3).join(" | ")}`);
+  if (bgPatterns.length > 0) lines.push(`Section backgrounds: ${bgPatterns.slice(0, 6).join(", ")}`);
+  if (gapPatterns.length > 0) lines.push(`Gaps: ${gapPatterns.join(", ")}`);
+  if (gridPatterns.length > 0) lines.push(`Grids: ${gridPatterns.join(", ")}`);
+  if (lines.length === 0) return "";
+  return `STYLE CONTEXT (match these patterns exactly for visual consistency with the Home page):
+${lines.map((l) => `  - ${l}`).join("\n")}`;
+}
+async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts) {
+  let pageNames = [];
+  spinner.start("Phase 1/4 \u2014 Planning pages...");
+  try {
+    const planResult = await parseModification(message, modCtx, provider, { ...parseOpts, planOnly: true });
+    const pageReqs = planResult.requests.filter((r) => r.type === "add-page");
+    pageNames = pageReqs.map((r) => {
+      const c = r.changes;
+      const name = c.name || c.id || "page";
+      const id = c.id || name.toLowerCase().replace(/\s+/g, "-");
+      const route = c.route || `/${id}`;
+      return { name, id, route };
+    });
+  } catch {
+    spinner.text = "AI plan failed \u2014 extracting pages from your request...";
+  }
+  if (pageNames.length === 0) {
+    pageNames = extractPageNamesFromMessage(message);
+  }
+  if (pageNames.length === 0) {
+    spinner.fail("Could not determine pages to create");
+    return [];
+  }
+  pageNames = deduplicatePages(pageNames);
+  const hasHomePage = pageNames.some((p) => p.route === "/");
+  if (!hasHomePage) {
+    const userPages = (modCtx.config.pages || []).filter(
+      (p) => p.id !== "home" && p.id !== "new" && p.route !== "/"
+    );
+    const isFreshProject = userPages.length === 0;
+    if (isFreshProject || impliesFullWebsite(message)) {
+      pageNames.unshift({ name: "Home", id: "home", route: "/" });
+    }
+  }
+  const existingRoutes = new Set((modCtx.config.pages || []).map((p) => p.route).filter(Boolean));
+  const inferred = inferRelatedPages(pageNames).filter((p) => !existingRoutes.has(p.route));
+  if (inferred.length > 0) {
+    pageNames.push(...inferred);
+    pageNames = deduplicatePages(pageNames);
   }
-  return { code: fixed, fixes };
-}
-function formatIssues(issues) {
-  if (issues.length === 0) return "";
-  const errors = issues.filter((i) => i.severity === "error");
-  const warnings = issues.filter((i) => i.severity === "warning");
-  const infos = issues.filter((i) => i.severity === "info");
-  const lines = [];
-  if (errors.length > 0) {
-    lines.push(`  \u274C ${errors.length} error(s):`);
-    for (const e of errors) {
-      lines.push(`     L${e.line}: [${e.type}] ${e.message}`);
+  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/4 \u2014 Found ${pageNames.length} pages${inferredNote}: ${allPagesList}`);
+  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));
+  spinner.start(`Phase 2/4 \u2014 Generating ${homePage.name} page (sets design direction)...`);
+  let homeRequest = null;
+  let homePageCode = "";
+  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.`,
+      modCtx,
+      provider,
+      parseOpts
+    );
+    const codePage = homeResult.requests.find((r) => r.type === "add-page");
+    if (codePage) {
+      homeRequest = codePage;
+      homePageCode = codePage.changes?.pageCode || "";
     }
+  } catch {
   }
-  if (warnings.length > 0) {
-    lines.push(`  \u26A0\uFE0F  ${warnings.length} warning(s):`);
-    for (const w of warnings) {
-      lines.push(`     L${w.line}: [${w.type}] ${w.message}`);
-    }
+  if (!homeRequest) {
+    homeRequest = {
+      type: "add-page",
+      target: "new",
+      changes: { id: homePage.id, name: homePage.name, route: homePage.route }
+    };
   }
-  if (infos.length > 0) {
-    lines.push(`  \u2139\uFE0F  ${infos.length} info:`);
-    for (const i of infos) {
-      lines.push(`     L${i.line}: [${i.type}] ${i.message}`);
+  spinner.succeed(`Phase 2/4 \u2014 ${homePage.name} page generated`);
+  spinner.start("Phase 3/4 \u2014 Extracting design patterns...");
+  const styleContext = homePageCode ? extractStyleContext(homePageCode) : "";
+  if (styleContext) {
+    const lineCount = styleContext.split("\n").length - 1;
+    spinner.succeed(`Phase 3/4 \u2014 Extracted ${lineCount} style patterns from ${homePage.name}`);
+  } else {
+    spinner.succeed("Phase 3/4 \u2014 No style patterns extracted (Home page had no code)");
+  }
+  if (remainingPages.length === 0) {
+    return [homeRequest];
+  }
+  spinner.start(`Phase 4/4 \u2014 Generating ${remainingPages.length} pages in parallel...`);
+  const sharedNote = "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 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 existingPagesContext = buildExistingPagesContext(modCtx.config);
+  const AI_CONCURRENCY = 3;
+  let phase4Done = 0;
+  const remainingRequests = await pMap(
+    remainingPages,
+    async ({ name, id, route }) => {
+      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.`,
+        sharedNote,
+        routeNote,
+        alignmentNote,
+        existingPagesContext,
+        styleContext
+      ].filter(Boolean).join("\n\n");
+      try {
+        const result = await parseModification(prompt, modCtx, provider, parseOpts);
+        phase4Done++;
+        spinner.text = `Phase 4/4 \u2014 ${phase4Done}/${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/4 \u2014 ${phase4Done}/${remainingPages.length} pages generated...`;
+        return { type: "add-page", target: "new", changes: { id, name, route } };
+      }
+    },
+    AI_CONCURRENCY
+  );
+  const allRequests = [homeRequest, ...remainingRequests];
+  const emptyPages = allRequests.filter((r) => r.type === "add-page" && !r.changes?.pageCode);
+  if (emptyPages.length > 0 && emptyPages.length <= 5) {
+    spinner.text = `Retrying ${emptyPages.length} page(s) without code...`;
+    for (const req of emptyPages) {
+      const page = req.changes;
+      const pageName = page.name || page.id || "page";
+      const pageRoute = page.route || `/${pageName.toLowerCase()}`;
+      try {
+        const retryResult = await parseModification(
+          `Create ONE page called "${pageName}" at route "${pageRoute}". Context: ${message}. Generate complete pageCode for this single page only.`,
+          modCtx,
+          provider,
+          parseOpts
+        );
+        const codePage = retryResult.requests.find((r) => r.type === "add-page");
+        if (codePage && codePage.changes?.pageCode) {
+          const idx = allRequests.indexOf(req);
+          if (idx !== -1) allRequests[idx] = codePage;
+        }
+      } catch {
+      }
     }
   }
-  return lines.join("\n");
+  const withCode = allRequests.filter((r) => r.changes?.pageCode).length;
+  spinner.succeed(`Phase 4/4 \u2014 Generated ${allRequests.length} pages (${withCode} with full code)`);
+  return allRequests;
 }
 
+// src/commands/chat/modification-handler.ts
+import { resolve as resolve7 } from "path";
+import { mkdir as mkdir4 } from "fs/promises";
+import { dirname as dirname6 } from "path";
+import chalk11 from "chalk";
+import {
+  getTemplateForPageType,
+  loadManifest as loadManifest5,
+  saveManifest,
+  updateUsedIn,
+  findSharedComponentByIdOrName,
+  generateSharedComponent as generateSharedComponent3
+} from "@getcoherent/core";
+
 // src/commands/chat/code-generator.ts
 import { resolve as resolve6 } from "path";
 import { existsSync as existsSync14 } from "fs";
-import { mkdir as mkdir2, readFile as readFile5 } from "fs/promises";
+import { mkdir as mkdir3 } from "fs/promises";
 import { dirname as dirname5 } from "path";
 import {
   ComponentGenerator as ComponentGenerator2,
@@ -6686,6 +6834,39 @@ import {
 } from "@getcoherent/core";
 import { integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout2, generateSharedComponent as generateSharedComponent2 } from "@getcoherent/core";
 import chalk9 from "chalk";
+
+// src/utils/file-hashes.ts
+import { createHash } from "crypto";
+import { readFile as readFile5, writeFile as writeFile4, mkdir as mkdir2 } from "fs/promises";
+import { join as join9 } from "path";
+var HASHES_FILE = ".coherent/file-hashes.json";
+async function computeFileHash(filePath) {
+  const content = await readFile5(filePath, "utf-8");
+  return createHash("sha256").update(content).digest("hex");
+}
+async function loadHashes(projectRoot) {
+  try {
+    const raw = await readFile5(join9(projectRoot, HASHES_FILE), "utf-8");
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+async function saveHashes(projectRoot, hashes) {
+  const dir = join9(projectRoot, ".coherent");
+  await mkdir2(dir, { recursive: true });
+  await writeFile4(join9(projectRoot, HASHES_FILE), JSON.stringify(hashes, null, 2) + "\n");
+}
+async function isManuallyEdited(filePath, storedHash) {
+  try {
+    const currentHash = await computeFileHash(filePath);
+    return currentHash !== storedHash;
+  } catch {
+    return false;
+  }
+}
+
+// src/commands/chat/code-generator.ts
 async function validateAndFixGeneratedCode(projectRoot, code, options = {}) {
   const fixes = [];
   let fixed = fixEscapedClosingQuotes(code);
@@ -6748,58 +6929,71 @@ async function regeneratePage(pageId, config2, projectRoot) {
   const route = page.route || "/";
   const isAuth = isAuthRoute(route) || isAuthRoute(page.name || page.id || "");
   const filePath = routeToFsPath(projectRoot, route, isAuth);
-  await mkdir2(dirname5(filePath), { recursive: true });
+  await mkdir3(dirname5(filePath), { recursive: true });
   await writeFile(filePath, code);
 }
-async function regenerateLayout(config2, projectRoot) {
-  const layout = config2.pages[0]?.layout || "centered";
+async function canOverwriteShared(projectRoot, componentFile, storedHashes) {
+  const filePath = resolve6(projectRoot, componentFile);
+  if (!existsSync14(filePath)) return true;
+  const storedHash = storedHashes[componentFile];
+  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`));
+  }
+  return !edited;
+}
+async function regenerateLayout(config2, projectRoot, options = { navChanged: false }) {
   const appType = config2.settings.appType || "multi-page";
   const generator = new PageGenerator(config2);
-  const code = await generator.generateLayout(layout, appType, { skipNav: true });
-  const layoutPath = resolve6(projectRoot, "app", "layout.tsx");
-  await writeFile(layoutPath, code);
+  const initialized = config2.settings.initialized !== false;
+  const hashes = options.storedHashes ?? {};
+  if (!initialized) {
+    const layout = config2.pages[0]?.layout || "centered";
+    const code = await generator.generateLayout(layout, appType, { skipNav: true });
+    await writeFile(resolve6(projectRoot, "app", "layout.tsx"), code);
+  }
   if (config2.navigation?.enabled && appType === "multi-page") {
     const navType = config2.navigation.type || "header";
-    if (navType === "header" || navType === "both") {
-      const headerCode = generator.generateSharedHeaderCode();
-      await generateSharedComponent2(projectRoot, {
-        name: "Header",
-        type: "layout",
-        code: headerCode,
-        description: "Main site header with navigation and theme toggle",
-        usedIn: ["app/layout.tsx"],
-        overwrite: true
-      });
-    }
-    let shouldOverwriteFooter = false;
-    try {
-      const footerPath = resolve6(projectRoot, "components", "shared", "footer.tsx");
-      const existing = await readFile5(footerPath, "utf-8");
-      shouldOverwriteFooter = existing.includes("Coherent Design Method");
-    } catch {
-      shouldOverwriteFooter = true;
-    }
-    if (shouldOverwriteFooter) {
-      const footerCode = generator.generateSharedFooterCode();
-      await generateSharedComponent2(projectRoot, {
-        name: "Footer",
-        type: "layout",
-        code: footerCode,
-        description: "Site footer",
-        usedIn: ["app/layout.tsx"],
-        overwrite: true
-      });
-    }
-    if (navType === "sidebar" || navType === "both") {
-      const sidebarCode = generator.generateSharedSidebarCode();
-      await generateSharedComponent2(projectRoot, {
-        name: "Sidebar",
-        type: "layout",
-        code: sidebarCode,
-        description: "Vertical sidebar navigation with collapsible sections",
-        usedIn: ["app/(app)/layout.tsx"],
-        overwrite: true
-      });
+    const shouldRegenShared = !initialized || options.navChanged;
+    if (shouldRegenShared) {
+      if (navType === "header" || navType === "both") {
+        if (await canOverwriteShared(projectRoot, "components/shared/header.tsx", hashes)) {
+          const headerCode = generator.generateSharedHeaderCode();
+          await generateSharedComponent2(projectRoot, {
+            name: "Header",
+            type: "layout",
+            code: headerCode,
+            description: "Main site header with navigation and theme toggle",
+            usedIn: ["app/layout.tsx"],
+            overwrite: true
+          });
+        }
+      }
+      if (await canOverwriteShared(projectRoot, "components/shared/footer.tsx", hashes)) {
+        const footerCode = generator.generateSharedFooterCode();
+        await generateSharedComponent2(projectRoot, {
+          name: "Footer",
+          type: "layout",
+          code: footerCode,
+          description: "Site footer",
+          usedIn: ["app/layout.tsx"],
+          overwrite: true
+        });
+      }
+      if (navType === "sidebar" || navType === "both") {
+        if (await canOverwriteShared(projectRoot, "components/shared/sidebar.tsx", hashes)) {
+          const sidebarCode = generator.generateSharedSidebarCode();
+          await generateSharedComponent2(projectRoot, {
+            name: "Sidebar",
+            type: "layout",
+            code: sidebarCode,
+            description: "Vertical sidebar navigation with collapsible sections",
+            usedIn: ["app/(app)/layout.tsx"],
+            overwrite: true
+          });
+        }
+      }
     }
   }
   try {
@@ -6854,7 +7048,7 @@ export default function AppLayout({
 }
 `;
 }
-async function regenerateFiles(modified, config2, projectRoot) {
+async function regenerateFiles(modified, config2, projectRoot, options = { navChanged: false }) {
   const componentIds = /* @__PURE__ */ new Set();
   const pageIds = /* @__PURE__ */ new Set();
   for (const item of modified) {
@@ -6865,7 +7059,10 @@ async function regenerateFiles(modified, config2, projectRoot) {
     }
   }
   if (config2.navigation?.enabled && modified.length > 0) {
-    await regenerateLayout(config2, projectRoot);
+    await regenerateLayout(config2, projectRoot, {
+      navChanged: options.navChanged,
+      storedHashes: options.storedHashes
+    });
   }
   if (componentIds.size > 0) {
     const twGen = new TailwindConfigGenerator(config2);
@@ -7592,7 +7789,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
             await ensureAuthRouteGroup(projectRoot);
           }
           const filePath = routeToFsPath(projectRoot, route, isAuth);
-          await mkdir3(dirname6(filePath), { recursive: true });
+          await mkdir4(dirname6(filePath), { recursive: true });
           const { fixedCode, fixes: postFixes } = await validateAndFixGeneratedCode(projectRoot, finalPageCode, {
             isPage: true
           });
@@ -7642,10 +7839,9 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
             layoutShared: manifestForAudit.shared.filter((c) => c.type === "layout"),
             allShared: manifestForAudit.shared
           });
-          const validRoutes = dsm.getConfig().pages.map((p) => p.route);
-          const issues = validatePageQuality(codeToWrite, validRoutes);
+          const issues = validatePageQuality(codeToWrite);
           const errors = issues.filter((i) => i.severity === "error");
-          if (errors.length >= 5 && aiProvider) {
+          if (errors.length >= 2 && aiProvider) {
             console.log(
               chalk11.yellow(`
 \u{1F504} ${errors.length} quality errors \u2014 attempting AI fix for ${page.name || page.id}...`)
@@ -7664,7 +7860,7 @@ 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, validRoutes);
+                  const recheck = validatePageQuality(fixedCode2);
                   const recheckErrors = recheck.filter((i) => i.severity === "error");
                   if (recheckErrors.length < errors.length) {
                     codeToWrite = fixedCode2;
@@ -7682,6 +7878,12 @@ Rules:
 \u{1F50D} Quality check for ${page.name || page.id}:`));
             console.log(chalk11.dim(report));
           }
+          const consistency = checkDesignConsistency(codeToWrite);
+          if (consistency.length > 0) {
+            console.log(chalk11.yellow(`
+\u{1F3A8} Design consistency for ${page.name || page.id}:`));
+            consistency.forEach((w) => console.log(chalk11.dim(`   \u26A0 [${w.type}] ${w.message}`)));
+          }
         }
       }
       return {
@@ -7747,6 +7949,12 @@ ${routeRules}
 ${pagesCtx}`
                 );
                 if (DEBUG2) console.log(chalk11.dim(`  [update-page] AI returned ${resolvedPageCode.length} chars`));
+                const editIssues = verifyIncrementalEdit(currentCode, resolvedPageCode);
+                if (editIssues.length > 0) {
+                  console.log(chalk11.yellow(`
+\u26A0 Incremental edit issues for ${pageDef.name || pageDef.id}:`));
+                  editIssues.forEach((issue) => console.log(chalk11.dim(`   [${issue.type}] ${issue.message}`)));
+                }
               } else {
                 console.log(chalk11.yellow("  \u26A0 AI provider does not support editPageCode"));
               }
@@ -7771,7 +7979,7 @@ ${pagesCtx}`
             if (installed.length > 0) {
               result.modified = [...result.modified, ...installed.map((id) => `component:${id}`)];
             }
-            await mkdir3(dirname6(absPath), { recursive: true });
+            await mkdir4(dirname6(absPath), { recursive: true });
             const { fixedCode, fixes: postFixes } = await validateAndFixGeneratedCode(projectRoot, resolvedPageCode, {
               isPage: true
             });
@@ -7833,6 +8041,12 @@ ${pagesCtx}`
 \u{1F50D} Quality check for ${pageDef.name || pageDef.id}:`));
               console.log(chalk11.dim(report));
             }
+            const consistency = checkDesignConsistency(codeToWrite);
+            if (consistency.length > 0) {
+              console.log(chalk11.yellow(`
+\u{1F3A8} Design consistency for ${pageDef.name || pageDef.id}:`));
+              consistency.forEach((w) => console.log(chalk11.dim(`   \u26A0 [${w.type}] ${w.message}`)));
+            }
           } else {
             try {
               let code = await readFile(absPath);
@@ -7889,6 +8103,15 @@ ${pagesCtx}`
   }
 }
 
+// src/utils/nav-snapshot.ts
+function takeNavSnapshot(items) {
+  if (!items || items.length === 0) return "[]";
+  return JSON.stringify(items.map((i) => `${i.label}:${i.href}`).sort());
+}
+function hasNavChanged(before, after) {
+  return before !== after;
+}
+
 // src/commands/chat/interactive.ts
 import chalk12 from "chalk";
 import { resolve as resolve8 } from "path";
@@ -8121,6 +8344,7 @@ async function chatCommand(message, options) {
       }
       spinner.text = "Loading design system configuration...";
     }
+    const storedHashes = await loadHashes(projectRoot);
     const dsm = new DesignSystemManager7(configPath);
     await dsm.load();
     const cm = new ComponentManager4(config2);
@@ -8324,18 +8548,18 @@ async function chatCommand(message, options) {
     );
     const preflightInstalledIds = [];
     const allNpmImportsFromPages = /* @__PURE__ */ new Set();
+    const allNeededComponentIds = /* @__PURE__ */ new Set();
     for (const pageRequest of pageRequests) {
       const page = pageRequest.changes;
-      const neededComponentIds = /* @__PURE__ */ new Set();
       page.sections?.forEach(
         (section) => {
           if (section.componentId) {
-            neededComponentIds.add(section.componentId);
+            allNeededComponentIds.add(section.componentId);
           }
           if (section.props?.fields && Array.isArray(section.props.fields)) {
             section.props.fields.forEach((field) => {
               if (field.component) {
-                neededComponentIds.add(field.component);
+                allNeededComponentIds.add(field.component);
               }
             });
           }
@@ -8344,7 +8568,7 @@ async function chatCommand(message, options) {
       if (typeof page.pageCode === "string" && page.pageCode.trim() !== "") {
         const importMatches = page.pageCode.matchAll(/@\/components\/ui\/([a-z0-9-]+)/g);
         for (const m of importMatches) {
-          if (m[1]) neededComponentIds.add(m[1]);
+          if (m[1]) allNeededComponentIds.add(m[1]);
         }
         extractNpmPackagesFromCode(page.pageCode).forEach((p) => allNpmImportsFromPages.add(p));
       }
@@ -8359,7 +8583,7 @@ async function chatCommand(message, options) {
             });
             const tmplImports = preview.matchAll(/@\/components\/ui\/([a-z0-9-]+)/g);
             for (const m of tmplImports) {
-              if (m[1]) neededComponentIds.add(m[1]);
+              if (m[1]) allNeededComponentIds.add(m[1]);
             }
             extractNpmPackagesFromCode(preview).forEach((p) => allNpmImportsFromPages.add(p));
           } catch {
@@ -8367,8 +8591,8 @@ async function chatCommand(message, options) {
         }
       }
       if (DEBUG4) {
-        console.log(chalk13.gray("\n[DEBUG] Pre-flight analysis:"));
-        console.log(chalk13.gray(`  Needed components: ${Array.from(neededComponentIds).join(", ")}`));
+        console.log(chalk13.gray(`
+[DEBUG] Pre-flight analysis for page "${page.name || page.route}": `));
         console.log(chalk13.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`));
@@ -8376,64 +8600,67 @@ async function chatCommand(message, options) {
             console.log(chalk13.gray(`    Field ${i}: component=${f.component}`));
           });
         }
-        console.log("");
       }
-      const INVALID_COMPONENT_IDS = /* @__PURE__ */ new Set(["ui", "shared", "lib", "utils", "hooks", "app", "components"]);
-      for (const id of INVALID_COMPONENT_IDS) neededComponentIds.delete(id);
-      const missingComponents = [];
-      for (const componentId of neededComponentIds) {
-        const exists = cm.read(componentId);
-        if (DEBUG4) console.log(chalk13.gray(`    Checking ${componentId}: ${exists ? "EXISTS" : "MISSING"}`));
-        if (!exists) {
-          missingComponents.push(componentId);
-        }
+    }
+    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("");
+    }
+    const missingComponents = [];
+    for (const componentId of allNeededComponentIds) {
+      const exists = cm.read(componentId);
+      if (DEBUG4) console.log(chalk13.gray(`    Checking ${componentId}: ${exists ? "EXISTS" : "MISSING"}`));
+      if (!exists) {
+        missingComponents.push(componentId);
       }
-      if (missingComponents.length > 0) {
-        spinner.stop();
-        console.log(chalk13.cyan("\n\u{1F50D} Pre-flight check: Installing missing components...\n"));
-        for (const componentId of missingComponents) {
-          if (DEBUG4) {
-            console.log(chalk13.gray(`    [DEBUG] Trying to install: ${componentId}`));
-            console.log(chalk13.gray(`    [DEBUG] isShadcnComponent(${componentId}): ${isShadcnComponent(componentId)}`));
-          }
-          if (isShadcnComponent(componentId)) {
-            try {
-              const shadcnDef = await installShadcnComponent(componentId, projectRoot);
-              if (DEBUG4)
-                console.log(chalk13.gray(`    [DEBUG] shadcnDef for ${componentId}: ${shadcnDef ? "OK" : "NULL"}`));
-              if (shadcnDef) {
-                if (DEBUG4) console.log(chalk13.gray(`    [DEBUG] Registering ${shadcnDef.id} (${shadcnDef.name})`));
-                const result = await cm.register(shadcnDef);
-                if (DEBUG4) {
-                  console.log(
-                    chalk13.gray(
-                      `    [DEBUG] Register result: ${result.success ? "SUCCESS" : "FAILED"}${!result.success && result.message ? ` - ${result.message}` : ""}`
-                    )
-                  );
-                }
-                if (result.success) {
-                  preflightInstalledIds.push(shadcnDef.id);
-                  console.log(chalk13.green(`   \u2728 Auto-installed ${shadcnDef.name} component`));
-                  const updatedConfig2 = result.config;
-                  dsm.updateConfig(updatedConfig2);
-                  cm.updateConfig(updatedConfig2);
-                  pm.updateConfig(updatedConfig2);
-                }
+    }
+    if (missingComponents.length > 0) {
+      spinner.stop();
+      console.log(chalk13.cyan("\n\u{1F50D} Pre-flight check: Installing missing components...\n"));
+      for (const componentId of missingComponents) {
+        if (DEBUG4) {
+          console.log(chalk13.gray(`    [DEBUG] Trying to install: ${componentId}`));
+          console.log(chalk13.gray(`    [DEBUG] isShadcnComponent(${componentId}): ${isShadcnComponent(componentId)}`));
+        }
+        if (isShadcnComponent(componentId)) {
+          try {
+            const shadcnDef = await installShadcnComponent(componentId, projectRoot);
+            if (DEBUG4) console.log(chalk13.gray(`    [DEBUG] shadcnDef for ${componentId}: ${shadcnDef ? "OK" : "NULL"}`));
+            if (shadcnDef) {
+              if (DEBUG4) console.log(chalk13.gray(`    [DEBUG] Registering ${shadcnDef.id} (${shadcnDef.name})`));
+              const result = await cm.register(shadcnDef);
+              if (DEBUG4) {
+                console.log(
+                  chalk13.gray(
+                    `    [DEBUG] Register result: ${result.success ? "SUCCESS" : "FAILED"}${!result.success && result.message ? ` - ${result.message}` : ""}`
+                  )
+                );
               }
-            } catch (error) {
-              console.log(chalk13.red(`   \u274C Failed to install ${componentId}:`));
-              console.log(chalk13.red(`      ${error instanceof Error ? error.message : error}`));
-              if (error instanceof Error && error.stack) {
-                console.log(chalk13.gray(`      ${error.stack.split("\n")[1]}`));
+              if (result.success) {
+                preflightInstalledIds.push(shadcnDef.id);
+                console.log(chalk13.green(`   \u2728 Auto-installed ${shadcnDef.name} component`));
+                const updatedConfig2 = result.config;
+                dsm.updateConfig(updatedConfig2);
+                cm.updateConfig(updatedConfig2);
+                pm.updateConfig(updatedConfig2);
               }
             }
-          } else {
-            console.log(chalk13.yellow(`   \u26A0\uFE0F  Component ${componentId} not available`));
+          } catch (error) {
+            console.log(chalk13.red(`   \u274C Failed to install ${componentId}:`));
+            console.log(chalk13.red(`      ${error instanceof Error ? error.message : error}`));
+            if (error instanceof Error && error.stack) {
+              console.log(chalk13.gray(`      ${error.stack.split("\n")[1]}`));
+            }
           }
+        } else {
+          console.log(chalk13.yellow(`   \u26A0\uFE0F  Component ${componentId} not available`));
         }
-        console.log("");
-        spinner.start("Applying modifications...");
       }
+      console.log("");
+      spinner.start("Applying modifications...");
     }
     const installedPkgs = getInstalledPackages(projectRoot);
     const neededPkgs = /* @__PURE__ */ new Set([...COHERENT_REQUIRED_PACKAGES, ...allNpmImportsFromPages]);
@@ -8471,6 +8698,9 @@ async function chatCommand(message, options) {
       if (DEBUG4) console.log(chalk13.dim("[backup] Created snapshot"));
     } catch {
     }
+    const navBefore = takeNavSnapshot(
+      config2.navigation?.items?.map((i) => ({ label: i.label, href: i.route || `/${i.label.toLowerCase()}` }))
+    );
     spinner.start("Applying modifications...");
     const results = [];
     for (const request of normalizedRequests) {
@@ -8592,6 +8822,34 @@ async function chatCommand(message, options) {
         spinner.start("Finalizing...");
       }
     }
+    const finalConfig = dsm.getConfig();
+    const allRoutes = finalConfig.pages.map((p) => p.route).filter(Boolean);
+    if (allRoutes.length > 1) {
+      const linkIssues = [];
+      for (const result of results) {
+        if (!result.success) continue;
+        for (const mod of result.modified) {
+          if (mod.startsWith("app/") && mod.endsWith("/page.tsx")) {
+            try {
+              const code = readFileSync10(resolve9(projectRoot, mod), "utf-8");
+              const issues = validatePageQuality(code, allRoutes).filter(
+                (i) => i.type === "BROKEN_INTERNAL_LINK"
+              );
+              for (const issue of issues) {
+                linkIssues.push({ page: mod, message: issue.message });
+              }
+            } catch {
+            }
+          }
+        }
+      }
+      if (linkIssues.length > 0) {
+        console.log(chalk13.yellow("\n\u{1F517} Broken internal links:"));
+        for (const { page, message: message2 } of linkIssues) {
+          console.log(chalk13.dim(`   ${page}: ${message2}`));
+        }
+      }
+    }
     const updatedConfig = dsm.getConfig();
     const darkMatch = /\bdark\s*(theme|mode|background)\b/i.test(message);
     const lightMatch = /\blight\s*(theme|mode|background)\b/i.test(message);
@@ -8618,6 +8876,10 @@ async function chatCommand(message, options) {
       } catch {
       }
     }
+    if (updatedConfig.settings.initialized === false) {
+      updatedConfig.settings.initialized = true;
+      dsm.updateConfig(updatedConfig);
+    }
     spinner.text = "Saving configuration...";
     await dsm.save();
     spinner.succeed("Configuration saved");
@@ -8627,15 +8889,42 @@ async function chatCommand(message, options) {
     scaffoldedPages.forEach(({ route }) => {
       allModified.add(`page:${route.slice(1) || "home"}`);
     });
+    const navAfter = takeNavSnapshot(
+      updatedConfig.navigation?.items?.map((i) => ({
+        label: i.label,
+        href: i.route || `/${i.label.toLowerCase()}`
+      }))
+    );
+    const navChanged = hasNavChanged(navBefore, navAfter);
     if (allModified.size > 0) {
       spinner.start("Regenerating affected files...");
-      await regenerateFiles(Array.from(allModified), updatedConfig, projectRoot);
+      await regenerateFiles(Array.from(allModified), updatedConfig, projectRoot, { navChanged, storedHashes });
       spinner.succeed("Files regenerated");
     }
     try {
       fixGlobalsCss(projectRoot, updatedConfig);
     } catch {
     }
+    try {
+      const updatedHashes = { ...storedHashes };
+      const sharedDir = resolve9(projectRoot, "components", "shared");
+      const layoutFile = resolve9(projectRoot, "app", "layout.tsx");
+      const filesToHash = [layoutFile];
+      if (existsSync16(sharedDir)) {
+        for (const f of readdirSync2(sharedDir)) {
+          if (f.endsWith(".tsx")) filesToHash.push(resolve9(sharedDir, f));
+        }
+      }
+      for (const filePath of filesToHash) {
+        if (existsSync16(filePath)) {
+          const rel = relative2(projectRoot, filePath);
+          updatedHashes[rel] = await computeFileHash(filePath);
+        }
+      }
+      await saveHashes(projectRoot, updatedHashes);
+    } catch {
+      if (DEBUG4) console.log(chalk13.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) {
       const changes = successfulPairs.map(({ request }) => ({
@@ -8743,18 +9032,18 @@ import chalk14 from "chalk";
 import ora3 from "ora";
 import { spawn } from "child_process";
 import { existsSync as existsSync19, rmSync as rmSync3, readFileSync as readFileSync13, writeFileSync as writeFileSync10 } from "fs";
-import { resolve as resolve10, join as join11 } from "path";
+import { resolve as resolve10, join as join12 } from "path";
 import { readdir as readdir2 } from "fs/promises";
 import { DesignSystemManager as DesignSystemManager8, ComponentGenerator as ComponentGenerator3 } from "@getcoherent/core";
 
 // src/utils/file-watcher.ts
 import { readFileSync as readFileSync12, writeFileSync as writeFileSync9, existsSync as existsSync18 } from "fs";
-import { relative as relative3, join as join10 } from "path";
+import { relative as relative4, join as join11 } from "path";
 import { loadManifest as loadManifest8, saveManifest as saveManifest3 } from "@getcoherent/core";
 
 // src/utils/component-integrity.ts
-import { existsSync as existsSync17, readFileSync as readFileSync11, readdirSync as readdirSync2 } from "fs";
-import { join as join9, relative as relative2 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync11, readdirSync as readdirSync3 } from "fs";
+import { join as join10, relative as relative3 } from "path";
 function extractExportedComponentNames(code) {
   const names = [];
   let m;
@@ -8780,7 +9069,7 @@ function arraysEqual(a, b) {
 }
 function findPagesImporting(projectRoot, componentName, componentFile) {
   const results = [];
-  const appDir = join9(projectRoot, "app");
+  const appDir = join10(projectRoot, "app");
   if (!existsSync17(appDir)) return results;
   const pageFiles = collectFiles(appDir, (name) => name === "page.tsx" || name === "page.jsx");
   const componentImportPath = componentFile.replace(/\.tsx$/, "").replace(/\.jsx$/, "");
@@ -8792,7 +9081,7 @@ function findPagesImporting(projectRoot, componentName, componentFile) {
       const hasDefaultImport = new RegExp(`import\\s+${componentName}\\s+from\\s+['"]`).test(code);
       const hasPathImport = code.includes(`@/${componentImportPath}`);
       if (hasNamedImport || hasDefaultImport || hasPathImport) {
-        results.push(relative2(projectRoot, absPath));
+        results.push(relative3(projectRoot, absPath));
       }
     } catch {
     }
@@ -8800,7 +9089,7 @@ function findPagesImporting(projectRoot, componentName, componentFile) {
   return results;
 }
 function isUsedInLayout(projectRoot, componentName) {
-  const layoutPath = join9(projectRoot, "app", "layout.tsx");
+  const layoutPath = join10(projectRoot, "app", "layout.tsx");
   if (!existsSync17(layoutPath)) return false;
   try {
     const code = readFileSync11(layoutPath, "utf-8");
@@ -8811,7 +9100,7 @@ function isUsedInLayout(projectRoot, componentName) {
 }
 function findUnregisteredComponents(projectRoot, manifest) {
   const results = [];
-  const componentsDir = join9(projectRoot, "components");
+  const componentsDir = join10(projectRoot, "components");
   if (!existsSync17(componentsDir)) return results;
   const registeredFiles = new Set(manifest.shared.map((s) => s.file));
   const registeredNames = new Set(manifest.shared.map((s) => s.name));
@@ -8821,7 +9110,7 @@ function findUnregisteredComponents(projectRoot, manifest) {
     ["ui", "node_modules"]
   );
   for (const absPath of files) {
-    const relFile = relative2(projectRoot, absPath);
+    const relFile = relative3(projectRoot, absPath);
     if (registeredFiles.has(relFile)) continue;
     try {
       const code = readFileSync11(absPath, "utf-8");
@@ -8839,7 +9128,7 @@ function findUnregisteredComponents(projectRoot, manifest) {
 }
 function findInlineDuplicates(projectRoot, manifest) {
   const results = [];
-  const appDir = join9(projectRoot, "app");
+  const appDir = join10(projectRoot, "app");
   if (!existsSync17(appDir)) return results;
   const pageFiles = collectFiles(appDir, (name) => name === "page.tsx" || name === "page.jsx");
   for (const absPath of pageFiles) {
@@ -8850,7 +9139,7 @@ function findInlineDuplicates(projectRoot, manifest) {
     } catch {
       continue;
     }
-    const relPath = relative2(projectRoot, absPath);
+    const relPath = relative3(projectRoot, absPath);
     for (const shared of manifest.shared) {
       const importPath = shared.file.replace(/\.tsx$/, "").replace(/\.jsx$/, "");
       const isImported = code.includes(`@/${importPath}`) || code.includes(`from './${importPath}'`) || code.includes(`from "../${importPath}"`);
@@ -8869,7 +9158,7 @@ function findInlineDuplicates(projectRoot, manifest) {
   return results;
 }
 function findComponentFileByExportName(projectRoot, componentName) {
-  const componentsDir = join9(projectRoot, "components");
+  const componentsDir = join10(projectRoot, "components");
   if (!existsSync17(componentsDir)) return null;
   const files = collectFiles(
     componentsDir,
@@ -8881,7 +9170,7 @@ function findComponentFileByExportName(projectRoot, componentName) {
       const code = readFileSync11(absPath, "utf-8");
       const exports = extractExportedComponentNames(code);
       if (exports.includes(componentName)) {
-        return relative2(projectRoot, absPath);
+        return relative3(projectRoot, absPath);
       }
     } catch {
     }
@@ -8891,7 +9180,7 @@ function findComponentFileByExportName(projectRoot, componentName) {
 function removeOrphanedEntries(projectRoot, manifest) {
   const removed = [];
   const valid = manifest.shared.filter((entry) => {
-    const filePath = join9(projectRoot, entry.file);
+    const filePath = join10(projectRoot, entry.file);
     if (existsSync17(filePath)) return true;
     removed.push({ id: entry.id, name: entry.name });
     return false;
@@ -8910,7 +9199,7 @@ function reconcileComponents(projectRoot, manifest) {
   };
   const m = { ...manifest, shared: [...manifest.shared], nextId: manifest.nextId };
   m.shared = m.shared.filter((entry) => {
-    const filePath = join9(projectRoot, entry.file);
+    const filePath = join10(projectRoot, entry.file);
     if (!existsSync17(filePath)) {
       const newPath = findComponentFileByExportName(projectRoot, entry.name);
       if (newPath) {
@@ -8923,7 +9212,7 @@ function reconcileComponents(projectRoot, manifest) {
     }
     let code;
     try {
-      code = readFileSync11(join9(projectRoot, entry.file), "utf-8");
+      code = readFileSync11(join10(projectRoot, entry.file), "utf-8");
     } catch {
       return true;
     }
@@ -9000,12 +9289,12 @@ function collectFiles(dir, filter, skipDirs = []) {
   function walk(d) {
     let entries;
     try {
-      entries = readdirSync2(d, { withFileTypes: true });
+      entries = readdirSync3(d, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
-      const full = join9(d, e.name);
+      const full = join10(d, e.name);
       if (e.isDirectory()) {
         if (skipDirs.includes(e.name) || e.name.startsWith(".")) continue;
         walk(full);
@@ -9044,7 +9333,7 @@ function findInlineDuplicatesOfShared(content, manifest) {
 }
 function getWatcherConfig(projectRoot) {
   try {
-    const pkgPath = join10(projectRoot, "package.json");
+    const pkgPath = join11(projectRoot, "package.json");
     if (!existsSync18(pkgPath)) return defaultWatcherConfig();
     const pkg = JSON.parse(readFileSync12(pkgPath, "utf-8"));
     const c = pkg?.coherent?.watcher ?? {};
@@ -9069,7 +9358,7 @@ function defaultWatcherConfig() {
   };
 }
 async function handleFileChange(projectRoot, filePath) {
-  const relativePath = relative3(projectRoot, filePath).replace(/\\/g, "/");
+  const relativePath = relative4(projectRoot, filePath).replace(/\\/g, "/");
   if (!relativePath.endsWith(".tsx") && !relativePath.endsWith(".ts")) return;
   if (relativePath.includes("node_modules") || relativePath.includes(".next")) return;
   let content;
@@ -9119,7 +9408,7 @@ async function handleFileChange(projectRoot, filePath) {
   }
 }
 async function handleFileDelete(projectRoot, filePath) {
-  const relativePath = relative3(projectRoot, filePath).replace(/\\/g, "/");
+  const relativePath = relative4(projectRoot, filePath).replace(/\\/g, "/");
   if (!relativePath.startsWith("components/") || relativePath.startsWith("components/ui/")) return;
   try {
     const chalk32 = (await import("chalk")).default;
@@ -9139,7 +9428,7 @@ async function handleFileDelete(projectRoot, filePath) {
   }
 }
 async function detectNewComponent(projectRoot, filePath) {
-  const relativePath = relative3(projectRoot, filePath).replace(/\\/g, "/");
+  const relativePath = relative4(projectRoot, filePath).replace(/\\/g, "/");
   if (!relativePath.startsWith("components/") || relativePath.startsWith("components/ui/")) return;
   if (!relativePath.endsWith(".tsx") && !relativePath.endsWith(".jsx")) return;
   try {
@@ -9173,8 +9462,8 @@ function startFileWatcher(projectRoot) {
   let watcher = null;
   let manifestWatcher = null;
   import("chokidar").then((chokidar) => {
-    const appGlob = join10(projectRoot, "app", "**", "*.tsx");
-    const compGlob = join10(projectRoot, "components", "**", "*.tsx");
+    const appGlob = join11(projectRoot, "app", "**", "*.tsx");
+    const compGlob = join11(projectRoot, "components", "**", "*.tsx");
     watcher = chokidar.default.watch([appGlob, compGlob], {
       ignoreInitial: true,
       awaitWriteFinish: { stabilityThreshold: 500 }
@@ -9186,7 +9475,7 @@ function startFileWatcher(projectRoot) {
     });
     watcher.on("unlink", (fp) => handleFileDelete(projectRoot, fp));
   });
-  const manifestPath = join10(projectRoot, "coherent.components.json");
+  const manifestPath = join11(projectRoot, "coherent.components.json");
   if (existsSync18(manifestPath)) {
     import("chokidar").then((chokidar) => {
       manifestWatcher = chokidar.default.watch(manifestPath, { ignoreInitial: true });
@@ -9238,7 +9527,7 @@ function checkDependenciesInstalled(projectRoot) {
   return existsSync19(nodeModulesPath);
 }
 function clearStaleCache(projectRoot) {
-  const nextDir = join11(projectRoot, ".next");
+  const nextDir = join12(projectRoot, ".next");
   if (existsSync19(nextDir)) {
     rmSync3(nextDir, { recursive: true, force: true });
     console.log(chalk14.dim("   \u2714 Cleared stale build cache"));
@@ -9259,7 +9548,7 @@ async function listPageFiles(appDir) {
   async function walk(dir) {
     const entries = await readdir2(dir, { withFileTypes: true });
     for (const e of entries) {
-      const full = join11(dir, e.name);
+      const full = join12(dir, e.name);
       if (e.isDirectory() && !e.name.startsWith(".") && e.name !== "api" && e.name !== "design-system") await walk(full);
       else if (e.isFile() && e.name === "page.tsx") out.push(full);
     }
@@ -9268,7 +9557,7 @@ async function listPageFiles(appDir) {
   return out;
 }
 async function validateSyntax(projectRoot) {
-  const appDir = join11(projectRoot, "app");
+  const appDir = join12(projectRoot, "app");
   const pages = await listPageFiles(appDir);
   for (const file of pages) {
     const content = readFileSync13(file, "utf-8");
@@ -9280,8 +9569,8 @@ async function validateSyntax(projectRoot) {
   }
 }
 async function fixMissingComponentExports(projectRoot) {
-  const appDir = join11(projectRoot, "app");
-  const uiDir = join11(projectRoot, "components", "ui");
+  const appDir = join12(projectRoot, "app");
+  const uiDir = join12(projectRoot, "components", "ui");
   if (!existsSync19(appDir) || !existsSync19(uiDir)) return;
   const pages = await listPageFiles(appDir);
   const neededExports = /* @__PURE__ */ new Map();
@@ -9296,7 +9585,7 @@ async function fixMissingComponentExports(projectRoot) {
       for (const name of names) neededExports.get(componentId).add(name);
     }
   }
-  const configPath = join11(projectRoot, "design-system.config.ts");
+  const configPath = join12(projectRoot, "design-system.config.ts");
   let config2 = null;
   try {
     const mgr = new DesignSystemManager8(configPath);
@@ -9305,7 +9594,7 @@ async function fixMissingComponentExports(projectRoot) {
   }
   const generator = new ComponentGenerator3(config2 || { components: [], pages: [], tokens: {} });
   for (const [componentId, needed] of neededExports) {
-    const componentFile = join11(uiDir, `${componentId}.tsx`);
+    const componentFile = join12(uiDir, `${componentId}.tsx`);
     const def = getShadcnComponent(componentId);
     if (!existsSync19(componentFile)) {
       if (!def) continue;
@@ -9342,7 +9631,7 @@ async function fixMissingComponentExports(projectRoot) {
   }
 }
 async function backfillPageAnalysis(projectRoot) {
-  const configPath = join11(projectRoot, "design-system.config.ts");
+  const configPath = join12(projectRoot, "design-system.config.ts");
   if (!existsSync19(configPath)) return;
   try {
     const mgr = new DesignSystemManager8(configPath);
@@ -9354,11 +9643,11 @@ async function backfillPageAnalysis(projectRoot) {
       const isAuth = route.includes("login") || route.includes("register") || route.includes("signup") || route.includes("sign-up");
       let filePath;
       if (route === "/") {
-        filePath = join11(projectRoot, "app", "page.tsx");
+        filePath = join12(projectRoot, "app", "page.tsx");
       } else if (isAuth) {
-        filePath = join11(projectRoot, "app", "(auth)", route.slice(1), "page.tsx");
+        filePath = join12(projectRoot, "app", "(auth)", route.slice(1), "page.tsx");
       } else {
-        filePath = join11(projectRoot, "app", route.slice(1), "page.tsx");
+        filePath = join12(projectRoot, "app", route.slice(1), "page.tsx");
       }
       if (!existsSync19(filePath)) continue;
       const code = readFileSync13(filePath, "utf-8");
@@ -9388,7 +9677,7 @@ async function autoInstallShadcnComponent(componentId, projectRoot) {
   const def = getShadcnComponent(componentId);
   if (!def) return false;
   try {
-    const configPath = join11(projectRoot, "design-system.config.ts");
+    const configPath = join12(projectRoot, "design-system.config.ts");
     let config2 = null;
     try {
       const mgr = new DesignSystemManager8(configPath);
@@ -9397,10 +9686,10 @@ async function autoInstallShadcnComponent(componentId, projectRoot) {
     }
     const generator = new ComponentGenerator3(config2 || { components: [], pages: [], tokens: {} });
     const code = await generator.generate(def);
-    const uiDir = join11(projectRoot, "components", "ui");
+    const uiDir = join12(projectRoot, "components", "ui");
     const { mkdirSync: mkdirSync9 } = await import("fs");
     mkdirSync9(uiDir, { recursive: true });
-    writeFileSync10(join11(uiDir, `${componentId}.tsx`), code, "utf-8");
+    writeFileSync10(join12(uiDir, `${componentId}.tsx`), code, "utf-8");
     return true;
   } catch {
     return false;
@@ -9614,9 +9903,9 @@ async function previewCommand() {
 import chalk15 from "chalk";
 import ora4 from "ora";
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync20, rmSync as rmSync4, readdirSync as readdirSync3 } from "fs";
-import { resolve as resolve11, join as join12, dirname as dirname7 } from "path";
-import { readdir as readdir3, readFile as readFile6, writeFile as writeFile4, mkdir as mkdir4, copyFile as copyFile2 } from "fs/promises";
+import { existsSync as existsSync20, rmSync as rmSync4, readdirSync as readdirSync4 } from "fs";
+import { resolve as resolve11, join as join13, dirname as dirname7 } from "path";
+import { readdir as readdir3, readFile as readFile6, writeFile as writeFile5, mkdir as mkdir5, copyFile as copyFile2 } from "fs/promises";
 var COPY_EXCLUDE = /* @__PURE__ */ new Set([
   "node_modules",
   ".next",
@@ -9634,16 +9923,16 @@ var COPY_EXCLUDE = /* @__PURE__ */ new Set([
   ".env.local"
 ]);
 async function copyDir(src, dest) {
-  await mkdir4(dest, { recursive: true });
+  await mkdir5(dest, { recursive: true });
   const entries = await readdir3(src, { withFileTypes: true });
   for (const e of entries) {
-    const srcPath = join12(src, e.name);
-    const destPath = join12(dest, e.name);
+    const srcPath = join13(src, e.name);
+    const destPath = join13(dest, e.name);
     if (COPY_EXCLUDE.has(e.name)) continue;
     if (e.isDirectory()) {
       await copyDir(srcPath, destPath);
     } else {
-      await mkdir4(dirname7(destPath), { recursive: true });
+      await mkdir5(dirname7(destPath), { recursive: true });
       await copyFile2(srcPath, destPath);
     }
   }
@@ -9658,7 +9947,7 @@ function getPackageManager2(projectRoot) {
 }
 async function patchNextConfigForExport(outRoot) {
   for (const name of ["next.config.ts", "next.config.mjs", "next.config.js"]) {
-    const p = join12(outRoot, name);
+    const p = join13(outRoot, name);
     if (!existsSync20(p)) continue;
     let content = await readFile6(p, "utf-8");
     if (content.includes("ignoreDuringBuilds")) return;
@@ -9666,7 +9955,7 @@ async function patchNextConfigForExport(outRoot) {
       /(const\s+nextConfig\s*(?::\s*\w+)?\s*=\s*\{)/,
       "$1\n  eslint: { ignoreDuringBuilds: true },\n  typescript: { ignoreBuildErrors: true },"
     );
-    await writeFile4(p, content, "utf-8");
+    await writeFile5(p, content, "utf-8");
     return;
   }
 }
@@ -9700,13 +9989,13 @@ EXPOSE 3000
 \`\`\`
 `;
 async function ensureReadmeDeploySection(outRoot) {
-  const readmePath = join12(outRoot, "README.md");
+  const readmePath = join13(outRoot, "README.md");
   if (!existsSync20(readmePath)) return;
   try {
     let content = await readFile6(readmePath, "utf-8");
     if (/##\s+Deploy\b/m.test(content)) return;
     content = content.trimEnd() + DEPLOY_SECTION + "\n";
-    await writeFile4(readmePath, content);
+    await writeFile5(readmePath, content);
   } catch {
   }
 }
@@ -9720,22 +10009,22 @@ async function countPages(outRoot) {
       return;
     }
     for (const e of entries) {
-      const full = join12(dir, e.name);
+      const full = join13(dir, e.name);
       if (e.isFile() && e.name === "page.tsx") n++;
       else if (e.isDirectory() && !e.name.startsWith(".") && e.name !== "api") await walk(full);
     }
   }
-  const appDir = join12(outRoot, "app");
+  const appDir = join13(outRoot, "app");
   if (existsSync20(appDir)) await walk(appDir);
   return n;
 }
 function countComponents(outRoot) {
   let n = 0;
   for (const sub of ["ui", "shared"]) {
-    const dir = join12(outRoot, "components", sub);
+    const dir = join13(outRoot, "components", sub);
     if (!existsSync20(dir)) continue;
     try {
-      n += readdirSync3(dir).filter((f) => f.endsWith(".tsx") || f.endsWith(".jsx")).length;
+      n += readdirSync4(dir).filter((f) => f.endsWith(".tsx") || f.endsWith(".jsx")).length;
     } catch {
     }
   }
@@ -9748,7 +10037,7 @@ async function collectImportedPackages2(dir, extensions) {
   async function walk(d) {
     const entries = await readdir3(d, { withFileTypes: true });
     for (const e of entries) {
-      const full = join12(d, e.name);
+      const full = join13(d, e.name);
       if (e.isDirectory() && !e.name.startsWith(".") && e.name !== "node_modules") {
         await walk(full);
         continue;
@@ -9771,7 +10060,7 @@ async function collectImportedPackages2(dir, extensions) {
   return packages;
 }
 async function findMissingDepsInExport(outRoot) {
-  const pkgPath = join12(outRoot, "package.json");
+  const pkgPath = join13(outRoot, "package.json");
   if (!existsSync20(pkgPath)) return [];
   let pkg;
   try {
@@ -9780,7 +10069,7 @@ async function findMissingDepsInExport(outRoot) {
     return [];
   }
   const inDeps = /* @__PURE__ */ new Set([...Object.keys(pkg.dependencies ?? {}), ...Object.keys(pkg.devDependencies ?? {})]);
-  const codeDirs = [join12(outRoot, "app"), join12(outRoot, "components")];
+  const codeDirs = [join13(outRoot, "app"), join13(outRoot, "components")];
   const extensions = /* @__PURE__ */ new Set(["ts", "tsx", "js", "jsx"]);
   const imported = /* @__PURE__ */ new Set();
   for (const dir of codeDirs) {
@@ -9792,33 +10081,33 @@ async function findMissingDepsInExport(outRoot) {
 async function stripCoherentArtifacts(outputDir) {
   const removed = [];
   for (const p of ["app/design-system", "app/api/design-system"]) {
-    const full = join12(outputDir, p);
+    const full = join13(outputDir, p);
     if (existsSync20(full)) {
       rmSync4(full, { recursive: true, force: true });
       removed.push(p);
     }
   }
-  const appNavPath = join12(outputDir, "app", "AppNav.tsx");
+  const appNavPath = join13(outputDir, "app", "AppNav.tsx");
   if (existsSync20(appNavPath)) {
     rmSync4(appNavPath, { force: true });
     removed.push("app/AppNav.tsx");
   }
-  const layoutPath = join12(outputDir, "app", "layout.tsx");
+  const layoutPath = join13(outputDir, "app", "layout.tsx");
   if (existsSync20(layoutPath)) {
     let layout = await readFile6(layoutPath, "utf-8");
     layout = layout.replace(/import\s*\{?\s*AppNav\s*\}?\s*from\s*['"][^'"]+['"]\s*\n?/g, "");
     layout = layout.replace(/\s*<AppNav\s*\/?\s*>\s*/g, "\n");
-    await writeFile4(layoutPath, layout, "utf-8");
+    await writeFile5(layoutPath, layout, "utf-8");
   }
-  const sharedHeaderPath = join12(outputDir, "components", "shared", "header.tsx");
+  const sharedHeaderPath = join13(outputDir, "components", "shared", "header.tsx");
   if (existsSync20(sharedHeaderPath)) {
     let header = await readFile6(sharedHeaderPath, "utf-8");
     header = header.replace(/<Link\s[^>]*href="\/design-system"[^>]*>[\s\S]*?<\/Link>/g, "");
     header = header.replace(/\n\s*<>\s*\n/, "\n");
     header = header.replace(/\n\s*<\/>\s*\n/, "\n");
-    await writeFile4(sharedHeaderPath, header, "utf-8");
+    await writeFile5(sharedHeaderPath, header, "utf-8");
   }
-  const guardPath = join12(outputDir, "app", "ShowWhenNotAuthRoute.tsx");
+  const guardPath = join13(outputDir, "app", "ShowWhenNotAuthRoute.tsx");
   if (existsSync20(guardPath)) {
     let guard = await readFile6(guardPath, "utf-8");
     guard = guard.replace(/['"],?\s*'\/design-system['"],?\s*/g, "");
@@ -9832,10 +10121,10 @@ async function stripCoherentArtifacts(outputDir) {
         layout = layout.replace(/import\s+\w+\s+from\s*['"]\.\/ShowWhenNotAuthRoute['"]\s*\n?/g, "");
         layout = layout.replace(/\s*<ShowWhenNotAuthRoute>\s*\n?/g, "\n");
         layout = layout.replace(/\s*<\/ShowWhenNotAuthRoute>\s*\n?/g, "\n");
-        await writeFile4(layoutPath, layout, "utf-8");
+        await writeFile5(layoutPath, layout, "utf-8");
       }
     } else {
-      await writeFile4(guardPath, guard, "utf-8");
+      await writeFile5(guardPath, guard, "utf-8");
     }
   }
   for (const name of [
@@ -9847,14 +10136,14 @@ async function stripCoherentArtifacts(outputDir) {
     ".env.local",
     "recommendations.md"
   ]) {
-    const full = join12(outputDir, name);
+    const full = join13(outputDir, name);
     if (existsSync20(full)) {
       rmSync4(full, { force: true });
       removed.push(name);
     }
   }
   for (const dir of [".claude", ".coherent"]) {
-    const full = join12(outputDir, dir);
+    const full = join13(outputDir, dir);
     if (existsSync20(full)) {
       rmSync4(full, { recursive: true, force: true });
       removed.push(dir + "/");
@@ -10054,8 +10343,8 @@ async function regenerateDocsCommand() {
 
 // src/commands/fix.ts
 import chalk18 from "chalk";
-import { readdirSync as readdirSync4, readFileSync as readFileSync14, existsSync as existsSync21, writeFileSync as writeFileSync11, rmSync as rmSync5, mkdirSync as mkdirSync7 } from "fs";
-import { resolve as resolve12, join as join13 } from "path";
+import { readdirSync as readdirSync5, readFileSync as readFileSync14, existsSync as existsSync21, writeFileSync as writeFileSync11, rmSync as rmSync5, mkdirSync as mkdirSync7 } from "fs";
+import { resolve as resolve12, join as join14 } from "path";
 import {
   DesignSystemManager as DesignSystemManager11,
   ComponentManager as ComponentManager5,
@@ -10079,9 +10368,9 @@ function extractComponentIdsFromCode2(code) {
 function listTsxFiles(dir) {
   const files = [];
   try {
-    const entries = readdirSync4(dir, { withFileTypes: true });
+    const entries = readdirSync5(dir, { withFileTypes: true });
     for (const e of entries) {
-      const full = join13(dir, e.name);
+      const full = join14(dir, e.name);
       if (e.isDirectory() && e.name !== "node_modules" && !e.name.startsWith(".")) {
         files.push(...listTsxFiles(full));
       } else if (e.isFile() && e.name.endsWith(".tsx")) {
@@ -10110,7 +10399,7 @@ async function fixCommand(opts = {}) {
     console.log(chalk18.cyan("\ncoherent fix\n"));
   }
   if (!skipCache) {
-    const nextDir = join13(projectRoot, ".next");
+    const nextDir = join14(projectRoot, ".next");
     if (existsSync21(nextDir)) {
       if (!dryRun) rmSync5(nextDir, { recursive: true, force: true });
       fixes.push("Cleared build cache");
@@ -10367,13 +10656,13 @@ async function fixCommand(opts = {}) {
 // src/commands/check.ts
 import chalk19 from "chalk";
 import { resolve as resolve13 } from "path";
-import { readdirSync as readdirSync5, readFileSync as readFileSync15, statSync as statSync2, existsSync as existsSync22 } from "fs";
+import { readdirSync as readdirSync6, readFileSync as readFileSync15, statSync as statSync2, existsSync as existsSync22 } from "fs";
 import { loadManifest as loadManifest10 } from "@getcoherent/core";
 var EXCLUDED_DIRS = /* @__PURE__ */ new Set(["node_modules", "design-system"]);
 function findTsxFiles(dir) {
   const results = [];
   try {
-    const entries = readdirSync5(dir);
+    const entries = readdirSync6(dir);
     for (const entry of entries) {
       const full = resolve13(dir, entry);
       const stat = statSync2(full);
@@ -10701,8 +10990,8 @@ import { existsSync as existsSync23 } from "fs";
 import { resolve as resolve14 } from "path";
 
 // src/utils/ds-files.ts
-import { mkdir as mkdir5, writeFile as writeFile5 } from "fs/promises";
-import { join as join14, dirname as dirname8 } from "path";
+import { mkdir as mkdir6, writeFile as writeFile6 } from "fs/promises";
+import { join as join15, dirname as dirname8 } from "path";
 import { DesignSystemGenerator } from "@getcoherent/core";
 var SHARED_DS_KEYS = [
   "app/design-system/shared/page.tsx",
@@ -10716,9 +11005,9 @@ async function writeDesignSystemFiles(projectRoot, config2, options) {
   const toWrite = options?.sharedOnly ? new Map([...files].filter(([path3]) => SHARED_DS_KEYS.includes(path3))) : files;
   const written = [];
   for (const [relativePath, content] of toWrite) {
-    const fullPath = join14(projectRoot, relativePath);
-    await mkdir5(dirname8(fullPath), { recursive: true });
-    await writeFile5(fullPath, content, "utf-8");
+    const fullPath = join15(projectRoot, relativePath);
+    await mkdir6(dirname8(fullPath), { recursive: true });
+    await writeFile6(fullPath, content, "utf-8");
     written.push(relativePath);
   }
   return written;
@@ -10854,8 +11143,8 @@ function createComponentsCommand() {
 // src/commands/import-cmd.ts
 import chalk26 from "chalk";
 import ora6 from "ora";
-import { writeFile as writeFile6, mkdir as mkdir6 } from "fs/promises";
-import { resolve as resolve15, join as join15, dirname as dirname9 } from "path";
+import { writeFile as writeFile7, mkdir as mkdir7 } from "fs/promises";
+import { resolve as resolve15, join as join16, dirname as dirname9 } from "path";
 import { existsSync as existsSync24 } from "fs";
 import {
   FigmaClient,
@@ -11003,9 +11292,9 @@ async function importFigmaAction(urlOrKey, opts) {
       stats.filesWritten.push(filePath);
       return;
     }
-    const fullPath = join15(projectRoot, filePath);
-    await mkdir6(dirname9(fullPath), { recursive: true });
-    await writeFile6(fullPath, content, "utf-8");
+    const fullPath = join16(projectRoot, filePath);
+    await mkdir7(dirname9(fullPath), { recursive: true });
+    await writeFile7(fullPath, content, "utf-8");
     stats.filesWritten.push(filePath);
   };
   try {
@@ -11079,7 +11368,7 @@ async function importFigmaAction(urlOrKey, opts) {
     });
     if (dryRun) stats.filesWritten.push(FIGMA_COMPONENT_MAP_FILENAME);
     else
-      await writeFile6(
+      await writeFile7(
         resolve15(projectRoot, FIGMA_COMPONENT_MAP_FILENAME),
         JSON.stringify(componentMapObj, null, 2),
         "utf-8"
@@ -11119,7 +11408,7 @@ async function importFigmaAction(urlOrKey, opts) {
         });
         await dsm.save();
       } else {
-        await writeFile6(
+        await writeFile7(
           configPath,
           `/**
  * Design System Configuration
@@ -11134,10 +11423,10 @@ export const config = ${JSON.stringify(fullConfig, null, 2)} as const
       stats.configUpdated = true;
       spinner.succeed("design-system.config.ts updated");
       spinner.start("Ensuring root layout...");
-      const layoutPath = join15(projectRoot, "app/layout.tsx");
+      const layoutPath = join16(projectRoot, "app/layout.tsx");
       if (!existsSync24(layoutPath)) {
-        await mkdir6(dirname9(layoutPath), { recursive: true });
-        await writeFile6(layoutPath, MINIMAL_ROOT_LAYOUT, "utf-8");
+        await mkdir7(dirname9(layoutPath), { recursive: true });
+        await writeFile7(layoutPath, MINIMAL_ROOT_LAYOUT, "utf-8");
         stats.filesWritten.push("app/layout.tsx");
       }
       spinner.succeed("Root layout OK");
@@ -11226,7 +11515,7 @@ async function dsRegenerateCommand() {
 import chalk28 from "chalk";
 import ora8 from "ora";
 import { readFileSync as readFileSync16, existsSync as existsSync25 } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 import { DesignSystemManager as DesignSystemManager15, CLI_VERSION as CLI_VERSION4 } from "@getcoherent/core";
 
 // src/utils/migrations.ts
@@ -11395,7 +11684,7 @@ var EXPECTED_CSS_VARS = [
   "--sidebar-ring"
 ];
 function checkMissingCssVars(projectRoot) {
-  const globalsPath = join16(projectRoot, "app", "globals.css");
+  const globalsPath = join17(projectRoot, "app", "globals.css");
   if (!existsSync25(globalsPath)) return [];
   try {
     const content = readFileSync16(globalsPath, "utf-8");
@@ -11405,7 +11694,7 @@ function checkMissingCssVars(projectRoot) {
   }
 }
 function patchGlobalsCss(projectRoot, missingVars) {
-  const globalsPath = join16(projectRoot, "app", "globals.css");
+  const globalsPath = join17(projectRoot, "app", "globals.css");
   if (!existsSync25(globalsPath) || missingVars.length === 0) return;
   const { writeFileSync: writeFileSync13 } = __require("fs");
   let content = readFileSync16(globalsPath, "utf-8");
@@ -11487,14 +11776,14 @@ async function undoCommand(options) {
 import chalk30 from "chalk";
 import ora9 from "ora";
 import { existsSync as existsSync26, readFileSync as readFileSync17 } from "fs";
-import { join as join17, relative as relative4, dirname as dirname10 } from "path";
+import { join as join18, relative as relative5, dirname as dirname10 } from "path";
 import { readdir as readdir4, readFile as readFile7 } from "fs/promises";
 import { DesignSystemManager as DesignSystemManager16 } from "@getcoherent/core";
 import { loadManifest as loadManifest12, saveManifest as saveManifest5, findSharedComponent } from "@getcoherent/core";
 function extractTokensFromProject(projectRoot) {
   const lightColors = {};
   const darkColors = {};
-  const globalsPath = join17(projectRoot, "app", "globals.css");
+  const globalsPath = join18(projectRoot, "app", "globals.css");
   if (existsSync26(globalsPath)) {
     const css = readFileSync17(globalsPath, "utf-8");
     const rootMatch = css.match(/:root\s*\{([^}]+)\}/s);
@@ -11502,7 +11791,7 @@ function extractTokensFromProject(projectRoot) {
     const darkMatch = css.match(/\.dark\s*\{([^}]+)\}/s);
     if (darkMatch) parseVarsInto(darkMatch[1], darkColors);
   }
-  const layoutPath = join17(projectRoot, "app", "layout.tsx");
+  const layoutPath = join18(projectRoot, "app", "layout.tsx");
   let layoutCode = "";
   if (existsSync26(layoutPath)) {
     layoutCode = readFileSync17(layoutPath, "utf-8");
@@ -11546,14 +11835,14 @@ function parseVarsInto(block, target) {
 }
 async function detectCustomComponents(projectRoot, allPageCode) {
   const results = [];
-  const componentsDir = join17(projectRoot, "components");
+  const componentsDir = join18(projectRoot, "components");
   if (!existsSync26(componentsDir)) return results;
   const files = [];
   await walkForTsx(componentsDir, files, ["ui"]);
   const fileResults = await Promise.all(
     files.map(async (filePath) => {
       const code = await readFile7(filePath, "utf-8");
-      const relFile = relative4(projectRoot, filePath);
+      const relFile = relative5(projectRoot, filePath);
       const exportedNames = extractExportedComponentNames2(code);
       return exportedNames.map((name) => ({
         name,
@@ -11574,7 +11863,7 @@ async function walkForTsx(dir, files, skipDirs) {
     return;
   }
   for (const e of entries) {
-    const full = join17(dir, e.name);
+    const full = join18(dir, e.name);
     if (e.isDirectory()) {
       if (skipDirs.includes(e.name) || e.name.startsWith(".")) continue;
       await walkForTsx(full, files, skipDirs);
@@ -11648,14 +11937,14 @@ async function discoverPages(appDir) {
       return;
     }
     for (const entry of entries) {
-      const full = join17(dir, entry.name);
+      const full = join18(dir, entry.name);
       if (entry.isDirectory()) {
         if (["design-system", "api", "_not-found"].includes(entry.name)) continue;
         if (entry.name.startsWith(".")) continue;
         await walk(full);
       } else if (entry.name === "page.tsx" || entry.name === "page.jsx") {
         const code = await readFile7(full, "utf-8");
-        const routeDir = dirname10(relative4(appDir, full));
+        const routeDir = dirname10(relative5(appDir, full));
         let route = routeDir === "." ? "/" : "/" + routeDir;
         route = route.replace(/\/\([^)]+\)/g, "");
         if (!route.startsWith("/")) route = "/" + route;
@@ -11725,7 +12014,7 @@ async function syncCommand(options = {}) {
   if (dryRun) console.log(chalk30.yellow("  [dry-run] No files will be written\n"));
   const spinner = ora9("Scanning project files...").start();
   try {
-    const appDir = join17(project.root, "app");
+    const appDir = join18(project.root, "app");
     if (!existsSync26(appDir)) {
       spinner.fail("No app/ directory found");
       process.exit(1);
@@ -11952,14 +12241,14 @@ async function syncCommand(options = {}) {
 
 // src/utils/update-notifier.ts
 import { existsSync as existsSync27, mkdirSync as mkdirSync8, readFileSync as readFileSync18, writeFileSync as writeFileSync12 } from "fs";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 import { homedir } from "os";
 import chalk31 from "chalk";
 import { CLI_VERSION as CLI_VERSION5 } from "@getcoherent/core";
 var DEBUG5 = process.env.COHERENT_DEBUG === "1";
 var PACKAGE_NAME = "@getcoherent/cli";
-var CACHE_DIR = join18(homedir(), ".coherent");
-var CACHE_FILE = join18(CACHE_DIR, "update-check.json");
+var CACHE_DIR = join19(homedir(), ".coherent");
+var CACHE_FILE = join19(CACHE_DIR, "update-check.json");
 var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 function readCache() {
   try {