@getcoherent/cli 0.6.14 → 0.6.16

package/dist/{ai-provider-HUQO64P3.js → ai-provider-CGSIYFZT.js}

@@ -3,7 +3,7 @@ import {
   detectAIProvider,
   getAPIKey,
   hasAnyAPIKey
-} from "./chunk-25JRF5MA.js";
+} from "./chunk-SPQZBQYY.js";
 import "./chunk-3RG5ZIWI.js";
 export {
   createAIProvider,

package/dist/{chunk-WRDWFCQJ.js → chunk-PVJJ2YXP.js}

@@ -253,7 +253,7 @@ Style context: ${styleContext || "default"}
 ${designRules}
 
 Requirements:
-- Each component MUST have \`export default function ComponentName\`
+- Each component MUST use a NAMED export: \`export function ComponentName\` (NOT export default)
 - Use shadcn/ui imports from @/components/ui/*
 - Use Tailwind CSS classes matching the style context
 - TypeScript with proper props interface
@@ -269,9 +269,10 @@ Return JSON with { requests: [{ type: "add-page", changes: { name: "ComponentNam
         (r) => r.type === "add-page" && r.changes?.name === comp.name
       );
       const code = match?.changes?.pageCode;
-      if (code && code.includes("export default")) {
+      if (code && (code.includes("export function") || code.includes("export default"))) {
+        const fixedCode = code.replace(/export default function (\w+)/g, "export function $1");
         const file = `components/shared/${toKebabCase(comp.name)}.tsx`;
-        results.push({ name: comp.name, code, file });
+        results.push({ name: comp.name, code: fixedCode, file });
       }
     }
   } catch {
@@ -284,9 +285,10 @@ Return JSON with { requests: [{ type: "add-page", changes: { name: "ComponentNam
           (r) => r.type === "add-page" && r.changes?.name === comp.name
         );
         const code = match?.changes?.pageCode;
-        if (code && code.includes("export default")) {
+        if (code && (code.includes("export function") || code.includes("export default"))) {
+          const fixedCode = code.replace(/export default function (\w+)/g, "export function $1");
           const file = `components/shared/${toKebabCase(comp.name)}.tsx`;
-          results.push({ name: comp.name, code, file });
+          results.push({ name: comp.name, code: fixedCode, file });
         }
       } catch {
       }

package/dist/{chunk-25JRF5MA.js → chunk-SPQZBQYY.js}

@@ -68,7 +68,7 @@ Please set ${envVar} in your environment or .env file.`);
     }
     if (preferredProvider === "openai") {
       try {
-        const { OpenAIClient } = await import("./openai-provider-XUI7ZHUR.js");
+        const { OpenAIClient } = await import("./openai-provider-4KGARVC3.js");
         return await OpenAIClient.create(apiKey2, config?.model);
       } catch (error) {
         if (error.message?.includes("not installed")) {
@@ -82,7 +82,7 @@ Error: ${error.message}`
         );
       }
     } else {
-      const { ClaudeClient } = await import("./claude-BZ3HSBD3.js");
+      const { ClaudeClient } = await import("./claude-K5B5ITAT.js");
       return ClaudeClient.create(apiKey2, config?.model);
     }
   }
@@ -95,7 +95,7 @@ Error: ${error.message}`
   switch (provider) {
     case "openai":
       try {
-        const { OpenAIClient } = await import("./openai-provider-XUI7ZHUR.js");
+        const { OpenAIClient } = await import("./openai-provider-4KGARVC3.js");
         return await OpenAIClient.create(apiKey, config?.model);
       } catch (error) {
         if (error.message?.includes("not installed")) {
@@ -109,7 +109,7 @@ Error: ${error.message}`
         );
       }
     case "claude":
-      const { ClaudeClient } = await import("./claude-BZ3HSBD3.js");
+      const { ClaudeClient } = await import("./claude-K5B5ITAT.js");
       return ClaudeClient.create(apiKey, config?.model);
     default:
       throw new Error(`Unsupported AI provider: ${provider}`);

package/dist/{claude-BZ3HSBD3.js → claude-K5B5ITAT.js}

@@ -399,7 +399,7 @@ Rules:
 - Do NOT use these names (already shared): ${existingSharedNames.join(", ")}
 - Look for: cards with icon+title+description, pricing tiers, testimonial blocks, stat displays, CTA sections
 
-Each component object: "name" (PascalCase), "type" ("section"|"widget"), "description", "propsInterface", "code" (full TSX module as string)
+Each component object: "name" (PascalCase), "type" ("layout"|"navigation"|"data-display"|"form"|"feedback"|"section"|"widget"), "description", "propsInterface", "code" (full TSX module as string)
 
 If no repeating patterns found: { "components": [] }`
           }

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   createAIProvider
-} from "./chunk-25JRF5MA.js";
+} from "./chunk-SPQZBQYY.js";
 import {
   autoFixCode,
   checkDesignConsistency,
@@ -14,8 +14,9 @@ import {
   getPageType,
   loadPlan,
   routeToKey,
-  savePlan
-} from "./chunk-WRDWFCQJ.js";
+  savePlan,
+  updateArchitecturePlan
+} from "./chunk-PVJJ2YXP.js";
 import {
   CORE_CONSTRAINTS,
   DESIGN_QUALITY,
@@ -2464,7 +2465,7 @@ import { loadManifest } from "@getcoherent/core";
 import { DesignSystemManager } from "@getcoherent/core";
 function buildSharedComponentsListForClaude(manifest) {
   if (!manifest.shared || manifest.shared.length === 0) {
-    return "No shared components yet. Register with: coherent components shared add <name> --type layout|section|widget";
+    return "No shared components yet. Register with: coherent components shared add <name> --type layout|navigation|data-display|form|feedback|section|widget";
   }
   const order = {
     layout: 0,
@@ -2959,7 +2960,7 @@ function buildSharedComponentsList(manifest) {
   if (!manifest.shared || manifest.shared.length === 0) {
     return `No shared components registered yet.
 When you create reusable blocks (headers, footers, repeated sections),
-register them: coherent components shared add <Name> --type layout|section|widget`;
+register them: coherent components shared add <Name> --type layout|navigation|data-display|form|feedback|section|widget`;
   }
   const typeOrder = {
     layout: 0,
@@ -3857,7 +3858,7 @@ import {
   CLI_VERSION as CLI_VERSION2,
   getTemplateForPageType as getTemplateForPageType2,
   loadManifest as loadManifest8,
-  saveManifest as saveManifest2,
+  saveManifest as saveManifest3,
   updateEntry
 } from "@getcoherent/core";
 
@@ -4101,7 +4102,7 @@ function detectPageType(pageName) {
   const normalized = pageName.toLowerCase();
   if (/dashboard|admin|overview/.test(normalized)) return "dashboard";
   if (/login|signin|sign-in/.test(normalized)) return "login";
-  if (/register|signup|sign.?up/.test(normalized)) return "register";
+  if (/regist(?:er|ration)|signup|sign.?up/.test(normalized)) return "register";
   if (/pricing|plans|subscription/.test(normalized)) return "pricing";
   if (/about|company/.test(normalized)) return "about";
   if (/contact|support|help/.test(normalized)) return "contact";
@@ -4171,7 +4172,8 @@ async function parseModification(message, context, provider = "auto", options) {
   const prompt = buildModificationPrompt(enhancedMessage, context.config, componentRegistry, {
     isExpandedPageRequest,
     sharedComponentsSummary: options?.sharedComponentsSummary,
-    tieredComponentsPrompt: options?.tieredComponentsPrompt
+    tieredComponentsPrompt: options?.tieredComponentsPrompt,
+    reusePlanDirective: options?.reusePlanDirective
   });
   const raw = await ai.parseModification(prompt);
   const requestsArray = Array.isArray(raw) ? raw : raw?.requests ?? [];
@@ -4237,7 +4239,14 @@ Rules:
 function buildModificationPrompt(message, config2, componentRegistry, options) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const expandedHint = options?.isExpandedPageRequest === true ? "\nIMPORTANT: The user request has been expanded with best practices. Use ALL the details provided when generating sections and content.\n\n" : "";
-  const sharedSection = options?.tieredComponentsPrompt ? `
+  const sharedSection = options?.reusePlanDirective ? `
+
+## COMPONENT REUSE DIRECTIVE
+
+${options.reusePlanDirective}
+
+For editing an existing shared component use type "modify-layout-block" with target "CID-XXX" or name.
+` : options?.tieredComponentsPrompt ? `
 
 ## SHARED COMPONENTS (MANDATORY REUSE)
 
@@ -4520,9 +4529,9 @@ Return valid JSON only, no markdown code fence. Use this shape:
 { "requests": [ ... array of ModificationRequest ... ], "uxRecommendations": "optional markdown or omit key" }
 Legacy: returning only a JSON array of requests is still accepted.`;
 }
-function buildLightweightPagePrompt(pageName, route, styleContext, sharedComponentsSummary, pageType, tieredComponentsPrompt) {
+function buildLightweightPagePrompt(pageName, route, styleContext, sharedComponentsSummary, pageType, tieredComponentsPrompt, reusePlanDirective) {
   const designConstraints = pageType ? getDesignQualityForType(pageType) : "";
-  const sharedNote = tieredComponentsPrompt || (sharedComponentsSummary ? `Available shared components:
+  const sharedNote = reusePlanDirective || tieredComponentsPrompt || (sharedComponentsSummary ? `Available shared components:
 ${sharedComponentsSummary}` : "");
   return [
     `Generate complete pageCode for a page called "${pageName}" at route "${route}".`,
@@ -5028,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);
@@ -5050,10 +5059,10 @@ function extractComponentIdsFromCode(code) {
   return ids;
 }
 async function warnInlineDuplicates(projectRoot, pageName, route, pageCode, manifest, plan) {
-  const sectionOrWidget = manifest.shared.filter((e) => e.type === "section" || e.type === "widget");
-  if (sectionOrWidget.length === 0) return;
+  const reusable = manifest.shared.filter((e) => e.type !== "layout");
+  if (reusable.length === 0) return;
   const plannedForPage = plan ? new Set(plan.sharedComponents.filter((c) => c.usedBy.includes(route)).map((c) => c.name)) : null;
-  for (const e of sectionOrWidget) {
+  for (const e of reusable) {
     if (plannedForPage && !plannedForPage.has(e.name)) continue;
     const kebab = e.file.replace(/^components\/shared\//, "").replace(/\.tsx$/, "");
     const hasImport = pageCode.includes(`@/components/shared/${kebab}`);
@@ -5298,6 +5307,52 @@ function extractPageNamesFromMessage(message) {
   }
   return pages;
 }
+function detectExplicitRootPage(message, pageNames) {
+  const lower = message.toLowerCase();
+  const w = "[a-z\u0430-\u044F\u0451A-Z\u0410-\u042F\u04010-9_]";
+  const patterns = [
+    new RegExp(
+      `(?:main|start|home|root|first|entry|primary|\u0441\u0442\u0430\u0440\u0442\u043E\u0432${w}*|\u0433\u043B\u0430\u0432\u043D${w}*|\u043D\u0430\u0447\u0430\u043B\u044C\u043D${w}*)\\s*(?:page|screen|view|\u0441\u0442\u0440\u0430\u043D\u0438\u0446${w}*|\u044D\u043A\u0440\u0430\u043D${w}*)\\s*(?:is|should be|:|\u2014|\u2013|-|\u0431\u0443\u0434\u0435\u0442|\u044D\u0442\u043E)\\s*([a-z\u0430-\u044F\u0451A-Z\u0410-\u042F\u0401\\s]+)`,
+      "i"
+    ),
+    new RegExp(
+      `([a-z\u0430-\u044F\u0451A-Z\u0410-\u042F\u0401\\s]+)\\s*(?:as|for|\u043A\u0430\u043A|\u0432 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435)\\s*(?:the\\s+)?(?:main|start|home|root|primary|\u0441\u0442\u0430\u0440\u0442\u043E\u0432${w}*|\u0433\u043B\u0430\u0432\u043D${w}*)\\s*(?:page|screen|\u0441\u0442\u0440\u0430\u043D\u0438\u0446${w}*)`,
+      "i"
+    ),
+    new RegExp(
+      `(?:start|begin|\u043D\u0430\u0447\u0430\u0442${w}*|\u043D\u0430\u0447\u0438\u043D${w}*)\\s*(?:with|from|\u0441|\u0441\u043E)\\s*(?:a\\s+|an\\s+)?([a-z\u0430-\u044F\u0451A-Z\u0410-\u042F\u0401\\s]+?)(?:\\s+page|\\s+screen|\\s+form|\\s+\u0441\u0442\u0440\u0430\u043D\u0438\u0446${w}*|\\s+\u0444\u043E\u0440\u043C${w}*)?(?:\\s*$|[,.])`,
+      "i"
+    )
+  ];
+  for (const pattern of patterns) {
+    const match = lower.match(pattern);
+    if (match) {
+      const keyword = match[1].trim();
+      const found = pageNames.find(
+        (p) => p.name.toLowerCase().includes(keyword) || keyword.includes(p.name.toLowerCase()) || p.id.includes(keyword.replace(/\s+/g, "-"))
+      );
+      if (found) return found.id;
+    }
+  }
+  return null;
+}
+var NON_MARKETING_ROUTES = /* @__PURE__ */ new Set([
+  "/login",
+  "/signin",
+  "/signup",
+  "/register",
+  "/forgot-password",
+  "/reset-password",
+  "/dashboard",
+  "/settings",
+  "/account",
+  "/tasks",
+  "/profile"
+]);
+function isAppOnlyRequest(pageNames) {
+  if (pageNames.length === 0) return false;
+  return pageNames.every((p) => NON_MARKETING_ROUTES.has(p.route) || p.route.startsWith("/dashboard"));
+}
 function normalizeRequest(request, config2) {
   const changes = request.changes;
   const VALID_TYPES = [
@@ -5567,7 +5622,9 @@ import { existsSync as existsSync14, readFileSync as readFileSync9, readdirSync
 import { resolve as resolve6 } from "path";
 import { z } from "zod";
 import {
+  SharedComponentTypeSchema,
   loadManifest as loadManifest5,
+  saveManifest,
   generateSharedComponent as generateSharedComponent2
 } from "@getcoherent/core";
 
@@ -5688,6 +5745,140 @@ async function pMap(items, fn, concurrency = 3) {
 
 // src/commands/chat/split-generator.ts
 import chalk8 from "chalk";
+
+// src/utils/reuse-planner.ts
+var SECTION_TYPE_MAP = {
+  stats: ["data-display", "widget"],
+  metrics: ["data-display", "widget"],
+  kpi: ["data-display", "widget"],
+  list: ["data-display"],
+  table: ["data-display"],
+  items: ["data-display"],
+  form: ["form"],
+  filter: ["form"],
+  search: ["form"],
+  nav: ["navigation"],
+  menu: ["navigation"],
+  tabs: ["navigation"],
+  card: ["widget", "data-display"],
+  grid: ["widget", "data-display"],
+  chart: ["data-display"],
+  graph: ["data-display"],
+  alert: ["feedback"],
+  toast: ["feedback"],
+  banner: ["feedback"]
+};
+function sectionToComponentTypes(section) {
+  const lower = section.toLowerCase();
+  const types = /* @__PURE__ */ new Set();
+  for (const [keyword, componentTypes] of Object.entries(SECTION_TYPE_MAP)) {
+    if (lower.includes(keyword)) {
+      componentTypes.forEach((t) => types.add(t));
+    }
+  }
+  return [...types];
+}
+function componentFilenameToImportPath(file) {
+  const withoutExt = file.replace(/\.tsx?$/, "");
+  return `@/${withoutExt}`;
+}
+function buildReusePlan(input) {
+  const { pageName, sections, manifest } = input;
+  const reuse = [];
+  const usedComponents = /* @__PURE__ */ new Set();
+  for (const section of sections) {
+    const matchingTypes = sectionToComponentTypes(section);
+    if (matchingTypes.length === 0) continue;
+    for (const entry of manifest.shared) {
+      if (usedComponents.has(entry.id)) continue;
+      if (!matchingTypes.includes(entry.type)) continue;
+      reuse.push({
+        component: entry.name,
+        targetSection: section,
+        reason: entry.usedIn.length > 0 ? `Used on ${entry.usedIn.length} page(s)` : `Matches section type (${entry.type})`,
+        importPath: componentFilenameToImportPath(entry.file),
+        usageExample: entry.usageExample || `<${entry.name} />`
+      });
+      usedComponents.add(entry.id);
+      break;
+    }
+  }
+  const reusePatterns = extractCodePatterns(input.existingPageCode, sections);
+  return { pageName, reuse, createNew: [], reusePatterns };
+}
+function extractCodePatterns(existingPageCode, _sections) {
+  const patterns = [];
+  const gridPatterns = /* @__PURE__ */ new Map();
+  for (const [route, code] of Object.entries(existingPageCode)) {
+    const gridMatches = code.match(/className="[^"]*grid[^"]*"/g) || [];
+    for (const match of gridMatches) {
+      const cls = match.replace(/className="|"/g, "");
+      if (!gridPatterns.has(cls)) gridPatterns.set(cls, []);
+      gridPatterns.get(cls).push(route);
+    }
+  }
+  for (const [pattern, pages] of gridPatterns) {
+    if (pages.length >= 1 && pattern.includes("grid-cols")) {
+      patterns.push({
+        pattern,
+        sourcePages: pages,
+        targetSection: "Layout grid"
+      });
+    }
+  }
+  return patterns;
+}
+function buildReusePlanDirective(plan) {
+  if (plan.reuse.length === 0 && plan.createNew.length === 0 && plan.reusePatterns.length === 0) {
+    return "";
+  }
+  const lines = [`COMPONENT REUSE PLAN FOR THIS PAGE:`];
+  if (plan.reuse.length > 0) {
+    lines.push("", "MUST USE (import these \u2014 do NOT re-implement):");
+    for (const r of plan.reuse) {
+      lines.push(`  - ${r.component} from ${r.importPath} \u2014 for "${r.targetSection}" section`);
+      if (r.usageExample) {
+        lines.push(`    Example: ${r.usageExample}`);
+      }
+    }
+  }
+  if (plan.createNew.length > 0) {
+    lines.push("", "CREATE NEW (no existing match):");
+    for (const c of plan.createNew) {
+      lines.push(`  - ${c.name} \u2014 ${c.reason} (suggest type: ${c.suggestedType})`);
+    }
+  }
+  if (plan.reusePatterns.length > 0) {
+    lines.push("", "LAYOUT PATTERNS (copy from existing pages for visual consistency):");
+    for (const p of plan.reusePatterns) {
+      lines.push(`  - ${p.targetSection}: className="${p.pattern}"`);
+      lines.push(`    (source: ${p.sourcePages.join(", ")})`);
+    }
+  }
+  return lines.join("\n");
+}
+function verifyReusePlan(generatedCode, plan) {
+  const passed = [];
+  const missed = [];
+  for (const entry of plan.reuse) {
+    const isImported = generatedCode.includes(entry.importPath) || generatedCode.includes(`{ ${entry.component} }`) || generatedCode.includes(`{ ${entry.component},`);
+    if (isImported) {
+      passed.push(entry);
+    } else {
+      missed.push(entry);
+    }
+  }
+  let retryDirective;
+  if (missed.length > 0) {
+    const lines = missed.map(
+      (m) => `CRITICAL: Your previous output failed to import ${m.component} from ${m.importPath}. You MUST import and use this component for the "${m.targetSection}" section. Do NOT re-implement it inline.`
+    );
+    retryDirective = lines.join("\n");
+  }
+  return { passed, missed, retryDirective };
+}
+
+// src/commands/chat/split-generator.ts
 function buildExistingPagesContext(config2) {
   const pages = config2.pages || [];
   const analyzed = pages.filter((p) => p.pageAnalysis);
@@ -5758,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)) {
@@ -5882,6 +6073,52 @@ function readExistingAppPageForReference(projectRoot, plan) {
   }
   return null;
 }
+function buildLayoutNote(layoutType) {
+  switch (layoutType) {
+    case "sidebar":
+      return "This page uses a SIDEBAR layout. The sidebar navigation is already rendered by the group layout. Do NOT create your own sidebar or side navigation. Start with the main content area directly. The page content appears to the right of the sidebar.";
+    case "both":
+      return "This page has both a sidebar and a header rendered by the group layout. Do NOT include any site-wide header, nav, sidebar, or footer in this page. Start with the main content directly.";
+    case "none":
+      return "This page has no shared navigation from the layout. Include any needed navigation within the page itself.";
+    default:
+      return "Header and Footer are shared components rendered by the root layout. Do NOT include any site-wide <header>, <nav>, or <footer> in this page. Start with the main content directly.";
+  }
+}
+function buildAnchorPagePrompt(homePage, message, allPagesList, allRoutes, plan) {
+  const pageType = detectPageType(homePage.name) || detectPageType(homePage.route);
+  const authPageTypes = /* @__PURE__ */ new Set(["login", "register", "reset-password"]);
+  const isAuth = isAuthRoute(homePage.route) || isAuthRoute(homePage.name) || authPageTypes.has(pageType || "");
+  if (isAuth) {
+    return `Create ONE page called "${homePage.name}" at route "${homePage.route}". Context: ${message}. This is the application's entry point \u2014 a clean, centered authentication form. Generate complete pageCode. Do NOT include site-wide <header>, <nav>, or <footer> \u2014 this page has its own minimal layout. Make it visually polished with proper form validation UI \u2014 this page sets the design direction for the entire site. Do not generate other pages.`;
+  }
+  const groupLayout = plan?.groups.find((g) => g.pages.includes(homePage.route))?.layout;
+  if (groupLayout === "sidebar" || pageType === "dashboard") {
+    return `Create ONE page called "${homePage.name}" at route "${homePage.route}". Context: ${message}. This REPLACES the default placeholder page \u2014 generate a complete application page. Generate complete pageCode. Do NOT include a sidebar or top navigation \u2014 these are handled by the layout. Focus on the main content area. Make it visually polished \u2014 this page sets the design direction for the entire site. Do not generate other pages.`;
+  }
+  return `Create ONE page called "${homePage.name}" at route "${homePage.route}". Context: ${message}. This REPLACES the default placeholder page \u2014 generate a complete, content-rich landing page for the project described above. Generate complete pageCode. Include a branded site-wide <header> with navigation links to ALL these pages: ${allPagesList}. Use these EXACT routes in navigation: ${allRoutes}. Include a <footer> at the bottom. Make it visually polished \u2014 this page sets the design direction for the entire site. Do not generate other pages.`;
+}
+function getGroupLayoutForRoute(route, plan) {
+  if (!plan) return void 0;
+  const group = plan.groups.find((g) => g.pages.includes(route));
+  return group?.layout;
+}
+var manifestLock = Promise.resolve();
+async function updateManifestSafe(projectRoot, fn) {
+  const timeoutMs = 5e3;
+  const update = manifestLock.then(async () => {
+    const m = await loadManifest5(projectRoot);
+    const updated = fn(m);
+    await saveManifest(projectRoot, updated);
+  });
+  manifestLock = update.catch(() => {
+  });
+  await Promise.race([
+    update,
+    new Promise((_, reject) => setTimeout(() => reject(new Error("manifest sync timeout")), timeoutMs))
+  ]).catch(() => {
+  });
+}
 async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts) {
   let pageNames = [];
   spinner.start("Phase 1/6 \u2014 Planning pages...");
@@ -5924,7 +6161,11 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
       (p) => p.id !== "home" && p.id !== "new" && p.route !== "/"
     );
     const isFreshProject = userPages.length === 0;
-    if (isFreshProject || impliesFullWebsite(message)) {
+    const explicitRootId = detectExplicitRootPage(message, pageNames);
+    if (explicitRootId) {
+      const rootPage = pageNames.find((p) => p.id === explicitRootId);
+      if (rootPage) rootPage.route = "/";
+    } else if (!isAppOnlyRequest(pageNames) && (isFreshProject || impliesFullWebsite(message))) {
       pageNames.unshift({ name: "Home", id: "home", route: "/" });
     }
   }
@@ -5943,14 +6184,16 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
     spinner.start("Phase 2/6 \u2014 Generating architecture plan...");
     try {
       const ai = await createAIProvider(provider ?? "auto");
-      const layoutHint = modCtx.config.navigation?.type || null;
-      const { plan: generatedPlan, warnings: planWarnings } = await generateArchitecturePlan(
-        pageNames,
-        message,
-        ai,
-        layoutHint
-      );
-      plan = generatedPlan;
+      const cachedPlan = loadPlan(parseOpts.projectRoot);
+      let planWarnings = [];
+      if (cachedPlan) {
+        plan = await updateArchitecturePlan(cachedPlan, pageNames, message, ai);
+      } else {
+        const layoutHint = modCtx.config.navigation?.type || null;
+        const result = await generateArchitecturePlan(pageNames, message, ai, layoutHint);
+        plan = result.plan;
+        planWarnings = result.warnings;
+      }
       if (plan) {
         const groupsSummary = plan.groups.map((g) => `${g.id} (${g.layout}, ${g.pages.length} pages)`).join(", ");
         const sharedSummary = plan.sharedComponents.length > 0 ? plan.sharedComponents.map((c) => `${c.name} \u2192 ${c.usedBy.join(", ")}`).join(" | ") : "";
@@ -6001,12 +6244,8 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
   if (!reusedExistingAnchor) {
     spinner.start(`Phase 3/6 \u2014 Generating ${homePage.name} page (sets design direction)...`);
     try {
-      const homeResult = await parseModification(
-        `Create ONE page called "${homePage.name}" at route "${homePage.route}". Context: ${message}. This REPLACES the default placeholder page \u2014 generate a complete, content-rich landing page for the project described above. Generate complete pageCode. Include a branded site-wide <header> with navigation links to ALL these pages: ${allPagesList}. Use these EXACT routes in navigation: ${allRoutes}. Include a <footer> at the bottom. Make it visually polished \u2014 this page sets the design direction for the entire site. Do not generate other pages.`,
-        modCtx,
-        provider,
-        parseOpts
-      );
+      const anchorPrompt = buildAnchorPagePrompt(homePage, message, allPagesList, allRoutes, plan);
+      const homeResult = await parseModification(anchorPrompt, modCtx, provider, parseOpts);
       const codePage = homeResult.requests.find((r) => r.type === "add-page");
       if (codePage) {
         homeRequest = codePage;
@@ -6036,7 +6275,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-H55WEIY2.js");
+        const { generateSharedComponentsFromPlan } = await import("./plan-generator-ITHYNYJI.js");
         const generated = await generateSharedComponentsFromPlan(
           plan,
           styleContext,
@@ -6078,7 +6317,6 @@ async function splitGeneratePages(spinner, message, modCtx, provider, parseOpts)
     return { requests: homeRequest ? [homeRequest] : [], plan };
   }
   spinner.start(`Phase 5/6 \u2014 Generating ${remainingPages.length} pages in parallel...`);
-  const sharedLayoutNote = "Header and Footer are shared components rendered by the root layout. Do NOT include any site-wide <header>, <nav>, or <footer> in this page. Start with the main content directly.";
   const sharedComponentsNote = buildSharedComponentsNote(parseOpts.sharedComponentsSummary);
   const currentManifest = projectRoot ? await loadManifest5(projectRoot) : null;
   const routeNote = `EXISTING ROUTES in this project: ${allRoutes}. All internal links MUST point to one of these routes. If a target doesn't exist, use href="#".`;
@@ -6092,6 +6330,23 @@ ${existingAppPageCode}
 \`\`\`
 ` : "";
   const existingPagesContext = buildExistingPagesContext(modCtx.config);
+  const existingPageCode = {};
+  if (projectRoot) {
+    const appDir = resolve6(projectRoot, "app");
+    if (existsSync14(appDir)) {
+      const pageFiles = readdirSync2(appDir, { recursive: true }).filter(
+        (f) => typeof f === "string" && f.endsWith("page.tsx")
+      );
+      for (const pf of pageFiles) {
+        try {
+          const code = readFileSync9(resolve6(appDir, pf), "utf-8");
+          const route = "/" + pf.replace(/\/page\.tsx$/, "").replace(/\(.*?\)\//g, "");
+          existingPageCode[route === "/" ? "/" : route] = code;
+        } catch {
+        }
+      }
+    }
+  }
   const AI_CONCURRENCY = 3;
   let phase5Done = 0;
   const remainingRequests = await pMap(
@@ -6101,15 +6356,45 @@ ${existingAppPageCode}
       const pageType = plan ? getPageType(route, plan) : inferPageTypeFromRoute(route);
       const designConstraints = getDesignQualityForType(pageType);
       const authNote = isAuth ? 'For this auth page: the auth layout already provides centering (flex items-center justify-center min-h-svh). Do NOT add your own centering wrapper or min-h-svh. Just output a div with className="w-full max-w-md" containing the Card. Do NOT use section containers or full-width wrappers.' : void 0;
+      const layoutForPage = getGroupLayoutForRoute(route, plan);
+      const layoutNote = buildLayoutNote(layoutForPage);
       const tieredNote = currentManifest ? buildTieredComponentsPrompt(currentManifest, pageType) : void 0;
+      const pageKey = route.replace(/^\//, "") || "home";
+      const pageSections = plan?.pageNotes?.[pageKey]?.sections || [];
+      let reusePlanDirective = "";
+      let currentReusePlan = null;
+      if (currentManifest && currentManifest.shared.length > 0) {
+        try {
+          currentReusePlan = buildReusePlan({
+            pageName: name,
+            pageType,
+            sections: pageSections,
+            manifest: currentManifest,
+            existingPageCode,
+            userRequest: message
+          });
+          reusePlanDirective = buildReusePlanDirective(currentReusePlan);
+          if (currentReusePlan.reuse.length > 0 || currentReusePlan.createNew.length > 0) {
+            const parts = [];
+            if (currentReusePlan.reuse.length > 0)
+              parts.push(`REUSE: ${currentReusePlan.reuse.map((r) => r.component).join(", ")}`);
+            if (currentReusePlan.createNew.length > 0)
+              parts.push(`CREATE: ${currentReusePlan.createNew.map((c) => c.name).join(", ")}`);
+            if (currentReusePlan.reusePatterns.length > 0)
+              parts.push(`${currentReusePlan.reusePatterns.length} pattern(s)`);
+            console.log(chalk8.dim(`  \u{1F504} Reuse Plan for "${name}": ${parts.join(" | ")}`));
+          }
+        } catch {
+        }
+      }
       const prompt = [
         `Create ONE page called "${name}" at route "${route}".`,
         `Context: ${message}.`,
         `Generate complete pageCode for this single page only. Do not generate other pages.`,
         `PAGE TYPE: ${pageType}`,
         designConstraints,
-        sharedLayoutNote,
-        tieredNote || sharedComponentsNote,
+        layoutNote,
+        reusePlanDirective || tieredNote || sharedComponentsNote,
         routeNote,
         alignmentNote,
         authNote,
@@ -6122,7 +6407,47 @@ ${existingAppPageCode}
         const result = await parseModification(prompt, modCtx, provider, parseOpts);
         phase5Done++;
         spinner.text = `Phase 5/6 \u2014 ${phase5Done}/${remainingPages.length} pages generated...`;
-        const codePage = result.requests.find((r) => r.type === "add-page");
+        let codePage = result.requests.find((r) => r.type === "add-page");
+        if (currentReusePlan && currentReusePlan.reuse.length > 0 && codePage) {
+          const pageCode = codePage.changes?.pageCode;
+          if (pageCode) {
+            const verification = verifyReusePlan(pageCode, currentReusePlan);
+            if (verification.passed.length > 0) {
+              console.log(
+                chalk8.dim(`  \u2713 Reuse verified for "${name}": ${verification.passed.map((p) => p.component).join(", ")}`)
+              );
+            }
+            if (verification.missed.length > 0 && verification.retryDirective) {
+              console.log(
+                chalk8.yellow(
+                  `  \u26A0 Missed reuse in "${name}": ${verification.missed.map((m) => m.component).join(", ")} \u2014 retrying...`
+                )
+              );
+              try {
+                const retryPrompt = [prompt, verification.retryDirective].join("\n\n");
+                const retryResult = await parseModification(retryPrompt, modCtx, provider, parseOpts);
+                const retryPage = retryResult.requests.find((r) => r.type === "add-page");
+                if (retryPage) codePage = retryPage;
+              } catch {
+              }
+            }
+          }
+        }
+        if (projectRoot && codePage && currentManifest) {
+          const finalPageCode = codePage.changes?.pageCode;
+          if (finalPageCode) {
+            await updateManifestSafe(projectRoot, (m) => {
+              const updatedShared = m.shared.map((entry) => {
+                const isUsed = finalPageCode.includes(`{ ${entry.name} }`) || finalPageCode.includes(`{ ${entry.name},`);
+                if (isUsed && !entry.usedIn.includes(route)) {
+                  return { ...entry, usedIn: [...entry.usedIn, route] };
+                }
+                return entry;
+              });
+              return { ...m, shared: updatedShared };
+            });
+          }
+        }
         return codePage || { type: "add-page", target: "new", changes: { id, name, route } };
       } catch {
         phase5Done++;
@@ -6170,7 +6495,7 @@ ${existingAppPageCode}
 }
 var SharedExtractionItemSchema = z.object({
   name: z.string().min(2).max(50),
-  type: z.enum(["section", "widget"]),
+  type: SharedComponentTypeSchema,
   description: z.string().max(200).default(""),
   propsInterface: z.string().default("{}"),
   code: z.string()
@@ -6216,7 +6541,8 @@ async function extractSharedComponents(homePageCode, projectRoot, aiProvider) {
   const provider = getComponentProvider();
   for (const item of filtered) {
     try {
-      const { code: fixedCode } = await autoFixCode(item.code);
+      let { code: fixedCode } = await autoFixCode(item.code);
+      fixedCode = fixedCode.replace(/export default function (\w+)/g, "export function $1");
       const shadcnImports = [...fixedCode.matchAll(/from\s+["']@\/components\/ui\/(.+?)["']/g)];
       for (const match of shadcnImports) {
         await provider.installComponent(match[1], projectRoot);
@@ -6284,7 +6610,7 @@ import chalk11 from "chalk";
 import {
   getTemplateForPageType,
   loadManifest as loadManifest6,
-  saveManifest,
+  saveManifest as saveManifest2,
   updateUsedIn,
   findSharedComponentByIdOrName,
   generateSharedComponent as generateSharedComponent4
@@ -6394,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);
 }
@@ -6409,7 +6737,9 @@ async function canOverwriteShared(projectRoot, componentFile, storedHashes) {
   }
   return !edited;
 }
-async function regenerateLayout(config2, projectRoot, options = { navChanged: false }) {
+async function regenerateLayout(config2, projectRoot, options = {
+  navChanged: false
+}) {
   const appType = config2.settings.appType || "multi-page";
   const generator = new PageGenerator(config2);
   const initialized = config2.settings.initialized !== false;
@@ -6465,7 +6795,7 @@ async function regenerateLayout(config2, projectRoot, options = { navChanged: fa
   try {
     await integrateSharedLayoutIntoRootLayout2(projectRoot);
     await ensureAuthRouteGroup(projectRoot);
-    await ensureAppRouteGroupLayout(projectRoot, config2.navigation?.type, options.navChanged);
+    await ensureAppRouteGroupLayout(projectRoot, config2.navigation?.type, options.navChanged, options.groupLayouts);
   } catch (err) {
     if (process.env.COHERENT_DEBUG === "1") {
       console.log(chalk9.dim("Layout integration warning:", err));
@@ -6494,18 +6824,20 @@ async function scanAndInstallSharedDeps(projectRoot) {
   }
   return [...new Set(installed)];
 }
-async function ensureAppRouteGroupLayout(projectRoot, navType, forceUpdate = false) {
+async function ensureAppRouteGroupLayout(projectRoot, navType, forceUpdate = false, groupLayouts) {
+  const effectiveNavType = groupLayouts?.["app"] || navType;
   const layoutPath = resolve7(projectRoot, "app", "(app)", "layout.tsx");
   if (existsSync15(layoutPath) && !forceUpdate) return;
   const { mkdir: mkdirAsync } = await import("fs/promises");
   await mkdirAsync(resolve7(projectRoot, "app", "(app)"), { recursive: true });
-  const code = buildAppLayoutCode(navType);
+  const code = buildAppLayoutCode(effectiveNavType);
   await writeFile(layoutPath, code);
 }
 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,
@@ -6513,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>
   )
 }
 `;
@@ -6538,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,
@@ -6546,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>
   )
 }
 `;
@@ -6583,15 +6920,32 @@ export default function GroupLayout({
 }
 `;
 }
-async function ensurePlanGroupLayouts(projectRoot, plan) {
+async function ensurePlanGroupLayouts(projectRoot, plan, storedHashes = {}, config2) {
   const { mkdir: mkdirAsync } = await import("fs/promises");
+  const { createHash: createHash2 } = await import("crypto");
   for (const group of plan.groups) {
     const groupDir = resolve7(projectRoot, "app", `(${group.id})`);
     await mkdirAsync(groupDir, { recursive: true });
     const layoutPath = resolve7(groupDir, "layout.tsx");
+    const relPath = `app/(${group.id})/layout.tsx`;
+    if (existsSync15(layoutPath)) {
+      const currentContent = readFileSync10(layoutPath, "utf-8");
+      const currentHash = createHash2("md5").update(currentContent).digest("hex");
+      const storedHash = storedHashes[relPath];
+      if (storedHash && storedHash !== currentHash) {
+        continue;
+      }
+    }
     const code = buildGroupLayoutCode(group.layout, group.pages);
     await writeFile(layoutPath, code);
   }
+  if (config2) {
+    const layouts = {};
+    for (const group of plan.groups) {
+      layouts[group.id] = group.layout;
+    }
+    config2.groupLayouts = layouts;
+  }
 }
 async function regenerateFiles(modified, config2, projectRoot, options = { navChanged: false }) {
   const componentIds = /* @__PURE__ */ new Set();
@@ -7058,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);
@@ -7093,7 +7448,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
       const filePathRel = routePath ? `app/${routePath}/page.tsx` : "app/page.tsx";
       if (!usedIn.includes(filePathRel)) {
         const nextManifest = updateUsedIn(manifest, resolved.id, [...usedIn, filePathRel]);
-        await saveManifest(projectRoot, nextManifest);
+        await saveManifest2(projectRoot, nextManifest);
       }
       printLinkSharedReport({
         sharedId: resolved.id,
@@ -7194,7 +7549,7 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
       }
       const manifest = await loadManifest6(projectRoot);
       const nextManifest = updateUsedIn(manifest, created.id, usedInFiles);
-      await saveManifest(projectRoot, nextManifest);
+      await saveManifest2(projectRoot, nextManifest);
       printPromoteAndLinkReport({
         id: created.id,
         name: created.name,
@@ -7341,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),
@@ -7413,44 +7768,55 @@ async function applyModification(request, dsm, cm, pm, projectRoot, aiProvider,
           });
           let issues = validatePageQuality(codeToWrite, void 0, qualityPageType);
           const errors = issues.filter((i) => i.severity === "error");
-          if (errors.length >= 2 && aiProvider) {
+          const MAX_QUALITY_FIX_ATTEMPTS = 2;
+          let currentErrors = errors;
+          for (let attempt = 0; attempt < MAX_QUALITY_FIX_ATTEMPTS && currentErrors.length > 0; attempt++) {
+            if (!aiProvider) break;
             console.log(
-              chalk11.yellow(`
-\u{1F504} ${errors.length} quality errors \u2014 attempting AI fix for ${page.name || page.id}...`)
+              chalk11.yellow(
+                `
+\u{1F504} ${currentErrors.length} quality errors \u2014 attempting AI fix${attempt > 0 ? ` (retry ${attempt + 1})` : ""} for ${page.name || page.id}...`
+              )
             );
             try {
               const ai = await createAIProvider(aiProvider);
-              if (ai.editPageCode) {
-                const errorList = errors.map((e) => `Line ${e.line}: [${e.type}] ${e.message}`).join("\n");
-                const instruction = `Fix these quality issues:
+              if (!ai.editPageCode) break;
+              const errorList = currentErrors.map((e) => `Line ${e.line}: [${e.type}] ${e.message}`).join("\n");
+              const instruction = `Fix these quality issues:
 ${errorList}
 
 Rules:
 - Replace raw Tailwind colors (bg-emerald-500, text-zinc-400, etc.) with semantic tokens (bg-primary, text-muted-foreground, bg-muted, etc.)
+- Replace placeholder content ("Lorem ipsum", "John Doe", "user@example.com") with realistic contextual content
 - Ensure heading hierarchy (h1 \u2192 h2 \u2192 h3, no skipping)
 - Add Label components for form inputs
 - Keep all existing functionality and layout intact`;
-                const fixedCode2 = await ai.editPageCode(codeToWrite, instruction, page.name || page.id || "Page");
-                if (fixedCode2 && fixedCode2.length > 100 && /export\s+default/.test(fixedCode2)) {
-                  const recheck = validatePageQuality(fixedCode2, void 0, qualityPageType);
-                  const recheckErrors = recheck.filter((i) => i.severity === "error");
-                  if (recheckErrors.length < errors.length) {
-                    codeToWrite = fixedCode2;
-                    const { code: reFixed, fixes: reFixes } = await autoFixCode(codeToWrite, autoFixCtx);
-                    if (reFixes.length > 0) {
-                      codeToWrite = reFixed;
-                      postFixes.push(...reFixes);
-                    }
-                    await writeFile(filePath, codeToWrite);
-                    issues = validatePageQuality(codeToWrite, void 0, qualityPageType);
-                    const finalErrors = issues.filter((i) => i.severity === "error").length;
-                    console.log(chalk11.green(`   \u2714 Quality fix: ${errors.length} \u2192 ${finalErrors} errors`));
+              const fixedCode2 = await ai.editPageCode(codeToWrite, instruction, page.name || page.id || "Page");
+              if (fixedCode2 && fixedCode2.length > 100 && /export\s+default/.test(fixedCode2)) {
+                const recheck = validatePageQuality(fixedCode2, void 0, qualityPageType);
+                const recheckErrors = recheck.filter((i) => i.severity === "error");
+                if (recheckErrors.length < currentErrors.length) {
+                  codeToWrite = fixedCode2;
+                  const { code: reFixed, fixes: reFixes } = await autoFixCode(codeToWrite, autoFixCtx);
+                  if (reFixes.length > 0) {
+                    codeToWrite = reFixed;
+                    postFixes.push(...reFixes);
                   }
+                  await writeFile(filePath, codeToWrite);
+                  currentErrors = recheckErrors;
+                  console.log(chalk11.green(`   \u2714 Quality fix: ${errors.length} \u2192 ${currentErrors.length} errors`));
+                  if (currentErrors.length === 0) break;
+                } else {
+                  break;
                 }
+              } else {
+                break;
               }
             } catch {
+              break;
             }
           }
+          issues = validatePageQuality(codeToWrite, void 0, qualityPageType);
           const report = formatIssues(issues);
           if (report) {
             console.log(chalk11.yellow(`
@@ -7496,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 {
@@ -7630,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(`
@@ -8056,7 +8470,7 @@ async function chatCommand(message, options) {
     if (options.newComponent) {
       const componentName = options.newComponent;
       spinner.start(`Creating shared component: ${componentName}...`);
-      const { createAIProvider: createAIProvider2 } = await import("./ai-provider-HUQO64P3.js");
+      const { createAIProvider: createAIProvider2 } = await import("./ai-provider-CGSIYFZT.js");
       const { generateSharedComponent: generateSharedComponent7 } = await import("@getcoherent/core");
       const { autoFixCode: autoFixCode2 } = await import("./quality-validator-3K5BMJSR.js");
       const { extractPropsInterface, extractDependencies } = await import("./component-extractor-VYJLT5NR.js");
@@ -8102,7 +8516,7 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
               type: classifications[0].type,
               description: classifications[0].description || message
             });
-            await saveManifest2(projectRoot, manifest2);
+            await saveManifest3(projectRoot, manifest2);
           }
         } catch {
         }
@@ -8171,7 +8585,7 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
     if (validShared.length !== manifest.shared.length) {
       const cleaned = manifest.shared.length - validShared.length;
       manifest = { ...manifest, shared: validShared };
-      await saveManifest2(project.root, manifest);
+      await saveManifest3(project.root, manifest);
       if (DEBUG4) {
         console.log(chalk13.dim(`[pre-gen] Cleaned ${cleaned} orphaned component(s) from manifest`));
       }
@@ -8184,7 +8598,7 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
     let uxRecommendations;
     const SPLIT_THRESHOLD = 4;
     const parseOpts = { sharedComponentsSummary, projectRoot };
-    const modCtx = { config: config2, componentManager: cm };
+    const modCtx = { config: dsm.getConfig(), componentManager: cm };
     const multiPageHint = /\b(pages?|sections?)\s*[:]\s*\w/i.test(message) || (message.match(
       /\b(?:registration|about|catal|account|contact|pricing|dashboard|settings|login|sign.?up|blog|portfolio|features)\b/gi
     ) || []).length >= SPLIT_THRESHOLD;
@@ -8194,7 +8608,7 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
         requests = splitResult.requests;
         if (splitResult.plan && projectRoot) {
           savePlan(projectRoot, splitResult.plan);
-          await ensurePlanGroupLayouts(projectRoot, splitResult.plan);
+          await ensurePlanGroupLayouts(projectRoot, splitResult.plan, storedHashes, dsm.getConfig());
         }
         uxRecommendations = void 0;
       } catch {
@@ -8233,8 +8647,24 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
         }
       }
     } else {
+      let reusePlanDirective;
+      try {
+        const singlePageManifest = await loadManifest8(projectRoot);
+        if (singlePageManifest.shared.length > 0) {
+          const reusePlan = buildReusePlan({
+            pageName: "page",
+            pageType: inferPageTypeFromRoute("/"),
+            sections: [],
+            manifest: singlePageManifest,
+            existingPageCode: {},
+            userRequest: message
+          });
+          reusePlanDirective = buildReusePlanDirective(reusePlan) || void 0;
+        }
+      } catch {
+      }
       try {
-        const result = await parseModification(message, modCtx, provider, parseOpts);
+        const result = await parseModification(message, modCtx, provider, { ...parseOpts, reusePlanDirective });
         requests = result.requests;
         uxRecommendations = result.uxRecommendations;
         const pagesWithoutCode = requests.filter(
@@ -8272,7 +8702,7 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
             requests = splitResult.requests;
             if (splitResult.plan && projectRoot) {
               savePlan(projectRoot, splitResult.plan);
-              await ensurePlanGroupLayouts(projectRoot, splitResult.plan);
+              await ensurePlanGroupLayouts(projectRoot, splitResult.plan, storedHashes, dsm.getConfig());
             }
             uxRecommendations = void 0;
           } catch {
@@ -8798,7 +9228,7 @@ Return JSON: { "requests": [{ "type": "add-page", "changes": { "name": "${compon
         }
       }
       if (manifestChanged) {
-        await saveManifest2(projectRoot, currentManifest);
+        await saveManifest3(projectRoot, currentManifest);
         if (DEBUG4) console.log(chalk13.dim("[auto-sync] Manifest updated"));
       }
     } catch {
@@ -8969,7 +9399,7 @@ import { DesignSystemManager as DesignSystemManager8, ComponentGenerator as Comp
 // src/utils/file-watcher.ts
 import { readFileSync as readFileSync14, writeFileSync as writeFileSync9, existsSync as existsSync19 } from "fs";
 import { relative as relative4, join as join13 } from "path";
-import { loadManifest as loadManifest9, saveManifest as saveManifest3 } from "@getcoherent/core";
+import { loadManifest as loadManifest9, saveManifest as saveManifest4 } from "@getcoherent/core";
 
 // src/utils/component-integrity.ts
 import { existsSync as existsSync18, readFileSync as readFileSync13, readdirSync as readdirSync5 } from "fs";
@@ -9357,7 +9787,7 @@ async function handleFileDelete(projectRoot, filePath) {
         ...manifest,
         shared: manifest.shared.filter((s) => s.id !== orphaned.id)
       };
-      await saveManifest3(projectRoot, cleaned);
+      await saveManifest4(projectRoot, cleaned);
       console.log(chalk33.cyan(`
   \u{1F5D1} Auto-removed ${orphaned.id} (${orphaned.name}) \u2014 file deleted`));
       await writeCursorRules(projectRoot);
@@ -9594,6 +10024,41 @@ async function fixMissingComponentExports(projectRoot) {
       }
     }
   }
+  const neededSharedExports = /* @__PURE__ */ new Map();
+  for (const file of pages) {
+    const content = readFileSync15(file, "utf-8");
+    const sharedImportRe = /import\s*\{([^}]+)\}\s*from\s*['"]@\/components\/shared\/([^'"]+)['"]/g;
+    let sm;
+    while ((sm = sharedImportRe.exec(content)) !== null) {
+      const names = sm[1].split(",").map((s) => s.trim()).filter(Boolean);
+      const componentId = sm[2];
+      if (!neededSharedExports.has(componentId)) neededSharedExports.set(componentId, /* @__PURE__ */ new Set());
+      for (const name of names) neededSharedExports.get(componentId).add(name);
+    }
+  }
+  for (const [componentId, needed] of neededSharedExports) {
+    const componentFile = join14(sharedDir, `${componentId}.tsx`);
+    if (!existsSync20(componentFile)) continue;
+    let content = readFileSync15(componentFile, "utf-8");
+    const exportRe = /export\s+(?:const|function|class)\s+(\w+)|export\s*\{([^}]+)\}/g;
+    const existingExports = /* @__PURE__ */ new Set();
+    let em;
+    while ((em = exportRe.exec(content)) !== null) {
+      if (em[1]) existingExports.add(em[1]);
+      if (em[2])
+        em[2].split(",").map(
+          (s) => s.trim().split(/\s+as\s+/).pop()
+        ).filter(Boolean).forEach((n) => existingExports.add(n));
+    }
+    const missing = [...needed].filter((n) => !existingExports.has(n));
+    if (missing.length === 0) continue;
+    const defaultExportMatch = content.match(/export\s+default\s+function\s+(\w+)/);
+    if (defaultExportMatch && missing.includes(defaultExportMatch[1])) {
+      content = content.replace(/export\s+default\s+function\s+(\w+)/, "export function $1");
+      writeFileSync10(componentFile, content, "utf-8");
+      console.log(chalk14.dim(`   \u2714 Fixed export in ${componentId}.tsx (default \u2192 named)`));
+    }
+  }
 }
 async function backfillPageAnalysis(projectRoot) {
   const configPath = join14(projectRoot, "design-system.config.ts");
@@ -10318,7 +10783,7 @@ import {
   PageManager as PageManager4,
   ComponentGenerator as ComponentGenerator4,
   loadManifest as loadManifest10,
-  saveManifest as saveManifest4
+  saveManifest as saveManifest5
 } from "@getcoherent/core";
 function extractComponentIdsFromCode2(code) {
   const ids = /* @__PURE__ */ new Set();
@@ -10587,7 +11052,7 @@ async function fixCommand(opts = {}) {
       manifestModified = true;
     }
     if (manifestModified && !dryRun) {
-      await saveManifest4(project.root, manifest);
+      await saveManifest5(project.root, manifest);
       fixes.push("Shared component manifest updated");
     }
     for (const entry of manifest.shared) {
@@ -11124,10 +11589,15 @@ function createComponentsCommand() {
     });
     console.log(chalk25.cyan("\u{1F4A1} Modify by ID:"), chalk25.white('coherent chat "in CID-001 add a search button"\n'));
   });
-  sharedCmd.command("add <name>").description("Create a shared component (layout/section/widget) and register in manifest").option("-t, --type <type>", "Type: layout | section | widget", "layout").option("-d, --description <desc>", "Description").action(async (name, opts) => {
+  sharedCmd.command("add <name>").description("Create a shared component (layout/section/widget) and register in manifest").option(
+    "-t, --type <type>",
+    "Type: layout | navigation | data-display | form | feedback | section | widget",
+    "layout"
+  ).option("-d, --description <desc>", "Description").action(async (name, opts) => {
     const project = findConfig();
     if (!project) exitNotCoherent();
-    const type = opts.type === "section" || opts.type === "widget" ? opts.type : "layout";
+    const validTypes = ["layout", "navigation", "data-display", "form", "feedback", "section", "widget"];
+    const type = validTypes.includes(opts.type ?? "") ? opts.type : "layout";
     const result = await generateSharedComponent5(project.root, {
       name: name.trim(),
       type,
@@ -11803,7 +12273,7 @@ import { existsSync as existsSync27, readFileSync as readFileSync19 } from "fs";
 import { join as join20, relative as relative5, dirname as dirname10 } from "path";
 import { readdir as readdir4, readFile as readFile7 } from "fs/promises";
 import { DesignSystemManager as DesignSystemManager16 } from "@getcoherent/core";
-import { loadManifest as loadManifest13, saveManifest as saveManifest5, findSharedComponent } from "@getcoherent/core";
+import { loadManifest as loadManifest13, saveManifest as saveManifest6, findSharedComponent } from "@getcoherent/core";
 function extractTokensFromProject(projectRoot) {
   const lightColors = {};
   const darkColors = {};
@@ -12099,7 +12569,7 @@ async function syncCommand(options = {}) {
       const { manifest: reconciledManifest, result: rr } = reconcileComponents(project.root, manifest);
       reconcileResult = rr;
       if (!dryRun) {
-        await saveManifest5(project.root, reconciledManifest);
+        await saveManifest6(project.root, reconciledManifest);
       }
       detectedComponents = await detectCustomComponents(project.root, allPageCode);
       for (const comp of detectedComponents) {

package/dist/{openai-provider-XUI7ZHUR.js → openai-provider-4KGARVC3.js}

@@ -365,7 +365,7 @@ Rules:
 - Do NOT use these names (already shared): ${existingSharedNames.join(", ")}
 - Look for: cards with icon+title+description, pricing tiers, testimonial blocks, stat displays, CTA sections
 
-Each component object: "name" (PascalCase), "type" ("section"|"widget"), "description", "propsInterface", "code" (full TSX module as string)
+Each component object: "name" (PascalCase), "type" ("layout"|"navigation"|"data-display"|"form"|"feedback"|"section"|"widget"), "description", "propsInterface", "code" (full TSX module as string)
 
 If no repeating patterns found: { "components": [] }`
           }

package/dist/{plan-generator-H55WEIY2.js → plan-generator-ITHYNYJI.js}

@@ -11,7 +11,7 @@ import {
   routeToKey,
   savePlan,
   updateArchitecturePlan
-} from "./chunk-WRDWFCQJ.js";
+} from "./chunk-PVJJ2YXP.js";
 import "./chunk-5AHG4NNX.js";
 import "./chunk-3RG5ZIWI.js";
 export {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.6.14",
+  "version": "0.6.16",
   "description": "CLI interface for Coherent Design Method",
   "type": "module",
   "main": "./dist/index.js",
@@ -33,8 +33,15 @@
   ],
   "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",
@@ -42,19 +49,12 @@
     "open": "^10.1.0",
     "ora": "^7.0.1",
     "prompts": "^2.4.2",
-    "zod": "^3.22.4",
-    "@getcoherent/core": "0.6.14"
+    "zod": "^3.22.4"
   },
   "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"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-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.