From f4d1d7e20163f093c6fc2f528887ddf96862457d Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Thu, 23 Apr 2026 21:00:00 +0000
Subject: [PATCH 1/2] Fix block schema errors and add MDI icon cache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- section-header: replace invalid title/subtitle fields with intro (markdown)
- contact.md: fix contact_form → contact-form type name
- home.md + gallery.md: remove unsupported full_width field from video-background and image-background blocks
- Add MDI icon SVGs to local cache (ferris-wheel, rotate-3d-variant, music-note, tune-variant, shield-check) to avoid runtime API fetches

https://claude.ai/code/session_01JEo9nCdhXJ5GYaeMvNMixX
---
 pages/contact.md                              |  8 ++++---
 pages/gallery.md                              | 23 ++++++++++---------
 pages/home.md                                 |  8 +++----
 src/assets/icons/iconify/mdi/ferris-wheel.svg |  1 +
 src/assets/icons/iconify/mdi/music-note.svg   |  1 +
 .../icons/iconify/mdi/rotate-3d-variant.svg   |  1 +
 src/assets/icons/iconify/mdi/shield-check.svg |  1 +
 src/assets/icons/iconify/mdi/tune-variant.svg |  1 +
 8 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 src/assets/icons/iconify/mdi/ferris-wheel.svg
 create mode 100644 src/assets/icons/iconify/mdi/music-note.svg
 create mode 100644 src/assets/icons/iconify/mdi/rotate-3d-variant.svg
 create mode 100644 src/assets/icons/iconify/mdi/shield-check.svg
 create mode 100644 src/assets/icons/iconify/mdi/tune-variant.svg

diff --git a/pages/contact.md b/pages/contact.md
index 56f7113..b781144 100644
--- a/pages/contact.md
+++ b/pages/contact.md
@@ -8,10 +8,12 @@ eleventyNavigation:
   order: 2
 blocks:
   - type: section-header
-    title: "Get in Touch"
-    subtitle: "Want to book EnteR 6.0 for your event? Have questions about the ride? Drop us a message."
+    intro: |
+      ## Get in Touch
 
-  - type: contact_form
+      Want to book EnteR 6.0 for your event? Have questions about the ride? Drop us a message.
+
+  - type: contact-form
     content: |
       ## Book EnteR 6.0
 
diff --git a/pages/gallery.md b/pages/gallery.md
index 368272a..6e31e42 100644
--- a/pages/gallery.md
+++ b/pages/gallery.md
@@ -8,7 +8,6 @@ meta_title: "Gallery - EnteR 6.0"
 meta_description: "Photos and videos of the EnteR 6.0 Extreme fairground ride."
 blocks:
   - type: video-background
-    full_width: true
     video_id: "fOdSi9Uaxds"
     content: |
       # Gallery
@@ -17,14 +16,15 @@ blocks:
     video_title: "EnteR 6.0 Gallery"
 
   - type: image-background
-    full_width: true
     image: "src/images/IMG_2835.jpeg"
     image_alt: "EnteR 6.0 sound system full setup"
     content: " "
 
   - type: section-header
-    title: "THE SYSTEM"
-    subtitle: "Built for the road. Designed for impact."
+    intro: |
+      ## THE SYSTEM
+
+      Built for the road. Designed for impact.
 
   - type: image-cards
     image_aspect_ratio: "4/3"
@@ -40,14 +40,15 @@ blocks:
         description: "Mid and top end cabinets ready for deployment."
 
   - type: image-background
-    full_width: true
     image: "src/images/IMG_2860.jpeg"
     image_alt: "EnteR 6.0 panoramic view"
     content: " "
 
   - type: section-header
-    title: "ON THE ROAD"
-    subtitle: "From build to showground"
+    intro: |
+      ## ON THE ROAD
+
+      From build to showground
 
   - type: image-cards
     image_aspect_ratio: "4/3"
@@ -66,14 +67,15 @@ blocks:
         description: "System assembly on the ground."
 
   - type: image-background
-    full_width: true
     image: "src/images/IMG_2819.jpeg"
     image_alt: "EnteR 6.0 system close-up"
     content: " "
 
   - type: section-header
-    title: "THE DETAILS"
-    subtitle: "Every component purpose-built"
+    intro: |
+      ## THE DETAILS
+
+      Every component purpose-built
 
   - type: image-cards
     image_aspect_ratio: "1/1"
@@ -99,7 +101,6 @@ blocks:
         description: "Maximum output at the fair."
 
   - type: image-background
-    full_width: true
     image: "src/images/IMG_0808.jpeg"
     image_alt: "EnteR 6.0 system detail"
     content: " "
diff --git a/pages/home.md b/pages/home.md
index 7b19e18..2196373 100644
--- a/pages/home.md
+++ b/pages/home.md
@@ -6,15 +6,16 @@ eleventyNavigation:
   order: 1
 blocks:
   - type: video-background
-    full_width: true
     video_id: "https://iframe.mediadelivery.net/embed/588034/72c13f1f-5200-4268-9061-0f45809df741?autoplay=true&loop=true&muted=true&preload=true&responsive=true"
     content: |
       ![Enter 6.0](/assets/logo.png)
     video_title: "EnteR 6.0 Extreme Ride"
 
   - type: section-header
-    title: "THE EXTREME"
-    subtitle: "Redefining the limits of excitement"
+    intro: |
+      ## THE EXTREME
+
+      Redefining the limits of excitement
 
   - type: features
     items:
@@ -35,7 +36,6 @@ blocks:
         description: "Manufactured in the UK by Tivoli Enterprises. Dual hydraulic and mechanical locking on every seat, continuously monitored by the onboard computer. Thorough daily inspections carried out and recorded."
 
   - type: video-background
-    full_width: true
     video_id: "https://iframe.mediadelivery.net/embed/588034/a79f990b-d7d7-4bd0-a7e3-af2c875b1580?autoplay=true&loop=true&muted=true&preload=true&responsive=true"
     content: |
       ## Coming to a fair near you
diff --git a/src/assets/icons/iconify/mdi/ferris-wheel.svg b/src/assets/icons/iconify/mdi/ferris-wheel.svg
new file mode 100644
index 0000000..32ed0f6
--- /dev/null
+++ b/src/assets/icons/iconify/mdi/ferris-wheel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-ferris-wheel" viewBox="0 0 24 24"><path d="M12,19C12.86,19 13.59,19.54 13.87,20.29C14.42,20.17 14.95,20 15.46,19.77L13.7,15.62C13.18,15.87 12.61,16 12,16C11.39,16 10.82,15.87 10.3,15.62L8.54,19.77C9.05,20 9.58,20.17 10.13,20.29C10.41,19.54 11.14,19 12,19M18.25,17.76C18,17.42 17.81,17 17.81,16.5C17.81,15.41 18.71,14.5 19.81,14.5L20.12,14.53C20.37,13.73 20.5,12.88 20.5,12C20.5,11.12 20.37,10.27 20.12,9.5H19.81C18.7,9.5 17.81,8.61 17.81,7.5C17.81,7 17.97,6.59 18.25,6.24C17.1,5 15.59,4.09 13.87,3.71C13.59,4.46 12.86,5 12,5C11.14,5 10.41,4.46 10.13,3.71C8.41,4.09 6.9,5 5.75,6.24C6.03,6.59 6.2,7.03 6.2,7.5C6.2,8.61 5.3,9.5 4.2,9.5H3.88C3.63,10.28 3.5,11.12 3.5,12C3.5,12.89 3.64,13.74 3.89,14.55L4.2,14.5C5.31,14.5 6.2,15.42 6.2,16.5C6.2,17 6.04,17.43 5.76,17.77C6.08,18.12 6.44,18.44 6.81,18.73L8.71,14.27C8.26,13.62 8,12.84 8,12A4,4 0 0,1 12,8A4,4 0 0,1 16,12C16,12.84 15.74,13.62 15.29,14.27L17.19,18.73C17.57,18.44 17.92,18.11 18.25,17.76M12,23C11,23 10.16,22.26 10,21.29C9.37,21.16 8.75,20.95 8.15,20.69L7.17,23H5L6.41,19.68C5.88,19.3 5.39,18.86 4.96,18.37C4.72,18.47 4.47,18.5 4.2,18.5A2,2 0 0,1 2.2,16.5C2.2,15.88 2.5,15.32 2.97,14.95C2.66,14 2.5,13.03 2.5,12C2.5,11 2.66,10 2.96,9.08C2.5,8.71 2.2,8.15 2.2,7.5C2.2,6.41 3.09,5.5 4.2,5.5C4.46,5.5 4.71,5.56 4.93,5.65C6.25,4.18 8,3.13 10,2.71C10.16,1.74 11,1 12,1C13,1 13.84,1.74 14,2.71C16,3.13 17.74,4.18 19.06,5.64C19.29,5.55 19.54,5.5 19.81,5.5A2,2 0 0,1 21.81,7.5C21.81,8.14 21.5,8.71 21.04,9.07C21.34,10 21.5,11 21.5,12C21.5,13 21.34,14 21.04,14.93C21.5,15.3 21.81,15.87 21.81,16.5C21.81,17.62 20.92,18.5 19.81,18.5C19.54,18.5 19.29,18.46 19.05,18.36C18.61,18.85 18.12,19.29 17.59,19.68L19,23H16.83L15.85,20.69C15.25,20.95 14.63,21.16 14,21.29C13.84,22.26 13,23 12,23Z" /></svg>
\ No newline at end of file
diff --git a/src/assets/icons/iconify/mdi/music-note.svg b/src/assets/icons/iconify/mdi/music-note.svg
new file mode 100644
index 0000000..f902f29
--- /dev/null
+++ b/src/assets/icons/iconify/mdi/music-note.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-music-note" viewBox="0 0 24 24"><path d="M12 3V13.55C11.41 13.21 10.73 13 10 13C7.79 13 6 14.79 6 17S7.79 21 10 21 14 19.21 14 17V7H18V3H12Z" /></svg>
\ No newline at end of file
diff --git a/src/assets/icons/iconify/mdi/rotate-3d-variant.svg b/src/assets/icons/iconify/mdi/rotate-3d-variant.svg
new file mode 100644
index 0000000..d80ffe0
--- /dev/null
+++ b/src/assets/icons/iconify/mdi/rotate-3d-variant.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-rotate-3d-variant" viewBox="0 0 24 24"><path d="M12,5C16.97,5 21,7.69 21,11C21,12.68 19.96,14.2 18.29,15.29C19.36,14.42 20,13.32 20,12.13C20,9.29 16.42,7 12,7V10L8,6L12,2V5M12,19C7.03,19 3,16.31 3,13C3,11.32 4.04,9.8 5.71,8.71C4.64,9.58 4,10.68 4,11.88C4,14.71 7.58,17 12,17V14L16,18L12,22V19Z" /></svg>
\ No newline at end of file
diff --git a/src/assets/icons/iconify/mdi/shield-check.svg b/src/assets/icons/iconify/mdi/shield-check.svg
new file mode 100644
index 0000000..9ba4ee6
--- /dev/null
+++ b/src/assets/icons/iconify/mdi/shield-check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-shield-check" viewBox="0 0 24 24"><path d="M10,17L6,13L7.41,11.59L10,14.17L16.59,7.58L18,9M12,1L3,5V11C3,16.55 6.84,21.74 12,23C17.16,21.74 21,16.55 21,11V5L12,1Z" /></svg>
\ No newline at end of file
diff --git a/src/assets/icons/iconify/mdi/tune-variant.svg b/src/assets/icons/iconify/mdi/tune-variant.svg
new file mode 100644
index 0000000..fc2f662
--- /dev/null
+++ b/src/assets/icons/iconify/mdi/tune-variant.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-tune-variant" viewBox="0 0 24 24"><path d="M8 13C6.14 13 4.59 14.28 4.14 16H2V18H4.14C4.59 19.72 6.14 21 8 21S11.41 19.72 11.86 18H22V16H11.86C11.41 14.28 9.86 13 8 13M8 19C6.9 19 6 18.1 6 17C6 15.9 6.9 15 8 15S10 15.9 10 17C10 18.1 9.1 19 8 19M19.86 6C19.41 4.28 17.86 3 16 3S12.59 4.28 12.14 6H2V8H12.14C12.59 9.72 14.14 11 16 11S19.41 9.72 19.86 8H22V6H19.86M16 9C14.9 9 14 8.1 14 7C14 5.9 14.9 5 16 5S18 5.9 18 7C18 8.1 17.1 9 16 9Z" /></svg>
\ No newline at end of file

From dd76b4928fba3e626d3bc5fd07680dac4dacf8cd Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Thu, 23 Apr 2026 21:03:02 +0000
Subject: [PATCH 2/2] Sync scripts from chobble-client reference repo

- Replace rsync shell dependency with pure JS copyDir/mergeTemplateAndSource (fixes build on systems without rsync)
- Move templateExcludes/sourceExcludes to consts.js; add _site to sourceExcludes to prevent copying stale output into dev build
- Add new scripts: ci-merge.js, fetch-instagram-posts.js
- Update test.js: set PLACEHOLDER_IMAGES=1, sync js-toolkit from submodule if present
- Update update-pages.js: support copyLocalPageLayouts and --regenerate flag
- Update update-scripts.js: use copyDir instead of shell rsync

https://claude.ai/code/session_01JEo9nCdhXJ5GYaeMvNMixX
---
 scripts/ci-merge.js              |  26 +++++++
 scripts/consts.js                |  26 +++++++
 scripts/fetch-instagram-posts.js | 118 +++++++++++++++++++++++++++++++
 scripts/prepare-dev.js           |  57 +++++++--------
 scripts/test.js                  |  10 +++
 scripts/update-pages.js          |  55 ++++++++++----
 scripts/update-scripts.js        |  12 ++--
 scripts/utils.js                 | 107 +++++++++++++++++++++++-----
 8 files changed, 348 insertions(+), 63 deletions(-)
 create mode 100644 scripts/ci-merge.js
 create mode 100644 scripts/fetch-instagram-posts.js

diff --git a/scripts/ci-merge.js b/scripts/ci-merge.js
new file mode 100644
index 0000000..dd3a976
--- /dev/null
+++ b/scripts/ci-merge.js
@@ -0,0 +1,26 @@
+import { resolve } from "node:path";
+import { sourceExcludes, templateExcludes } from "./consts.js";
+import { fs, mergeTemplateAndSource } from "./utils.js";
+
+const [templateDir, sourceDir, combinedDir] = process.argv.slice(2);
+
+if (!templateDir || !sourceDir || !combinedDir) {
+  console.error(
+    "Usage: bun scripts/ci-merge.js <template> <source> <combined>",
+  );
+  process.exit(1);
+}
+
+const template = resolve(templateDir);
+const source = resolve(sourceDir);
+const combined = resolve(combinedDir);
+
+console.log(`Merging template and source into ${combined}...`);
+fs.mkdir(combined);
+mergeTemplateAndSource(template, source, combined, {
+  delete: true,
+  templateExcludes,
+  sourceExcludes,
+});
+
+console.log("Merge complete.");
diff --git a/scripts/consts.js b/scripts/consts.js
index b646d15..a16a03b 100644
--- a/scripts/consts.js
+++ b/scripts/consts.js
@@ -1,2 +1,28 @@
 export const templateRepo = "https://github.com/chobbledotcom/chobble-template";
 export const buildDir = ".build";
+
+export const templateExcludes = [
+  ".git",
+  ".direnv",
+  "node_modules",
+  "*.md",
+  "test",
+  "test-*",
+  ".image-cache",
+  "images",
+  "landing-pages",
+  "instagram-posts",
+];
+
+export const sourceExcludes = [
+  ".*",
+  "*.nix",
+  "README.md",
+  "scripts",
+  "node_modules",
+  "package*.json",
+  "bun.lock",
+  "old_site",
+  "_site",
+  ...(process.env.PLACEHOLDER_IMAGES === "1" ? ["images"] : []),
+];
diff --git a/scripts/fetch-instagram-posts.js b/scripts/fetch-instagram-posts.js
new file mode 100644
index 0000000..70b6d6d
--- /dev/null
+++ b/scripts/fetch-instagram-posts.js
@@ -0,0 +1,118 @@
+#!/usr/bin/env bun
+
+import { join } from "node:path";
+import { exists, fs, loadEnv, path, readJson, write } from "./utils.js";
+
+await loadEnv();
+
+const CONFIG = {
+  siteConfig: path("_data", "site.json"),
+  postsDir: path("instagram-posts"),
+  imagesDir: path("images", "instagram-posts"),
+  actorId: "shu8hvrXbJbY3Eb9W",
+  resultsLimit: 100,
+};
+
+const formatTimestamp = (iso) =>
+  iso.replace(/[:.]/g, "-").replace(/-\d{3}Z$/, "Z");
+
+const extractUsername = (instagramUrl) => {
+  const match = instagramUrl.match(/instagram\.com\/([^/?#]+)/);
+  return match ? match[1] : null;
+};
+
+const fetchPosts = async (profileUrl) => {
+  const url = `https://api.apify.com/v2/acts/${CONFIG.actorId}/run-sync-get-dataset-items?token=${process.env.APIFY_API_TOKEN}`;
+
+  console.log(`Fetching posts for ${profileUrl}...`);
+
+  const res = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      directUrls: [profileUrl],
+      resultsType: "posts",
+      resultsLimit: CONFIG.resultsLimit,
+    }),
+  });
+
+  if (!res.ok) throw new Error(`HTTP ${res.status}: ${await res.text()}`);
+
+  const results = await res.json();
+  if (!Array.isArray(results)) throw new Error("Invalid API response format");
+
+  return results
+    .filter((p) => p.timestamp && p.displayUrl && p.url)
+    .map((p) => ({
+      date: p.timestamp,
+      title: p.caption || "",
+      url: p.url,
+      thumbnail: p.displayUrl,
+    }));
+};
+
+const downloadImage = async (imageUrl, filepath) => {
+  const res = await fetch(imageUrl);
+  if (!res.ok) throw new Error(`Image HTTP ${res.status} for ${imageUrl}`);
+  await write(filepath, await res.arrayBuffer());
+};
+
+const savePost = async (post) => {
+  const slug = formatTimestamp(post.date);
+  const jsonPath = join(CONFIG.postsDir, `${slug}.json`);
+  const imagePath = join(CONFIG.imagesDir, `${slug}.jpg`);
+
+  if (await exists(jsonPath)) return false;
+
+  await downloadImage(post.thumbnail, imagePath);
+
+  const record = {
+    thumbnail: `/images/instagram-posts/${slug}.jpg`,
+    title: post.title,
+    date: post.date,
+    url: post.url,
+  };
+
+  await write(jsonPath, `${JSON.stringify(record, null, 2)}\n`);
+  console.log(`${slug}.json`);
+  return true;
+};
+
+const main = async () => {
+  if (!process.env.APIFY_API_TOKEN) {
+    console.error("Error: APIFY_API_TOKEN required in .env file");
+    console.error("Get token: https://console.apify.com/account/integrations");
+    process.exit(1);
+  }
+
+  if (!(await exists(CONFIG.siteConfig))) {
+    console.error(`Error: ${CONFIG.siteConfig} not found`);
+    process.exit(1);
+  }
+
+  const siteConfig = await readJson(CONFIG.siteConfig);
+  const instagramUrl = siteConfig.socials?.Instagram;
+  if (!instagramUrl || !extractUsername(instagramUrl)) {
+    console.error("Error: socials.Instagram missing or invalid in site.json");
+    process.exit(1);
+  }
+
+  fs.mkdir(CONFIG.postsDir);
+  fs.mkdir(CONFIG.imagesDir);
+
+  const posts = await fetchPosts(instagramUrl);
+  console.log(`Found ${posts.length} posts`);
+
+  const saved = (await Promise.all(posts.map(savePost))).filter(Boolean).length;
+
+  console.log(
+    `\nSaved ${saved} new posts (${posts.length - saved} already existed)`,
+  );
+};
+
+if (import.meta.main) {
+  main().catch((err) => {
+    console.error("Error:", err.message);
+    process.exit(1);
+  });
+}
diff --git a/scripts/prepare-dev.js b/scripts/prepare-dev.js
index 3dbc965..6e9644a 100644
--- a/scripts/prepare-dev.js
+++ b/scripts/prepare-dev.js
@@ -1,41 +1,36 @@
 import { join } from "node:path";
-import { buildDir, templateRepo } from "./consts.js";
-import { bun, find, fs, git, path, root, rsync } from "./utils.js";
+import {
+  buildDir,
+  sourceExcludes,
+  templateExcludes,
+  templateRepo,
+} from "./consts.js";
+import {
+  bun,
+  copyDir,
+  find,
+  fs,
+  git,
+  mergeTemplateAndSource,
+  path,
+  root,
+} from "./utils.js";
 
 const build = path(buildDir);
 const template = path(buildDir, "template");
 const dev = path(buildDir, "dev");
 const localTemplate = join(root, "..", "chobble-template");
 
-const templateExcludes = [
-  ".git",
-  "node_modules",
-  "*.md",
-  "test",
-  "test-*",
-  ".image-cache",
-];
-const rootExcludes = [
-  ".git",
-  ".direnv",
-  "*.nix",
-  "README.md",
-  buildDir,
-  "scripts",
-  "node_modules",
-  "package*.json",
-  "bun.lock",
-  "old_site",
-  ...(process.env.PLACEHOLDER_IMAGES === "1" ? ["images"] : []),
-];
-
 export const prep = () => {
   console.log("Preparing build...");
   fs.mkdir(build);
 
   if (fs.exists(localTemplate)) {
     console.log("Using local template from ../chobble-template...");
-    rsync(localTemplate, template, { delete: true, exclude: [".git", "node_modules"] });
+    copyDir(localTemplate, template, {
+      delete: true,
+      exclude: templateExcludes,
+    });
   } else if (!fs.exists(join(template, ".git"))) {
     console.log("Cloning template...");
     fs.rm(template);
@@ -47,8 +42,11 @@ export const prep = () => {
   }
 
   find.deleteByExt(dev, ".md");
-  rsync(template, dev, { delete: true, exclude: templateExcludes });
-  rsync(root, join(dev, "src"), { exclude: rootExcludes });
+  mergeTemplateAndSource(template, root, dev, {
+    delete: true,
+    templateExcludes,
+    sourceExcludes,
+  });
 
   sync();
 
@@ -62,10 +60,9 @@ export const prep = () => {
 };
 
 export const sync = () => {
-  rsync(root, join(dev, "src"), {
+  copyDir(root, join(dev, "src"), {
     update: true,
-    exclude: rootExcludes,
-    include: ["*/", "**/*.md", "**/*.scss"],
+    exclude: sourceExcludes,
   });
 };
 
diff --git a/scripts/test.js b/scripts/test.js
index e98cd9c..d772356 100644
--- a/scripts/test.js
+++ b/scripts/test.js
@@ -1,9 +1,13 @@
 import { prep } from "./prepare-dev.js";
 import { bun, fs, path } from "./utils.js";
 
+process.env.PLACEHOLDER_IMAGES = "1";
+
 const templateTest = path(".build", "template", "test");
 const devTest = path(".build", "dev", "test");
 const dev = path(".build", "dev");
+const submoduleToolkit = path("chobble-template", "packages", "js-toolkit");
+const devToolkit = path(".build", "dev", "packages", "js-toolkit");
 
 prep();
 
@@ -13,5 +17,11 @@ if (fs.exists(templateTest)) {
   fs.cp(templateTest, devTest);
 }
 
+if (fs.exists(submoduleToolkit)) {
+  console.log("Syncing #toolkit from submodule...");
+  fs.rm(devToolkit);
+  fs.cp(submoduleToolkit, devToolkit);
+}
+
 console.log("Running tests...");
 bun.test(dev);
diff --git a/scripts/update-pages.js b/scripts/update-pages.js
index 02d4fe4..d5da78c 100644
--- a/scripts/update-pages.js
+++ b/scripts/update-pages.js
@@ -1,10 +1,30 @@
+import { cpSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { setupTemplate } from "./template-utils.js";
-import { bun, exists, fs, path, read, write } from "./utils.js";
+import { exists, fs, path, read, spawn, write } from "./utils.js";
 
 const TEMPLATE_RAW_URL =
   "https://raw.githubusercontent.com/chobbledotcom/chobble-template/refs/heads/main/.pages.yml";
 
+/**
+ * Copy local page-layout JSON files into the template's page-layouts directory.
+ * Skips silently if no local page-layouts directory exists.
+ */
+const copyLocalPageLayouts = (templatePageLayouts) => {
+  const localPageLayouts = path("_data", "page-layouts");
+  if (!fs.exists(localPageLayouts)) return;
+
+  const jsonFiles = readdirSync(localPageLayouts).filter((f) =>
+    f.endsWith(".json"),
+  );
+  for (const file of jsonFiles) {
+    cpSync(join(localPageLayouts, file), join(templatePageLayouts, file));
+  }
+  if (jsonFiles.length > 0) {
+    console.log(`Copied ${jsonFiles.length} local page-layout(s) to template`);
+  }
+};
+
 const fetchPages = async () => {
   console.log("Fetching .pages.yml from chobble-template...");
 
@@ -15,15 +35,16 @@ const fetchPages = async () => {
   console.log("Updated .pages.yml from chobble-template (with src/ removed)");
 };
 
-const customisePages = async () => {
+const customisePages = async ({ args = [] } = {}) => {
   const { tempDir, cleanup } = await setupTemplate({ mergeSite: false });
 
   try {
-    // Remove template's page-layouts to avoid interference with customisation
-    // (but keep an empty directory so pageLayouts.js doesn't fail)
+    // Remove template's page-layouts and replace with local ones (if any)
+    // so customise-cms uses our layouts, not the template defaults
     const templatePageLayouts = join(tempDir, "src", "_data", "page-layouts");
     fs.rm(templatePageLayouts);
     fs.mkdir(templatePageLayouts);
+    copyLocalPageLayouts(templatePageLayouts);
 
     // Copy local site.json and .pages.yml to the template so customise-cms uses them as defaults
     const localSiteJson = path("_data", "site.json");
@@ -47,9 +68,17 @@ const customisePages = async () => {
       );
     }
 
-    console.log("\nStarting CMS customisation TUI...\n");
+    const cmsArgs =
+      args.includes("--regenerate") || args.includes("-r")
+        ? ["--regenerate"]
+        : [];
+
+    console.log("\nStarting CMS customisation...\n");
 
-    const proc = bun.spawn("customise-cms", tempDir);
+    const proc = spawn(["bun", "run", "customise-cms", ...cmsArgs], {
+      cwd: tempDir,
+      shell: true,
+    });
     const code = await proc.exited;
 
     if (code !== 0) {
@@ -73,8 +102,8 @@ const customisePages = async () => {
   }
 };
 
-const updatePages = async ({ customise = false } = {}) =>
-  customise ? customisePages() : fetchPages();
+const updatePages = async ({ customise = false, args = [] } = {}) =>
+  customise ? customisePages({ args }) : fetchPages();
 
 if (import.meta.main) {
   const args = process.argv.slice(2);
@@ -83,18 +112,20 @@ if (import.meta.main) {
     console.log(`Usage: bun run update-pages [options]
 
 Options:
-  --customise, -c  Run the interactive CMS customisation TUI
-  --help, -h       Show this help message
+  --customise, -c    Run the interactive CMS customisation TUI
+  --regenerate, -r   Non-interactive: regenerate using saved site.json config
+  --help, -h         Show this help message
 
 Without options, fetches the latest .pages.yml from chobble-template.
 With --customise, clones chobble-template and runs the customise-cms TUI
-to let you select which collections to include.`);
+to let you select which collections to include.
+With --customise --regenerate, runs non-interactively using saved config.`);
     process.exit(0);
   }
 
   const customise = args.includes("--customise") || args.includes("-c");
 
-  updatePages({ customise }).catch((err) => {
+  updatePages({ customise, args }).catch((err) => {
     console.error("Error:", err.message);
     process.exit(1);
   });
diff --git a/scripts/update-scripts.js b/scripts/update-scripts.js
index 3d4f11f..9a0712f 100755
--- a/scripts/update-scripts.js
+++ b/scripts/update-scripts.js
@@ -6,10 +6,11 @@
  * without deleting any extra scripts we've added locally
  */
 
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
 import { $ } from "bun";
-import { mkdtemp, rm } from "fs/promises";
-import { tmpdir } from "os";
-import { dirname, join } from "path";
+import { copyDir } from "./utils.js";
 
 const REPO_URL = "https://github.com/chobbledotcom/chobble-client.git";
 const SCRIPT_DIR = dirname(import.meta.path);
@@ -28,8 +29,9 @@ async function main() {
 
     console.log("Copying scripts...");
 
-    // rsync: copy files, preserve structure, don't delete extras, exclude this script
-    await $`rsync -av --exclude='update-scripts.js' --exclude='update-scripts.sh' ${sourceDir}/ ${SCRIPT_DIR}/`;
+    copyDir(sourceDir, SCRIPT_DIR, {
+      exclude: ["update-scripts.js", "update-scripts.sh"],
+    });
 
     console.log("Done! Your local-only scripts have been preserved.");
   } catch (error) {
diff --git a/scripts/utils.js b/scripts/utils.js
index ff5facc..d550bef 100644
--- a/scripts/utils.js
+++ b/scripts/utils.js
@@ -1,4 +1,13 @@
-import { cpSync, existsSync, mkdirSync, renameSync, rmSync } from "node:fs";
+import {
+  chmodSync,
+  cpSync,
+  existsSync,
+  mkdirSync,
+  readdirSync,
+  renameSync,
+  rmSync,
+  statSync,
+} from "node:fs";
 import { extname, join, resolve } from "node:path";
 
 // Paths
@@ -50,21 +59,87 @@ export const git = {
     ]),
 };
 
-// Rsync commands
-const rsyncExcludes = (list) => list.flatMap((e) => ["--exclude", e]);
-const rsyncIncludes = (list) => list.flatMap((e) => ["--include", e]);
-
-export const rsync = (src, dest, opts = {}) =>
-  run([
-    "rsync",
-    "--recursive",
-    ...(opts.update ? ["--update"] : []),
-    ...(opts.delete ? ["--delete"] : []),
-    ...rsyncExcludes(opts.exclude || []),
-    ...rsyncIncludes(opts.include || []),
-    src.endsWith("/") ? src : `${src}/`,
-    dest.endsWith("/") ? dest : `${dest}/`,
-  ]);
+// Directory sync (replaces rsync)
+const globToRegex = (pattern) => {
+  const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&");
+  const globs = escaped
+    .replaceAll("**", "\0")
+    .replaceAll("*", "[^/]*")
+    .replaceAll("\0", ".*");
+  return new RegExp(`^${globs}$`);
+};
+
+const isExcluded = (name, relPath, excludes) =>
+  excludes.some((p) => {
+    const regex = globToRegex(p);
+    return regex.test(name) || regex.test(relPath);
+  });
+
+const isNewer = (srcPath, destPath) =>
+  !existsSync(destPath) ||
+  statSync(srcPath).mtimeMs > statSync(destPath).mtimeMs;
+
+const shouldCopy = (srcPath, destPath, update) =>
+  !update || isNewer(srcPath, destPath);
+
+const copyFile = (srcPath, destPath) => {
+  cpSync(srcPath, destPath);
+  chmodSync(destPath, statSync(srcPath).mode);
+};
+
+const entryRelPath = (relBase, name) => (relBase ? `${relBase}/${name}` : name);
+
+const copyRecursive = (src, dest, excludes, update, relBase = "") => {
+  mkdirSync(dest, { recursive: true });
+  for (const entry of readdirSync(src, { withFileTypes: true })) {
+    const relPath = entryRelPath(relBase, entry.name);
+    if (isExcluded(entry.name, relPath, excludes)) continue;
+    const srcPath = join(src, entry.name);
+    const destPath = join(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyRecursive(srcPath, destPath, excludes, update, relPath);
+    } else if (shouldCopy(srcPath, destPath, update)) {
+      copyFile(srcPath, destPath);
+    }
+  }
+};
+
+const removeIfMissing = (destPath, srcPath, relPath, excludes) => {
+  if (!existsSync(srcPath)) rmSync(destPath, { recursive: true, force: true });
+  else if (statSync(destPath).isDirectory())
+    deleteMissing(destPath, srcPath, relPath, excludes);
+};
+
+const deleteMissing = (dest, src, relBase, excludes) => {
+  if (!existsSync(dest)) return;
+  for (const entry of readdirSync(dest, { withFileTypes: true })) {
+    const relPath = entryRelPath(relBase, entry.name);
+    if (isExcluded(entry.name, relPath, excludes)) continue;
+    removeIfMissing(
+      join(dest, entry.name),
+      join(src, entry.name),
+      relPath,
+      excludes,
+    );
+  }
+};
+
+export const copyDir = (src, dest, opts = {}) => {
+  const excludes = opts.exclude || [];
+  if (opts.delete) deleteMissing(dest, src, "", excludes);
+  copyRecursive(src, dest, excludes, opts.update || false);
+};
+
+export const mergeTemplateAndSource = (template, source, dest, opts = {}) => {
+  copyDir(template, dest, {
+    delete: opts.delete,
+    exclude: opts.templateExcludes || [],
+  });
+  copyDir(source, join(dest, "src"), {
+    update: opts.update,
+    exclude: opts.sourceExcludes || [],
+  });
+};
 
 // Bun commands
 export const bun = {