@getcoherent/cli 0.6.33 → 0.6.35

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

@@ -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-G7ABCFAD.js → code-generator-U2N646D4.js}

@@ -1,16 +1,18 @@
 import {
   buildAppLayoutCode,
   buildGroupLayoutCode,
+  buildPublicLayoutCodeForSidebar,
   ensureAppRouteGroupLayout,
   ensureComponentsInstalled,
   ensurePlanGroupLayouts,
+  generateThemeToggleCode,
   regenerateComponent,
   regenerateFiles,
   regenerateLayout,
   regeneratePage,
   scanAndInstallSharedDeps,
   validateAndFixGeneratedCode
-} from "./chunk-WONZJJN5.js";
+} from "./chunk-UBTRGU7W.js";
 import "./chunk-QT5MRW4F.js";
 import "./chunk-5AHG4NNX.js";
 import "./chunk-4A4YYAGN.js";
@@ -18,9 +20,11 @@ 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-WONZJJN5.js";
+} from "./chunk-UBTRGU7W.js";
 import {
   COHERENT_REQUIRED_PACKAGES,
   ensureUseClientIfNeeded,
@@ -2366,6 +2366,8 @@ For editing an existing shared component use type "modify-layout-block" with tar
   const visualDepth = VISUAL_DEPTH;
   const contextualRules = selectContextualRules(message);
   const interactionPatterns = INTERACTION_PATTERNS;
+  const light = config2.tokens.colors.light;
+  const dark = config2.tokens.colors.dark;
   return `You are a design-forward UI architect. Your goal is to create interfaces that are not just functional, but visually distinctive and memorable \u2014 while staying within shadcn/ui and Tailwind CSS.
 
 Parse the user's natural language request into structured modification requests.
@@ -2383,6 +2385,16 @@ Current Design System:
 - Pages: ${config2.pages.map((p) => `${p.name} (${p.route})`).join(", ")}
 - Components: ${config2.components.length} components
 
+Current color tokens (#RRGGBB hex):
+  Light theme:
+    Brand:   primary=${light.primary}, secondary=${light.secondary}, accent=${light.accent || "none"}
+    Status:  success=${light.success}, warning=${light.warning}, error=${light.error}, info=${light.info}
+    Surface: background=${light.background}, foreground=${light.foreground}, muted=${light.muted}, border=${light.border}
+  Dark theme:
+    Brand:   primary=${dark.primary}, secondary=${dark.secondary}, accent=${dark.accent || "none"}
+    Status:  success=${dark.success}, warning=${dark.warning}, error=${dark.error}, info=${dark.info}
+    Surface: background=${dark.background}, foreground=${dark.foreground}, muted=${dark.muted}, border=${dark.border}
+
 EXISTING ROUTES IN THIS PROJECT:
 ${config2.pages.map((p) => p.route).join(", ") || "(no pages yet)"}
 
@@ -2414,7 +2426,7 @@ Parse this into one or more ModificationRequest objects. Each request should be:
 5. For add-component with source "shadcn": include id, name, category, source: "shadcn", shadcnComponent, baseClassName (or omit for default), variants: [], sizes: [], usedInPages: [], createdAt, updatedAt
 
 Available modification types:
-- "update-token": Change design token (e.g., colors.light.primary)
+- "update-token": Change design token. target: dot-path (e.g. "colors.light.primary"). changes: { "value": "#RRGGBB" }. Color values MUST be 6-digit hex with # prefix (e.g. #4F46E5 for indigo, #DC2626 for red). When changing a color, ALWAYS update BOTH light and dark themes for consistency.
 - "add-component": Add new component (check registry first for reuse!)
 - "modify-component": Update existing component
 - "modify-layout-block": Edit a shared layout component by ID or name (target: "CID-001" or "Header"). changes: { "instruction": "user instruction e.g. add a search button" }. Use when user says "in CID-001 add...", "update the header...", "change the footer...".
@@ -2986,6 +2998,7 @@ function fixGlobalsCss(projectRoot, config2) {
 }
 
 // src/commands/chat/request-parser.ts
+import { colorToHex } from "@getcoherent/core";
 var AUTH_FLOW_PATTERNS = {
   "/login": ["/signup", "/forgot-password"],
   "/signin": ["/signup", "/forgot-password"],
@@ -3289,6 +3302,18 @@ function normalizeRequest(request, config2) {
       }
       break;
     }
+    case "update-token": {
+      if (changes?.value && typeof changes.value === "string") {
+        const isColorPath = request.target.includes("colors.");
+        if (isColorPath) {
+          const hex = colorToHex(changes.value);
+          if (hex && hex !== changes.value) {
+            return { ...request, changes: { ...changes, value: hex } };
+          }
+        }
+      }
+      break;
+    }
   }
   return request;
 }
@@ -5701,9 +5726,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;
@@ -6414,7 +6440,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 +6676,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 +8064,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");
@@ -8444,10 +8480,14 @@ async function fixCommand(opts = {}) {
   }
   try {
     const { loadPlan: loadPlan2 } = await import("./plan-generator-625ZNUZF.js");
-    const { ensurePlanGroupLayouts: ensurePlanGroupLayouts2 } = await import("./code-generator-G7ABCFAD.js");
+    const { ensurePlanGroupLayouts: ensurePlanGroupLayouts2 } = await import("./code-generator-U2N646D4.js");
     const plan = loadPlan2(projectRoot);
     if (plan) {
-      await ensurePlanGroupLayouts2(projectRoot, plan);
+      if (!dsm) {
+        dsm = new DesignSystemManager9(project.configPath);
+        await dsm.load();
+      }
+      await ensurePlanGroupLayouts2(projectRoot, plan, {}, dsm.getConfig());
       const layoutTypes = plan.groups.map((g) => `${g.id}:${g.layout}`).join(", ");
       fixes.push(`Verified group layouts (${layoutTypes})`);
       console.log(chalk15.green(`  \u2714 Verified group layouts: ${layoutTypes}`));
@@ -8466,6 +8506,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/package.json

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