@getcoherent/cli 0.6.38 → 0.6.40

package/dist/index.js

@@ -6980,14 +6980,28 @@ function findPagesImporting(projectRoot, componentName, componentFile) {
   return results;
 }
 function isUsedInLayout(projectRoot, componentName) {
-  const layoutPath = join7(projectRoot, "app", "layout.tsx");
-  if (!existsSync12(layoutPath)) return false;
-  try {
-    const code = readFileSync9(layoutPath, "utf-8");
-    return code.includes(componentName);
-  } catch {
-    return false;
+  const appDir = join7(projectRoot, "app");
+  const layoutPaths = [join7(appDir, "layout.tsx")];
+  if (existsSync12(appDir)) {
+    try {
+      for (const entry of readdirSync4(appDir, { withFileTypes: true })) {
+        if (entry.isDirectory() && entry.name.startsWith("(") && entry.name.endsWith(")")) {
+          layoutPaths.push(join7(appDir, entry.name, "layout.tsx"));
+        }
+      }
+    } catch {
+    }
   }
+  const matched = [];
+  for (const lp of [...new Set(layoutPaths)]) {
+    try {
+      if (readFileSync9(lp, "utf-8").includes(componentName)) {
+        matched.push(relative3(projectRoot, lp));
+      }
+    } catch {
+    }
+  }
+  return matched;
 }
 function findUnregisteredComponents(projectRoot, manifest) {
   const results = [];
@@ -7114,8 +7128,8 @@ function reconcileComponents(projectRoot, manifest) {
       result.updated.push({ id: entry.id, field: "name", from: oldName, to: entry.name });
     }
     const actualUsedIn = findPagesImporting(projectRoot, entry.name, entry.file);
-    const inLayout = isUsedInLayout(projectRoot, entry.name);
-    const fullUsedIn = inLayout ? [.../* @__PURE__ */ new Set([...actualUsedIn, "app/layout.tsx"])] : actualUsedIn;
+    const layoutPaths = isUsedInLayout(projectRoot, entry.name);
+    const fullUsedIn = [.../* @__PURE__ */ new Set([...actualUsedIn, ...layoutPaths])];
     if (!arraysEqual(fullUsedIn, entry.usedIn || [])) {
       result.updated.push({
         id: entry.id,
@@ -8308,8 +8322,8 @@ async function regenerateDocsCommand() {
 
 // src/commands/fix.ts
 import chalk15 from "chalk";
-import { readdirSync as readdirSync7, readFileSync as readFileSync12, existsSync as existsSync16, writeFileSync as writeFileSync10, rmSync as rmSync5, mkdirSync as mkdirSync7 } from "fs";
-import { resolve as resolve10, join as join11 } from "path";
+import { readdirSync as readdirSync7, readFileSync as readFileSync13, existsSync as existsSync17, rmSync as rmSync5, mkdirSync as mkdirSync7 } from "fs";
+import { resolve as resolve10, join as join12, relative as relative5 } from "path";
 import {
   DesignSystemManager as DesignSystemManager9,
   ComponentManager as ComponentManager5,
@@ -8318,6 +8332,54 @@ import {
   loadManifest as loadManifest9,
   saveManifest as saveManifest5
 } from "@getcoherent/core";
+
+// src/commands/fix-validation.ts
+import { createRequire } from "module";
+import { existsSync as existsSync16, readFileSync as readFileSync12, writeFileSync as writeFileSync10 } from "fs";
+import { join as join11 } from "path";
+var cachedTs = null;
+var cachedProjectRoot = null;
+function isValidTsx(code, projectRoot, ext = ".tsx") {
+  if (ext !== ".tsx" && ext !== ".ts") return true;
+  const pkgJson = join11(projectRoot, "package.json");
+  if (!existsSync16(pkgJson)) return true;
+  try {
+    if (!cachedTs || cachedProjectRoot !== projectRoot) {
+      const req = createRequire(pkgJson);
+      cachedTs = req("typescript");
+      cachedProjectRoot = projectRoot;
+    }
+    const sf = cachedTs.createSourceFile(
+      "check.tsx",
+      code,
+      cachedTs.ScriptTarget.Latest,
+      false,
+      cachedTs.ScriptKind.TSX
+    );
+    const diagnostics = sf.parseDiagnostics;
+    return !diagnostics || diagnostics.length === 0;
+  } catch {
+    return true;
+  }
+}
+function safeWrite(filePath, newContent, projectRoot, backups) {
+  if (!backups.has(filePath)) {
+    try {
+      backups.set(filePath, readFileSync12(filePath, "utf-8"));
+    } catch {
+    }
+  }
+  const ext = filePath.slice(filePath.lastIndexOf("."));
+  writeFileSync10(filePath, newContent, "utf-8");
+  if (!isValidTsx(newContent, projectRoot, ext)) {
+    const original = backups.get(filePath);
+    if (original) writeFileSync10(filePath, original, "utf-8");
+    return { ok: false };
+  }
+  return { ok: true };
+}
+
+// src/commands/fix.ts
 function extractComponentIdsFromCode2(code) {
   const ids = /* @__PURE__ */ new Set();
   const allMatches = code.matchAll(/@\/components\/((?:ui\/)?[a-z0-9-]+)/g);
@@ -8335,7 +8397,7 @@ function listTsxFiles(dir) {
   try {
     const entries = readdirSync7(dir, { withFileTypes: true });
     for (const e of entries) {
-      const full = join11(dir, e.name);
+      const full = join12(dir, e.name);
       if (e.isDirectory() && e.name !== "node_modules" && !e.name.startsWith(".")) {
         files.push(...listTsxFiles(full));
       } else if (e.isFile() && e.name.endsWith(".tsx")) {
@@ -8358,14 +8420,16 @@ async function fixCommand(opts = {}) {
   const projectRoot = project.root;
   const fixes = [];
   const remaining = [];
+  const backups = /* @__PURE__ */ new Map();
+  const modifiedFiles = [];
   if (dryRun) {
     console.log(chalk15.cyan("\ncoherent fix --dry-run\n"));
   } else {
     console.log(chalk15.cyan("\ncoherent fix\n"));
   }
   if (!skipCache) {
-    const nextDir = join11(projectRoot, ".next");
-    if (existsSync16(nextDir)) {
+    const nextDir = join12(projectRoot, ".next");
+    if (existsSync17(nextDir)) {
       if (!dryRun) rmSync5(nextDir, { recursive: true, force: true });
       fixes.push("Cleared build cache");
       console.log(chalk15.green("  \u2714 Cleared build cache"));
@@ -8392,7 +8456,7 @@ async function fixCommand(opts = {}) {
   const componentsTsxFiles = listTsxFiles(resolve10(projectRoot, "components"));
   const allComponentIds = /* @__PURE__ */ new Set();
   for (const file of [...allTsxFiles, ...componentsTsxFiles]) {
-    const content = readFileSync12(file, "utf-8");
+    const content = readFileSync13(file, "utf-8");
     extractComponentIdsFromCode2(content).forEach((id) => allComponentIds.add(id));
   }
   let dsm = null;
@@ -8412,7 +8476,7 @@ async function fixCommand(opts = {}) {
       } else {
         const fileName = toKebabCase(id) + ".tsx";
         const filePath = resolve10(projectRoot, "components", "ui", fileName);
-        if (!existsSync16(filePath)) missingFiles.push(id);
+        if (!existsSync17(filePath)) missingFiles.push(id);
       }
     }
     const provider = getComponentProvider();
@@ -8464,13 +8528,22 @@ async function fixCommand(opts = {}) {
   const userTsxFiles = allTsxFiles.filter((f) => !f.includes("/design-system/"));
   let syntaxFixed = 0;
   for (const file of userTsxFiles) {
-    const content = readFileSync12(file, "utf-8");
+    const content = readFileSync13(file, "utf-8");
     const fixed = fixUnescapedLtInJsx(
       fixEscapedClosingQuotes(sanitizeMetadataStrings(ensureUseClientIfNeeded(content)))
     );
     if (fixed !== content) {
-      if (!dryRun) writeFileSync10(file, fixed, "utf-8");
-      syntaxFixed++;
+      if (!dryRun) {
+        const result = safeWrite(file, fixed, projectRoot, backups);
+        if (result.ok) {
+          modifiedFiles.push(file);
+          syntaxFixed++;
+        } else {
+          console.log(chalk15.yellow(`  \u26A0 Syntax fix rolled back for ${relative5(projectRoot, file)} (parse error)`));
+        }
+      } else {
+        syntaxFixed++;
+      }
     }
   }
   if (syntaxFixed > 0) {
@@ -8493,7 +8566,7 @@ async function fixCommand(opts = {}) {
       console.log(chalk15.green(`  \u2714 Verified group layouts: ${layoutTypes}`));
       const hasSidebar = plan.groups.some((g) => g.layout === "sidebar" || g.layout === "both");
       const sidebarPath = resolve10(projectRoot, "components", "shared", "sidebar.tsx");
-      if (hasSidebar && !existsSync16(sidebarPath) && !dryRun) {
+      if (hasSidebar && !existsSync17(sidebarPath) && !dryRun) {
         if (!dsm) {
           dsm = new DesignSystemManager9(project.configPath);
           await dsm.load();
@@ -8502,14 +8575,18 @@ async function fixCommand(opts = {}) {
         const generator = new PageGenerator(dsm.getConfig());
         const sidebarCode = generator.generateSharedSidebarCode();
         mkdirSync7(resolve10(projectRoot, "components", "shared"), { recursive: true });
-        writeFileSync10(sidebarPath, sidebarCode, "utf-8");
-        fixes.push("Generated AppSidebar component (components/shared/sidebar.tsx)");
-        console.log(chalk15.green("  \u2714 Generated AppSidebar component"));
+        const sidebarResult = safeWrite(sidebarPath, sidebarCode, projectRoot, backups);
+        if (sidebarResult.ok) {
+          fixes.push("Generated AppSidebar component (components/shared/sidebar.tsx)");
+          console.log(chalk15.green("  \u2714 Generated AppSidebar component"));
+        } else {
+          console.log(chalk15.yellow("  \u26A0 AppSidebar generation failed validation"));
+        }
       }
       if (hasSidebar && !dryRun) {
         const rootLayoutPath = resolve10(projectRoot, "app", "layout.tsx");
-        if (existsSync16(rootLayoutPath)) {
-          let rootCode = readFileSync12(rootLayoutPath, "utf-8");
+        if (existsSync17(rootLayoutPath)) {
+          let rootCode = readFileSync13(rootLayoutPath, "utf-8");
           if (rootCode.includes("<Header")) {
             rootCode = rootCode.replace(/import\s*\{[^}]*Header[^}]*\}[^;\n]*[;\n]?\s*/g, "").replace(/import\s*\{[^}]*Footer[^}]*\}[^;\n]*[;\n]?\s*/g, "").replace(/import\s+ShowWhenNotAuthRoute[^;\n]*[;\n]?\s*/g, "").replace(/<ShowWhenNotAuthRoute>[\s\S]*?<\/ShowWhenNotAuthRoute>/g, (match) => {
               const inner = match.replace(/<\/?ShowWhenNotAuthRoute>/g, "").trim();
@@ -8517,50 +8594,74 @@ async function fixCommand(opts = {}) {
             }).replace(/\s*<Header\s*\/>\s*/g, "\n").replace(/\s*<Footer\s*\/>\s*/g, "\n");
             rootCode = rootCode.replace(/min-h-screen flex flex-col/g, "min-h-svh");
             rootCode = rootCode.replace(/"flex-1 flex flex-col"/g, '"flex-1"');
-            writeFileSync10(rootLayoutPath, rootCode, "utf-8");
-            fixes.push("Stripped Header/Footer from root layout (sidebar mode)");
-            console.log(chalk15.green("  \u2714 Stripped Header/Footer from root layout (sidebar mode)"));
+            const rootResult = safeWrite(rootLayoutPath, rootCode, projectRoot, backups);
+            if (rootResult.ok) {
+              fixes.push("Stripped Header/Footer from root layout (sidebar mode)");
+              console.log(chalk15.green("  \u2714 Stripped Header/Footer from root layout (sidebar mode)"));
+            } else {
+              console.log(chalk15.yellow("  \u26A0 Root layout update rolled back (parse error)"));
+            }
           }
         }
         const publicLayoutPath = resolve10(projectRoot, "app", "(public)", "layout.tsx");
-        const publicExists = existsSync16(publicLayoutPath);
-        const needsPublicLayout = !publicExists || !readFileSync12(publicLayoutPath, "utf-8").includes("<Header");
+        const publicExists = existsSync17(publicLayoutPath);
+        const needsPublicLayout = !publicExists || !readFileSync13(publicLayoutPath, "utf-8").includes("<Header");
         if (needsPublicLayout) {
           const { buildPublicLayoutCodeForSidebar } = await import("./code-generator-D3ZHOO4M.js");
           mkdirSync7(resolve10(projectRoot, "app", "(public)"), { recursive: true });
-          writeFileSync10(publicLayoutPath, buildPublicLayoutCodeForSidebar(), "utf-8");
-          fixes.push("Added Header/Footer to (public) layout");
-          console.log(chalk15.green("  \u2714 Added Header/Footer to (public) layout"));
+          const publicResult = safeWrite(publicLayoutPath, buildPublicLayoutCodeForSidebar(), projectRoot, backups);
+          if (publicResult.ok) {
+            fixes.push("Added Header/Footer to (public) layout");
+            console.log(chalk15.green("  \u2714 Added Header/Footer to (public) layout"));
+          } else {
+            console.log(chalk15.yellow("  \u26A0 Public layout generation failed validation"));
+          }
         }
         const appLayoutPath = resolve10(projectRoot, "app", "(app)", "layout.tsx");
-        if (existsSync16(appLayoutPath) && dsm) {
-          let appLayoutCode = readFileSync12(appLayoutPath, "utf-8");
+        if (existsSync17(appLayoutPath) && dsm) {
+          let appLayoutCode = readFileSync13(appLayoutPath, "utf-8");
           const configName = dsm.getConfig().name;
           if (configName && configName !== "My App" && appLayoutCode.includes("My App")) {
             appLayoutCode = appLayoutCode.replace(/My App/g, configName);
-            writeFileSync10(appLayoutPath, appLayoutCode, "utf-8");
-            fixes.push(`Replaced "My App" with "${configName}" in (app)/layout.tsx`);
-            console.log(chalk15.green(`  \u2714 Replaced "My App" with "${configName}" in (app)/layout.tsx`));
+            const appResult = safeWrite(appLayoutPath, appLayoutCode, projectRoot, backups);
+            if (appResult.ok) {
+              fixes.push(`Replaced "My App" with "${configName}" in (app)/layout.tsx`);
+              console.log(chalk15.green(`  \u2714 Replaced "My App" with "${configName}" in (app)/layout.tsx`));
+            } else {
+              console.log(chalk15.yellow("  \u26A0 (app)/layout.tsx update rolled back (parse error)"));
+            }
           }
         }
         const sidebarComponentPath2 = resolve10(projectRoot, "components", "shared", "sidebar.tsx");
-        if (existsSync16(sidebarComponentPath2)) {
-          const sidebarCode = readFileSync12(sidebarComponentPath2, "utf-8");
-          if (sidebarCode.includes("SidebarTrigger")) {
+        if (existsSync17(sidebarComponentPath2)) {
+          const existingSidebarCode = readFileSync13(sidebarComponentPath2, "utf-8");
+          const sidebarConfigName = dsm?.getConfig().name ?? "";
+          const hasWrongName = existingSidebarCode.includes("My App") && sidebarConfigName !== "My App";
+          const hasTrigger = existingSidebarCode.includes("SidebarTrigger");
+          if (hasWrongName || hasTrigger) {
             if (!dsm) {
               dsm = new DesignSystemManager9(project.configPath);
               await dsm.load();
             }
             const { PageGenerator } = await import("@getcoherent/core");
             const gen = new PageGenerator(dsm.getConfig());
-            writeFileSync10(sidebarComponentPath2, gen.generateSharedSidebarCode(), "utf-8");
-            fixes.push("Regenerated sidebar component (removed duplicate SidebarTrigger)");
-            console.log(chalk15.green("  \u2714 Regenerated sidebar component (removed duplicate SidebarTrigger)"));
+            const sidebarResult2 = safeWrite(
+              sidebarComponentPath2,
+              gen.generateSharedSidebarCode(),
+              projectRoot,
+              backups
+            );
+            if (sidebarResult2.ok) {
+              fixes.push("Regenerated sidebar component");
+              console.log(chalk15.green("  \u2714 Regenerated sidebar component"));
+            } else {
+              console.log(chalk15.yellow("  \u26A0 Sidebar regeneration failed validation \u2014 restored original"));
+            }
           }
         }
         const rootPagePath = resolve10(projectRoot, "app", "page.tsx");
         const publicPagePath = resolve10(projectRoot, "app", "(public)", "page.tsx");
-        if (existsSync16(rootPagePath) && !existsSync16(publicPagePath)) {
+        if (existsSync17(rootPagePath) && !existsSync17(publicPagePath)) {
           const { renameSync } = await import("fs");
           mkdirSync7(resolve10(projectRoot, "app", "(public)"), { recursive: true });
           renameSync(rootPagePath, publicPagePath);
@@ -8568,27 +8669,42 @@ async function fixCommand(opts = {}) {
           console.log(chalk15.green("  \u2714 Moved app/page.tsx \u2192 app/(public)/page.tsx (gets Header/Footer)"));
         }
         const themeTogglePath = resolve10(projectRoot, "components", "shared", "theme-toggle.tsx");
-        if (!existsSync16(themeTogglePath)) {
+        if (!existsSync17(themeTogglePath)) {
           const { generateThemeToggleCode } = await import("./code-generator-D3ZHOO4M.js");
           mkdirSync7(resolve10(projectRoot, "components", "shared"), { recursive: true });
-          writeFileSync10(themeTogglePath, generateThemeToggleCode(), "utf-8");
-          fixes.push("Generated ThemeToggle component (components/shared/theme-toggle.tsx)");
-          console.log(chalk15.green("  \u2714 Generated ThemeToggle component"));
+          const themeResult = safeWrite(themeTogglePath, generateThemeToggleCode(), projectRoot, backups);
+          if (themeResult.ok) {
+            fixes.push("Generated ThemeToggle component (components/shared/theme-toggle.tsx)");
+            console.log(chalk15.green("  \u2714 Generated ThemeToggle component"));
+          } else {
+            console.log(chalk15.yellow("  \u26A0 ThemeToggle generation failed validation"));
+          }
         }
       }
     }
-  } catch {
+  } catch (err) {
+    console.log(chalk15.yellow(`  \u26A0 Layout repair skipped: ${err instanceof Error ? err.message : "unknown error"}`));
   }
   if (!skipQuality) {
     let qualityFixCount = 0;
     const qualityFixDetails = [];
     for (const file of userTsxFiles) {
-      const content = readFileSync12(file, "utf-8");
+      const content = readFileSync13(file, "utf-8");
       const { code: autoFixed, fixes: fileFixes } = await autoFixCode(content);
       if (autoFixed !== content) {
-        if (!dryRun) writeFileSync10(file, autoFixed, "utf-8");
-        qualityFixCount++;
-        qualityFixDetails.push(...fileFixes);
+        if (!dryRun) {
+          const qResult = safeWrite(file, autoFixed, projectRoot, backups);
+          if (qResult.ok) {
+            modifiedFiles.push(file);
+            qualityFixCount++;
+            qualityFixDetails.push(...fileFixes);
+          } else {
+            console.log(chalk15.yellow(`  \u26A0 Quality fix rolled back for ${relative5(projectRoot, file)} (parse error)`));
+          }
+        } else {
+          qualityFixCount++;
+          qualityFixDetails.push(...fileFixes);
+        }
       }
     }
     if (qualityFixCount > 0) {
@@ -8598,11 +8714,22 @@ async function fixCommand(opts = {}) {
       console.log(chalk15.green(`  \u2714 ${verb} ${uniqueFixes.length} quality issue type(s): ${uniqueFixes.join(", ")}`));
     }
   }
+  for (const file of modifiedFiles) {
+    if (!backups.has(file)) continue;
+    const before = backups.get(file);
+    const after = readFileSync13(file, "utf-8");
+    const issues = verifyIncrementalEdit(before, after);
+    if (issues.length > 0) {
+      for (const issue of issues) {
+        remaining.push(`${relative5(projectRoot, file)}: ${issue.message}`);
+      }
+    }
+  }
   let totalErrors = 0;
   let totalWarnings = 0;
   const fileIssues = [];
   for (const file of allTsxFiles) {
-    const code = dryRun ? readFileSync12(file, "utf-8") : readFileSync12(file, "utf-8");
+    const code = dryRun ? readFileSync13(file, "utf-8") : readFileSync13(file, "utf-8");
     const relativePath = file.replace(projectRoot + "/", "");
     const baseName = file.split("/").pop() || "";
     const isAuthPage = relativePath.includes("(auth)");
@@ -8653,8 +8780,8 @@ async function fixCommand(opts = {}) {
     }
     for (const entry of manifest.shared) {
       const actualUsedIn = findPagesImporting(project.root, entry.name, entry.file);
-      const inLayout = isUsedInLayout(project.root, entry.name);
-      const fullActual = inLayout ? [.../* @__PURE__ */ new Set([...actualUsedIn, "app/layout.tsx"])] : actualUsedIn;
+      const layoutPaths = isUsedInLayout(project.root, entry.name);
+      const fullActual = [.../* @__PURE__ */ new Set([...actualUsedIn, ...layoutPaths])];
       if (!arraysEqual(fullActual, entry.usedIn || [])) {
         entry.usedIn = fullActual;
         manifestModified = true;
@@ -8691,12 +8818,18 @@ async function fixCommand(opts = {}) {
     }
     for (const entry of manifest.shared) {
       const actualUsedIn = findPagesImporting(project.root, entry.name, entry.file);
-      const inLayout = isUsedInLayout(project.root, entry.name);
-      if (actualUsedIn.length === 0 && !inLayout) {
+      const layoutPaths2 = isUsedInLayout(project.root, entry.name);
+      if (actualUsedIn.length === 0 && layoutPaths2.length === 0) {
         remaining.push(`${entry.id} (${entry.name}) \u2014 unused. Remove: coherent components shared remove ${entry.id}`);
       }
     }
-  } catch {
+  } catch (err) {
+    const isNotFound = err instanceof Error && "code" in err && err.code === "ENOENT";
+    if (!isNotFound) {
+      console.log(
+        chalk15.yellow(`  \u26A0 Component manifest check skipped: ${err instanceof Error ? err.message : "unknown error"}`)
+      );
+    }
   }
   if (fixes.length === 0 && totalErrors === 0 && totalWarnings === 0 && remaining.length === 0) {
     console.log(chalk15.green("\n  \u2705 Everything looks good \u2014 no issues found\n"));
@@ -8727,7 +8860,7 @@ async function fixCommand(opts = {}) {
 // src/commands/check.ts
 import chalk16 from "chalk";
 import { resolve as resolve11 } from "path";
-import { readdirSync as readdirSync8, readFileSync as readFileSync13, statSync as statSync3, existsSync as existsSync17 } from "fs";
+import { readdirSync as readdirSync8, readFileSync as readFileSync14, statSync as statSync3, existsSync as existsSync18 } from "fs";
 import { loadManifest as loadManifest10 } from "@getcoherent/core";
 var EXCLUDED_DIRS = /* @__PURE__ */ new Set(["node_modules", "design-system"]);
 function findTsxFiles(dir) {
@@ -8784,7 +8917,7 @@ async function checkCommand(opts = {}) {
       "NATIVE_TABLE"
     ]);
     for (const file of files) {
-      const code = readFileSync13(file, "utf-8");
+      const code = readFileSync14(file, "utf-8");
       const relativePath = file.replace(projectRoot + "/", "");
       const baseName = file.split("/").pop() || "";
       const isAuthPage = relativePath.includes("(auth)");
@@ -8826,7 +8959,7 @@ async function checkCommand(opts = {}) {
     routeSet.add("/");
     routeSet.add("#");
     for (const file of files) {
-      const code = readFileSync13(file, "utf-8");
+      const code = readFileSync14(file, "utf-8");
       const relativePath = file.replace(projectRoot + "/", "");
       const lines = code.split("\n");
       const linkHrefRe = /href\s*=\s*["'](\/[a-z0-9/-]*)["']/gi;
@@ -8859,7 +8992,7 @@ async function checkCommand(opts = {}) {
       if (manifest.shared.length > 0) {
         for (const entry of manifest.shared) {
           const fullPath = resolve11(project.root, entry.file);
-          if (!existsSync17(fullPath)) {
+          if (!existsSync18(fullPath)) {
             result.pages.withErrors++;
             if (!opts.json) console.log(chalk16.red(`
   \u2717 Missing shared component file: ${entry.id} (${entry.file})`));
@@ -8884,7 +9017,7 @@ async function checkCommand(opts = {}) {
       let _nameMismatch = 0;
       for (const entry of manifest.shared) {
         const filePath = resolve11(projectRoot, entry.file);
-        const fileExists = existsSync17(filePath);
+        const fileExists = existsSync18(filePath);
         if (!fileExists) {
           _orphaned++;
           if (!opts.json) {
@@ -8894,7 +9027,7 @@ async function checkCommand(opts = {}) {
           continue;
         }
         try {
-          const code = readFileSync13(filePath, "utf-8");
+          const code = readFileSync14(filePath, "utf-8");
           const actualExports = extractExportedComponentNames(code);
           if (actualExports.length > 0 && !actualExports.includes(entry.name)) {
             _nameMismatch++;
@@ -8910,10 +9043,10 @@ async function checkCommand(opts = {}) {
         } catch {
         }
         const actualUsedIn = findPagesImporting(projectRoot, entry.name, entry.file);
-        const inLayout = isUsedInLayout(projectRoot, entry.name);
-        const totalUsage = actualUsedIn.length + (inLayout ? 1 : 0);
+        const layoutPaths = isUsedInLayout(projectRoot, entry.name);
+        const totalUsage = actualUsedIn.length + layoutPaths.length;
         const manifestUsedIn = entry.usedIn || [];
-        const fullActual = inLayout ? [.../* @__PURE__ */ new Set([...actualUsedIn, "app/layout.tsx"])] : actualUsedIn;
+        const fullActual = [.../* @__PURE__ */ new Set([...actualUsedIn, ...layoutPaths])];
         const isStale = manifestUsedIn.length !== fullActual.length || !manifestUsedIn.every((p) => fullActual.includes(p));
         if (isStale) _staleUsedIn++;
         if (totalUsage === 0) {
@@ -8924,7 +9057,7 @@ async function checkCommand(opts = {}) {
           }
         } else {
           consistent++;
-          const usageDesc = inLayout ? `layout + ${actualUsedIn.length} page(s)` : `${actualUsedIn.length} page(s)`;
+          const usageDesc = layoutPaths.length > 0 ? `layout(${layoutPaths.length}) + ${actualUsedIn.length} page(s)` : `${actualUsedIn.length} page(s)`;
           if (!opts.json) {
             const staleNote = isStale ? chalk16.yellow(" [usedIn stale]") : "";
             console.log(chalk16.green(`  \u2714 ${entry.id} (${entry.name})`) + chalk16.dim(` \u2014 ${usageDesc}`) + staleNote);
@@ -8962,7 +9095,7 @@ async function checkCommand(opts = {}) {
           id: e.id,
           name: e.name,
           type: e.type,
-          status: existsSync17(resolve11(projectRoot, e.file)) ? "ok" : "unused",
+          status: existsSync18(resolve11(projectRoot, e.file)) ? "ok" : "unused",
           message: "",
           suggestions: void 0
         }))
@@ -8976,11 +9109,11 @@ async function checkCommand(opts = {}) {
       const { inferPageTypeFromRoute: inferPageTypeFromRoute2 } = await import("./design-constraints-EIP2XM7T.js");
       const manifest = await loadManifest10(projectRoot);
       const appDir = resolve11(projectRoot, "app");
-      const pageFiles = existsSync17(appDir) ? findTsxFiles(appDir) : [];
+      const pageFiles = existsSync18(appDir) ? findTsxFiles(appDir) : [];
       if (manifest.shared.length > 0 && pageFiles.length > 0) {
         const reuseWarnings = [];
         for (const file of pageFiles) {
-          const code = readFileSync13(file, "utf-8");
+          const code = readFileSync14(file, "utf-8");
           const relativePath = file.replace(projectRoot + "/", "");
           const route = "/" + relativePath.replace(/^app\//, "").replace(/\/page\.tsx$/, "").replace(/^\(.*?\)\//, "");
           const pageType = inferPageTypeFromRoute2(route);
@@ -9091,12 +9224,12 @@ import {
   generateSharedComponent as generateSharedComponent4,
   integrateSharedLayoutIntoRootLayout as integrateSharedLayoutIntoRootLayout2
 } from "@getcoherent/core";
-import { existsSync as existsSync18 } from "fs";
+import { existsSync as existsSync19 } from "fs";
 import { resolve as resolve12 } from "path";
 
 // src/utils/ds-files.ts
 import { mkdir as mkdir3, writeFile as writeFile4 } from "fs/promises";
-import { join as join12, dirname as dirname5 } from "path";
+import { join as join13, dirname as dirname5 } from "path";
 import { DesignSystemGenerator } from "@getcoherent/core";
 var SHARED_DS_KEYS = [
   "app/design-system/shared/page.tsx",
@@ -9110,7 +9243,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 = join12(projectRoot, relativePath);
+    const fullPath = join13(projectRoot, relativePath);
     await mkdir3(dirname5(fullPath), { recursive: true });
     await writeFile4(fullPath, content, "utf-8");
     written.push(relativePath);
@@ -9246,7 +9379,7 @@ function createComponentsCommand() {
       if (updated) console.log(chalk22.cyan("   Updated app/layout.tsx to use shared layout components.\n"));
     }
     const sharedPagePath = resolve12(project.root, "app/design-system/shared/page.tsx");
-    if (!existsSync18(sharedPagePath)) {
+    if (!existsSync19(sharedPagePath)) {
       try {
         const dsm = new DesignSystemManager10(project.configPath);
         await dsm.load();
@@ -9272,8 +9405,8 @@ function createComponentsCommand() {
 import chalk23 from "chalk";
 import ora6 from "ora";
 import { writeFile as writeFile5, mkdir as mkdir4 } from "fs/promises";
-import { resolve as resolve13, join as join13, dirname as dirname6 } from "path";
-import { existsSync as existsSync19 } from "fs";
+import { resolve as resolve13, join as join14, dirname as dirname6 } from "path";
+import { existsSync as existsSync20 } from "fs";
 import {
   FigmaClient,
   parseFigmaFileResponse,
@@ -9420,7 +9553,7 @@ async function importFigmaAction(urlOrKey, opts) {
       stats.filesWritten.push(filePath);
       return;
     }
-    const fullPath = join13(projectRoot, filePath);
+    const fullPath = join14(projectRoot, filePath);
     await mkdir4(dirname6(fullPath), { recursive: true });
     await writeFile5(fullPath, content, "utf-8");
     stats.filesWritten.push(filePath);
@@ -9522,7 +9655,7 @@ async function importFigmaAction(urlOrKey, opts) {
       spinner.start("Updating design-system.config.ts...");
       const configPath = resolve13(projectRoot, DESIGN_SYSTEM_CONFIG_PATH);
       const dsm = new DesignSystemManager11(configPath);
-      if (existsSync19(configPath)) {
+      if (existsSync20(configPath)) {
         await dsm.load();
         const existing = dsm.getConfig();
         dsm.updateConfig({
@@ -9551,8 +9684,8 @@ 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 = join13(projectRoot, "app/layout.tsx");
-      if (!existsSync19(layoutPath)) {
+      const layoutPath = join14(projectRoot, "app/layout.tsx");
+      if (!existsSync20(layoutPath)) {
         await mkdir4(dirname6(layoutPath), { recursive: true });
         await writeFile5(layoutPath, MINIMAL_ROOT_LAYOUT, "utf-8");
         stats.filesWritten.push("app/layout.tsx");
@@ -9642,8 +9775,8 @@ async function dsRegenerateCommand() {
 // src/commands/update.ts
 import chalk25 from "chalk";
 import ora8 from "ora";
-import { readFileSync as readFileSync14, existsSync as existsSync20 } from "fs";
-import { join as join14 } from "path";
+import { readFileSync as readFileSync15, existsSync as existsSync21 } from "fs";
+import { join as join15 } from "path";
 import { DesignSystemManager as DesignSystemManager13, CLI_VERSION as CLI_VERSION4 } from "@getcoherent/core";
 
 // src/utils/migrations.ts
@@ -9812,20 +9945,20 @@ var EXPECTED_CSS_VARS = [
   "--sidebar-ring"
 ];
 function checkMissingCssVars(projectRoot) {
-  const globalsPath = join14(projectRoot, "app", "globals.css");
-  if (!existsSync20(globalsPath)) return [];
+  const globalsPath = join15(projectRoot, "app", "globals.css");
+  if (!existsSync21(globalsPath)) return [];
   try {
-    const content = readFileSync14(globalsPath, "utf-8");
+    const content = readFileSync15(globalsPath, "utf-8");
     return EXPECTED_CSS_VARS.filter((v) => !content.includes(v));
   } catch {
     return [];
   }
 }
 function patchGlobalsCss(projectRoot, missingVars) {
-  const globalsPath = join14(projectRoot, "app", "globals.css");
-  if (!existsSync20(globalsPath) || missingVars.length === 0) return;
-  const { writeFileSync: writeFileSync13 } = __require("fs");
-  let content = readFileSync14(globalsPath, "utf-8");
+  const globalsPath = join15(projectRoot, "app", "globals.css");
+  if (!existsSync21(globalsPath) || missingVars.length === 0) return;
+  const { writeFileSync: writeFileSync14 } = __require("fs");
+  let content = readFileSync15(globalsPath, "utf-8");
   const defaultValues = {
     "--chart-1": "220 70% 50%",
     "--chart-2": "160 60% 45%",
@@ -9853,7 +9986,7 @@ function patchGlobalsCss(projectRoot, missingVars) {
   const lightSectionEnd = content.indexOf("}");
   if (lightSectionEnd > 0) {
     content = content.slice(0, lightSectionEnd) + "\n" + injection + "\n" + content.slice(lightSectionEnd);
-    writeFileSync13(globalsPath, content, "utf-8");
+    writeFileSync14(globalsPath, content, "utf-8");
   }
 }
 
@@ -9903,26 +10036,26 @@ async function undoCommand(options) {
 // src/commands/sync.ts
 import chalk27 from "chalk";
 import ora9 from "ora";
-import { existsSync as existsSync21, readFileSync as readFileSync15 } from "fs";
-import { join as join15, relative as relative5, dirname as dirname7 } from "path";
+import { existsSync as existsSync22, readFileSync as readFileSync16 } from "fs";
+import { join as join16, relative as relative6, dirname as dirname7 } from "path";
 import { readdir as readdir3, readFile as readFile4 } from "fs/promises";
 import { DesignSystemManager as DesignSystemManager14 } from "@getcoherent/core";
 import { loadManifest as loadManifest12, saveManifest as saveManifest6, findSharedComponent } from "@getcoherent/core";
 function extractTokensFromProject(projectRoot) {
   const lightColors = {};
   const darkColors = {};
-  const globalsPath = join15(projectRoot, "app", "globals.css");
-  if (existsSync21(globalsPath)) {
-    const css = readFileSync15(globalsPath, "utf-8");
+  const globalsPath = join16(projectRoot, "app", "globals.css");
+  if (existsSync22(globalsPath)) {
+    const css = readFileSync16(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 = join15(projectRoot, "app", "layout.tsx");
+  const layoutPath = join16(projectRoot, "app", "layout.tsx");
   let layoutCode = "";
-  if (existsSync21(layoutPath)) {
-    layoutCode = readFileSync15(layoutPath, "utf-8");
+  if (existsSync22(layoutPath)) {
+    layoutCode = readFileSync16(layoutPath, "utf-8");
     const rootInline = layoutCode.match(/:root\s*\{([^}]+)\}/s);
     if (rootInline && Object.keys(lightColors).length === 0) {
       parseVarsInto(rootInline[1], lightColors);
@@ -9940,7 +10073,7 @@ function extractTokensFromProject(projectRoot) {
     defaultMode = "dark";
   }
   let radius;
-  const allCss = [existsSync21(globalsPath) ? readFileSync15(globalsPath, "utf-8") : "", layoutCode].join("\n");
+  const allCss = [existsSync22(globalsPath) ? readFileSync16(globalsPath, "utf-8") : "", layoutCode].join("\n");
   const radiusMatch = allCss.match(/--radius:\s*([^;]+);/);
   if (radiusMatch) radius = radiusMatch[1].trim();
   return {
@@ -9963,14 +10096,14 @@ function parseVarsInto(block, target) {
 }
 async function detectCustomComponents(projectRoot, allPageCode) {
   const results = [];
-  const componentsDir = join15(projectRoot, "components");
-  if (!existsSync21(componentsDir)) return results;
+  const componentsDir = join16(projectRoot, "components");
+  if (!existsSync22(componentsDir)) return results;
   const files = [];
   await walkForTsx(componentsDir, files, ["ui"]);
   const fileResults = await Promise.all(
     files.map(async (filePath) => {
       const code = await readFile4(filePath, "utf-8");
-      const relFile = relative5(projectRoot, filePath);
+      const relFile = relative6(projectRoot, filePath);
       const exportedNames = extractExportedComponentNames2(code);
       return exportedNames.map((name) => ({
         name,
@@ -9991,7 +10124,7 @@ async function walkForTsx(dir, files, skipDirs) {
     return;
   }
   for (const e of entries) {
-    const full = join15(dir, e.name);
+    const full = join16(dir, e.name);
     if (e.isDirectory()) {
       if (skipDirs.includes(e.name) || e.name.startsWith(".")) continue;
       await walkForTsx(full, files, skipDirs);
@@ -10065,14 +10198,14 @@ async function discoverPages(appDir) {
       return;
     }
     for (const entry of entries) {
-      const full = join15(dir, entry.name);
+      const full = join16(dir, entry.name);
       if (entry.isDirectory()) {
         if (["design-system", "api", "_not-found"].includes(entry.name)) continue;
         if (entry.name.startsWith(".")) continue;
         await walk(full);
       } else if (entry.name === "page.tsx" || entry.name === "page.jsx") {
         const code = await readFile4(full, "utf-8");
-        const routeDir = dirname7(relative5(appDir, full));
+        const routeDir = dirname7(relative6(appDir, full));
         let route = routeDir === "." ? "/" : "/" + routeDir;
         route = route.replace(/\/\([^)]+\)/g, "");
         if (!route.startsWith("/")) route = "/" + route;
@@ -10154,8 +10287,8 @@ async function syncCommand(options = {}) {
   if (dryRun) console.log(chalk27.yellow("  [dry-run] No files will be written\n"));
   const spinner = ora9("Scanning project files...").start();
   try {
-    const appDir = join15(project.root, "app");
-    if (!existsSync21(appDir)) {
+    const appDir = join16(project.root, "app");
+    if (!existsSync22(appDir)) {
       spinner.fail("No app/ directory found");
       process.exit(1);
     }
@@ -10385,53 +10518,53 @@ async function syncCommand(options = {}) {
 // src/commands/migrate.ts
 import chalk28 from "chalk";
 import ora10 from "ora";
-import { existsSync as existsSync22, mkdirSync as mkdirSync8, cpSync, rmSync as rmSync6, writeFileSync as writeFileSync11, readFileSync as readFileSync16, readdirSync as readdirSync9 } from "fs";
-import { join as join16 } from "path";
+import { existsSync as existsSync23, mkdirSync as mkdirSync8, cpSync, rmSync as rmSync6, writeFileSync as writeFileSync12, readFileSync as readFileSync17, readdirSync as readdirSync9 } from "fs";
+import { join as join17 } from "path";
 function backupDir(projectRoot) {
   const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  return join16(projectRoot, ".coherent", "backups", `pre-migrate-${ts}`);
+  return join17(projectRoot, ".coherent", "backups", `pre-migrate-${ts}`);
 }
 function guardPath(projectRoot) {
-  return join16(projectRoot, ".coherent", "migration-in-progress");
+  return join17(projectRoot, ".coherent", "migration-in-progress");
 }
 function createBackup2(projectRoot) {
-  const uiDir = join16(projectRoot, "components", "ui");
+  const uiDir = join17(projectRoot, "components", "ui");
   const dest = backupDir(projectRoot);
   mkdirSync8(dest, { recursive: true });
-  if (existsSync22(uiDir)) {
-    cpSync(uiDir, join16(dest, "components-ui"), { recursive: true });
+  if (existsSync23(uiDir)) {
+    cpSync(uiDir, join17(dest, "components-ui"), { recursive: true });
   }
-  const configPath = join16(projectRoot, "design-system.config.ts");
-  if (existsSync22(configPath)) {
-    cpSync(configPath, join16(dest, "design-system.config.ts"));
+  const configPath = join17(projectRoot, "design-system.config.ts");
+  if (existsSync23(configPath)) {
+    cpSync(configPath, join17(dest, "design-system.config.ts"));
   }
   return dest;
 }
 function setGuard(projectRoot, backupPath) {
   const guard = guardPath(projectRoot);
-  mkdirSync8(join16(projectRoot, ".coherent"), { recursive: true });
-  writeFileSync11(guard, JSON.stringify({ backup: backupPath, startedAt: (/* @__PURE__ */ new Date()).toISOString() }));
+  mkdirSync8(join17(projectRoot, ".coherent"), { recursive: true });
+  writeFileSync12(guard, JSON.stringify({ backup: backupPath, startedAt: (/* @__PURE__ */ new Date()).toISOString() }));
 }
 function clearGuard(projectRoot) {
   const guard = guardPath(projectRoot);
-  if (existsSync22(guard)) rmSync6(guard);
+  if (existsSync23(guard)) rmSync6(guard);
 }
 function rollback(projectRoot) {
   const guard = guardPath(projectRoot);
-  if (!existsSync22(guard)) return false;
+  if (!existsSync23(guard)) return false;
   try {
-    const data = JSON.parse(readFileSync16(guard, "utf-8"));
+    const data = JSON.parse(readFileSync17(guard, "utf-8"));
     const backup = data.backup;
-    if (!existsSync22(backup)) return false;
-    const uiBackup = join16(backup, "components-ui");
-    const uiDir = join16(projectRoot, "components", "ui");
-    if (existsSync22(uiBackup)) {
-      if (existsSync22(uiDir)) rmSync6(uiDir, { recursive: true });
+    if (!existsSync23(backup)) return false;
+    const uiBackup = join17(backup, "components-ui");
+    const uiDir = join17(projectRoot, "components", "ui");
+    if (existsSync23(uiBackup)) {
+      if (existsSync23(uiDir)) rmSync6(uiDir, { recursive: true });
       cpSync(uiBackup, uiDir, { recursive: true });
     }
-    const configBackup = join16(backup, "design-system.config.ts");
-    const configDest = join16(projectRoot, "design-system.config.ts");
-    if (existsSync22(configBackup)) {
+    const configBackup = join17(backup, "design-system.config.ts");
+    const configDest = join17(projectRoot, "design-system.config.ts");
+    if (existsSync23(configBackup)) {
       cpSync(configBackup, configDest);
     }
     clearGuard(projectRoot);
@@ -10459,13 +10592,13 @@ async function migrateAction(options) {
     return;
   }
   const guard = guardPath(projectRoot);
-  if (existsSync22(guard)) {
+  if (existsSync23(guard)) {
     console.log(chalk28.yellow("A migration is already in progress."));
     console.log(chalk28.dim("Run `coherent migrate --rollback` to undo, or delete .coherent/migration-in-progress"));
     return;
   }
-  const uiDir = join16(projectRoot, "components", "ui");
-  if (!existsSync22(uiDir)) {
+  const uiDir = join17(projectRoot, "components", "ui");
+  if (!existsSync23(uiDir)) {
     console.log(chalk28.yellow("No components/ui directory found. Nothing to migrate."));
     return;
   }
@@ -10491,8 +10624,8 @@ Found ${migratable.length} component(s) to migrate:`));
   setGuard(projectRoot, backup);
   try {
     for (const id of migratable) {
-      const filePath = join16(uiDir, `${id}.tsx`);
-      if (existsSync22(filePath)) rmSync6(filePath);
+      const filePath = join17(uiDir, `${id}.tsx`);
+      if (existsSync23(filePath)) rmSync6(filePath);
     }
     const results = await provider.installBatch(migratable, projectRoot, { force: true });
     let migrated = 0;
@@ -10514,20 +10647,20 @@ Found ${migratable.length} component(s) to migrate:`));
 }
 
 // src/utils/update-notifier.ts
-import { existsSync as existsSync23, mkdirSync as mkdirSync9, readFileSync as readFileSync17, writeFileSync as writeFileSync12 } from "fs";
-import { join as join17 } from "path";
+import { existsSync as existsSync24, mkdirSync as mkdirSync9, readFileSync as readFileSync18, writeFileSync as writeFileSync13 } from "fs";
+import { join as join18 } from "path";
 import { homedir } from "os";
 import chalk29 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 = join17(homedir(), ".coherent");
-var CACHE_FILE = join17(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 (!existsSync23(CACHE_FILE)) return null;
-    const raw = readFileSync17(CACHE_FILE, "utf-8");
+    if (!existsSync24(CACHE_FILE)) return null;
+    const raw = readFileSync18(CACHE_FILE, "utf-8");
     return JSON.parse(raw);
   } catch (e) {
     if (DEBUG5) console.error("Failed to read update cache:", e);
@@ -10536,8 +10669,8 @@ function readCache() {
 }
 function writeCache(data) {
   try {
-    if (!existsSync23(CACHE_DIR)) mkdirSync9(CACHE_DIR, { recursive: true });
-    writeFileSync12(CACHE_FILE, JSON.stringify(data), "utf-8");
+    if (!existsSync24(CACHE_DIR)) mkdirSync9(CACHE_DIR, { recursive: true });
+    writeFileSync13(CACHE_FILE, JSON.stringify(data), "utf-8");
   } catch (e) {
     if (DEBUG5) console.error("Failed to write update cache:", e);
   }

package/package.json

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