@getcoherent/cli 0.6.15 → 0.6.16

package/dist/index.js

@@ -5037,7 +5037,7 @@ var AUTH_SYNONYMS = {
 };
 function deduplicatePages(pages) {
   const canonicalize = (route) => AUTH_SYNONYMS[route] || route;
-  const normalize = (route) => canonicalize(route).replace(/\/$/, "").replace(/s$/, "").replace(/ue$/, "");
+  const normalize = (route) => canonicalize(route).replace(/\/$/, "");
   const seen = /* @__PURE__ */ new Map();
   return pages.filter((page, idx) => {
     const norm = normalize(page.route);
@@ -5949,7 +5949,7 @@ function extractStyleContext(pageCode) {
   return `STYLE CONTEXT (match these patterns exactly for visual consistency with the anchor page):
 ${lines.map((l) => `  - ${l}`).join("\n")}`;
 }
-var VALID_NAV_TYPES = /* @__PURE__ */ new Set(["header", "sidebar", "both"]);
+var VALID_NAV_TYPES = /* @__PURE__ */ new Set(["header", "sidebar", "both", "none"]);
 function parseNavTypeFromPlan(planResult) {
   const nav = planResult.navigation;
   if (nav && typeof nav.type === "string" && VALID_NAV_TYPES.has(nav.type)) {
@@ -6720,7 +6720,9 @@ async function regeneratePage(pageId, config2, projectRoot) {
   const code = await generator.generate(page, appType);
   const route = page.route || "/";
   const isAuth = isAuthRoute(route) || isAuthRoute(page.name || page.id || "");
-  const filePath = routeToFsPath(projectRoot, route, isAuth);
+  const { loadPlan: loadPlanForPath } = await import("./plan-generator-ITHYNYJI.js");
+  const planForPath = loadPlanForPath(projectRoot);
+  const filePath = routeToFsPath(projectRoot, route, planForPath || isAuth);
   await mkdir3(dirname5(filePath), { recursive: true });
   await writeFile(filePath, code);
 }
@@ -6834,7 +6836,8 @@ async function ensureAppRouteGroupLayout(projectRoot, navType, forceUpdate = fal
 function buildAppLayoutCode(navType) {
   const hasSidebar = navType === "sidebar" || navType === "both";
   if (hasSidebar) {
-    return `import { Sidebar } from '@/components/shared/sidebar'
+    return `import { AppSidebar } from '@/components/shared/sidebar'
+import { SidebarProvider, SidebarInset } from '@/components/ui/sidebar'
 
 export default function AppLayout({
   children,
@@ -6842,12 +6845,14 @@ export default function AppLayout({
   children: React.ReactNode
 }) {
   return (
-    <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>
+    <SidebarProvider>
+      <AppSidebar />
+      <SidebarInset>
+        <main className="flex-1 px-4 sm:px-6 lg:px-8 py-6">
+          {children}
+        </main>
+      </SidebarInset>
+    </SidebarProvider>
   )
 }
 `;
@@ -6867,7 +6872,8 @@ export default function AppLayout({
 }
 function buildGroupLayoutCode(layout, _pages) {
   if (layout === "sidebar" || layout === "both") {
-    return `import { Sidebar } from '@/components/shared/sidebar'
+    return `import { AppSidebar } from '@/components/shared/sidebar'
+import { SidebarProvider, SidebarInset } from '@/components/ui/sidebar'
 
 export default function GroupLayout({
   children,
@@ -6875,12 +6881,14 @@ export default function GroupLayout({
   children: React.ReactNode
 }) {
   return (
-    <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>
+    <SidebarProvider>
+      <AppSidebar />
+      <SidebarInset>
+        <main className="flex-1 px-4 sm:px-6 lg:px-8 py-6">
+          {children}
+        </main>
+      </SidebarInset>
+    </SidebarProvider>
   )
 }
 `;
@@ -7404,7 +7412,8 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
           modified: []
         };
       }
-      const pageFilePath = routeToFsPath(projectRoot, route, false);
+      const readPlan = projectRoot ? loadPlan(projectRoot) : null;
+      const pageFilePath = routeToFsPath(projectRoot, route, readPlan || false);
       let pageCode;
       try {
         pageCode = await readFile(pageFilePath);
@@ -7687,13 +7696,13 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
           if (isAuth) {
             await ensureAuthRouteGroup(projectRoot);
           }
-          const filePath = routeToFsPath(projectRoot, route, isAuth);
+          const currentPlan = projectRoot ? loadPlan(projectRoot) : null;
+          const filePath = routeToFsPath(projectRoot, route, currentPlan || isAuth);
           await mkdir4(dirname6(filePath), { recursive: true });
           const { fixedCode, fixes: postFixes } = await validateAndFixGeneratedCode(projectRoot, finalPageCode, {
             isPage: true
           });
           let codeToWrite = fixedCode;
-          const currentPlan = projectRoot ? loadPlan(projectRoot) : null;
           const autoFixCtx = route ? {
             currentRoute: route,
             knownRoutes: dsm.getConfig().pages.map((p) => p.route).filter(Boolean),
@@ -7853,7 +7862,8 @@ Rules:
         if (pageDef?.route) {
           const route = pageDef.route;
           const isAuth = isAuthRoute(route) || isAuthRoute(pageDef.name || pageDef.id || "");
-          const absPath = routeToFsPath(projectRoot, route, isAuth);
+          const updatePlan = projectRoot ? loadPlan(projectRoot) : null;
+          const absPath = routeToFsPath(projectRoot, route, updatePlan || isAuth);
           if (!resolvedPageCode && instruction) {
             let currentCode;
             try {
@@ -7987,7 +7997,54 @@ ${pagesCtx}`
               allShared: manifestForAudit.shared,
               layoutShared: manifestForAudit.shared.filter((c) => c.type === "layout")
             });
-            const issues = validatePageQuality(codeToWrite, void 0, qualityPageType2);
+            let issues = validatePageQuality(codeToWrite, void 0, qualityPageType2);
+            let qualityErrors = issues.filter((i) => i.severity === "error");
+            const MAX_UPDATE_QUALITY_FIX_ATTEMPTS = 2;
+            for (let attempt = 0; attempt < MAX_UPDATE_QUALITY_FIX_ATTEMPTS && qualityErrors.length > 0; attempt++) {
+              if (!aiProvider) break;
+              try {
+                const ai = await createAIProvider(aiProvider);
+                if (!ai.editPageCode) break;
+                const errorList = qualityErrors.map((e) => `Line ${e.line}: [${e.type}] ${e.message}`).join("\n");
+                const fixInstruction = `Fix these quality issues:
+${errorList}
+
+Rules:
+- Replace raw Tailwind colors with semantic tokens (bg-primary, text-muted-foreground, etc.)
+- Replace placeholder content with realistic contextual content
+- Ensure heading hierarchy
+- Keep all existing functionality and layout intact`;
+                const qFixedCode = await ai.editPageCode(
+                  codeToWrite,
+                  fixInstruction,
+                  pageDef.name || pageDef.id || "Page"
+                );
+                if (qFixedCode && qFixedCode.length > 100 && /export\s+(default\s+)?function/.test(qFixedCode)) {
+                  const recheck = validatePageQuality(qFixedCode, void 0, qualityPageType2);
+                  const recheckErrors = recheck.filter((i) => i.severity === "error");
+                  if (recheckErrors.length < qualityErrors.length) {
+                    codeToWrite = qFixedCode;
+                    const { code: reFixed } = await autoFixCode(codeToWrite, autoFixCtx2);
+                    codeToWrite = reFixed;
+                    await writeFile(absPath, codeToWrite);
+                    qualityErrors = recheckErrors;
+                    console.log(
+                      chalk11.green(
+                        `   \u2714 Quality fix: ${qualityErrors.length + (qualityErrors.length - recheckErrors.length)} \u2192 ${recheckErrors.length} errors`
+                      )
+                    );
+                    if (qualityErrors.length === 0) break;
+                  } else {
+                    break;
+                  }
+                } else {
+                  break;
+                }
+              } catch {
+                break;
+              }
+            }
+            issues = validatePageQuality(codeToWrite, void 0, qualityPageType2);
             const report = formatIssues(issues);
             if (report) {
               console.log(chalk11.yellow(`

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.6.15",
+  "version": "0.6.16",
   "description": "CLI interface for Coherent Design Method",
   "type": "module",
   "main": "./dist/index.js",