@getcoherent/cli 0.6.32 → 0.6.34

package/dist/{chunk-NP2CGABX.js → chunk-4A4YYAGN.js}

@@ -715,6 +715,11 @@ async function autoFixCode(code, context) {
   if (fixed !== beforeEntityFix) {
     fixes.push("Fixed syntax issues");
   }
+  const beforeTemplateFix = fixed;
+  fixed = fixed.replace(/`\)>/g, "`}>");
+  if (fixed !== beforeTemplateFix) {
+    fixes.push("Fixed syntax issues");
+  }
   const isJsExpr = (text) => /[().;=&|!?]/.test(text);
   const beforeLtFix = fixed;
   fixed = fixed.replace(/>([^<{}\n]*)<(\d)/g, (m, text, d) => isJsExpr(text) ? m : `>${text}&lt;${d}`);

package/dist/{chunk-NK4G2DES.js → chunk-QT5MRW4F.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-5AHG4NNX.js";
 import {
   autoFixCode
-} from "./chunk-NP2CGABX.js";
+} from "./chunk-4A4YYAGN.js";
 
 // src/commands/chat/plan-generator.ts
 import { z } from "zod";

package/dist/{chunk-KUCRJLLU.js → chunk-UBTRGU7W.js}

@@ -6,7 +6,7 @@ import {
   getPageGroup,
   installPackages,
   sanitizeMetadataStrings
-} from "./chunk-NK4G2DES.js";
+} from "./chunk-QT5MRW4F.js";
 
 // src/commands/chat/code-generator.ts
 import { resolve as resolve3 } from "path";
@@ -2149,7 +2149,7 @@ async function regeneratePage(pageId, config, projectRoot) {
   const code = await generator.generate(page, appType);
   const route = page.route || "/";
   const isAuth = isAuthRoute(route) || isAuthRoute(page.name || page.id || "");
-  const { loadPlan: loadPlanForPath } = await import("./plan-generator-HQAAV5S4.js");
+  const { loadPlan: loadPlanForPath } = await import("./plan-generator-625ZNUZF.js");
   const planForPath = loadPlanForPath(projectRoot);
   const filePath = routeToFsPath(projectRoot, route, planForPath || isAuth);
   await mkdir3(dirname3(filePath), { recursive: true });
@@ -2217,14 +2217,41 @@ async function regenerateLayout(config, projectRoot, options = {
       }
     }
   }
+  const effectiveNavType = config.navigation?.type || "header";
+  const isSidebar = effectiveNavType === "sidebar" || effectiveNavType === "both";
   try {
-    await integrateSharedLayoutIntoRootLayout(projectRoot);
-    await ensureAuthRouteGroup(projectRoot);
+    if (!isSidebar) {
+      await integrateSharedLayoutIntoRootLayout(projectRoot);
+      await ensureAuthRouteGroup(projectRoot);
+    } else {
+      const { mkdir: mkdirAsync, writeFile: writeFileAsync } = await import("fs/promises");
+      const publicLayoutPath = resolve3(projectRoot, "app", "(public)", "layout.tsx");
+      if (!existsSync5(publicLayoutPath) || options.navChanged) {
+        await mkdirAsync(resolve3(projectRoot, "app", "(public)"), { recursive: true });
+        await writeFileAsync(publicLayoutPath, buildPublicLayoutCodeForSidebar(), "utf-8");
+      }
+      const themeTogglePath = resolve3(projectRoot, "components", "shared", "theme-toggle.tsx");
+      if (!existsSync5(themeTogglePath)) {
+        await mkdirAsync(resolve3(projectRoot, "components", "shared"), { recursive: true });
+        await writeFileAsync(themeTogglePath, generateThemeToggleCode(), "utf-8");
+      }
+      const provider = getComponentProvider();
+      for (const cid of ["separator", "sidebar"]) {
+        const uiPath = resolve3(projectRoot, "components", "ui", `${cid}.tsx`);
+        if (!existsSync5(uiPath) && provider.has(cid)) {
+          try {
+            await provider.installComponent(cid, projectRoot);
+          } catch {
+          }
+        }
+      }
+    }
     await ensureAppRouteGroupLayout(
       projectRoot,
       config.navigation?.type,
       options.navChanged,
-      options.groupLayouts ?? config.groupLayouts
+      options.groupLayouts ?? config.groupLayouts,
+      config.name
     );
   } catch (err) {
     if (process.env.COHERENT_DEBUG === "1") {
@@ -2254,33 +2281,59 @@ async function scanAndInstallSharedDeps(projectRoot) {
   }
   return [...new Set(installed)];
 }
-async function ensureAppRouteGroupLayout(projectRoot, navType, forceUpdate = false, groupLayouts) {
+async function ensureAppRouteGroupLayout(projectRoot, navType, forceUpdate = false, groupLayouts, appName) {
   const effectiveNavType = groupLayouts?.["app"] || navType;
   const layoutPath = resolve3(projectRoot, "app", "(app)", "layout.tsx");
   if (existsSync5(layoutPath) && !forceUpdate) return;
   const { mkdir: mkdirAsync } = await import("fs/promises");
   await mkdirAsync(resolve3(projectRoot, "app", "(app)"), { recursive: true });
-  const code = buildAppLayoutCode(effectiveNavType);
+  const code = buildAppLayoutCode(effectiveNavType, appName);
   await writeFile2(layoutPath, code);
 }
-function buildAppLayoutCode(navType) {
+function buildAppLayoutCode(navType, appName) {
   const hasSidebar = navType === "sidebar" || navType === "both";
+  const name = appName || "My App";
+  const year = (/* @__PURE__ */ new Date()).getFullYear();
   if (hasSidebar) {
-    return `import { AppSidebar } from '@/components/shared/sidebar'
-import { SidebarProvider, SidebarInset } from '@/components/ui/sidebar'
+    return `'use client'
+
+import { AppSidebar } from '@/components/shared/sidebar'
+import { SidebarProvider, SidebarInset, SidebarTrigger } from '@/components/ui/sidebar'
+import { Separator } from '@/components/ui/separator'
+import { usePathname } from 'next/navigation'
+import { ThemeToggle } from '@/components/shared/theme-toggle'
+
+function getBreadcrumb(pathname: string): string {
+  const segments = pathname.replace(/^\\//, '').split('/')
+  const page = segments[0] || 'dashboard'
+  return page.charAt(0).toUpperCase() + page.slice(1)
+}
 
 export default function AppLayout({
   children,
 }: {
   children: React.ReactNode
 }) {
+  const pathname = usePathname()
+
   return (
     <SidebarProvider>
       <AppSidebar />
       <SidebarInset>
-        <main className="flex-1 px-4 sm:px-6 lg:px-8 py-6">
+        <header className="flex h-14 shrink-0 items-center justify-between border-b px-4">
+          <div className="flex items-center gap-2">
+            <SidebarTrigger className="-ml-1" />
+            <Separator orientation="vertical" className="mr-2 h-4" />
+            <span className="text-sm text-muted-foreground">{getBreadcrumb(pathname)}</span>
+          </div>
+          <ThemeToggle />
+        </header>
+        <main className="flex-1 px-4 py-6 lg:px-6">
           {children}
         </main>
+        <footer className="border-t px-4 py-3 text-xs text-muted-foreground">
+          \\u00A9 ${year} ${name}
+        </footer>
       </SidebarInset>
     </SidebarProvider>
   )
@@ -2300,28 +2353,55 @@ export default function AppLayout({
 }
 `;
 }
-function buildGroupLayoutCode(layout, _pages) {
-  if (layout === "sidebar" || layout === "both") {
-    return `import { AppSidebar } from '@/components/shared/sidebar'
-import { SidebarProvider, SidebarInset } from '@/components/ui/sidebar'
+function generateThemeToggleCode() {
+  return `'use client'
 
-export default function GroupLayout({
+import { Moon, Sun } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+
+export function ThemeToggle() {
+  const toggle = () => {
+    document.documentElement.classList.toggle('dark')
+  }
+  return (
+    <Button
+      variant="ghost"
+      size="icon"
+      onClick={toggle}
+      aria-label="Toggle theme"
+      className="relative"
+    >
+      <Sun className="h-4 w-4 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
+      <Moon className="absolute h-4 w-4 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
+    </Button>
+  )
+}
+`;
+}
+function buildPublicLayoutCodeForSidebar() {
+  return `import { Header } from '@/components/shared/header'
+import { Footer } from '@/components/shared/footer'
+
+export default function PublicLayout({
   children,
 }: {
   children: React.ReactNode
 }) {
   return (
-    <SidebarProvider>
-      <AppSidebar />
-      <SidebarInset>
-        <main className="flex-1 px-4 sm:px-6 lg:px-8 py-6">
-          {children}
-        </main>
-      </SidebarInset>
-    </SidebarProvider>
+    <>
+      <Header />
+      <main className="mx-auto w-full max-w-7xl px-4 sm:px-6 lg:px-8 py-6">
+        {children}
+      </main>
+      <Footer />
+    </>
   )
 }
 `;
+}
+function buildGroupLayoutCode(layout, _pages, appName) {
+  if (layout === "sidebar" || layout === "both") {
+    return buildAppLayoutCode("sidebar", appName);
   }
   if (layout === "none") {
     return `export default function GroupLayout({
@@ -2366,7 +2446,9 @@ async function ensurePlanGroupLayouts(projectRoot, plan, storedHashes = {}, conf
         continue;
       }
     }
-    const code = buildGroupLayoutCode(group.layout, group.pages);
+    const planHasSidebar = plan.groups.some((g) => g.layout === "sidebar" || g.layout === "both");
+    const isPublicWithSidebar = planHasSidebar && group.id === "public" && (group.layout === "header" || !group.layout);
+    const code = isPublicWithSidebar ? buildPublicLayoutCodeForSidebar() : buildGroupLayoutCode(group.layout, group.pages, config?.name);
     await writeFile2(layoutPath, code);
   }
   if (config) {
@@ -2458,6 +2540,8 @@ export {
   scanAndInstallSharedDeps,
   ensureAppRouteGroupLayout,
   buildAppLayoutCode,
+  generateThemeToggleCode,
+  buildPublicLayoutCodeForSidebar,
   buildGroupLayoutCode,
   ensurePlanGroupLayouts,
   regenerateFiles

package/dist/{code-generator-GAUWEX3G.js → code-generator-U2N646D4.js}

@@ -1,26 +1,30 @@
 import {
   buildAppLayoutCode,
   buildGroupLayoutCode,
+  buildPublicLayoutCodeForSidebar,
   ensureAppRouteGroupLayout,
   ensureComponentsInstalled,
   ensurePlanGroupLayouts,
+  generateThemeToggleCode,
   regenerateComponent,
   regenerateFiles,
   regenerateLayout,
   regeneratePage,
   scanAndInstallSharedDeps,
   validateAndFixGeneratedCode
-} from "./chunk-KUCRJLLU.js";
-import "./chunk-NK4G2DES.js";
+} from "./chunk-UBTRGU7W.js";
+import "./chunk-QT5MRW4F.js";
 import "./chunk-5AHG4NNX.js";
-import "./chunk-NP2CGABX.js";
+import "./chunk-4A4YYAGN.js";
 import "./chunk-3RG5ZIWI.js";
 export {
   buildAppLayoutCode,
   buildGroupLayoutCode,
+  buildPublicLayoutCodeForSidebar,
   ensureAppRouteGroupLayout,
   ensureComponentsInstalled,
   ensurePlanGroupLayouts,
+  generateThemeToggleCode,
   regenerateComponent,
   regenerateFiles,
   regenerateLayout,

package/dist/index.js

@@ -38,7 +38,7 @@ import {
   warnIfVolatile,
   warnInlineDuplicates,
   writeFile
-} from "./chunk-KUCRJLLU.js";
+} from "./chunk-UBTRGU7W.js";
 import {
   COHERENT_REQUIRED_PACKAGES,
   ensureUseClientIfNeeded,
@@ -56,7 +56,7 @@ import {
   sanitizeMetadataStrings,
   savePlan,
   updateArchitecturePlan
-} from "./chunk-NK4G2DES.js";
+} from "./chunk-QT5MRW4F.js";
 import {
   CORE_CONSTRAINTS,
   DESIGN_QUALITY,
@@ -74,7 +74,7 @@ import {
   formatIssues,
   validatePageQuality,
   verifyIncrementalEdit
-} from "./chunk-NP2CGABX.js";
+} from "./chunk-4A4YYAGN.js";
 import {
   __require
 } from "./chunk-3RG5ZIWI.js";
@@ -4109,7 +4109,7 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
     if (plan && plan.sharedComponents.length > 0) {
       spinner.start(`Phase 4.5/6 \u2014 Generating ${plan.sharedComponents.length} shared components from plan...`);
       try {
-        const { generateSharedComponentsFromPlan } = await import("./plan-generator-HQAAV5S4.js");
+        const { generateSharedComponentsFromPlan } = await import("./plan-generator-625ZNUZF.js");
         const generated = await generateSharedComponentsFromPlan(
           plan,
           styleContext,
@@ -5701,9 +5701,10 @@ function getDefaultContent(pageType, pageName) {
 }
 
 // src/utils/nav-snapshot.ts
-function takeNavSnapshot(items) {
-  if (!items || items.length === 0) return "[]";
-  return JSON.stringify(items.map((i) => `${i.label}:${i.href}`).sort());
+function takeNavSnapshot(items, navType) {
+  const prefix = navType ? `type:${navType}|` : "";
+  if (!items || items.length === 0) return `${prefix}[]`;
+  return `${prefix}${JSON.stringify(items.map((i) => `${i.label}:${i.href}`).sort())}`;
 }
 function hasNavChanged(before, after) {
   return before !== after;
@@ -5967,7 +5968,7 @@ async function chatCommand(message, options) {
       spinner.start(`Creating shared component: ${componentName}...`);
       const { createAIProvider: createAIProvider2 } = await import("./ai-provider-CGSIYFZT.js");
       const { generateSharedComponent: generateSharedComponent6 } = await import("@getcoherent/core");
-      const { autoFixCode: autoFixCode2 } = await import("./quality-validator-EC2QSVEM.js");
+      const { autoFixCode: autoFixCode2 } = await import("./quality-validator-ONJCQ325.js");
       const { extractPropsInterface, extractDependencies } = await import("./component-extractor-VYJLT5NR.js");
       const aiProvider = await createAIProvider2(provider ?? "auto");
       const prompt = `Generate a React component called "${componentName}". Description: ${message}.
@@ -6414,7 +6415,8 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
     } catch {
     }
     const navBefore = takeNavSnapshot(
-      config2.navigation?.items?.map((i) => ({ label: i.label, href: i.route || `/${i.label.toLowerCase()}` }))
+      config2.navigation?.items?.map((i) => ({ label: i.label, href: i.route || `/${i.label.toLowerCase()}` })),
+      config2.navigation?.type
     );
     spinner.start("Applying modifications...");
     const results = [];
@@ -6649,7 +6651,8 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
       updatedConfig.navigation?.items?.map((i) => ({
         label: i.label,
         href: i.route || `/${i.label.toLowerCase()}`
-      }))
+      })),
+      updatedConfig.navigation?.type
     );
     const navChanged = hasNavChanged(navBefore, navAfter);
     if (allModified.size > 0) {
@@ -8036,6 +8039,14 @@ async function stripCoherentArtifacts(outputDir) {
     header = header.replace(/\n\s*<\/>\s*\n/, "\n");
     await writeFile3(sharedHeaderPath, header, "utf-8");
   }
+  if (existsSync15(layoutPath)) {
+    let rootLayout = await readFile3(layoutPath, "utf-8");
+    const before = rootLayout;
+    rootLayout = rootLayout.replace(/<Link\s[^>]*href="\/design-system"[^>]*>[\s\S]*?<\/Link>/g, "");
+    if (rootLayout !== before) {
+      await writeFile3(layoutPath, rootLayout, "utf-8");
+    }
+  }
   const guardPath2 = join10(outputDir, "app", "ShowWhenNotAuthRoute.tsx");
   if (existsSync15(guardPath2)) {
     let guard = await readFile3(guardPath2, "utf-8");
@@ -8443,8 +8454,8 @@ async function fixCommand(opts = {}) {
     console.log(chalk15.green(`  \u2714 ${verb} syntax: ${syntaxFixed} file(s) (use client, metadata, quotes)`));
   }
   try {
-    const { loadPlan: loadPlan2 } = await import("./plan-generator-HQAAV5S4.js");
-    const { ensurePlanGroupLayouts: ensurePlanGroupLayouts2 } = await import("./code-generator-GAUWEX3G.js");
+    const { loadPlan: loadPlan2 } = await import("./plan-generator-625ZNUZF.js");
+    const { ensurePlanGroupLayouts: ensurePlanGroupLayouts2 } = await import("./code-generator-U2N646D4.js");
     const plan = loadPlan2(projectRoot);
     if (plan) {
       await ensurePlanGroupLayouts2(projectRoot, plan);
@@ -8466,6 +8477,41 @@ async function fixCommand(opts = {}) {
         fixes.push("Generated AppSidebar component (components/shared/sidebar.tsx)");
         console.log(chalk15.green("  \u2714 Generated AppSidebar component"));
       }
+      if (hasSidebar && !dryRun) {
+        const rootLayoutPath = resolve10(projectRoot, "app", "layout.tsx");
+        if (existsSync16(rootLayoutPath)) {
+          let rootCode = readFileSync12(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();
+              return inner;
+            }).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 publicLayoutPath = resolve10(projectRoot, "app", "(public)", "layout.tsx");
+        const publicExists = existsSync16(publicLayoutPath);
+        const needsPublicLayout = !publicExists || !readFileSync12(publicLayoutPath, "utf-8").includes("<Header");
+        if (needsPublicLayout) {
+          const { buildPublicLayoutCodeForSidebar } = await import("./code-generator-U2N646D4.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 themeTogglePath = resolve10(projectRoot, "components", "shared", "theme-toggle.tsx");
+        if (!existsSync16(themeTogglePath)) {
+          const { generateThemeToggleCode } = await import("./code-generator-U2N646D4.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"));
+        }
+      }
     }
   } catch {
   }

package/dist/{plan-generator-HQAAV5S4.js → plan-generator-625ZNUZF.js}

@@ -11,9 +11,9 @@ import {
   routeToKey,
   savePlan,
   updateArchitecturePlan
-} from "./chunk-NK4G2DES.js";
+} from "./chunk-QT5MRW4F.js";
 import "./chunk-5AHG4NNX.js";
-import "./chunk-NP2CGABX.js";
+import "./chunk-4A4YYAGN.js";
 import "./chunk-3RG5ZIWI.js";
 export {
   ArchitecturePlanSchema,

package/dist/{quality-validator-EC2QSVEM.js → quality-validator-ONJCQ325.js}

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

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.6.32",
+  "version": "0.6.34",
   "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.32"
+    "@getcoherent/core": "0.6.34"
   },
   "devDependencies": {
     "@types/node": "^20.11.0",