create-fornix 0.0.9 → 0.0.10

package/dist/index.js

@@ -216,6 +216,7 @@ function topologicalSort(blocks, manifests) {
 function generateStructure(config, manifests = []) {
   const files = {};
   const adapterDeps = getAdapterDependencies(config);
+  const blockDeps = getBlockDependencies(manifests);
   const pkg = {
     name: config.projectName,
     type: "module",
@@ -234,10 +235,14 @@ function generateStructure(config, manifests = []) {
         tailwindcss: "^4.0.0",
         "@tailwindcss/vite": "^4.0.0"
       },
-      ...adapterDeps
+      ...adapterDeps,
+      ...blockDeps
     },
     devDependencies: {
-      typescript: "^5.7.0"
+      typescript: "^5.7.0",
+      ...config.deployTarget === "cloudflare" && {
+        "@cloudflare/workers-types": "^4.0.0"
+      }
     }
   };
   files["package.json"] = JSON.stringify(pkg, null, 2) + "\n";
@@ -246,9 +251,11 @@ function generateStructure(config, manifests = []) {
     compilerOptions: {
       jsx: "preserve",
       jsxImportSource: "react",
-      // Even if not using React yet, good default for UI frameworks
       strictNullChecks: true,
       baseUrl: ".",
+      ...config.deployTarget === "cloudflare" && {
+        types: ["@cloudflare/workers-types"]
+      },
       paths: {
         "@/*": ["src/*"]
       }
@@ -278,42 +285,59 @@ pnpm-debug.log*
 .DS_Store
 Thumbs.db
 `.trim() + "\n";
-  const blockImports = [];
-  const blockComponents = [];
+  const LAYOUT_CATEGORIES2 = /* @__PURE__ */ new Set(["header", "footer"]);
+  const headerImports = [];
+  const headerComponents = [];
+  const contentImports = [];
+  const contentComponents = [];
+  const footerImports = [];
+  const footerComponents = [];
   if (manifests.length > 0) {
     for (const manifest2 of manifests) {
       if (manifest2.type !== "section") continue;
       const mainFile = manifest2.files.find((f) => f.destination.endsWith(".astro") || f.destination.endsWith(".tsx"));
-      if (mainFile) {
-        const componentName = manifest2.name.split("-").map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("");
-        let importPath = mainFile.destination;
-        if (importPath.startsWith("src/")) {
-          importPath = "../" + importPath.substring(4);
-        }
-        blockImports.push(`import ${componentName} from '${importPath}';`);
-        blockComponents.push(`    <${componentName} />`);
+      if (!mainFile) continue;
+      const componentName = manifest2.name.split("-").map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("");
+      let importPath = mainFile.destination;
+      if (importPath.startsWith("src/")) {
+        importPath = "../" + importPath.substring(4);
+      }
+      const category = manifest2.category ?? "other";
+      if (category === "header") {
+        headerImports.push(`import ${componentName} from '${importPath}';`);
+        headerComponents.push(`    <${componentName} />`);
+      } else if (category === "footer") {
+        footerImports.push(`import ${componentName} from '${importPath}';`);
+        footerComponents.push(`    <${componentName} />`);
+      } else {
+        contentImports.push(`import ${componentName} from '${importPath}';`);
+        contentComponents.push(`    <${componentName} />`);
       }
     }
   }
   const indexAstroContent = `
 ---
 import Layout from '../layouts/Layout.astro';
-${blockImports.join("\n")}
+${contentImports.join("\n")}
 ---
 <Layout title="Welcome to ${config.projectName}.">
   <main>
-${blockComponents.length > 0 ? blockComponents.join("\n") : `    <h1>Welcome to <span class="text-gradient">${config.projectName}</span></h1>`}
+${contentComponents.length > 0 ? contentComponents.join("\n") : `    <h1>Welcome to <span class="text-gradient">${config.projectName}</span></h1>`}
   </main>
 </Layout>
 `.trim() + "\n";
   files["src/pages/index.astro"] = indexAstroContent;
   const tailwindImport = config.cssEngine === "tailwind" ? '\nimport "../../tailwind.css";' : "";
+  const layoutImportsStr = [...headerImports, ...footerImports].join("\n");
+  const layoutImportSection = layoutImportsStr ? "\n" + layoutImportsStr : "";
+  const headerSection = headerComponents.length > 0 ? "\n" + headerComponents.join("\n") + "\n" : "";
+  const footerSection = footerComponents.length > 0 ? "\n" + footerComponents.join("\n") : "";
   files["src/layouts/Layout.astro"] = `
 ---
 interface Props {
   title: string;
 }
-const { title } = Astro.props;${tailwindImport}
+const { title } = Astro.props;${tailwindImport}${layoutImportSection}
 ---
 <!doctype html>
 <html lang="en">
@@ -325,8 +349,8 @@ const { title } = Astro.props;${tailwindImport}
     <meta name="generator" content={Astro.generator} />
     <title>{title}</title>
   </head>
-  <body>
-    <slot />
+  <body>${headerSection}
+    <slot />${footerSection}
   </body>
 </html>
 
@@ -378,6 +402,15 @@ const { title } = Astro.props;${tailwindImport}
   }
   return files;
 }
+function getBlockDependencies(manifests) {
+  const merged = {};
+  for (const manifest2 of manifests) {
+    if (manifest2.dependencies) {
+      Object.assign(merged, manifest2.dependencies);
+    }
+  }
+  return merged;
+}
 function getAdapterDependencies(config) {
   if (config.renderMode === "static" && config.deployTarget === "static") {
     return {};
@@ -502,11 +535,35 @@ function buildPaletteFile(colors) {
   const properties = COLOR_TOKENS.map(
     (token) => `  --color-${token}: ${colors[token]};`
   ).join("\n");
+  const surface = blendHex(colors.background, colors.foreground, 0.08);
+  const muted = blendHex(colors.foreground, colors.background, 0.4);
+  const derived = [
+    `  --color-surface: ${surface};`,
+    `  --color-muted: ${muted};`
+  ].join("\n");
   return `:root {
 ${properties}
+${derived}
 }
 `;
 }
+function blendHex(colorA, colorB, ratio) {
+  const a = parseHex(colorA);
+  const b = parseHex(colorB);
+  const r = Math.round(a.r + (b.r - a.r) * ratio);
+  const g = Math.round(a.g + (b.g - a.g) * ratio);
+  const bl = Math.round(a.b + (b.b - a.b) * ratio);
+  return `#${r.toString(16).padStart(2, "0")}${g.toString(16).padStart(2, "0")}${bl.toString(16).padStart(2, "0")}`;
+}
+function parseHex(hex) {
+  const h = hex.replace("#", "");
+  const full = h.length === 3 ? h.split("").map((c) => c + c).join("") : h;
+  return {
+    r: parseInt(full.slice(0, 2), 16),
+    g: parseInt(full.slice(2, 4), 16),
+    b: parseInt(full.slice(4, 6), 16)
+  };
+}
 function buildSwitcherScript(paletteNames) {
   return `(function () {
   const PALETTES = ${JSON.stringify(paletteNames)};
@@ -706,8 +763,17 @@ function wireI18n(config, manifests) {
   }
   files["src/i18n/utils.ts"] = generateI18nUtils(config);
   files["src/pages/[locale]/index.astro"] = generateLocaleIndexPage(config, manifests ?? []);
+  files["src/pages/index.astro"] = generateRootRedirect(config);
   return ok(files);
 }
+function generateRootRedirect(config) {
+  const needsPrerender = config.renderMode === "server" || config.renderMode === "hybrid";
+  const prerenderLine = needsPrerender ? "export const prerender = true;\n" : "";
+  return `---
+${prerenderLine}return Astro.redirect("/${config.defaultLocale}/");
+---
+`;
+}
 function generateI18nUtils(config) {
   const localesArray = config.locales.map((locale) => `"${locale}"`).join(", ");
   return `export const locales = [${localesArray}] as const;
@@ -741,22 +807,27 @@ export function t<T>(
 `;
 }
 function generateLocaleIndexPage(config, manifests) {
-  const sectionBlocks = manifests.filter((m) => m.type === "section");
+  const LAYOUT_CATEGORIES2 = /* @__PURE__ */ new Set(["header", "footer"]);
+  const contentBlocks = manifests.filter(
+    (m) => m.type === "section" && !LAYOUT_CATEGORIES2.has(m.category ?? "")
+  );
   const imports = [];
   const tags = [];
-  for (const block of sectionBlocks) {
+  for (const block of contentBlocks) {
     const componentName = block.name.split("-").map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("");
-    imports.push(`import ${componentName} from '../../../components/sections/${block.name}.astro';`);
+    imports.push(`import ${componentName} from '../../components/sections/${block.name}.astro';`);
     tags.push(`    <${componentName} />`);
   }
   const importSection = imports.length > 0 ? imports.join("\n") + "\n" : "";
   const blockSection = tags.length > 0 ? "\n" + tags.join("\n") + "\n  " : "\n    <h1>" + config.projectName + "</h1>\n    <p>Locale: {locale}</p>\n  ";
+  const needsPrerender = config.renderMode === "server" || config.renderMode === "hybrid";
+  const prerenderLine = needsPrerender ? "export const prerender = true;\n" : "";
   return `---
-import { locales } from "../../../i18n/utils";
-import Layout from "../../../layouts/Layout.astro";
-${importSection}
+import { locales } from "../../i18n/utils";
+import Layout from "../../layouts/Layout.astro";
+${importSection}${prerenderLine}
 export function getStaticPaths() {
-  return locales.map((locale) => ({ params: { locale } }));
+  return locales.map((locale: string) => ({ params: { locale } }));
 }
 
 const { locale } = Astro.params;
@@ -2193,16 +2264,38 @@ async function runManualFlow(input) {
     ]
   });
   if (p.isCancel(cssEngine)) return handleCancel();
-  const blockOptions = buildBlockOptions(input.manifests);
-  let selectedBlocks = [];
-  if (blockOptions.length > 0) {
+  const headerOptions = buildCategoryOptions(input.manifests, "header");
+  const footerOptions = buildCategoryOptions(input.manifests, "footer");
+  const contentOptions = buildContentBlockOptions(input.manifests);
+  let selectedHeader;
+  let selectedFooter;
+  let selectedContentBlocks = [];
+  if (headerOptions.length > 0) {
+    const noneOption = { value: "__none__", label: "None", hint: "No header" };
+    const headerChoice = await p.select({
+      message: "Choose a header (appears on every page)",
+      options: [noneOption, ...headerOptions]
+    });
+    if (p.isCancel(headerChoice)) return handleCancel();
+    if (headerChoice !== "__none__") selectedHeader = headerChoice;
+  }
+  if (contentOptions.length > 0) {
     const blocks = await p.multiselect({
-      message: "Select blocks to include (space to toggle, enter to confirm)",
-      options: blockOptions,
+      message: "Select content blocks (space to toggle, enter to confirm)",
+      options: contentOptions,
       required: false
     });
     if (p.isCancel(blocks)) return handleCancel();
-    selectedBlocks = blocks;
+    selectedContentBlocks = blocks;
+  }
+  if (footerOptions.length > 0) {
+    const noneOption = { value: "__none__", label: "None", hint: "No footer" };
+    const footerChoice = await p.select({
+      message: "Choose a footer (appears on every page)",
+      options: [noneOption, ...footerOptions]
+    });
+    if (p.isCancel(footerChoice)) return handleCancel();
+    if (footerChoice !== "__none__") selectedFooter = footerChoice;
   }
   const localesInput = await p.text({
     message: "Locales (comma-separated, e.g. en,es,ar)",
@@ -2232,6 +2325,24 @@ async function runManualFlow(input) {
     if (p.isCancel(switcherChoice)) return handleCancel();
     themeSwitcher = switcherChoice;
   }
+  if (!selectedHeader && headerOptions.length > 0) {
+    const needsNav = locales.length >= 2 || themeSwitcher;
+    if (needsNav) {
+      const autoHeader = await p.confirm({
+        message: `You enabled ${locales.length >= 2 ? "multiple locales" : "theme switching"} \u2014 add a header for navigation?`,
+        initialValue: true
+      });
+      if (p.isCancel(autoHeader)) return handleCancel();
+      if (autoHeader) {
+        selectedHeader = headerOptions[0].value;
+        console.log(pc.dim(`  Adding ${selectedHeader} for navigation.`));
+      }
+    }
+  }
+  const selectedBlocks = [];
+  if (selectedHeader) selectedBlocks.push(selectedHeader);
+  selectedBlocks.push(...selectedContentBlocks);
+  if (selectedFooter) selectedBlocks.push(selectedFooter);
   const config = {
     projectName: projectName.trim(),
     projectDir: `./${projectName.trim()}`,
@@ -2271,8 +2382,18 @@ function handleCancel() {
   p.cancel("Operation cancelled.");
   return null;
 }
-function buildBlockOptions(manifests) {
-  const blocks = Object.values(manifests);
+function buildCategoryOptions(manifests, category) {
+  return Object.values(manifests).filter((block) => (block.category ?? "other") === category).map((block) => ({
+    value: block.name,
+    label: block.name,
+    hint: block.description
+  }));
+}
+function buildContentBlockOptions(manifests) {
+  const LAYOUT_CATEGORIES2 = /* @__PURE__ */ new Set(["header", "footer"]);
+  const blocks = Object.values(manifests).filter(
+    (block) => !LAYOUT_CATEGORIES2.has(block.category ?? "other")
+  );
   const categories = /* @__PURE__ */ new Map();
   for (const block of blocks) {
     const category = block.category ?? "other";
@@ -2286,7 +2407,7 @@ function buildBlockOptions(manifests) {
     for (const block of categoryBlocks) {
       options.push({
         value: block.name,
-        label: `${block.name}`,
+        label: block.name,
         hint: `${category} \u2014 ${block.description}`
       });
     }
@@ -4104,17 +4225,60 @@ function preResolveDependencies(selected, manifests) {
 // src/cli/commands/add.ts
 import { defineCommand as defineCommand2 } from "citty";
 import pc4 from "picocolors";
-import { readFileSync as readFileSync5, writeFileSync as writeFileSync5, existsSync as existsSync4, mkdirSync as mkdirSync5 } from "fs";
-import { join as join7, dirname as dirname3 } from "path";
+import { readFileSync as readFileSync6, writeFileSync as writeFileSync5, existsSync as existsSync5, mkdirSync as mkdirSync5 } from "fs";
+import { join as join8, dirname as dirname3 } from "path";
 
 // src/scaffold/page-updater.ts
+import { readFileSync as readFileSync5, existsSync as existsSync4 } from "fs";
+import { join as join7 } from "path";
+var CATEGORY_ORDER = {
+  header: 0,
+  hero: 1,
+  features: 2,
+  pricing: 3,
+  testimonials: 4,
+  faq: 5,
+  cta: 6,
+  contact: 7,
+  theme: 8,
+  footer: 9
+};
+var DEFAULT_PRIORITY = 5;
+var LAYOUT_CATEGORIES = /* @__PURE__ */ new Set(["header", "footer"]);
 function blockNameToComponentName(blockName) {
   return blockName.split("-").map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("");
 }
 function blockNameToImportPath(blockName) {
   return `../components/sections/${blockName}.astro`;
 }
-function addBlockToPage(pageContent, blockName) {
+function blockNameToLayoutImportPath(blockName) {
+  return `../components/sections/${blockName}.astro`;
+}
+function getBlockCategory(blockName, projectDir) {
+  if (projectDir) {
+    try {
+      const fornixPath = join7(projectDir, "fornix.json");
+      if (existsSync4(fornixPath)) {
+        const fornix = JSON.parse(readFileSync5(fornixPath, "utf-8"));
+        const block = fornix.blocks?.find((b) => b.name === blockName);
+        if (block?.category) return block.category;
+      }
+    } catch {
+    }
+  }
+  for (const prefix of Object.keys(CATEGORY_ORDER)) {
+    if (blockName.startsWith(prefix)) return prefix;
+  }
+  return "other";
+}
+function getPriority(category) {
+  return CATEGORY_ORDER[category] ?? DEFAULT_PRIORITY;
+}
+function isLayoutBlock(blockName, projectDir) {
+  const category = getBlockCategory(blockName, projectDir);
+  return LAYOUT_CATEGORIES.has(category);
+}
+function addBlockToPage(pageContent, blockName, projectDir) {
   const componentName = blockNameToComponentName(blockName);
   const importPath = blockNameToImportPath(blockName);
   if (pageContent.includes(importPath) || pageContent.includes(`import ${componentName}`)) {
@@ -4122,14 +4286,67 @@ function addBlockToPage(pageContent, blockName) {
   }
   const importLine = `import ${componentName} from '${importPath}';`;
   const componentTag = `    <${componentName} />`;
+  const newCategory = getBlockCategory(blockName, projectDir);
+  const newPriority = getPriority(newCategory);
   const frontmatterEnd = pageContent.indexOf("---", pageContent.indexOf("---") + 3);
   if (frontmatterEnd === -1) {
     return pageContent;
   }
   let updated = pageContent.slice(0, frontmatterEnd) + importLine + "\n" + pageContent.slice(frontmatterEnd);
+  const mainOpenMatch = updated.match(/<main[^>]*>/);
   const mainCloseIndex = updated.lastIndexOf("</main>");
-  if (mainCloseIndex !== -1) {
-    updated = updated.slice(0, mainCloseIndex) + componentTag + "\n  " + updated.slice(mainCloseIndex);
+  if (!mainOpenMatch || mainCloseIndex === -1) {
+    return updated;
+  }
+  const mainOpenEnd = mainOpenMatch.index + mainOpenMatch[0].length;
+  const mainContent = updated.slice(mainOpenEnd, mainCloseIndex);
+  const tagPattern = /^(\s*<([A-Z][A-Za-z]*)\s*\/>)\s*$/gm;
+  let insertOffset = mainCloseIndex;
+  let match;
+  while ((match = tagPattern.exec(mainContent)) !== null) {
+    const existingComponentName = match[2];
+    const existingBlockName = componentNameToBlockName(existingComponentName);
+    const existingCategory = getBlockCategory(existingBlockName, projectDir);
+    const existingPriority = getPriority(existingCategory);
+    if (existingPriority > newPriority) {
+      insertOffset = mainOpenEnd + match.index;
+      break;
+    }
+  }
+  updated = updated.slice(0, insertOffset) + componentTag + "\n" + updated.slice(insertOffset);
+  return updated;
+}
+function addBlockToLayout(layoutContent, blockName, projectDir) {
+  const componentName = blockNameToComponentName(blockName);
+  const importPath = blockNameToLayoutImportPath(blockName);
+  if (layoutContent.includes(importPath) || layoutContent.includes(`import ${componentName}`)) {
+    return layoutContent;
+  }
+  const importLine = `import ${componentName} from '${importPath}';`;
+  const componentTag = `    <${componentName} />`;
+  const category = getBlockCategory(blockName, projectDir);
+  const frontmatterEnd = layoutContent.indexOf("---", layoutContent.indexOf("---") + 3);
+  if (frontmatterEnd === -1) {
+    return layoutContent;
+  }
+  let updated = layoutContent.slice(0, frontmatterEnd) + importLine + "\n" + layoutContent.slice(frontmatterEnd);
+  if (category === "header") {
+    const slotIndex = updated.indexOf("<slot");
+    const mainIndex = updated.indexOf("<main");
+    const insertBefore = mainIndex !== -1 ? mainIndex : slotIndex;
+    if (insertBefore !== -1) {
+      updated = updated.slice(0, insertBefore) + componentTag + "\n" + updated.slice(insertBefore);
+    }
+  } else if (category === "footer") {
+    const mainCloseIndex = updated.indexOf("</main>");
+    const slotMatch = updated.match(/<slot\s*\/>/);
+    if (mainCloseIndex !== -1) {
+      const afterMain = mainCloseIndex + "</main>".length;
+      updated = updated.slice(0, afterMain) + "\n" + componentTag + updated.slice(afterMain);
+    } else if (slotMatch) {
+      const afterSlot = slotMatch.index + slotMatch[0].length;
+      updated = updated.slice(0, afterSlot) + "\n" + componentTag + updated.slice(afterSlot);
+    }
   }
   return updated;
 }
@@ -4152,6 +4369,9 @@ function removeBlockFromPage(pageContent, blockName) {
 function escapeRegex(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+function componentNameToBlockName(componentName) {
+  return componentName.replace(/([A-Z])/g, "-$1").toLowerCase().replace(/^-/, "");
+}
 
 // src/cli/commands/add.ts
 var addCommand = defineCommand2({
@@ -4184,14 +4404,14 @@ var addCommand = defineCommand2({
   async run({ args: args2 }) {
     const typedArgs = args2;
     const cwd = process.cwd();
-    const manifestPath = join7(cwd, "fornix.json");
-    if (!existsSync4(manifestPath)) {
+    const manifestPath = join8(cwd, "fornix.json");
+    if (!existsSync5(manifestPath)) {
       console.error(
         pc4.red("\u2717 No fornix.json found. Are you in a Fornix project?")
       );
       process.exit(1);
     }
-    const manifestRaw = readFileSync5(manifestPath, "utf-8");
+    const manifestRaw = readFileSync6(manifestPath, "utf-8");
     const manifest2 = JSON.parse(manifestRaw);
     const registryResult = await fetchRegistryIndex();
     if (!isOk(registryResult)) {
@@ -4220,6 +4440,27 @@ var addCommand = defineCommand2({
       return;
     }
     const blocksToAdd = resolveDependencies2(blockName, installedNames, manifests);
+    for (const name of blocksToAdd) {
+      const m = manifests[name];
+      if (m?.conflicts && m.conflicts.length > 0) {
+        for (const conflictName of m.conflicts) {
+          if (installedNames.has(conflictName)) {
+            console.error(
+              pc4.red(
+                `\u2717 Block '${name}' conflicts with installed block '${conflictName}'.`
+              )
+            );
+            console.log(
+              pc4.dim(
+                `  Remove '${conflictName}' first: npx create-fornix remove ${conflictName}`
+              )
+            );
+            process.exitCode = 1;
+            return;
+          }
+        }
+      }
+    }
     for (const name of blocksToAdd) {
       const m = manifests[name];
       if (m?.requiredMode && manifest2.renderMode !== m.requiredMode) {
@@ -4257,7 +4498,7 @@ var addCommand = defineCommand2({
           return;
         }
         filesToWrite.push({
-          path: join7(cwd, file.destination),
+          path: join8(cwd, file.destination),
           content
         });
       }
@@ -4296,18 +4537,31 @@ var addCommand = defineCommand2({
       });
     }
     writeFileSync5(manifestPath, JSON.stringify(manifest2, null, 2) + "\n");
-    const indexPath = join7(cwd, "src/pages/index.astro");
-    if (existsSync4(indexPath)) {
-      let pageContent = readFileSync5(indexPath, "utf-8");
-      for (const name of blocksToAdd) {
-        const bManifest = manifests[name];
-        if (bManifest && bManifest.type === "section") {
-          pageContent = addBlockToPage(pageContent, name);
+    const indexPath = join8(cwd, "src/pages/index.astro");
+    const layoutPath = join8(cwd, "src/layouts/Layout.astro");
+    for (const name of blocksToAdd) {
+      const bManifest = manifests[name];
+      if (!bManifest || bManifest.type !== "section") continue;
+      if (isLayoutBlock(name, cwd)) {
+        if (existsSync5(layoutPath)) {
+          const layoutContent = readFileSync6(layoutPath, "utf-8");
+          const updated = addBlockToLayout(layoutContent, name, cwd);
+          if (updated !== layoutContent) {
+            writeFileSync5(layoutPath, updated);
+            if (typedArgs.verbose) {
+              console.log(`  ${pc4.dim("\u270E")} updated Layout.astro (${name})`);
+            }
+          }
+        }
+      } else {
+        if (existsSync5(indexPath)) {
+          let pageContent = readFileSync6(indexPath, "utf-8");
+          pageContent = addBlockToPage(pageContent, name, cwd);
+          writeFileSync5(indexPath, pageContent);
+          if (typedArgs.verbose) {
+            console.log(`  ${pc4.dim("\u270E")} updated index.astro (${name})`);
+          }
         }
-      }
-      writeFileSync5(indexPath, pageContent);
-      if (typedArgs.verbose) {
-        console.log(`  ${pc4.dim("\u270E")} updated index.astro`);
       }
     }
     console.log();
@@ -4350,8 +4604,8 @@ function resolveDependencies2(blockName, installedNames, manifests) {
 // src/cli/commands/remove.ts
 import { defineCommand as defineCommand3 } from "citty";
 import pc5 from "picocolors";
-import { readFileSync as readFileSync6, writeFileSync as writeFileSync6, existsSync as existsSync5, unlinkSync, readdirSync as readdirSync3, rmdirSync } from "fs";
-import { join as join8, dirname as dirname4 } from "path";
+import { readFileSync as readFileSync7, writeFileSync as writeFileSync6, existsSync as existsSync6, unlinkSync, readdirSync as readdirSync3, rmdirSync } from "fs";
+import { join as join9, dirname as dirname4 } from "path";
 var removeCommand = defineCommand3({
   meta: {
     name: "remove",
@@ -4382,14 +4636,14 @@ var removeCommand = defineCommand3({
   async run({ args: args2 }) {
     const typedArgs = args2;
     const cwd = process.cwd();
-    const manifestPath = join8(cwd, "fornix.json");
-    if (!existsSync5(manifestPath)) {
+    const manifestPath = join9(cwd, "fornix.json");
+    if (!existsSync6(manifestPath)) {
       console.error(
         pc5.red("\u2717 No fornix.json found. Are you in a Fornix project?")
       );
       process.exit(1);
     }
-    const manifestRaw = readFileSync6(manifestPath, "utf-8");
+    const manifestRaw = readFileSync7(manifestPath, "utf-8");
     const manifest2 = JSON.parse(manifestRaw);
     const registryResult = await fetchRegistryIndex();
     if (!isOk(registryResult)) {
@@ -4422,8 +4676,8 @@ var removeCommand = defineCommand3({
     const filesToRemove = [];
     if (blockManifest) {
       for (const file of blockManifest.files) {
-        const filePath = join8(cwd, file.destination);
-        if (existsSync5(filePath)) {
+        const filePath = join9(cwd, file.destination);
+        if (existsSync6(filePath)) {
           filesToRemove.push(filePath);
         }
       }
@@ -4446,14 +4700,15 @@ var removeCommand = defineCommand3({
     }
     manifest2.blocks = manifest2.blocks.filter((b) => b.name !== blockName);
     writeFileSync6(manifestPath, JSON.stringify(manifest2, null, 2) + "\n");
-    const indexPath = join8(cwd, "src/pages/index.astro");
-    if (existsSync5(indexPath)) {
-      const original = readFileSync6(indexPath, "utf-8");
+    const targetFile = isLayoutBlock(blockName, cwd) ? join9(cwd, "src/layouts/Layout.astro") : join9(cwd, "src/pages/index.astro");
+    const targetLabel = isLayoutBlock(blockName, cwd) ? "Layout.astro" : "index.astro";
+    if (existsSync6(targetFile)) {
+      const original = readFileSync7(targetFile, "utf-8");
       const updated = removeBlockFromPage(original, blockName);
       if (updated !== original) {
-        writeFileSync6(indexPath, updated);
+        writeFileSync6(targetFile, updated);
         if (typedArgs.verbose) {
-          console.log(`  ${pc5.dim("\u270E")} updated index.astro`);
+          console.log(`  ${pc5.dim("\u270E")} updated ${targetLabel}`);
         }
       }
     }
@@ -4628,8 +4883,8 @@ function printFormatted(blocks, verbose) {
 // src/cli/commands/status.ts
 import { defineCommand as defineCommand5 } from "citty";
 import pc7 from "picocolors";
-import { readFileSync as readFileSync7, existsSync as existsSync6 } from "fs";
-import { join as join9 } from "path";
+import { readFileSync as readFileSync8, existsSync as existsSync7 } from "fs";
+import { join as join10 } from "path";
 var statusCommand = defineCommand5({
   meta: {
     name: "status",
@@ -4650,8 +4905,8 @@ var statusCommand = defineCommand5({
   run({ args: args2 }) {
     const typedArgs = args2;
     const cwd = process.cwd();
-    const manifestPath = join9(cwd, "fornix.json");
-    if (!existsSync6(manifestPath)) {
+    const manifestPath = join10(cwd, "fornix.json");
+    if (!existsSync7(manifestPath)) {
       console.error(
         pc7.red("\u2717 No fornix.json found in the current directory.")
       );
@@ -4664,7 +4919,7 @@ var statusCommand = defineCommand5({
     }
     let manifest2;
     try {
-      const raw = readFileSync7(manifestPath, "utf-8");
+      const raw = readFileSync8(manifestPath, "utf-8");
       manifest2 = JSON.parse(raw);
     } catch {
       console.error(pc7.red("\u2717 Failed to parse fornix.json."));
@@ -4745,8 +5000,8 @@ function printStatus(manifest2, verbose) {
 // src/cli/commands/doctor.ts
 import { defineCommand as defineCommand6 } from "citty";
 import pc8 from "picocolors";
-import { readFileSync as readFileSync8, existsSync as existsSync7 } from "fs";
-import { join as join10 } from "path";
+import { readFileSync as readFileSync9, existsSync as existsSync8 } from "fs";
+import { join as join11 } from "path";
 var doctorCommand = defineCommand6({
   meta: {
     name: "doctor",
@@ -4761,7 +5016,7 @@ var doctorCommand = defineCommand6({
   },
   async run({ args: args2 }) {
     const cwd = process.cwd();
-    const manifestPath = join10(cwd, "fornix.json");
+    const manifestPath = join11(cwd, "fornix.json");
     let hasErrors = false;
     const errors = [];
     function reportError(msg) {
@@ -4771,7 +5026,7 @@ var doctorCommand = defineCommand6({
         console.error(pc8.red(`\u2717 ${msg}`));
       }
     }
-    if (!existsSync7(manifestPath)) {
+    if (!existsSync8(manifestPath)) {
       reportError("No fornix.json found in the current directory.");
       if (args2.json) {
         console.log(JSON.stringify({ healthy: false, errors }));
@@ -4780,7 +5035,7 @@ var doctorCommand = defineCommand6({
     }
     let manifest2;
     try {
-      const raw = readFileSync8(manifestPath, "utf-8");
+      const raw = readFileSync9(manifestPath, "utf-8");
       manifest2 = JSON.parse(raw);
     } catch {
       reportError("Failed to parse fornix.json.");
@@ -4806,8 +5061,8 @@ var doctorCommand = defineCommand6({
       const bManifest = manifests[block.name];
       if (bManifest) {
         for (const file of bManifest.files) {
-          const filePath = join10(cwd, file.destination);
-          if (!existsSync7(filePath)) {
+          const filePath = join11(cwd, file.destination);
+          if (!existsSync8(filePath)) {
             reportError(`Missing expected file for installed block '${block.name}': ${file.destination}`);
           }
         }
@@ -4816,7 +5071,7 @@ var doctorCommand = defineCommand6({
     for (const [name, bManifest] of Object.entries(manifests)) {
       if (!installedBlocks.has(name)) {
         const foundOrphaned = bManifest.files.some((file) => {
-          return existsSync7(join10(cwd, file.destination));
+          return existsSync8(join11(cwd, file.destination));
         });
         if (foundOrphaned) {
           reportError(`Orphaned block files detected for '${name}'. The block is not in fornix.json.`);
@@ -4840,14 +5095,14 @@ var doctorCommand = defineCommand6({
           if (locale !== "") {
             pathFragment = `src/content/${locale}/${subdirectory}/${bManifest.name}.json`;
           }
-          if (!existsSync7(join10(cwd, pathFragment))) {
+          if (!existsSync8(join11(cwd, pathFragment))) {
             missingContentFiles.push(pathFragment);
           }
         }
       }
     }
     if (requiresContentConfig) {
-      if (!existsSync7(join10(cwd, "src/content/config.ts"))) {
+      if (!existsSync8(join11(cwd, "src/content/config.ts"))) {
         reportError("Missing expected file: src/content/config.ts");
       }
     }
@@ -4938,19 +5193,19 @@ async function listBlocksHandler(args2) {
 }
 
 // src/mcp/tools/add-block.ts
-import { readFileSync as readFileSync9, writeFileSync as writeFileSync7, existsSync as existsSync8, mkdirSync as mkdirSync6 } from "fs";
-import { join as join11, dirname as dirname5 } from "path";
+import { readFileSync as readFileSync10, writeFileSync as writeFileSync7, existsSync as existsSync9, mkdirSync as mkdirSync6 } from "fs";
+import { join as join12, dirname as dirname5 } from "path";
 async function addBlock2(input) {
   const { name, variant = "default", projectDirectory } = input;
-  const manifestPath = join11(projectDirectory, "fornix.json");
-  if (!existsSync8(manifestPath)) {
+  const manifestPath = join12(projectDirectory, "fornix.json");
+  if (!existsSync9(manifestPath)) {
     return err(
       new Error("No fornix.json found. Not a Fornix project directory.")
     );
   }
   let manifest2;
   try {
-    const raw = readFileSync9(manifestPath, "utf-8");
+    const raw = readFileSync10(manifestPath, "utf-8");
     manifest2 = JSON.parse(raw);
   } catch {
     return err(new Error("Failed to parse fornix.json."));
@@ -5002,7 +5257,7 @@ async function addBlock2(input) {
           )
         );
       }
-      const filePath = join11(projectDirectory, file.destination);
+      const filePath = join12(projectDirectory, file.destination);
       mkdirSync6(dirname5(filePath), { recursive: true });
       writeFileSync7(filePath, content);
       filesCreated++;
@@ -5041,25 +5296,25 @@ function resolveDependencies3(blockName, installedNames, manifests) {
 
 // src/mcp/tools/remove-block.ts
 import {
-  readFileSync as readFileSync10,
+  readFileSync as readFileSync11,
   writeFileSync as writeFileSync8,
-  existsSync as existsSync9,
+  existsSync as existsSync10,
   unlinkSync as unlinkSync2,
   readdirSync as readdirSync4,
   rmdirSync as rmdirSync2
 } from "fs";
-import { join as join12, dirname as dirname6 } from "path";
+import { join as join13, dirname as dirname6 } from "path";
 async function removeBlock(input) {
   const { name, force = false, projectDirectory } = input;
-  const manifestPath = join12(projectDirectory, "fornix.json");
-  if (!existsSync9(manifestPath)) {
+  const manifestPath = join13(projectDirectory, "fornix.json");
+  if (!existsSync10(manifestPath)) {
     return err(
       new Error("No fornix.json found. Not a Fornix project directory.")
     );
   }
   let manifest2;
   try {
-    const raw = readFileSync10(manifestPath, "utf-8");
+    const raw = readFileSync11(manifestPath, "utf-8");
     manifest2 = JSON.parse(raw);
   } catch {
     return err(new Error("Failed to parse fornix.json."));
@@ -5085,8 +5340,8 @@ async function removeBlock(input) {
   const filesToRemove = [];
   if (blockManifest) {
     for (const file of blockManifest.files) {
-      const filePath = join12(projectDirectory, file.destination);
-      if (existsSync9(filePath)) {
+      const filePath = join13(projectDirectory, file.destination);
+      if (existsSync10(filePath)) {
         filesToRemove.push(filePath);
       }
     }
@@ -5218,17 +5473,17 @@ function zodTypeForSlot(slotType) {
 }
 
 // src/mcp/tools/get-project-status.ts
-import { readFileSync as readFileSync11, existsSync as existsSync10 } from "fs";
-import { join as join13 } from "path";
+import { readFileSync as readFileSync12, existsSync as existsSync11 } from "fs";
+import { join as join14 } from "path";
 function getProjectStatus(input) {
-  const manifestPath = join13(input.projectDirectory, "fornix.json");
-  if (!existsSync10(manifestPath)) {
+  const manifestPath = join14(input.projectDirectory, "fornix.json");
+  if (!existsSync11(manifestPath)) {
     return err(
       new Error("No fornix.json found. Not a Fornix project directory.")
     );
   }
   try {
-    const raw = readFileSync11(manifestPath, "utf-8");
+    const raw = readFileSync12(manifestPath, "utf-8");
     const manifest2 = JSON.parse(raw);
     const blocks = manifest2.blocks;
     return ok({
@@ -5251,7 +5506,7 @@ function getProjectStatus(input) {
 
 // src/mcp/tools/scaffold-project.ts
 import { mkdirSync as mkdirSync7, writeFileSync as writeFileSync9 } from "fs";
-import { join as join14, basename as basename3 } from "path";
+import { join as join15, basename as basename3 } from "path";
 var DEFAULT_COLORS2 = {
   primary: "#6366f1",
   secondary: "#818cf8",
@@ -5322,8 +5577,8 @@ async function scaffoldProject(input) {
   const files = result.value.files;
   let filesCreated = 0;
   for (const [relativePath, content] of Object.entries(files)) {
-    const fullPath = join14(projectDirectory, relativePath);
-    const parentDirectory = join14(fullPath, "..");
+    const fullPath = join15(projectDirectory, relativePath);
+    const parentDirectory = join15(fullPath, "..");
     mkdirSync7(parentDirectory, { recursive: true });
     writeFileSync9(fullPath, content, "utf-8");
     filesCreated++;