@getcoherent/cli 0.4.0 → 0.5.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Sergei Kovtun
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.js

@@ -698,10 +698,7 @@ function generateWelcomeComponent(_markdown) {
 import { useState } from 'react'
 import {
   ArrowRight,
-  Blocks,
   ClipboardCopy,
-  Eye,
-  Globe,
   LayoutDashboard,
   LogIn,
   Monitor,
@@ -709,7 +706,6 @@ import {
   Rocket,
   Settings,
   ShoppingBag,
-  Sparkles,
 } from 'lucide-react'
 
 export default function HomePage() {
@@ -1020,47 +1016,7 @@ export default function HomePage() {
         </div>
       </section>
 
-      {/* Footer links (shared Footer component provides the main footer) */}
-      <div className="border-t pt-8 pb-8 mt-auto">
-        <div className="flex flex-col items-center gap-5 px-4">
-          <div className="flex items-center gap-3">
-            <div className="flex size-8 items-center justify-center rounded-lg bg-primary text-primary-foreground shrink-0">
-              <Blocks className="size-4" />
-            </div>
-            <span className="text-sm font-semibold">Coherent Design Method</span>
-          </div>
-          <div className="flex flex-wrap items-center justify-center gap-x-6 gap-y-2">
-            <a
-              href="https://getcoherent.design"
-              target="_blank"
-              rel="noopener noreferrer"
-              className="text-xs text-muted-foreground hover:text-foreground transition-colors"
-            >
-              getcoherent.design
-            </a>
-            <a href="https://github.com/skovtun/coherent-design-method" target="_blank" rel="noopener noreferrer" className="text-xs text-muted-foreground hover:text-foreground transition-colors">
-              GitHub
-            </a>
-            <a href="#" className="text-xs text-muted-foreground hover:text-foreground transition-colors">
-              Terms of Use
-            </a>
-            <a href="#" className="text-xs text-muted-foreground hover:text-foreground transition-colors">
-              Privacy Policy
-            </a>
-          </div>
-          <p className="text-xs text-muted-foreground">
-            \xA9 {new Date().getFullYear()}{' '}
-            <a
-              href="https://www.linkedin.com/in/sergeikovtun/"
-              target="_blank"
-              rel="noopener noreferrer"
-              className="underline underline-offset-2 hover:text-foreground transition-colors"
-            >
-              Sergei Kovtun
-            </a>
-          </p>
-        </div>
-      </div>
+      
     </div>
   )
 }
@@ -2459,7 +2415,7 @@ async function createAppRouteGroupLayout(projectPath) {
   children: React.ReactNode
 }) {
   return (
-    <main className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 py-6">
+    <main className="mx-auto w-full max-w-7xl px-4 sm:px-6 lg:px-8 py-6">
       {children}
     </main>
   )
@@ -4534,15 +4490,19 @@ LAYOUT CONTRACT (CRITICAL \u2014 prevents duplicate navigation and footer):
 - Do NOT add any navigation bars, logo headers, site-wide menus, or site footers to pages. The layout provides all of these.
 
 PAGE WRAPPER (CRITICAL \u2014 the layout provides width/padding automatically):
-- App pages (dashboard, projects, team, settings, etc.) are rendered inside a route group layout that already provides <main className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 py-6">.
-- Do NOT include any <main> wrapper, max-w-*, mx-auto, or px-* padding classes on the outermost element. The layout handles this.
-- Start page content directly with a <div className="space-y-6"> or similar spacing wrapper. The first visible element should be the page title.
-- Do NOT add inner centering wrappers like <div className="max-w-4xl mx-auto">. All content flows within the layout's max-w-7xl container.
+- App pages are rendered inside a route group layout that ALREADY provides: <main className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 py-6">
+- Your outermost element MUST be exactly: <div className="space-y-6">
+- FORBIDDEN on the outermost element: <main>, max-w-*, mx-auto, px-*, py-*, p-*, flex-1, min-h-*
+- FORBIDDEN anywhere: <div className="max-w-4xl mx-auto">, <div className="max-w-2xl mx-auto">, or any inner centering wrapper
+- The first child inside <div className="space-y-6"> should be the page header (h1 + description)
+- ALL app pages must follow this exact same structure so content aligns consistently across pages
 - Landing/marketing pages are an exception: they render outside the app layout and should use full-width <section> elements with inner "mx-auto max-w-6xl" for content.
 
 PAGE CONTENT (CRITICAL \u2014 prevents empty or duplicate pages):
 - Every page MUST have substantial content. NEVER generate a page with only metadata and an empty <main> element.
 - NEVER create an inline preview/demo of another page (e.g., embedding a "dashboard view" inside the landing page with a toggle). Each page should be its own route.
+- NEVER create a single-page app (SPA) that renders multiple views via useState. Each view must be a separate Next.js page with its own route.
+- The home page (route "/") should be a simple redirect using next/navigation redirect('/dashboard') \u2014 OR a standalone landing page. NEVER a multi-view SPA.
 - Landing pages should link to app pages via <Link href="/dashboard">, NOT via useState toggles that render inline content.
 
 pageCode rules (shadcn/ui blocks quality):
@@ -6806,15 +6766,18 @@ async function regenerateLayout(config2, projectRoot) {
   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"],
-      overwrite: true
-    });
+    const navType = config2.navigation.type || "header";
+    if (navType === "header" || navType === "both") {
+      const headerCode = generator.generateSharedHeaderCode();
+      await generateSharedComponent2(projectRoot, {
+        name: "Header",
+        type: "layout",
+        code: headerCode,
+        description: "Main site header with navigation and theme toggle",
+        usedIn: ["app/layout.tsx"],
+        overwrite: true
+      });
+    }
     if (!hasSharedFooter) {
       const footerCode = generator.generateSharedFooterCode();
       await generateSharedComponent2(projectRoot, {
@@ -6826,35 +6789,69 @@ async function regenerateLayout(config2, projectRoot) {
         overwrite: true
       });
     }
+    if (navType === "sidebar" || navType === "both") {
+      const sidebarCode = generator.generateSharedSidebarCode();
+      await generateSharedComponent2(projectRoot, {
+        name: "Sidebar",
+        type: "layout",
+        code: sidebarCode,
+        description: "Vertical sidebar navigation with collapsible sections",
+        usedIn: ["app/(app)/layout.tsx"],
+        overwrite: true
+      });
+    }
   }
   try {
     await integrateSharedLayoutIntoRootLayout2(projectRoot);
     await ensureAuthRouteGroup(projectRoot);
-    await ensureAppRouteGroupLayout(projectRoot);
+    await ensureAppRouteGroupLayout(projectRoot, config2.navigation?.type);
   } catch (err) {
     if (process.env.COHERENT_DEBUG === "1") {
       console.log(chalk9.dim("Layout integration warning:", err));
     }
   }
 }
-async function ensureAppRouteGroupLayout(projectRoot) {
+async function ensureAppRouteGroupLayout(projectRoot, navType) {
   const layoutPath = resolve6(projectRoot, "app", "(app)", "layout.tsx");
   if (existsSync14(layoutPath)) return;
   const { mkdir: mkdirAsync } = await import("fs/promises");
   await mkdirAsync(resolve6(projectRoot, "app", "(app)"), { recursive: true });
-  const code = `export default function AppLayout({
+  const code = buildAppLayoutCode(navType);
+  await writeFile(layoutPath, code);
+}
+function buildAppLayoutCode(navType) {
+  const hasSidebar = navType === "sidebar" || navType === "both";
+  if (hasSidebar) {
+    return `import { Sidebar } from '@/components/shared/sidebar'
+
+export default function AppLayout({
   children,
 }: {
   children: React.ReactNode
 }) {
   return (
-    <main className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 py-6">
+    <div className="flex min-h-[calc(100vh-3.5rem)]">
+      <Sidebar />
+      <main className="flex-1 px-4 sm:px-6 lg:px-8 py-6">
+        {children}
+      </main>
+    </div>
+  )
+}
+`;
+  }
+  return `export default function AppLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return (
+    <main className="mx-auto w-full max-w-7xl px-4 sm:px-6 lg:px-8 py-6">
       {children}
     </main>
   )
 }
 `;
-  await writeFile(layoutPath, code);
 }
 async function regenerateFiles(modified, config2, projectRoot) {
   const componentIds = /* @__PURE__ */ new Set();
@@ -7189,26 +7186,41 @@ function stripInlineLayoutElements(code) {
   }
   return { code: result, stripped };
 }
-function stripOuterMainWrapper(code) {
-  const mainWrapperRe = /(return\s*\(\s*\n?\s*)<main\s+className="[^"]*">\s*\n([\s\S]*?)\n\s*<\/main>(\s*\n?\s*\))/;
-  const match = code.match(mainWrapperRe);
-  if (match) {
-    const [, before, children, after] = match;
-    const dedented = children.replace(/^    /gm, "  ");
-    return {
-      code: code.replace(match[0], `${before}<>${dedented}
-    </${">"}${after}`),
-      stripped: true
-    };
+var STANDARD_PAGE_WRAPPER = "space-y-6";
+var HOME_REDIRECT_CODE = `import { redirect } from 'next/navigation'
+
+export default function Home() {
+  redirect('/dashboard')
+}
+`;
+function detectAndFixSpaHomePage(code, route) {
+  if (route !== "/" && route !== "") return { code, fixed: false };
+  const hasMultipleRenders = (code.match(/const render\w+\s*=\s*\(\)/g) || []).length >= 2;
+  const hasPageToggle = /useState\s*\(\s*['"](?:dashboard|home|page)/i.test(code);
+  const isMassive = code.split("\n").length > 200;
+  if (hasMultipleRenders && hasPageToggle || isMassive && hasPageToggle) {
+    return { code: HOME_REDIRECT_CODE, fixed: true };
   }
+  return { code, fixed: false };
+}
+function normalizePageWrapper(code) {
   let result = code;
-  let stripped = false;
+  let fixed = false;
   if (/<main\s+className="[^"]*">/.test(result)) {
-    result = result.replace(/<main\s+className="[^"]*">\s*/g, '<div className="space-y-6">');
+    result = result.replace(/<main\s+className="[^"]*">/g, `<div className="${STANDARD_PAGE_WRAPPER}">`);
     result = result.replace(/<\/main>/g, "</div>");
-    stripped = true;
+    fixed = true;
   }
-  return { code: result, stripped };
+  const outerDivRe = /(return\s*\(\s*\n?\s*)<div\s+className="([^"]*)">/;
+  const match = result.match(outerDivRe);
+  if (match) {
+    const cls = match[2];
+    if (cls !== STANDARD_PAGE_WRAPPER) {
+      result = result.replace(match[0], `${match[1]}<div className="${STANDARD_PAGE_WRAPPER}">`);
+      fixed = true;
+    }
+  }
+  return { code: result, fixed };
 }
 async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider, originalMessage) {
   switch (request.type) {
@@ -7541,7 +7553,11 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
         console.log(chalk11.yellow(`
 \u26A0\uFE0F  Page "${page.name || page.id}" has no generated code \u2014 it will appear empty.`));
         console.log(chalk11.dim("   This usually means the AI did not produce pageCode for this page."));
-        console.log(chalk11.dim('   Try running: coherent chat "regenerate the ' + (page.name || page.id) + ' page with full content"'));
+        console.log(
+          chalk11.dim(
+            '   Try running: coherent chat "regenerate the ' + (page.name || page.id) + ' page with full content"'
+          )
+        );
       }
       const pageForConfig = {
         ...page,
@@ -7582,11 +7598,19 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
           let codeToWrite = fixedCode;
           const { code: autoFixed, fixes: autoFixes } = await autoFixCode(codeToWrite);
           codeToWrite = autoFixed;
+          const { code: spaFixed, fixed: spaWasFixed } = detectAndFixSpaHomePage(codeToWrite, route);
+          if (spaWasFixed) {
+            codeToWrite = spaFixed;
+            autoFixes.push("replaced SPA-style home page with redirect to /dashboard");
+          }
           const { code: layoutStripped, stripped } = stripInlineLayoutElements(codeToWrite);
           codeToWrite = layoutStripped;
           if (!isMarketingRoute(route)) {
-            const { code: noMain, stripped: mainStripped } = stripOuterMainWrapper(codeToWrite);
-            if (mainStripped) codeToWrite = noMain;
+            const { code: normalized, fixed: wrapperFixed } = normalizePageWrapper(codeToWrite);
+            if (wrapperFixed) {
+              codeToWrite = normalized;
+              autoFixes.push("normalized page wrapper to standard spacing");
+            }
           }
           const allFixes = [...postFixes, ...autoFixes];
           if (stripped.length > 0) allFixes.push(`stripped inline ${stripped.join(", ")} (layout owns these)`);
@@ -7753,11 +7777,19 @@ ${pagesCtx}`
             let codeToWrite = fixedCode;
             const { code: autoFixed, fixes: autoFixes } = await autoFixCode(codeToWrite);
             codeToWrite = autoFixed;
+            const { code: spaFixed, fixed: spaWasFixed } = detectAndFixSpaHomePage(codeToWrite, route);
+            if (spaWasFixed) {
+              codeToWrite = spaFixed;
+              autoFixes.push("replaced SPA-style home page with redirect to /dashboard");
+            }
             const { code: layoutStripped, stripped } = stripInlineLayoutElements(codeToWrite);
             codeToWrite = layoutStripped;
             if (!isMarketingRoute(route)) {
-              const { code: noMain, stripped: mainStripped } = stripOuterMainWrapper(codeToWrite);
-              if (mainStripped) codeToWrite = noMain;
+              const { code: normalized, fixed: wrapperFixed } = normalizePageWrapper(codeToWrite);
+              if (wrapperFixed) {
+                codeToWrite = normalized;
+                autoFixes.push("normalized page wrapper to standard spacing");
+              }
             }
             const allFixes = [...postFixes, ...autoFixes];
             if (stripped.length > 0) allFixes.push(`stripped inline ${stripped.join(", ")} (layout owns these)`);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "CLI interface for Coherent Design Method",
   "type": "module",
   "main": "./dist/index.js",
@@ -33,15 +33,8 @@
   ],
   "author": "Coherent Design Method",
   "license": "MIT",
-  "scripts": {
-    "dev": "tsup --watch",
-    "build": "tsup",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest"
-  },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.32.0",
-    "@getcoherent/core": "workspace:*",
     "chalk": "^5.3.0",
     "chokidar": "^4.0.1",
     "commander": "^11.1.0",
@@ -49,12 +42,19 @@
     "open": "^10.1.0",
     "ora": "^7.0.1",
     "prompts": "^2.4.2",
-    "zod": "^3.22.4"
+    "zod": "^3.22.4",
+    "@getcoherent/core": "0.5.0"
   },
   "devDependencies": {
     "@types/node": "^20.11.0",
     "@types/prompts": "^2.4.9",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3"
+  },
+  "scripts": {
+    "dev": "tsup --watch",
+    "build": "tsup",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest"
   }
-}
+}