npm - @getcoherent/cli - Versions diffs - 0.2.3 → 0.3.0 - Mend

@getcoherent/cli 0.2.3 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/index.js +371 -504
package/package.json +2 -2

package/dist/index.js CHANGED Viewed

@@ -601,7 +601,7 @@ function installPackages(projectRoot, packages) {
   if (packages.length === 0) return Promise.resolve(true);
   const safe = packages.filter((p) => SAFE_PKG_NAME.test(p));
   if (safe.length === 0) return Promise.resolve(true);
-  return new Promise((resolve17) => {
+  return new Promise((resolve16) => {
     try {
       const hasPnpm = existsSync4(join2(projectRoot, "pnpm-lock.yaml"));
       if (hasPnpm) {
@@ -612,10 +612,10 @@ function installPackages(projectRoot, packages) {
           stdio: "pipe"
         });
       }
-      resolve17(true);
+      resolve16(true);
     } catch (e) {
       if (process.env.COHERENT_DEBUG === "1") console.error("Failed to install packages:", e);
-      resolve17(false);
+      resolve16(false);
     }
   });
 }
@@ -1974,7 +1974,7 @@ Run in terminal:
 ## Platform Overlay (DO NOT TOUCH)
 The following are dev-only platform features, excluded from production export:
-- Floating Design System button (in AppNav.tsx)
+- Floating Design System button (in shared Header component)
 - /design-system/* pages
 - /api/design-system/* routes
 - coherent.components.json
@@ -2425,8 +2425,8 @@ export default config
 // src/commands/chat.ts
 import chalk13 from "chalk";
 import ora2 from "ora";
-import { resolve as resolve10 } from "path";
-import { existsSync as existsSync16, readFileSync as readFileSync11, mkdirSync as mkdirSync6 } from "fs";
+import { resolve as resolve9 } from "path";
+import { existsSync as existsSync16, readFileSync as readFileSync10, mkdirSync as mkdirSync6 } from "fs";
 import {
   DesignSystemManager as DesignSystemManager7,
   ComponentManager as ComponentManager4,
@@ -4480,6 +4480,14 @@ Format:
   "pageCode": "import { Metadata } from 'next'\\n..."
 }
+LAYOUT CONTRACT (CRITICAL \u2014 prevents duplicate navigation and footer):
+- The app has a root layout (app/layout.tsx) that renders a shared Header and Footer.
+- Pages are rendered INSIDE this layout, between the Header and Footer.
+- NEVER include <header>, <nav>, or <footer> elements in pageCode.
+- Start page content with <main> or a wrapper <div>. The first visible element should be the page title or hero section.
+- If the page needs sub-navigation (tabs, breadcrumbs, sidebar nav), use elements like <div role="tablist"> or <aside> \u2014 NOT <header>, <nav>, or <footer>.
+- Do NOT add any navigation bars, logo headers, site-wide menus, or site footers to pages. The layout provides all of these.
 pageCode rules (shadcn/ui blocks quality):
 - Full Next.js App Router page. Imports from '@/components/ui/...' for registry components.
 - Follow ALL design constraints above: text-sm base, semantic colors only, restricted spacing, weight-based hierarchy.
@@ -5849,14 +5857,14 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
 import { resolve as resolve7 } from "path";
 import { mkdir as mkdir3 } from "fs/promises";
 import { dirname as dirname6 } from "path";
-import chalk10 from "chalk";
+import chalk11 from "chalk";
 import {
   getTemplateForPageType,
-  loadManifest as loadManifest5,
+  loadManifest as loadManifest6,
   saveManifest,
   updateUsedIn,
   findSharedComponentByIdOrName,
-  generateSharedComponent as generateSharedComponent2
+  generateSharedComponent as generateSharedComponent3
 } from "@getcoherent/core";
 // src/utils/quality-validator.ts
@@ -6530,36 +6538,41 @@ ${fixed}`;
     } catch {
     }
     if (lucideExports2) {
-      const importedNames = new Set(
+      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 = [...fixed.matchAll(/<([A-Z][a-zA-Z]*(?:Icon)?)\s/g)].map((m) => m[1]);
-      const htmlElements = /* @__PURE__ */ new Set(["Link", "Fragment", "Suspense", "Image"]);
+      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 (importedNames.has(ref) || htmlElements.has(ref)) continue;
+        if (allImportedNames.has(ref)) continue;
         if (fixed.includes(`function ${ref}`) || fixed.includes(`const ${ref}`)) continue;
-        if (/^import\s.*\b${ref}\b/m.test(fixed)) continue;
         const baseName = ref.replace(/Icon$/, "");
         if (lucideExports2.has(ref)) {
           missing.push(ref);
-          importedNames.add(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);
-          importedNames.add(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);
-          importedNames.add(fallback);
+          lucideImported.add(fallback);
           fixes.push(`unknown icon ${ref} \u2192 ${fallback}`);
         }
       }
       if (missing.length > 0) {
-        const allNames = [...importedNames];
+        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(", ")}`);
@@ -6609,7 +6622,8 @@ import {
   PageGenerator,
   TailwindConfigGenerator
 } from "@getcoherent/core";
-import { integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout2 } from "@getcoherent/core";
+import { integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout2, loadManifest as loadManifest5, generateSharedComponent as generateSharedComponent2 } from "@getcoherent/core";
+import chalk9 from "chalk";
 async function validateAndFixGeneratedCode(projectRoot, code, options = {}) {
   const fixes = [];
   let fixed = fixEscapedClosingQuotes(code);
@@ -6679,18 +6693,49 @@ async function regenerateLayout(config2, projectRoot) {
   const layout = config2.pages[0]?.layout || "centered";
   const appType = config2.settings.appType || "multi-page";
   const generator = new PageGenerator(config2);
-  const code = await generator.generateLayout(layout, appType);
-  const layoutPath = resolve6(projectRoot, "app", "layout.tsx");
-  await writeFile(layoutPath, code);
-  if (config2.navigation?.enabled && appType === "multi-page") {
-    const appNavCode = generator.generateAppNav();
-    const appNavPath = resolve6(projectRoot, "app", "AppNav.tsx");
-    await writeFile(appNavPath, appNavCode);
+  let manifest = null;
+  try {
+    manifest = await loadManifest5(projectRoot);
+  } catch {
+  }
+  const hasSharedHeader = manifest?.shared.some((c) => c.type === "layout" && /header|nav/i.test(c.name)) ?? false;
+  const hasSharedFooter = manifest?.shared.some((c) => c.type === "layout" && /footer/i.test(c.name)) ?? false;
+  if (hasSharedHeader) {
+    const code = await generator.generateLayout(layout, appType, { skipNav: true });
+    const layoutPath = resolve6(projectRoot, "app", "layout.tsx");
+    await writeFile(layoutPath, code);
+  } else {
+    const code = await generator.generateLayout(layout, appType, { skipNav: true });
+    const layoutPath = resolve6(projectRoot, "app", "layout.tsx");
+    await writeFile(layoutPath, code);
+    if (config2.navigation?.enabled && appType === "multi-page") {
+      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"]
+      });
+      if (!hasSharedFooter) {
+        const footerCode = generator.generateSharedFooterCode();
+        await generateSharedComponent2(projectRoot, {
+          name: "Footer",
+          type: "layout",
+          code: footerCode,
+          description: "Site footer",
+          usedIn: ["app/layout.tsx"]
+        });
+      }
+    }
   }
   try {
     await integrateSharedLayoutIntoRootLayout2(projectRoot);
     await ensureAuthRouteGroup(projectRoot);
-  } catch {
+  } catch (err) {
+    if (process.env.COHERENT_DEBUG === "1") {
+      console.log(chalk9.dim("Layout integration warning:", err));
+    }
   }
 }
 async function regenerateFiles(modified, config2, projectRoot) {
@@ -6728,8 +6773,39 @@ async function regenerateFiles(modified, config2, projectRoot) {
   }
 }
+// src/commands/chat/jsx-extractor.ts
+function extractBalancedTag(source, tagName) {
+  const openRe = new RegExp(`<${tagName}\\b`, "gi");
+  const match = openRe.exec(source);
+  if (!match) return null;
+  const startIdx = match.index;
+  const openTagRe = new RegExp(`<${tagName}\\b`, "gi");
+  const closeTagRe = new RegExp(`</${tagName}>`, "gi");
+  const events = [];
+  let m;
+  openTagRe.lastIndex = startIdx;
+  while ((m = openTagRe.exec(source)) !== null) {
+    events.push({ pos: m.index, type: "open", end: m.index + m[0].length });
+  }
+  closeTagRe.lastIndex = startIdx;
+  while ((m = closeTagRe.exec(source)) !== null) {
+    events.push({ pos: m.index, type: "close", end: m.index + m[0].length });
+  }
+  events.sort((a, b) => a.pos - b.pos);
+  let depth = 0;
+  for (const ev of events) {
+    if (ev.pos < startIdx) continue;
+    if (ev.type === "open") depth++;
+    else {
+      depth--;
+      if (depth === 0) return source.slice(startIdx, ev.end);
+    }
+  }
+  return null;
+}
 // src/commands/chat/reporting.ts
-import chalk9 from "chalk";
+import chalk10 from "chalk";
 function extractImportsFrom(code, fromPath) {
   const escaped = fromPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const regex = new RegExp(`import\\s*\\{([^}]+)\\}\\s*from\\s*['"\`]${escaped}[^'"\`]*['"\`]`, "g");
@@ -6751,27 +6827,27 @@ function printPostGenerationReport(opts) {
   const iconCount = extractImportsFrom(code, "lucide-react").length;
   const hasInstalled = postFixes.some((f) => f.startsWith("Installed:"));
   const syntaxStatus = postFixes.length > 0 ? postFixes.some((f) => f.includes("metadata")) ? "fixed (escaped metadata quotes) \u2714" : "fixed \u2714" : "valid \u2714";
-  console.log(chalk9.green(`
+  console.log(chalk10.green(`
 \u2705 Page "${pageTitle}" ${action} at ${filePath}
 `));
   if (uiComponents.length > 0) {
-    console.log(chalk9.dim(`  Components:  ${uiComponents.join(", ")} (from @/components/ui)`));
+    console.log(chalk10.dim(`  Components:  ${uiComponents.join(", ")} (from @/components/ui)`));
   }
   if (inCodeShared.length > 0) {
-    console.log(chalk9.dim(`  Shared:      ${inCodeShared.map((s) => `${s.id} (${s.name})`).join(", ")}`));
+    console.log(chalk10.dim(`  Shared:      ${inCodeShared.map((s) => `${s.id} (${s.name})`).join(", ")}`));
   }
   if (layoutShared.length > 0) {
-    console.log(chalk9.dim(`  Layout:      ${layoutShared.map((l) => `${l.id} (${l.name})`).join(", ")} via layout.tsx`));
+    console.log(chalk10.dim(`  Layout:      ${layoutShared.map((l) => `${l.id} (${l.name})`).join(", ")} via layout.tsx`));
   }
   if (iconCount > 0) {
-    console.log(chalk9.dim(`  Icons:       ${iconCount} from lucide-react`));
+    console.log(chalk10.dim(`  Icons:       ${iconCount} from lucide-react`));
   }
   if (hasInstalled) {
-    console.log(chalk9.dim("  Dependencies: installed \u2714"));
+    console.log(chalk10.dim("  Dependencies: installed \u2714"));
   }
-  console.log(chalk9.dim(`  Syntax:      ${syntaxStatus}`));
+  console.log(chalk10.dim(`  Syntax:      ${syntaxStatus}`));
   if (route) {
-    console.log(chalk9.cyan(`
+    console.log(chalk10.cyan(`
   Preview: http://localhost:3000${route}`));
   }
   console.log("");
@@ -6779,35 +6855,35 @@ function printPostGenerationReport(opts) {
 function printSharedComponentReport(opts) {
   const { id, name, file, instruction, postFixes = [] } = opts;
   const syntaxStatus = postFixes.length > 0 ? "fixed \u2714" : "valid \u2714";
-  console.log(chalk9.green(`
+  console.log(chalk10.green(`
 \u2705 Updated ${id} (${name}) at ${file}
 `));
   if (instruction) {
     const snippet = instruction.length > 60 ? instruction.slice(0, 57) + "..." : instruction;
-    console.log(chalk9.dim(`  Changed:     ${snippet}`));
+    console.log(chalk10.dim(`  Changed:     ${snippet}`));
   }
-  console.log(chalk9.dim("  Affects:    all pages via layout.tsx"));
-  console.log(chalk9.dim(`  Syntax:     ${syntaxStatus}`));
+  console.log(chalk10.dim("  Affects:    all pages via layout.tsx"));
+  console.log(chalk10.dim(`  Syntax:     ${syntaxStatus}`));
   console.log("");
 }
 function printLinkSharedReport(opts) {
   const { sharedId, sharedName, pageTarget, route, postFixes = [] } = opts;
   const syntaxStatus = postFixes.length > 0 ? "fixed \u2714" : "valid \u2714";
-  console.log(chalk9.green(`
+  console.log(chalk10.green(`
 \u2705 Linked ${sharedId} (${sharedName}) to page "${pageTarget}"
 `));
-  console.log(chalk9.dim(`  Syntax:     ${syntaxStatus}`));
-  console.log(chalk9.cyan(`  Preview: http://localhost:3000${route}`));
+  console.log(chalk10.dim(`  Syntax:     ${syntaxStatus}`));
+  console.log(chalk10.cyan(`  Preview: http://localhost:3000${route}`));
   console.log("");
 }
 function printPromoteAndLinkReport(opts) {
   const { id, name, file, usedInFiles, postFixes = [] } = opts;
   const syntaxStatus = postFixes.length > 0 ? "fixed \u2714" : "valid \u2714";
-  console.log(chalk9.green(`
+  console.log(chalk10.green(`
 \u2705 Created ${id} (${name}) at ${file}
 `));
-  console.log(chalk9.dim(`  Linked to:  ${usedInFiles.length} page(s)`));
-  console.log(chalk9.dim(`  Syntax:     ${syntaxStatus}`));
+  console.log(chalk10.dim(`  Linked to:  ${usedInFiles.length} page(s)`));
+  console.log(chalk10.dim(`  Syntax:     ${syntaxStatus}`));
   console.log("");
 }
 function showPreview(requests, results, config2, preflightInstalledNames) {
@@ -6825,23 +6901,23 @@ function showPreview(requests, results, config2, preflightInstalledNames) {
   const modifiedSharedComponents = successfulPairs.filter(({ request }) => request.type === "modify-layout-block");
   const modifiedPages = successfulPairs.filter(({ request }) => request.type === "update-page");
   const tokenChanges = successfulPairs.filter(({ request }) => request.type === "update-token");
-  console.log(chalk9.bold.cyan("\n\u{1F4CB} Changes Applied:\n"));
+  console.log(chalk10.bold.cyan("\n\u{1F4CB} Changes Applied:\n"));
   if (preflightInstalledNames && preflightInstalledNames.length > 0) {
-    console.log(chalk9.cyan("\u{1F50D} Pre-flight check: Installed missing components:"));
+    console.log(chalk10.cyan("\u{1F50D} Pre-flight check: Installed missing components:"));
     preflightInstalledNames.forEach((name) => {
-      console.log(chalk9.green(`   \u2728 Auto-installed ${name}`));
+      console.log(chalk10.green(`   \u2728 Auto-installed ${name}`));
     });
     console.log("");
   }
   if (addedComponents.length > 0) {
     const names = addedComponents.map(({ request }) => request.changes.name).filter(Boolean);
-    console.log(chalk9.green("\u{1F4E6} Components:"));
-    console.log(chalk9.white(`   \u2728 Auto-installed: ${names.join(", ")}`));
+    console.log(chalk10.green("\u{1F4E6} Components:"));
+    console.log(chalk10.white(`   \u2728 Auto-installed: ${names.join(", ")}`));
   }
   if (customComponents.length > 0) {
     const names = customComponents.map(({ request }) => request.changes.name).filter(Boolean);
-    if (addedComponents.length === 0) console.log(chalk9.green("\u{1F4E6} Components:"));
-    console.log(chalk9.white(`   \u2728 Created: ${names.join(", ")}`));
+    if (addedComponents.length === 0) console.log(chalk10.green("\u{1F4E6} Components:"));
+    console.log(chalk10.white(`   \u2728 Created: ${names.join(", ")}`));
   }
   const usedComponentIds = /* @__PURE__ */ new Set();
   addedPages.forEach(({ request }) => {
@@ -6856,71 +6932,71 @@ function showPreview(requests, results, config2, preflightInstalledNames) {
   ]);
   const reusedIds = [...usedComponentIds].filter((id) => !newComponentIds.has(id));
   if (reusedIds.length > 0) {
-    if (addedComponents.length === 0 && customComponents.length === 0) console.log(chalk9.green("\u{1F4E6} Components:"));
-    console.log(chalk9.white(`   \u{1F504} Reused: ${reusedIds.join(", ")}`));
+    if (addedComponents.length === 0 && customComponents.length === 0) console.log(chalk10.green("\u{1F4E6} Components:"));
+    console.log(chalk10.white(`   \u{1F504} Reused: ${reusedIds.join(", ")}`));
   }
   if (addedComponents.length > 0 || customComponents.length > 0 || reusedIds.length > 0) {
     console.log("");
   }
   if (addedPages.length > 0) {
-    console.log(chalk9.green("\u{1F4C4} Pages Created:"));
+    console.log(chalk10.green("\u{1F4C4} Pages Created:"));
     addedPages.forEach(({ request }) => {
       const page = request.changes;
       const route = page.route || "/";
-      console.log(chalk9.white(`   \u2728 ${page.name || "Page"}`));
-      console.log(chalk9.gray(`      Route: ${route}`));
-      console.log(chalk9.gray(`      Sections: ${page.sections?.length ?? 0}`));
+      console.log(chalk10.white(`   \u2728 ${page.name || "Page"}`));
+      console.log(chalk10.gray(`      Route: ${route}`));
+      console.log(chalk10.gray(`      Sections: ${page.sections?.length ?? 0}`));
     });
     console.log("");
   }
   if (modifiedComponents.length > 0 || modifiedSharedComponents.length > 0 || modifiedPages.length > 0 || tokenChanges.length > 0) {
-    console.log(chalk9.yellow("\u{1F527} Modified:"));
+    console.log(chalk10.yellow("\u{1F527} Modified:"));
     modifiedComponents.forEach(({ result }) => {
-      console.log(chalk9.white(`   \u2022 ${result.message}`));
+      console.log(chalk10.white(`   \u2022 ${result.message}`));
     });
     modifiedSharedComponents.forEach(({ result }) => {
-      console.log(chalk9.white(`   \u2022 ${result.message}`));
+      console.log(chalk10.white(`   \u2022 ${result.message}`));
     });
     modifiedPages.forEach(({ result }) => {
-      console.log(chalk9.white(`   \u2022 ${result.message}`));
+      console.log(chalk10.white(`   \u2022 ${result.message}`));
     });
     tokenChanges.forEach(({ result }) => {
-      console.log(chalk9.white(`   \u2022 ${result.message}`));
+      console.log(chalk10.white(`   \u2022 ${result.message}`));
     });
     console.log("");
   }
   if (failedPairs.length > 0) {
-    console.log(chalk9.red("\u274C Failed modifications:"));
+    console.log(chalk10.red("\u274C Failed modifications:"));
     failedPairs.forEach(({ result }) => {
-      console.log(chalk9.gray(`   \u2716 ${result.message}`));
+      console.log(chalk10.gray(`   \u2716 ${result.message}`));
     });
     console.log("");
   }
   const successCount = successfulPairs.length;
   const totalCount = results.length;
   if (successCount === totalCount) {
-    console.log(chalk9.green.bold(`\u2705 Success! ${successCount} modification(s) applied
+    console.log(chalk10.green.bold(`\u2705 Success! ${successCount} modification(s) applied
 `));
   } else {
-    console.log(chalk9.yellow.bold(`\u26A0\uFE0F  Partial success: ${successCount}/${totalCount} modification(s) applied
+    console.log(chalk10.yellow.bold(`\u26A0\uFE0F  Partial success: ${successCount}/${totalCount} modification(s) applied
 `));
   }
   if (addedPages.length > 0) {
     const firstPage = addedPages[0].request.changes;
     const route = firstPage?.route || "/";
-    console.log(chalk9.cyan("\u{1F680} What's next:\n"));
-    console.log(chalk9.white("   \u{1F4FA} View in browser:"));
-    console.log(chalk9.cyan("      coherent preview"));
-    console.log(chalk9.gray(`      \u2192 Opens http://localhost:3000${route}
+    console.log(chalk10.cyan("\u{1F680} What's next:\n"));
+    console.log(chalk10.white("   \u{1F4FA} View in browser:"));
+    console.log(chalk10.cyan("      coherent preview"));
+    console.log(chalk10.gray(`      \u2192 Opens http://localhost:3000${route}
 `));
-    console.log(chalk9.white("   \u{1F3A8} Customize:"));
-    console.log(chalk9.cyan('      coherent chat "make buttons rounded"'));
-    console.log(chalk9.cyan(`      coherent chat "add hero section to ${firstPage?.name ?? "page"}"`));
+    console.log(chalk10.white("   \u{1F3A8} Customize:"));
+    console.log(chalk10.cyan('      coherent chat "make buttons rounded"'));
+    console.log(chalk10.cyan(`      coherent chat "add hero section to ${firstPage?.name ?? "page"}"`));
     console.log("");
   } else if (successCount > 0) {
-    console.log(chalk9.cyan("\u{1F680} What's next:\n"));
-    console.log(chalk9.white("   \u{1F4FA} Preview changes:"));
-    console.log(chalk9.cyan("      coherent preview\n"));
+    console.log(chalk10.cyan("\u{1F680} What's next:\n"));
+    console.log(chalk10.white("   \u{1F4FA} Preview changes:"));
+    console.log(chalk10.cyan("      coherent preview\n"));
   }
 }
 function getChangeDescription(request, config2) {
@@ -6962,6 +7038,24 @@ function getChangeDescription(request, config2) {
 // src/commands/chat/modification-handler.ts
 var DEBUG2 = process.env.COHERENT_DEBUG === "1";
+function stripInlineLayoutElements(code) {
+  let result = code;
+  const stripped = [];
+  const headerBlock = extractBalancedTag(result, "header");
+  if (headerBlock) {
+    result = result.replace(headerBlock, "");
+    stripped.push("header");
+  }
+  const footerBlock = extractBalancedTag(result, "footer");
+  if (footerBlock) {
+    result = result.replace(footerBlock, "");
+    stripped.push("footer");
+  }
+  if (stripped.length > 0) {
+    result = result.replace(/\n{3,}/g, "\n\n");
+  }
+  return { code: result, stripped };
+}
 async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider, originalMessage) {
   switch (request.type) {
     case "modify-layout-block": {
@@ -7000,8 +7094,8 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
       const newCode = await ai.editSharedComponentCode(currentCode, instruction, resolved.name);
       const { fixedCode, fixes } = await validateAndFixGeneratedCode(projectRoot, newCode, { isPage: false });
       if (fixes.length > 0) {
-        console.log(chalk10.dim("  \u{1F527} Post-generation fixes:"));
-        fixes.forEach((f) => console.log(chalk10.dim(`     ${f}`)));
+        console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
+        fixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
       }
       await writeFile(fullPath, fixedCode);
       printSharedComponentReport({
@@ -7074,11 +7168,11 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
       const newPageCode = await ai.replaceInlineWithShared(pageCode, sharedCode, resolved.name, changes?.blockHint);
       const { fixedCode, fixes } = await validateAndFixGeneratedCode(projectRoot, newPageCode, { isPage: true });
       if (fixes.length > 0) {
-        console.log(chalk10.dim("  \u{1F527} Post-generation fixes:"));
-        fixes.forEach((f) => console.log(chalk10.dim(`     ${f}`)));
+        console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
+        fixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
       }
       await writeFile(pageFilePath, fixedCode);
-      const manifest = await loadManifest5(projectRoot);
+      const manifest = await loadManifest6(projectRoot);
       const usedIn = manifest.shared.find((e) => e.id === resolved.id)?.usedIn ?? [];
       const routePath = route.replace(/^\//, "");
       const filePathRel = routePath ? `app/${routePath}/page.tsx` : "app/page.tsx";
@@ -7148,7 +7242,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
         };
       }
       const extractedCode = await ai.extractBlockAsComponent(sourceCode, blockHint, componentName);
-      const created = await generateSharedComponent2(projectRoot, {
+      const created = await generateSharedComponent3(projectRoot, {
         name: componentName,
         type: "section",
         code: extractedCode,
@@ -7177,13 +7271,13 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
         const newCode = await ai.replaceInlineWithShared(linkPageCode, sharedCode, created.name, blockHint);
         const { fixedCode, fixes } = await validateAndFixGeneratedCode(projectRoot, newCode, { isPage: true });
         if (fixes.length > 0) {
-          console.log(chalk10.dim("  \u{1F527} Post-generation fixes:"));
-          fixes.forEach((f) => console.log(chalk10.dim(`     ${f}`)));
+          console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
+          fixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
         }
         await writeFile(fullPath, fixedCode);
         usedInFiles.push(relPath);
       }
-      const manifest = await loadManifest5(projectRoot);
+      const manifest = await loadManifest6(projectRoot);
       const nextManifest = updateUsedIn(manifest, created.id, usedInFiles);
       await saveManifest(projectRoot, nextManifest);
       printPromoteAndLinkReport({
@@ -7272,7 +7366,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
       const aiPageCode = typeof page.pageCode === "string" && page.pageCode.trim() !== "" ? page.pageCode : void 0;
       if (aiPageCode) {
         finalPageCode = aiPageCode;
-        if (DEBUG2) console.log(chalk10.dim(`  [pageCode] Using AI-generated pageCode (user content priority)`));
+        if (DEBUG2) console.log(chalk11.dim(`  [pageCode] Using AI-generated pageCode (user content priority)`));
       } else if (page.pageType && page.structuredContent) {
         const templateFn = getTemplateForPageType(page.pageType);
         if (templateFn) {
@@ -7283,9 +7377,9 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
               pageName
             };
             finalPageCode = templateFn(page.structuredContent, opts);
-            if (DEBUG2) console.log(chalk10.dim(`  [template] Used "${page.pageType}" template (no pageCode provided)`));
+            if (DEBUG2) console.log(chalk11.dim(`  [template] Used "${page.pageType}" template (no pageCode provided)`));
           } catch {
-            if (DEBUG2) console.log(chalk10.dim(`  [template] Failed for "${page.pageType}"`));
+            if (DEBUG2) console.log(chalk11.dim(`  [template] Failed for "${page.pageType}"`));
           }
         }
       }
@@ -7328,10 +7422,13 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
           let codeToWrite = fixedCode;
           const { code: autoFixed, fixes: autoFixes } = await autoFixCode(codeToWrite);
           codeToWrite = autoFixed;
+          const { code: layoutStripped, stripped } = stripInlineLayoutElements(codeToWrite);
+          codeToWrite = layoutStripped;
           const allFixes = [...postFixes, ...autoFixes];
+          if (stripped.length > 0) allFixes.push(`stripped inline ${stripped.join(", ")} (layout owns these)`);
           if (allFixes.length > 0) {
-            console.log(chalk10.dim("  \u{1F527} Post-generation fixes:"));
-            allFixes.forEach((f) => console.log(chalk10.dim(`     ${f}`)));
+            console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
+            allFixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
           }
           await writeFile(filePath, codeToWrite);
           const pageIdx = dsm.getConfig().pages.findIndex((p) => p.id === page.id);
@@ -7342,7 +7439,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
             cm.updateConfig(cfg);
             pm.updateConfig(cfg);
           }
-          const manifestForAudit = await loadManifest5(projectRoot);
+          const manifestForAudit = await loadManifest6(projectRoot);
           await warnInlineDuplicates(projectRoot, page.name || page.id || route.slice(1), codeToWrite, manifestForAudit);
           const relFilePath = routeToRelPath(route, isAuth);
           printPostGenerationReport({
@@ -7361,7 +7458,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
           const errors = issues.filter((i) => i.severity === "error");
           if (errors.length >= 5 && aiProvider) {
             console.log(
-              chalk10.yellow(`
+              chalk11.yellow(`
 \u{1F504} ${errors.length} quality errors \u2014 attempting AI fix for ${page.name || page.id}...`)
             );
             try {
@@ -7383,7 +7480,7 @@ Rules:
                   if (recheckErrors.length < errors.length) {
                     codeToWrite = fixedCode2;
                     await writeFile(filePath, codeToWrite);
-                    console.log(chalk10.green(`   \u2714 Quality fix: ${errors.length} \u2192 ${recheckErrors.length} errors`));
+                    console.log(chalk11.green(`   \u2714 Quality fix: ${errors.length} \u2192 ${recheckErrors.length} errors`));
                   }
                 }
               }
@@ -7392,9 +7489,9 @@ Rules:
           }
           const report = formatIssues(issues);
           if (report) {
-            console.log(chalk10.yellow(`
+            console.log(chalk11.yellow(`
 \u{1F50D} Quality check for ${page.name || page.id}:`));
-            console.log(chalk10.dim(report));
+            console.log(chalk11.dim(report));
           }
         }
       }
@@ -7409,9 +7506,9 @@ Rules:
       const changes = request.changes;
       const instruction = originalMessage || (typeof changes?.instruction === "string" ? changes.instruction : void 0);
       let resolvedPageCode = typeof changes?.pageCode === "string" && changes.pageCode.trim() !== "" ? changes.pageCode : void 0;
-      if (DEBUG2 && instruction) console.log(chalk10.dim(`  [update-page] instruction: ${instruction.slice(0, 120)}...`));
+      if (DEBUG2 && instruction) console.log(chalk11.dim(`  [update-page] instruction: ${instruction.slice(0, 120)}...`));
       if (DEBUG2 && resolvedPageCode)
-        console.log(chalk10.dim(`  [update-page] has pageCode (${resolvedPageCode.length} chars)`));
+        console.log(chalk11.dim(`  [update-page] has pageCode (${resolvedPageCode.length} chars)`));
       const configChanges = { ...changes };
       delete configChanges.pageCode;
       delete configChanges.pageType;
@@ -7435,12 +7532,12 @@ Rules:
             try {
               currentCode = await readFile(absPath);
             } catch {
-              if (DEBUG2) console.log(chalk10.dim(`  [update-page] Could not read current file at ${absPath}`));
+              if (DEBUG2) console.log(chalk11.dim(`  [update-page] Could not read current file at ${absPath}`));
             }
             if (currentCode) {
               const ai = await createAIProvider(aiProvider ?? "auto");
               if (ai.editPageCode) {
-                console.log(chalk10.dim("  \u270F\uFE0F  Applying changes to existing page..."));
+                console.log(chalk11.dim("  \u270F\uFE0F  Applying changes to existing page..."));
                 const coreRules = CORE_CONSTRAINTS;
                 const qualityRules = DESIGN_QUALITY;
                 const contextualRules = selectContextualRules(instruction);
@@ -7460,9 +7557,9 @@ ${contextualRules}
 ${routeRules}
 ${pagesCtx}`
                 );
-                if (DEBUG2) console.log(chalk10.dim(`  [update-page] AI returned ${resolvedPageCode.length} chars`));
+                if (DEBUG2) console.log(chalk11.dim(`  [update-page] AI returned ${resolvedPageCode.length} chars`));
               } else {
-                console.log(chalk10.yellow("  \u26A0 AI provider does not support editPageCode"));
+                console.log(chalk11.yellow("  \u26A0 AI provider does not support editPageCode"));
               }
             }
           }
@@ -7492,10 +7589,13 @@ ${pagesCtx}`
             let codeToWrite = fixedCode;
             const { code: autoFixed, fixes: autoFixes } = await autoFixCode(codeToWrite);
             codeToWrite = autoFixed;
+            const { code: layoutStripped, stripped } = stripInlineLayoutElements(codeToWrite);
+            codeToWrite = layoutStripped;
             const allFixes = [...postFixes, ...autoFixes];
+            if (stripped.length > 0) allFixes.push(`stripped inline ${stripped.join(", ")} (layout owns these)`);
             if (allFixes.length > 0) {
-              console.log(chalk10.dim("  \u{1F527} Post-generation fixes:"));
-              allFixes.forEach((f) => console.log(chalk10.dim(`     ${f}`)));
+              console.log(chalk11.dim("  \u{1F527} Post-generation fixes:"));
+              allFixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
             }
             await writeFile(absPath, codeToWrite);
             const updatePageIdx = dsm.getConfig().pages.findIndex((p) => p.id === pageDef.id);
@@ -7506,7 +7606,7 @@ ${pagesCtx}`
               cm.updateConfig(cfg);
               pm.updateConfig(cfg);
             }
-            const manifestForAudit = await loadManifest5(projectRoot);
+            const manifestForAudit = await loadManifest6(projectRoot);
             await warnInlineDuplicates(
               projectRoot,
               pageDef.name || pageDef.id || route.slice(1),
@@ -7528,9 +7628,9 @@ ${pagesCtx}`
             const issues = validatePageQuality(codeToWrite);
             const report = formatIssues(issues);
             if (report) {
-              console.log(chalk10.yellow(`
+              console.log(chalk11.yellow(`
 \u{1F50D} Quality check for ${pageDef.name || pageDef.id}:`));
-              console.log(chalk10.dim(report));
+              console.log(chalk11.dim(report));
             }
           } else {
             try {
@@ -7539,11 +7639,11 @@ ${pagesCtx}`
               if (fixes.length > 0) {
                 code = fixed;
                 await writeFile(absPath, code);
-                console.log(chalk10.dim("  \u{1F527} Auto-fixes applied:"));
-                fixes.forEach((f) => console.log(chalk10.dim(`     ${f}`)));
+                console.log(chalk11.dim("  \u{1F527} Auto-fixes applied:"));
+                fixes.forEach((f) => console.log(chalk11.dim(`     ${f}`)));
               }
               const relFilePath = routeToRelPath(route, isAuth);
-              const manifest = await loadManifest5(projectRoot);
+              const manifest = await loadManifest6(projectRoot);
               printPostGenerationReport({
                 action: "updated",
                 pageTitle: pageDef.name || pageDef.id || "Page",
@@ -7557,9 +7657,9 @@ ${pagesCtx}`
               const issues = validatePageQuality(code);
               const report = formatIssues(issues);
               if (report) {
-                console.log(chalk10.yellow(`
+                console.log(chalk11.yellow(`
 \u{1F50D} Quality check for ${pageDef.name || pageDef.id}:`));
-                console.log(chalk10.dim(report));
+                console.log(chalk11.dim(report));
               }
             } catch {
             }
@@ -7588,236 +7688,10 @@ ${pagesCtx}`
   }
 }
-// src/commands/chat/layout-extractor.ts
-import { readFileSync as readFileSync9, readdirSync as readdirSync2 } from "fs";
-import { join as join9, resolve as resolve8 } from "path";
-import chalk11 from "chalk";
-import { loadManifest as loadManifest6, generateSharedComponent as generateSharedComponent3, integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout3 } from "@getcoherent/core";
-// src/commands/chat/jsx-extractor.ts
-function extractBalancedTag(source, tagName) {
-  const openRe = new RegExp(`<${tagName}\\b`, "gi");
-  const match = openRe.exec(source);
-  if (!match) return null;
-  const startIdx = match.index;
-  const openTagRe = new RegExp(`<${tagName}\\b`, "gi");
-  const closeTagRe = new RegExp(`</${tagName}>`, "gi");
-  const events = [];
-  let m;
-  openTagRe.lastIndex = startIdx;
-  while ((m = openTagRe.exec(source)) !== null) {
-    events.push({ pos: m.index, type: "open", end: m.index + m[0].length });
-  }
-  closeTagRe.lastIndex = startIdx;
-  while ((m = closeTagRe.exec(source)) !== null) {
-    events.push({ pos: m.index, type: "close", end: m.index + m[0].length });
-  }
-  events.sort((a, b) => a.pos - b.pos);
-  let depth = 0;
-  for (const ev of events) {
-    if (ev.pos < startIdx) continue;
-    if (ev.type === "open") depth++;
-    else {
-      depth--;
-      if (depth === 0) return source.slice(startIdx, ev.end);
-    }
-  }
-  return null;
-}
-function extractRelevantImports(fullSource, jsxBlock) {
-  const importLines = [];
-  const importRe = /^import\s+.*from\s+['"][^'"]+['"];?\s*$/gm;
-  let m;
-  while ((m = importRe.exec(fullSource)) !== null) {
-    const line = m[0];
-    const namesMatch = line.match(/import\s*\{([^}]+)\}/);
-    if (namesMatch) {
-      const names = namesMatch[1].split(",").map(
-        (n) => n.trim().split(/\s+as\s+/).pop().trim()
-      );
-      if (names.some((name) => jsxBlock.includes(name))) {
-        importLines.push(line);
-      }
-    }
-    const defaultMatch = line.match(/import\s+(\w+)\s+from/);
-    if (defaultMatch && jsxBlock.includes(defaultMatch[1])) {
-      importLines.push(line);
-    }
-  }
-  return [...new Set(importLines)];
-}
-function extractStateHooks(fullSource, jsxBlock) {
-  const hooks = [];
-  const stateRe = /const\s+\[(\w+),\s*(\w+)\]\s*=\s*useState\b[^)]*\)/g;
-  let m;
-  while ((m = stateRe.exec(fullSource)) !== null) {
-    const [fullMatch, getter, setter] = m;
-    if (jsxBlock.includes(getter) || jsxBlock.includes(setter)) {
-      hooks.push(fullMatch);
-    }
-  }
-  return hooks;
-}
-function addActiveNavToHeader(code) {
-  let result = code;
-  if (!result.includes("usePathname")) {
-    if (result.includes("from 'next/navigation'")) {
-      result = result.replace(
-        /import\s*\{([^}]+)\}\s*from\s*'next\/navigation'/,
-        (_, names) => `import { ${names.trim()}, usePathname } from 'next/navigation'`
-      );
-    } else {
-      result = result.replace(
-        "export function Header()",
-        "import { usePathname } from 'next/navigation'\n\nexport function Header()"
-      );
-    }
-  }
-  if (!result.includes("const pathname")) {
-    result = result.replace(
-      /export function Header\(\)\s*\{/,
-      "export function Header() {\n  const pathname = usePathname()"
-    );
-  }
-  result = result.replace(
-    /<Link\s+href="(\/[^"]*?)"\s+className="([^"]*?)(?:text-foreground|text-muted-foreground(?:\s+hover:text-foreground)?(?:\s+transition-colors)?)([^"]*?)">/g,
-    (_, href, before, after) => {
-      const base = before.trim();
-      const trail = after.trim();
-      const staticParts = [base, trail].filter(Boolean).join(" ");
-      const space = staticParts ? " " : "";
-      return `<Link href="${href}" className={\`${staticParts}${space}\${pathname === '${href}' ? 'text-foreground font-medium' : 'text-muted-foreground hover:text-foreground transition-colors'}\`}>`;
-    }
-  );
-  return result;
-}
-// src/commands/chat/layout-extractor.ts
-function findAllPageFiles(dir) {
-  const results = [];
-  try {
-    for (const entry of readdirSync2(dir, { withFileTypes: true })) {
-      const full = join9(dir, entry.name);
-      if (entry.isDirectory() && entry.name !== "node_modules" && entry.name !== ".next" && entry.name !== "design-system") {
-        results.push(...findAllPageFiles(full));
-      } else if (entry.name === "page.tsx" || entry.name === "page.jsx") {
-        results.push(full);
-      }
-    }
-  } catch {
-  }
-  return results;
-}
-async function extractAndShareLayoutComponents(projectRoot, generatedPageFiles) {
-  const manifest = await loadManifest6(projectRoot);
-  const hasSharedHeader = manifest.shared.some((c) => c.type === "layout" && /header|nav/i.test(c.name));
-  const hasSharedFooter = manifest.shared.some((c) => c.type === "layout" && /footer/i.test(c.name));
-  if (hasSharedHeader && hasSharedFooter) return false;
-  let sourceCode = "";
-  for (const file of generatedPageFiles) {
-    try {
-      const code = readFileSync9(file, "utf-8");
-      if (code.includes("<header") || code.includes("<footer") || code.includes("<nav")) {
-        sourceCode = code;
-        break;
-      }
-    } catch {
-      continue;
-    }
-  }
-  if (!sourceCode) return false;
-  let extracted = false;
-  if (!hasSharedHeader) {
-    let headerJsx = extractBalancedTag(sourceCode, "header");
-    if (!headerJsx) headerJsx = extractBalancedTag(sourceCode, "nav");
-    if (headerJsx) {
-      const imports = extractRelevantImports(sourceCode, headerJsx);
-      const importBlock = imports.length > 0 ? imports.join("\n") + "\n" : "import Link from 'next/link'\n";
-      const stateHooks = extractStateHooks(sourceCode, headerJsx);
-      const needsReactImport = stateHooks.length > 0 && !importBlock.includes("from 'react'");
-      const reactImport = needsReactImport ? "import { useState } from 'react'\n" : "";
-      const stateBlock = stateHooks.length > 0 ? "  " + stateHooks.join("\n  ") + "\n" : "";
-      const returnIndent = stateBlock ? "  " : "  ";
-      let headerComponent = `'use client'
-${reactImport}${importBlock}
-export function Header() {
-${stateBlock}${returnIndent}return (
-    ${headerJsx}
-  )
-}
-`;
-      headerComponent = addActiveNavToHeader(headerComponent);
-      await generateSharedComponent3(projectRoot, {
-        name: "Header",
-        type: "layout",
-        code: headerComponent,
-        description: "Main site header/navigation",
-        usedIn: ["app/layout.tsx"]
-      });
-      extracted = true;
-    }
-  }
-  if (!hasSharedFooter) {
-    const footerJsx = extractBalancedTag(sourceCode, "footer");
-    if (footerJsx) {
-      const imports = extractRelevantImports(sourceCode, footerJsx);
-      const importBlock = imports.length > 0 ? imports.join("\n") + "\n" : "import Link from 'next/link'\n";
-      const stateHooks = extractStateHooks(sourceCode, footerJsx);
-      const needsReactImport = stateHooks.length > 0 && !importBlock.includes("from 'react'");
-      const reactImport = needsReactImport ? "import { useState } from 'react'\n" : "";
-      const stateBlock = stateHooks.length > 0 ? "  " + stateHooks.join("\n  ") + "\n" : "";
-      const returnIndent = stateBlock ? "  " : "  ";
-      const footerComponent = `'use client'
-${reactImport}${importBlock}
-export function Footer() {
-${stateBlock}${returnIndent}return (
-    ${footerJsx}
-  )
-}
-`;
-      await generateSharedComponent3(projectRoot, {
-        name: "Footer",
-        type: "layout",
-        code: footerComponent,
-        description: "Site footer",
-        usedIn: ["app/layout.tsx"]
-      });
-      extracted = true;
-    }
-  }
-  if (!extracted) return false;
-  await integrateSharedLayoutIntoRootLayout3(projectRoot);
-  await ensureAuthRouteGroup(projectRoot);
-  const allPageFiles = /* @__PURE__ */ new Set([...generatedPageFiles, ...findAllPageFiles(resolve8(projectRoot, "app"))]);
-  for (const file of allPageFiles) {
-    try {
-      let code = await readFile(file);
-      const original = code;
-      const headerBlock = extractBalancedTag(code, "header");
-      if (headerBlock) {
-        code = code.replace(headerBlock, "");
-      } else {
-        const navBlock = extractBalancedTag(code, "nav");
-        if (navBlock) code = code.replace(navBlock, "");
-      }
-      const footerBlock = extractBalancedTag(code, "footer");
-      if (footerBlock) code = code.replace(footerBlock, "");
-      code = code.replace(/\n{3,}/g, "\n\n");
-      if (code !== original) await writeFile(file, code);
-    } catch {
-      continue;
-    }
-  }
-  console.log(chalk11.cyan("  \u{1F517} Extracted Header and Footer as shared components (all pages via layout)"));
-  return true;
-}
 // src/commands/chat/interactive.ts
 import chalk12 from "chalk";
-import { resolve as resolve9 } from "path";
-import { existsSync as existsSync15, readFileSync as readFileSync10, writeFileSync as writeFileSync8, mkdirSync as mkdirSync5 } from "fs";
+import { resolve as resolve8 } from "path";
+import { existsSync as existsSync15, readFileSync as readFileSync9, writeFileSync as writeFileSync8, mkdirSync as mkdirSync5 } from "fs";
 import { DesignSystemManager as DesignSystemManager6, ComponentManager as ComponentManager3, loadManifest as loadManifest7 } from "@getcoherent/core";
 var DEBUG3 = process.env.COHERENT_DEBUG === "1";
 async function interactiveChat(options, chatCommandFn) {
@@ -7837,13 +7711,13 @@ async function interactiveChat(options, chatCommandFn) {
 \u274C Invalid provider: ${options.provider}`));
     process.exit(1);
   }
-  const historyDir = resolve9(homedir2(), ".coherent");
-  const historyFile = resolve9(historyDir, "history");
+  const historyDir = resolve8(homedir2(), ".coherent");
+  const historyFile = resolve8(historyDir, "history");
   let history = [];
   try {
     mkdirSync5(historyDir, { recursive: true });
     if (existsSync15(historyFile)) {
-      history = readFileSync10(historyFile, "utf-8").split("\n").filter(Boolean).slice(-200);
+      history = readFileSync9(historyFile, "utf-8").split("\n").filter(Boolean).slice(-200);
     }
   } catch (e) {
     if (DEBUG3) console.error("Failed to load REPL history:", e);
@@ -8067,7 +7941,7 @@ async function chatCommand(message, options) {
       }
       if (/switch to light mode|default to light|make.*light.*(default|theme)|light theme/i.test(message)) {
         spinner.start("Setting default theme to light...");
-        const layoutPath = resolve10(projectRoot, "app/layout.tsx");
+        const layoutPath = resolve9(projectRoot, "app/layout.tsx");
         try {
           let layout = await readFile(layoutPath);
           layout = layout.replace(/className="dark"/, "");
@@ -8106,7 +7980,7 @@ async function chatCommand(message, options) {
     spinner.start("Parsing your request...");
     let manifest = await loadManifest8(project.root);
     const validShared = manifest.shared.filter((s) => {
-      const fp = resolve10(project.root, s.file);
+      const fp = resolve9(project.root, s.file);
       return existsSync16(fp);
     });
     if (validShared.length !== manifest.shared.length) {
@@ -8402,21 +8276,6 @@ async function chatCommand(message, options) {
       const result = await applyModification(request, dsm, cm, pm, projectRoot, provider, message);
       results.push(result);
     }
-    const anyPageGenerated = normalizedRequests.some(
-      (req, i) => (req.type === "add-page" || req.type === "update-page") && results[i]?.success
-    );
-    if (anyPageGenerated) {
-      const generatedPageFiles = normalizedRequests.filter((req, i) => (req.type === "add-page" || req.type === "update-page") && results[i]?.success).map((req) => {
-        const page = req.changes;
-        const route = page.route || `/${page.id || "page"}`;
-        return routeToFsPath(projectRoot, route, isAuthRoute(route));
-      }).filter((f) => existsSync16(f));
-      try {
-        await extractAndShareLayoutComponents(projectRoot, generatedPageFiles);
-      } catch (err) {
-        if (DEBUG4) console.log(chalk13.dim("Shared layout extraction failed:", err));
-      }
-    }
     const currentConfig = dsm.getConfig();
     const autoScaffoldEnabled = currentConfig.settings.autoScaffold === true;
     const scaffoldedPages = [];
@@ -8430,7 +8289,7 @@ async function chatCommand(message, options) {
         let pageCode = "";
         if (existsSync16(pageFilePath)) {
           try {
-            pageCode = readFileSync11(pageFilePath, "utf-8");
+            pageCode = readFileSync10(pageFilePath, "utf-8");
           } catch {
           }
         }
@@ -8507,7 +8366,7 @@ async function chatCommand(message, options) {
           const isAuth = isAuthRoute(linkedRoute);
           const filePath = routeToFsPath(projectRoot, linkedRoute, isAuth);
           if (isAuth) await ensureAuthRouteGroup(projectRoot);
-          const dir = resolve10(filePath, "..");
+          const dir = resolve9(filePath, "..");
           if (!existsSync16(dir)) {
             mkdirSync6(dir, { recursive: true });
           }
@@ -8543,7 +8402,7 @@ async function chatCommand(message, options) {
         dsm.updateConfig(latestConfig);
         if (DEBUG4) console.log(chalk13.dim(`  [theme] Set defaultMode to "${targetMode}"`));
       }
-      const layoutPath = resolve10(projectRoot, "app", "layout.tsx");
+      const layoutPath = resolve9(projectRoot, "app", "layout.tsx");
       try {
         let layoutCode = await readFile(layoutPath);
         if (targetMode === "dark" && !layoutCode.includes('className="dark"')) {
@@ -8598,7 +8457,7 @@ async function chatCommand(message, options) {
       console.log("");
     }
     if (uxRecommendations) {
-      const recPath = resolve10(projectRoot, "recommendations.md");
+      const recPath = resolve9(projectRoot, "recommendations.md");
       const section = `
 ---
@@ -8682,19 +8541,19 @@ ${uxRecommendations}
 import chalk14 from "chalk";
 import ora3 from "ora";
 import { spawn } from "child_process";
-import { existsSync as existsSync19, rmSync as rmSync3, readFileSync as readFileSync14, writeFileSync as writeFileSync10 } from "fs";
-import { resolve as resolve11, join as join12 } from "path";
+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 { readdir as readdir2 } from "fs/promises";
 import { DesignSystemManager as DesignSystemManager8, ComponentGenerator as ComponentGenerator3 } from "@getcoherent/core";
 // src/utils/file-watcher.ts
-import { readFileSync as readFileSync13, writeFileSync as writeFileSync9, existsSync as existsSync18 } from "fs";
-import { relative as relative3, join as join11 } from "path";
+import { readFileSync as readFileSync12, writeFileSync as writeFileSync9, existsSync as existsSync18 } from "fs";
+import { relative as relative3, join as join10 } from "path";
 import { loadManifest as loadManifest9, saveManifest as saveManifest3 } from "@getcoherent/core";
 // src/utils/component-integrity.ts
-import { existsSync as existsSync17, readFileSync as readFileSync12, readdirSync as readdirSync3 } from "fs";
-import { join as join10, relative as relative2 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync11, readdirSync as readdirSync2 } from "fs";
+import { join as join9, relative as relative2 } from "path";
 function extractExportedComponentNames(code) {
   const names = [];
   let m;
@@ -8720,14 +8579,14 @@ function arraysEqual(a, b) {
 }
 function findPagesImporting(projectRoot, componentName, componentFile) {
   const results = [];
-  const appDir = join10(projectRoot, "app");
+  const appDir = join9(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$/, "");
   for (const absPath of pageFiles) {
     if (absPath.includes("design-system")) continue;
     try {
-      const code = readFileSync12(absPath, "utf-8");
+      const code = readFileSync11(absPath, "utf-8");
       const hasNamedImport = new RegExp(`import\\s+\\{[^}]*\\b${componentName}\\b[^}]*\\}\\s+from\\s+['"]`).test(code);
       const hasDefaultImport = new RegExp(`import\\s+${componentName}\\s+from\\s+['"]`).test(code);
       const hasPathImport = code.includes(`@/${componentImportPath}`);
@@ -8740,10 +8599,10 @@ function findPagesImporting(projectRoot, componentName, componentFile) {
   return results;
 }
 function isUsedInLayout(projectRoot, componentName) {
-  const layoutPath = join10(projectRoot, "app", "layout.tsx");
+  const layoutPath = join9(projectRoot, "app", "layout.tsx");
   if (!existsSync17(layoutPath)) return false;
   try {
-    const code = readFileSync12(layoutPath, "utf-8");
+    const code = readFileSync11(layoutPath, "utf-8");
     return code.includes(componentName);
   } catch {
     return false;
@@ -8751,7 +8610,7 @@ function isUsedInLayout(projectRoot, componentName) {
 }
 function findUnregisteredComponents(projectRoot, manifest) {
   const results = [];
-  const componentsDir = join10(projectRoot, "components");
+  const componentsDir = join9(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));
@@ -8764,7 +8623,7 @@ function findUnregisteredComponents(projectRoot, manifest) {
     const relFile = relative2(projectRoot, absPath);
     if (registeredFiles.has(relFile)) continue;
     try {
-      const code = readFileSync12(absPath, "utf-8");
+      const code = readFileSync11(absPath, "utf-8");
       const exports = extractExportedComponentNames(code);
       for (const name of exports) {
         if (registeredNames.has(name)) continue;
@@ -8779,14 +8638,14 @@ function findUnregisteredComponents(projectRoot, manifest) {
 }
 function findInlineDuplicates(projectRoot, manifest) {
   const results = [];
-  const appDir = join10(projectRoot, "app");
+  const appDir = join9(projectRoot, "app");
   if (!existsSync17(appDir)) return results;
   const pageFiles = collectFiles(appDir, (name) => name === "page.tsx" || name === "page.jsx");
   for (const absPath of pageFiles) {
     if (absPath.includes("design-system")) continue;
     let code;
     try {
-      code = readFileSync12(absPath, "utf-8");
+      code = readFileSync11(absPath, "utf-8");
     } catch {
       continue;
     }
@@ -8809,7 +8668,7 @@ function findInlineDuplicates(projectRoot, manifest) {
   return results;
 }
 function findComponentFileByExportName(projectRoot, componentName) {
-  const componentsDir = join10(projectRoot, "components");
+  const componentsDir = join9(projectRoot, "components");
   if (!existsSync17(componentsDir)) return null;
   const files = collectFiles(
     componentsDir,
@@ -8818,7 +8677,7 @@ function findComponentFileByExportName(projectRoot, componentName) {
   );
   for (const absPath of files) {
     try {
-      const code = readFileSync12(absPath, "utf-8");
+      const code = readFileSync11(absPath, "utf-8");
       const exports = extractExportedComponentNames(code);
       if (exports.includes(componentName)) {
         return relative2(projectRoot, absPath);
@@ -8831,7 +8690,7 @@ function findComponentFileByExportName(projectRoot, componentName) {
 function removeOrphanedEntries(projectRoot, manifest) {
   const removed = [];
   const valid = manifest.shared.filter((entry) => {
-    const filePath = join10(projectRoot, entry.file);
+    const filePath = join9(projectRoot, entry.file);
     if (existsSync17(filePath)) return true;
     removed.push({ id: entry.id, name: entry.name });
     return false;
@@ -8850,7 +8709,7 @@ function reconcileComponents(projectRoot, manifest) {
   };
   const m = { ...manifest, shared: [...manifest.shared], nextId: manifest.nextId };
   m.shared = m.shared.filter((entry) => {
-    const filePath = join10(projectRoot, entry.file);
+    const filePath = join9(projectRoot, entry.file);
     if (!existsSync17(filePath)) {
       const newPath = findComponentFileByExportName(projectRoot, entry.name);
       if (newPath) {
@@ -8863,7 +8722,7 @@ function reconcileComponents(projectRoot, manifest) {
     }
     let code;
     try {
-      code = readFileSync12(join10(projectRoot, entry.file), "utf-8");
+      code = readFileSync11(join9(projectRoot, entry.file), "utf-8");
     } catch {
       return true;
     }
@@ -8940,12 +8799,12 @@ function collectFiles(dir, filter, skipDirs = []) {
   function walk(d) {
     let entries;
     try {
-      entries = readdirSync3(d, { withFileTypes: true });
+      entries = readdirSync2(d, { withFileTypes: true });
     } catch {
       return;
     }
     for (const e of entries) {
-      const full = join10(d, e.name);
+      const full = join9(d, e.name);
       if (e.isDirectory()) {
         if (skipDirs.includes(e.name) || e.name.startsWith(".")) continue;
         walk(full);
@@ -8984,9 +8843,9 @@ function findInlineDuplicatesOfShared(content, manifest) {
 }
 function getWatcherConfig(projectRoot) {
   try {
-    const pkgPath = join11(projectRoot, "package.json");
+    const pkgPath = join10(projectRoot, "package.json");
     if (!existsSync18(pkgPath)) return defaultWatcherConfig();
-    const pkg = JSON.parse(readFileSync13(pkgPath, "utf-8"));
+    const pkg = JSON.parse(readFileSync12(pkgPath, "utf-8"));
     const c = pkg?.coherent?.watcher ?? {};
     return {
       enabled: c.enabled !== false,
@@ -9014,7 +8873,7 @@ async function handleFileChange(projectRoot, filePath) {
   if (relativePath.includes("node_modules") || relativePath.includes(".next")) return;
   let content;
   try {
-    content = readFileSync13(filePath, "utf-8");
+    content = readFileSync12(filePath, "utf-8");
   } catch {
     return;
   }
@@ -9087,7 +8946,7 @@ async function detectNewComponent(projectRoot, filePath) {
     const manifest = await loadManifest9(projectRoot);
     const alreadyRegistered = manifest.shared.some((s) => s.file === relativePath);
     if (alreadyRegistered) return;
-    const code = readFileSync13(filePath, "utf-8");
+    const code = readFileSync12(filePath, "utf-8");
     const exports = extractExportedComponentNames(code);
     if (exports.length > 0) {
       const alreadyByName = exports.every((n) => manifest.shared.some((s) => s.name === n));
@@ -9113,8 +8972,8 @@ function startFileWatcher(projectRoot) {
   let watcher = null;
   let manifestWatcher = null;
   import("chokidar").then((chokidar) => {
-    const appGlob = join11(projectRoot, "app", "**", "*.tsx");
-    const compGlob = join11(projectRoot, "components", "**", "*.tsx");
+    const appGlob = join10(projectRoot, "app", "**", "*.tsx");
+    const compGlob = join10(projectRoot, "components", "**", "*.tsx");
     watcher = chokidar.default.watch([appGlob, compGlob], {
       ignoreInitial: true,
       awaitWriteFinish: { stabilityThreshold: 500 }
@@ -9126,7 +8985,7 @@ function startFileWatcher(projectRoot) {
     });
     watcher.on("unlink", (fp) => handleFileDelete(projectRoot, fp));
   });
-  const manifestPath = join11(projectRoot, "coherent.components.json");
+  const manifestPath = join10(projectRoot, "coherent.components.json");
   if (existsSync18(manifestPath)) {
     import("chokidar").then((chokidar) => {
       manifestWatcher = chokidar.default.watch(manifestPath, { ignoreInitial: true });
@@ -9141,7 +9000,7 @@ function startFileWatcher(projectRoot) {
 // src/commands/preview.ts
 function getPackageManager(projectRoot) {
-  const hasPnpm = existsSync19(resolve11(projectRoot, "pnpm-lock.yaml"));
+  const hasPnpm = existsSync19(resolve10(projectRoot, "pnpm-lock.yaml"));
   return hasPnpm ? "pnpm" : "npm";
 }
 function runInstall(projectRoot) {
@@ -9163,8 +9022,8 @@ function runInstall(projectRoot) {
   });
 }
 function checkProjectInitialized(projectRoot) {
-  const configPath = resolve11(projectRoot, "design-system.config.ts");
-  const packageJsonPath = resolve11(projectRoot, "package.json");
+  const configPath = resolve10(projectRoot, "design-system.config.ts");
+  const packageJsonPath = resolve10(projectRoot, "package.json");
   if (!existsSync19(configPath)) {
     return false;
   }
@@ -9174,11 +9033,11 @@ function checkProjectInitialized(projectRoot) {
   return true;
 }
 function checkDependenciesInstalled(projectRoot) {
-  const nodeModulesPath = resolve11(projectRoot, "node_modules");
+  const nodeModulesPath = resolve10(projectRoot, "node_modules");
   return existsSync19(nodeModulesPath);
 }
 function clearStaleCache(projectRoot) {
-  const nextDir = join12(projectRoot, ".next");
+  const nextDir = join11(projectRoot, ".next");
   if (existsSync19(nextDir)) {
     rmSync3(nextDir, { recursive: true, force: true });
     console.log(chalk14.dim("   \u2714 Cleared stale build cache"));
@@ -9199,7 +9058,7 @@ async function listPageFiles(appDir) {
   async function walk(dir) {
     const entries = await readdir2(dir, { withFileTypes: true });
     for (const e of entries) {
-      const full = join12(dir, e.name);
+      const full = join11(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);
     }
@@ -9208,10 +9067,10 @@ async function listPageFiles(appDir) {
   return out;
 }
 async function validateSyntax(projectRoot) {
-  const appDir = join12(projectRoot, "app");
+  const appDir = join11(projectRoot, "app");
   const pages = await listPageFiles(appDir);
   for (const file of pages) {
-    const content = readFileSync14(file, "utf-8");
+    const content = readFileSync13(file, "utf-8");
     const fixed = fixUnescapedLtInJsx(sanitizeMetadataStrings(ensureUseClientIfNeeded(content)));
     if (fixed !== content) {
       writeFileSync10(file, fixed, "utf-8");
@@ -9220,13 +9079,13 @@ async function validateSyntax(projectRoot) {
   }
 }
 async function fixMissingComponentExports(projectRoot) {
-  const appDir = join12(projectRoot, "app");
-  const uiDir = join12(projectRoot, "components", "ui");
+  const appDir = join11(projectRoot, "app");
+  const uiDir = join11(projectRoot, "components", "ui");
   if (!existsSync19(appDir) || !existsSync19(uiDir)) return;
   const pages = await listPageFiles(appDir);
   const neededExports = /* @__PURE__ */ new Map();
   for (const file of pages) {
-    const content = readFileSync14(file, "utf-8");
+    const content = readFileSync13(file, "utf-8");
     const importRe = /import\s*\{([^}]+)\}\s*from\s*['"]@\/components\/ui\/([^'"]+)['"]/g;
     let m;
     while ((m = importRe.exec(content)) !== null) {
@@ -9236,7 +9095,7 @@ async function fixMissingComponentExports(projectRoot) {
       for (const name of names) neededExports.get(componentId).add(name);
     }
   }
-  const configPath = join12(projectRoot, "design-system.config.ts");
+  const configPath = join11(projectRoot, "design-system.config.ts");
   let config2 = null;
   try {
     const mgr = new DesignSystemManager8(configPath);
@@ -9245,7 +9104,7 @@ async function fixMissingComponentExports(projectRoot) {
   }
   const generator = new ComponentGenerator3(config2 || { components: [], pages: [], tokens: {} });
   for (const [componentId, needed] of neededExports) {
-    const componentFile = join12(uiDir, `${componentId}.tsx`);
+    const componentFile = join11(uiDir, `${componentId}.tsx`);
     const def = getShadcnComponent(componentId);
     if (!existsSync19(componentFile)) {
       if (!def) continue;
@@ -9259,7 +9118,7 @@ async function fixMissingComponentExports(projectRoot) {
       }
       continue;
     }
-    const content = readFileSync14(componentFile, "utf-8");
+    const content = readFileSync13(componentFile, "utf-8");
     const exportRe = /export\s+(?:const|function|class)\s+(\w+)|export\s*\{([^}]+)\}/g;
     const existingExports = /* @__PURE__ */ new Set();
     let em;
@@ -9282,7 +9141,7 @@ async function fixMissingComponentExports(projectRoot) {
   }
 }
 async function backfillPageAnalysis(projectRoot) {
-  const configPath = join12(projectRoot, "design-system.config.ts");
+  const configPath = join11(projectRoot, "design-system.config.ts");
   if (!existsSync19(configPath)) return;
   try {
     const mgr = new DesignSystemManager8(configPath);
@@ -9294,14 +9153,14 @@ async function backfillPageAnalysis(projectRoot) {
       const isAuth = route.includes("login") || route.includes("register") || route.includes("signup") || route.includes("sign-up");
       let filePath;
       if (route === "/") {
-        filePath = join12(projectRoot, "app", "page.tsx");
+        filePath = join11(projectRoot, "app", "page.tsx");
       } else if (isAuth) {
-        filePath = join12(projectRoot, "app", "(auth)", route.slice(1), "page.tsx");
+        filePath = join11(projectRoot, "app", "(auth)", route.slice(1), "page.tsx");
       } else {
-        filePath = join12(projectRoot, "app", route.slice(1), "page.tsx");
+        filePath = join11(projectRoot, "app", route.slice(1), "page.tsx");
       }
       if (!existsSync19(filePath)) continue;
-      const code = readFileSync14(filePath, "utf-8");
+      const code = readFileSync13(filePath, "utf-8");
       if (code.length < 50) continue;
       page.pageAnalysis = analyzePageCode(code);
       changed = true;
@@ -9328,7 +9187,7 @@ async function autoInstallShadcnComponent(componentId, projectRoot) {
   const def = getShadcnComponent(componentId);
   if (!def) return false;
   try {
-    const configPath = join12(projectRoot, "design-system.config.ts");
+    const configPath = join11(projectRoot, "design-system.config.ts");
     let config2 = null;
     try {
       const mgr = new DesignSystemManager8(configPath);
@@ -9337,10 +9196,10 @@ async function autoInstallShadcnComponent(componentId, projectRoot) {
     }
     const generator = new ComponentGenerator3(config2 || { components: [], pages: [], tokens: {} });
     const code = await generator.generate(def);
-    const uiDir = join12(projectRoot, "components", "ui");
+    const uiDir = join11(projectRoot, "components", "ui");
     const { mkdirSync: mkdirSync9 } = await import("fs");
     mkdirSync9(uiDir, { recursive: true });
-    writeFileSync10(join12(uiDir, `${componentId}.tsx`), code, "utf-8");
+    writeFileSync10(join11(uiDir, `${componentId}.tsx`), code, "utf-8");
     return true;
   } catch {
     return false;
@@ -9463,12 +9322,12 @@ async function openBrowser(url) {
   }
 }
 function startDevServer(projectRoot) {
-  const packageJsonPath = resolve11(projectRoot, "package.json");
+  const packageJsonPath = resolve10(projectRoot, "package.json");
   if (!existsSync19(packageJsonPath)) {
     throw new Error('package.json not found. Run "coherent init" first.');
   }
-  const hasPnpm = existsSync19(resolve11(projectRoot, "pnpm-lock.yaml"));
-  const hasNpm = existsSync19(resolve11(projectRoot, "package-lock.json"));
+  const hasPnpm = existsSync19(resolve10(projectRoot, "pnpm-lock.yaml"));
+  const hasNpm = existsSync19(resolve10(projectRoot, "package-lock.json"));
   const command = hasPnpm ? "pnpm" : hasNpm ? "npm" : "npx";
   const args = hasPnpm ? ["dev", "--turbo"] : hasNpm ? ["run", "dev", "--", "--turbo"] : ["next", "dev", "--turbo"];
   const child = spawn(command, args, {
@@ -9515,7 +9374,7 @@ async function previewCommand() {
     if (needsGlobalsFix(projectRoot)) {
       spinner.text = "Fixing globals.css...";
       try {
-        const dsm = new DesignSystemManager8(resolve11(projectRoot, "design-system.config.ts"));
+        const dsm = new DesignSystemManager8(resolve10(projectRoot, "design-system.config.ts"));
         await dsm.load();
         const config2 = dsm.getConfig();
         fixGlobalsCss(projectRoot, config2);
@@ -9554,8 +9413,8 @@ 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 readdirSync4 } from "fs";
-import { resolve as resolve12, join as join13, dirname as dirname7 } from "path";
+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 readFile5, writeFile as writeFile4, mkdir as mkdir4, copyFile as copyFile2 } from "fs/promises";
 var COPY_EXCLUDE = /* @__PURE__ */ new Set([
   "node_modules",
@@ -9577,8 +9436,8 @@ async function copyDir(src, dest) {
   await mkdir4(dest, { recursive: true });
   const entries = await readdir3(src, { withFileTypes: true });
   for (const e of entries) {
-    const srcPath = join13(src, e.name);
-    const destPath = join13(dest, e.name);
+    const srcPath = join12(src, e.name);
+    const destPath = join12(dest, e.name);
     if (COPY_EXCLUDE.has(e.name)) continue;
     if (e.isDirectory()) {
       await copyDir(srcPath, destPath);
@@ -9589,16 +9448,16 @@ async function copyDir(src, dest) {
   }
 }
 function checkProjectInitialized2(projectRoot) {
-  return existsSync20(resolve12(projectRoot, "design-system.config.ts")) && existsSync20(resolve12(projectRoot, "package.json"));
+  return existsSync20(resolve11(projectRoot, "design-system.config.ts")) && existsSync20(resolve11(projectRoot, "package.json"));
 }
 function getPackageManager2(projectRoot) {
-  if (existsSync20(resolve12(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
-  if (existsSync20(resolve12(projectRoot, "package-lock.json"))) return "npm";
+  if (existsSync20(resolve11(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
+  if (existsSync20(resolve11(projectRoot, "package-lock.json"))) return "npm";
   return "npx";
 }
 async function patchNextConfigForExport(outRoot) {
   for (const name of ["next.config.ts", "next.config.mjs", "next.config.js"]) {
-    const p = join13(outRoot, name);
+    const p = join12(outRoot, name);
     if (!existsSync20(p)) continue;
     let content = await readFile5(p, "utf-8");
     if (content.includes("ignoreDuringBuilds")) return;
@@ -9614,9 +9473,9 @@ async function buildProduction(projectRoot) {
   const pm = getPackageManager2(projectRoot);
   const command = pm === "pnpm" ? "pnpm" : pm === "npm" ? "npm" : "npx";
   const args = pm === "npx" ? ["next", "build"] : ["run", "build"];
-  return new Promise((resolve17, reject) => {
+  return new Promise((resolve16, reject) => {
     const child = spawn2(command, args, { cwd: projectRoot, stdio: "inherit", shell: true });
-    child.on("exit", (code) => code === 0 ? resolve17() : reject(new Error(`Build failed with exit code ${code}`)));
+    child.on("exit", (code) => code === 0 ? resolve16() : reject(new Error(`Build failed with exit code ${code}`)));
     child.on("error", (error) => reject(new Error(`Failed to start build: ${error.message}`)));
   });
 }
@@ -9640,7 +9499,7 @@ EXPOSE 3000
 \`\`\`
 `;
 async function ensureReadmeDeploySection(outRoot) {
-  const readmePath = join13(outRoot, "README.md");
+  const readmePath = join12(outRoot, "README.md");
   if (!existsSync20(readmePath)) return;
   try {
     let content = await readFile5(readmePath, "utf-8");
@@ -9660,22 +9519,22 @@ async function countPages(outRoot) {
       return;
     }
     for (const e of entries) {
-      const full = join13(dir, e.name);
+      const full = join12(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 = join13(outRoot, "app");
+  const appDir = join12(outRoot, "app");
   if (existsSync20(appDir)) await walk(appDir);
   return n;
 }
 function countComponents(outRoot) {
   let n = 0;
   for (const sub of ["ui", "shared"]) {
-    const dir = join13(outRoot, "components", sub);
+    const dir = join12(outRoot, "components", sub);
     if (!existsSync20(dir)) continue;
     try {
-      n += readdirSync4(dir).filter((f) => f.endsWith(".tsx") || f.endsWith(".jsx")).length;
+      n += readdirSync3(dir).filter((f) => f.endsWith(".tsx") || f.endsWith(".jsx")).length;
     } catch {
     }
   }
@@ -9688,7 +9547,7 @@ async function collectImportedPackages2(dir, extensions) {
   async function walk(d) {
     const entries = await readdir3(d, { withFileTypes: true });
     for (const e of entries) {
-      const full = join13(d, e.name);
+      const full = join12(d, e.name);
       if (e.isDirectory() && !e.name.startsWith(".") && e.name !== "node_modules") {
         await walk(full);
         continue;
@@ -9711,7 +9570,7 @@ async function collectImportedPackages2(dir, extensions) {
   return packages;
 }
 async function findMissingDepsInExport(outRoot) {
-  const pkgPath = join13(outRoot, "package.json");
+  const pkgPath = join12(outRoot, "package.json");
   if (!existsSync20(pkgPath)) return [];
   let pkg;
   try {
@@ -9720,7 +9579,7 @@ async function findMissingDepsInExport(outRoot) {
     return [];
   }
   const inDeps = /* @__PURE__ */ new Set([...Object.keys(pkg.dependencies ?? {}), ...Object.keys(pkg.devDependencies ?? {})]);
-  const codeDirs = [join13(outRoot, "app"), join13(outRoot, "components")];
+  const codeDirs = [join12(outRoot, "app"), join12(outRoot, "components")];
   const extensions = /* @__PURE__ */ new Set(["ts", "tsx", "js", "jsx"]);
   const imported = /* @__PURE__ */ new Set();
   for (const dir of codeDirs) {
@@ -9732,25 +9591,33 @@ async function findMissingDepsInExport(outRoot) {
 async function stripCoherentArtifacts(outputDir) {
   const removed = [];
   for (const p of ["app/design-system", "app/api/design-system"]) {
-    const full = join13(outputDir, p);
+    const full = join12(outputDir, p);
     if (existsSync20(full)) {
       rmSync4(full, { recursive: true, force: true });
       removed.push(p);
     }
   }
-  const appNavPath = join13(outputDir, "app", "AppNav.tsx");
+  const appNavPath = join12(outputDir, "app", "AppNav.tsx");
   if (existsSync20(appNavPath)) {
     rmSync4(appNavPath, { force: true });
     removed.push("app/AppNav.tsx");
   }
-  const layoutPath = join13(outputDir, "app", "layout.tsx");
+  const layoutPath = join12(outputDir, "app", "layout.tsx");
   if (existsSync20(layoutPath)) {
     let layout = await readFile5(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");
   }
-  const guardPath = join13(outputDir, "app", "ShowWhenNotAuthRoute.tsx");
+  const sharedHeaderPath = join12(outputDir, "components", "shared", "header.tsx");
+  if (existsSync20(sharedHeaderPath)) {
+    let header = await readFile5(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");
+  }
+  const guardPath = join12(outputDir, "app", "ShowWhenNotAuthRoute.tsx");
   if (existsSync20(guardPath)) {
     let guard = await readFile5(guardPath, "utf-8");
     guard = guard.replace(/['"],?\s*'\/design-system['"],?\s*/g, "");
@@ -9779,14 +9646,14 @@ async function stripCoherentArtifacts(outputDir) {
     ".env.local",
     "recommendations.md"
   ]) {
-    const full = join13(outputDir, name);
+    const full = join12(outputDir, name);
     if (existsSync20(full)) {
       rmSync4(full, { force: true });
       removed.push(name);
     }
   }
   for (const dir of [".claude", ".coherent"]) {
-    const full = join13(outputDir, dir);
+    const full = join12(outputDir, dir);
     if (existsSync20(full)) {
       rmSync4(full, { recursive: true, force: true });
       removed.push(dir + "/");
@@ -9795,7 +9662,7 @@ async function stripCoherentArtifacts(outputDir) {
   return removed;
 }
 async function exportCommand(options = {}) {
-  const outputDir = resolve12(process.cwd(), options.output ?? "./export");
+  const outputDir = resolve11(process.cwd(), options.output ?? "./export");
   const doBuild = options.build !== false;
   const keepDs = options.keepDs === true;
   const spinner = ora4("Preparing export...").start();
@@ -9986,8 +9853,8 @@ async function regenerateDocsCommand() {
 // src/commands/fix.ts
 import chalk18 from "chalk";
-import { readdirSync as readdirSync5, readFileSync as readFileSync15, existsSync as existsSync21, writeFileSync as writeFileSync11, rmSync as rmSync5, mkdirSync as mkdirSync7 } from "fs";
-import { resolve as resolve13, join as join14 } from "path";
+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 {
   DesignSystemManager as DesignSystemManager11,
   ComponentManager as ComponentManager5,
@@ -10011,9 +9878,9 @@ function extractComponentIdsFromCode2(code) {
 function listTsxFiles(dir) {
   const files = [];
   try {
-    const entries = readdirSync5(dir, { withFileTypes: true });
+    const entries = readdirSync4(dir, { withFileTypes: true });
     for (const e of entries) {
-      const full = join14(dir, e.name);
+      const full = join13(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")) {
@@ -10042,7 +9909,7 @@ async function fixCommand(opts = {}) {
     console.log(chalk18.cyan("\ncoherent fix\n"));
   }
   if (!skipCache) {
-    const nextDir = join14(projectRoot, ".next");
+    const nextDir = join13(projectRoot, ".next");
     if (existsSync21(nextDir)) {
       if (!dryRun) rmSync5(nextDir, { recursive: true, force: true });
       fixes.push("Cleared build cache");
@@ -10065,12 +9932,12 @@ async function fixCommand(opts = {}) {
       }
     }
   }
-  const appDir = resolve13(projectRoot, "app");
+  const appDir = resolve12(projectRoot, "app");
   const allTsxFiles = listTsxFiles(appDir);
-  const componentsTsxFiles = listTsxFiles(resolve13(projectRoot, "components"));
+  const componentsTsxFiles = listTsxFiles(resolve12(projectRoot, "components"));
   const allComponentIds = /* @__PURE__ */ new Set();
   for (const file of [...allTsxFiles, ...componentsTsxFiles]) {
-    const content = readFileSync15(file, "utf-8");
+    const content = readFileSync14(file, "utf-8");
     extractComponentIdsFromCode2(content).forEach((id) => allComponentIds.add(id));
   }
   let dsm = null;
@@ -10089,7 +9956,7 @@ async function fixCommand(opts = {}) {
         missingComponents.push(id);
       } else {
         const fileName = toKebabCase(id) + ".tsx";
-        const filePath = resolve13(projectRoot, "components", "ui", fileName);
+        const filePath = resolve12(projectRoot, "components", "ui", fileName);
         if (!existsSync21(filePath)) missingFiles.push(id);
       }
     }
@@ -10117,8 +9984,8 @@ async function fixCommand(opts = {}) {
               const generator = new ComponentGenerator4(updatedConfig);
               const code = await generator.generate(component);
               const fileName = toKebabCase(component.name) + ".tsx";
-              const filePath = resolve13(projectRoot, "components", "ui", fileName);
-              mkdirSync7(resolve13(projectRoot, "components", "ui"), { recursive: true });
+              const filePath = resolve12(projectRoot, "components", "ui", fileName);
+              mkdirSync7(resolve12(projectRoot, "components", "ui"), { recursive: true });
               await writeFile(filePath, code);
               installed++;
             }
@@ -10139,7 +10006,7 @@ async function fixCommand(opts = {}) {
   const userTsxFiles = allTsxFiles.filter((f) => !f.includes("/design-system/"));
   let syntaxFixed = 0;
   for (const file of userTsxFiles) {
-    const content = readFileSync15(file, "utf-8");
+    const content = readFileSync14(file, "utf-8");
     const fixed = fixUnescapedLtInJsx(
       fixEscapedClosingQuotes(sanitizeMetadataStrings(ensureUseClientIfNeeded(content)))
     );
@@ -10157,7 +10024,7 @@ async function fixCommand(opts = {}) {
     let qualityFixCount = 0;
     const qualityFixDetails = [];
     for (const file of userTsxFiles) {
-      const content = readFileSync15(file, "utf-8");
+      const content = readFileSync14(file, "utf-8");
       const { code: autoFixed, fixes: fileFixes } = await autoFixCode(content);
       if (autoFixed !== content) {
         if (!dryRun) writeFileSync11(file, autoFixed, "utf-8");
@@ -10176,7 +10043,7 @@ async function fixCommand(opts = {}) {
   let totalWarnings = 0;
   const fileIssues = [];
   for (const file of allTsxFiles) {
-    const code = dryRun ? readFileSync15(file, "utf-8") : readFileSync15(file, "utf-8");
+    const code = dryRun ? readFileSync14(file, "utf-8") : readFileSync14(file, "utf-8");
     const relativePath = file.replace(projectRoot + "/", "");
     const baseName = file.split("/").pop() || "";
     const isAuthPage = relativePath.includes("(auth)");
@@ -10298,16 +10165,16 @@ async function fixCommand(opts = {}) {
 // src/commands/check.ts
 import chalk19 from "chalk";
-import { resolve as resolve14 } from "path";
-import { readdirSync as readdirSync6, readFileSync as readFileSync16, statSync as statSync2, existsSync as existsSync22 } from "fs";
+import { resolve as resolve13 } from "path";
+import { readdirSync as readdirSync5, readFileSync as readFileSync15, statSync as statSync2, existsSync as existsSync22 } from "fs";
 import { loadManifest as loadManifest11 } from "@getcoherent/core";
 var EXCLUDED_DIRS = /* @__PURE__ */ new Set(["node_modules", "design-system"]);
 function findTsxFiles(dir) {
   const results = [];
   try {
-    const entries = readdirSync6(dir);
+    const entries = readdirSync5(dir);
     for (const entry of entries) {
-      const full = resolve14(dir, entry);
+      const full = resolve13(dir, entry);
       const stat = statSync2(full);
       if (stat.isDirectory() && !entry.startsWith(".") && !EXCLUDED_DIRS.has(entry)) {
         results.push(...findTsxFiles(full));
@@ -10342,7 +10209,7 @@ async function checkCommand(opts = {}) {
   } catch {
   }
   if (!skipPages) {
-    const appDir = resolve14(projectRoot, "app");
+    const appDir = resolve13(projectRoot, "app");
     const files = findTsxFiles(appDir);
     result.pages.total = files.length;
     if (!opts.json) console.log(chalk19.cyan("\n  \u{1F4C4} Pages") + chalk19.dim(` (${files.length} scanned)
@@ -10356,7 +10223,7 @@ async function checkCommand(opts = {}) {
       "NATIVE_TABLE"
     ]);
     for (const file of files) {
-      const code = readFileSync16(file, "utf-8");
+      const code = readFileSync15(file, "utf-8");
       const relativePath = file.replace(projectRoot + "/", "");
       const baseName = file.split("/").pop() || "";
       const isAuthPage = relativePath.includes("(auth)");
@@ -10398,7 +10265,7 @@ async function checkCommand(opts = {}) {
     routeSet.add("/");
     routeSet.add("#");
     for (const file of files) {
-      const code = readFileSync16(file, "utf-8");
+      const code = readFileSync15(file, "utf-8");
       const relativePath = file.replace(projectRoot + "/", "");
       const lines = code.split("\n");
       const linkHrefRe = /href\s*=\s*["'](\/[a-z0-9/-]*)["']/gi;
@@ -10430,7 +10297,7 @@ async function checkCommand(opts = {}) {
       const manifest = await loadManifest11(project.root);
       if (manifest.shared.length > 0) {
         for (const entry of manifest.shared) {
-          const fullPath = resolve14(project.root, entry.file);
+          const fullPath = resolve13(project.root, entry.file);
           if (!existsSync22(fullPath)) {
             result.pages.withErrors++;
             if (!opts.json) console.log(chalk19.red(`
@@ -10455,7 +10322,7 @@ async function checkCommand(opts = {}) {
       let _staleUsedIn = 0;
       let _nameMismatch = 0;
       for (const entry of manifest.shared) {
-        const filePath = resolve14(projectRoot, entry.file);
+        const filePath = resolve13(projectRoot, entry.file);
         const fileExists = existsSync22(filePath);
         if (!fileExists) {
           _orphaned++;
@@ -10466,7 +10333,7 @@ async function checkCommand(opts = {}) {
           continue;
         }
         try {
-          const code = readFileSync16(filePath, "utf-8");
+          const code = readFileSync15(filePath, "utf-8");
           const actualExports = extractExportedComponentNames(code);
           if (actualExports.length > 0 && !actualExports.includes(entry.name)) {
             _nameMismatch++;
@@ -10534,7 +10401,7 @@ async function checkCommand(opts = {}) {
           id: e.id,
           name: e.name,
           type: e.type,
-          status: existsSync22(resolve14(projectRoot, e.file)) ? "ok" : "unused",
+          status: existsSync22(resolve13(projectRoot, e.file)) ? "ok" : "unused",
           message: "",
           suggestions: void 0
         }))
@@ -10627,14 +10494,14 @@ import {
   ComponentManager as ComponentManager6,
   loadManifest as loadManifest12,
   generateSharedComponent as generateSharedComponent4,
-  integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout4
+  integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout3
 } from "@getcoherent/core";
 import { existsSync as existsSync23 } from "fs";
-import { resolve as resolve15 } from "path";
+import { resolve as resolve14 } from "path";
 // src/utils/ds-files.ts
 import { mkdir as mkdir5, writeFile as writeFile5 } from "fs/promises";
-import { join as join15, dirname as dirname8 } from "path";
+import { join as join14, dirname as dirname8 } from "path";
 import { DesignSystemGenerator } from "@getcoherent/core";
 var SHARED_DS_KEYS = [
   "app/design-system/shared/page.tsx",
@@ -10648,7 +10515,7 @@ 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 = join15(projectRoot, relativePath);
+    const fullPath = join14(projectRoot, relativePath);
     await mkdir5(dirname8(fullPath), { recursive: true });
     await writeFile5(fullPath, content, "utf-8");
     written.push(relativePath);
@@ -10757,10 +10624,10 @@ function createComponentsCommand() {
 \u2705 Created ${result.id} (${result.name}) at ${result.file}
 `));
     if (type === "layout") {
-      const updated = await integrateSharedLayoutIntoRootLayout4(project.root);
+      const updated = await integrateSharedLayoutIntoRootLayout3(project.root);
       if (updated) console.log(chalk25.cyan("   Updated app/layout.tsx to use shared layout components.\n"));
     }
-    const sharedPagePath = resolve15(project.root, "app/design-system/shared/page.tsx");
+    const sharedPagePath = resolve14(project.root, "app/design-system/shared/page.tsx");
     if (!existsSync23(sharedPagePath)) {
       try {
         const dsm = new DesignSystemManager12(project.configPath);
@@ -10787,7 +10654,7 @@ function createComponentsCommand() {
 import chalk26 from "chalk";
 import ora6 from "ora";
 import { writeFile as writeFile6, mkdir as mkdir6 } from "fs/promises";
-import { resolve as resolve16, join as join16, dirname as dirname9 } from "path";
+import { resolve as resolve15, join as join15, dirname as dirname9 } from "path";
 import { existsSync as existsSync24 } from "fs";
 import {
   FigmaClient,
@@ -10800,7 +10667,7 @@ import {
   setSharedMapping,
   generateSharedComponent as generateSharedComponent5,
   generatePagesFromFigma,
-  integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout5,
+  integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout4,
   DesignSystemManager as DesignSystemManager13,
   validateConfig,
   FRAMEWORK_VERSIONS as FRAMEWORK_VERSIONS2,
@@ -10935,7 +10802,7 @@ async function importFigmaAction(urlOrKey, opts) {
       stats.filesWritten.push(filePath);
       return;
     }
-    const fullPath = join16(projectRoot, filePath);
+    const fullPath = join15(projectRoot, filePath);
     await mkdir6(dirname9(fullPath), { recursive: true });
     await writeFile6(fullPath, content, "utf-8");
     stats.filesWritten.push(filePath);
@@ -11012,7 +10879,7 @@ async function importFigmaAction(urlOrKey, opts) {
     if (dryRun) stats.filesWritten.push(FIGMA_COMPONENT_MAP_FILENAME);
     else
       await writeFile6(
-        resolve16(projectRoot, FIGMA_COMPONENT_MAP_FILENAME),
+        resolve15(projectRoot, FIGMA_COMPONENT_MAP_FILENAME),
         JSON.stringify(componentMapObj, null, 2),
         "utf-8"
       );
@@ -11035,7 +10902,7 @@ async function importFigmaAction(urlOrKey, opts) {
     const fullConfig = buildFigmaImportConfig(mergedConfig, pageDefs, intermediate.fileName);
     if (!dryRun) {
       spinner.start("Updating design-system.config.ts...");
-      const configPath = resolve16(projectRoot, DESIGN_SYSTEM_CONFIG_PATH);
+      const configPath = resolve15(projectRoot, DESIGN_SYSTEM_CONFIG_PATH);
       const dsm = new DesignSystemManager13(configPath);
       if (existsSync24(configPath)) {
         await dsm.load();
@@ -11066,7 +10933,7 @@ 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 = join16(projectRoot, "app/layout.tsx");
+      const layoutPath = join15(projectRoot, "app/layout.tsx");
       if (!existsSync24(layoutPath)) {
         await mkdir6(dirname9(layoutPath), { recursive: true });
         await writeFile6(layoutPath, MINIMAL_ROOT_LAYOUT, "utf-8");
@@ -11074,7 +10941,7 @@ export const config = ${JSON.stringify(fullConfig, null, 2)} as const
       }
       spinner.succeed("Root layout OK");
       spinner.start("Integrating shared layout (Header/Footer)...");
-      const layoutIntegrated = await integrateSharedLayoutIntoRootLayout5(projectRoot);
+      const layoutIntegrated = await integrateSharedLayoutIntoRootLayout4(projectRoot);
       stats.layoutIntegrated = layoutIntegrated;
       spinner.succeed(layoutIntegrated ? "Layout components wired" : "No layout components to wire");
       spinner.start("Generating Design System viewer...");
@@ -11157,8 +11024,8 @@ async function dsRegenerateCommand() {
 // src/commands/update.ts
 import chalk28 from "chalk";
 import ora8 from "ora";
-import { readFileSync as readFileSync17, existsSync as existsSync25 } from "fs";
-import { join as join17 } from "path";
+import { readFileSync as readFileSync16, existsSync as existsSync25 } from "fs";
+import { join as join16 } from "path";
 import { DesignSystemManager as DesignSystemManager15, CLI_VERSION as CLI_VERSION4 } from "@getcoherent/core";
 // src/utils/migrations.ts
@@ -11327,20 +11194,20 @@ var EXPECTED_CSS_VARS = [
   "--sidebar-ring"
 ];
 function checkMissingCssVars(projectRoot) {
-  const globalsPath = join17(projectRoot, "app", "globals.css");
+  const globalsPath = join16(projectRoot, "app", "globals.css");
   if (!existsSync25(globalsPath)) return [];
   try {
-    const content = readFileSync17(globalsPath, "utf-8");
+    const content = readFileSync16(globalsPath, "utf-8");
     return EXPECTED_CSS_VARS.filter((v) => !content.includes(v));
   } catch {
     return [];
   }
 }
 function patchGlobalsCss(projectRoot, missingVars) {
-  const globalsPath = join17(projectRoot, "app", "globals.css");
+  const globalsPath = join16(projectRoot, "app", "globals.css");
   if (!existsSync25(globalsPath) || missingVars.length === 0) return;
   const { writeFileSync: writeFileSync13 } = __require("fs");
-  let content = readFileSync17(globalsPath, "utf-8");
+  let content = readFileSync16(globalsPath, "utf-8");
   const defaultValues = {
     "--chart-1": "220 70% 50%",
     "--chart-2": "160 60% 45%",
@@ -11418,26 +11285,26 @@ async function undoCommand(options) {
 // src/commands/sync.ts
 import chalk30 from "chalk";
 import ora9 from "ora";
-import { existsSync as existsSync26, readFileSync as readFileSync18 } from "fs";
-import { join as join18, relative as relative4, dirname as dirname10 } from "path";
+import { existsSync as existsSync26, readFileSync as readFileSync17 } from "fs";
+import { join as join17, relative as relative4, dirname as dirname10 } from "path";
 import { readdir as readdir4, readFile as readFile6 } from "fs/promises";
 import { DesignSystemManager as DesignSystemManager16 } from "@getcoherent/core";
 import { loadManifest as loadManifest13, saveManifest as saveManifest5, findSharedComponent } from "@getcoherent/core";
 function extractTokensFromProject(projectRoot) {
   const lightColors = {};
   const darkColors = {};
-  const globalsPath = join18(projectRoot, "app", "globals.css");
+  const globalsPath = join17(projectRoot, "app", "globals.css");
   if (existsSync26(globalsPath)) {
-    const css = readFileSync18(globalsPath, "utf-8");
+    const css = readFileSync17(globalsPath, "utf-8");
     const rootMatch = css.match(/:root\s*\{([^}]+)\}/s);
     if (rootMatch) parseVarsInto(rootMatch[1], lightColors);
     const darkMatch = css.match(/\.dark\s*\{([^}]+)\}/s);
     if (darkMatch) parseVarsInto(darkMatch[1], darkColors);
   }
-  const layoutPath = join18(projectRoot, "app", "layout.tsx");
+  const layoutPath = join17(projectRoot, "app", "layout.tsx");
   let layoutCode = "";
   if (existsSync26(layoutPath)) {
-    layoutCode = readFileSync18(layoutPath, "utf-8");
+    layoutCode = readFileSync17(layoutPath, "utf-8");
     const rootInline = layoutCode.match(/:root\s*\{([^}]+)\}/s);
     if (rootInline && Object.keys(lightColors).length === 0) {
       parseVarsInto(rootInline[1], lightColors);
@@ -11455,7 +11322,7 @@ function extractTokensFromProject(projectRoot) {
     defaultMode = "dark";
   }
   let radius;
-  const allCss = [existsSync26(globalsPath) ? readFileSync18(globalsPath, "utf-8") : "", layoutCode].join("\n");
+  const allCss = [existsSync26(globalsPath) ? readFileSync17(globalsPath, "utf-8") : "", layoutCode].join("\n");
   const radiusMatch = allCss.match(/--radius:\s*([^;]+);/);
   if (radiusMatch) radius = radiusMatch[1].trim();
   return {
@@ -11478,7 +11345,7 @@ function parseVarsInto(block, target) {
 }
 async function detectCustomComponents(projectRoot, allPageCode) {
   const results = [];
-  const componentsDir = join18(projectRoot, "components");
+  const componentsDir = join17(projectRoot, "components");
   if (!existsSync26(componentsDir)) return results;
   const files = [];
   await walkForTsx(componentsDir, files, ["ui"]);
@@ -11506,7 +11373,7 @@ async function walkForTsx(dir, files, skipDirs) {
     return;
   }
   for (const e of entries) {
-    const full = join18(dir, e.name);
+    const full = join17(dir, e.name);
     if (e.isDirectory()) {
       if (skipDirs.includes(e.name) || e.name.startsWith(".")) continue;
       await walkForTsx(full, files, skipDirs);
@@ -11580,7 +11447,7 @@ async function discoverPages(appDir) {
       return;
     }
     for (const entry of entries) {
-      const full = join18(dir, entry.name);
+      const full = join17(dir, entry.name);
       if (entry.isDirectory()) {
         if (["design-system", "api", "_not-found"].includes(entry.name)) continue;
         if (entry.name.startsWith(".")) continue;
@@ -11657,7 +11524,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 = join18(project.root, "app");
+    const appDir = join17(project.root, "app");
     if (!existsSync26(appDir)) {
       spinner.fail("No app/ directory found");
       process.exit(1);
@@ -11883,20 +11750,20 @@ async function syncCommand(options = {}) {
 }
 // src/utils/update-notifier.ts
-import { existsSync as existsSync27, mkdirSync as mkdirSync8, readFileSync as readFileSync19, writeFileSync as writeFileSync12 } from "fs";
-import { join as join19 } from "path";
+import { existsSync as existsSync27, mkdirSync as mkdirSync8, readFileSync as readFileSync18, writeFileSync as writeFileSync12 } from "fs";
+import { join as join18 } 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 = join19(homedir(), ".coherent");
-var CACHE_FILE = join19(CACHE_DIR, "update-check.json");
+var CACHE_DIR = join18(homedir(), ".coherent");
+var CACHE_FILE = join18(CACHE_DIR, "update-check.json");
 var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 function readCache() {
   try {
     if (!existsSync27(CACHE_FILE)) return null;
-    const raw = readFileSync19(CACHE_FILE, "utf-8");
+    const raw = readFileSync18(CACHE_FILE, "utf-8");
     return JSON.parse(raw);
   } catch (e) {
     if (DEBUG5) console.error("Failed to read update cache:", e);