@riverbankcms/sdk 0.8.1 → 0.9.0

package/dist/cli/index.js

@@ -2,7 +2,7 @@
 'use strict';
 
 var jiti = require('jiti');
-var path9 = require('path');
+var path2 = require('path');
 var fs6 = require('fs');
 var dotenv = require('dotenv');
 var commander = require('commander');
@@ -39,7 +39,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var path9__namespace = /*#__PURE__*/_interopNamespace(path9);
+var path2__namespace = /*#__PURE__*/_interopNamespace(path2);
 var fs6__namespace = /*#__PURE__*/_interopNamespace(fs6);
 var fs3__namespace = /*#__PURE__*/_interopNamespace(fs3);
 var readline__namespace = /*#__PURE__*/_interopNamespace(readline);
@@ -105,11 +105,11 @@ Create a riverbank.config.ts file or specify a path with --config`
 }
 function resolveConfigPath(configPath) {
   if (!configPath) {
-    return path9.resolve(process.cwd(), DEFAULT_CONFIG_FILENAME);
+    return path2.resolve(process.cwd(), DEFAULT_CONFIG_FILENAME);
   }
-  const resolved = path9.resolve(configPath);
+  const resolved = path2.resolve(configPath);
   if (fs6.existsSync(resolved) && !resolved.endsWith(".ts") && !resolved.endsWith(".js")) {
-    return path9.resolve(resolved, DEFAULT_CONFIG_FILENAME);
+    return path2.resolve(resolved, DEFAULT_CONFIG_FILENAME);
   }
   return resolved;
 }
@@ -141,7 +141,7 @@ function loadManifest(prebuildDir) {
   if (cachedManifest?.dir === prebuildDir) {
     return cachedManifest.manifest;
   }
-  const manifestPath = path9__namespace.join(prebuildDir, "manifest.json");
+  const manifestPath = path2__namespace.join(prebuildDir, "manifest.json");
   if (!fs6__namespace.existsSync(manifestPath)) {
     return null;
   }
@@ -155,7 +155,7 @@ function loadManifest(prebuildDir) {
   }
 }
 function loadJsonFile(prebuildDir, relativePath) {
-  const filePath = path9__namespace.join(prebuildDir, relativePath);
+  const filePath = path2__namespace.join(prebuildDir, relativePath);
   if (!fs6__namespace.existsSync(filePath)) {
     return null;
   }
@@ -338,6 +338,26 @@ var init_loader = __esm({
           prebuildAgeSec: getPrebuildAgeSec(manifest)
         };
       }
+      /**
+       * Load forms data from prebuild cache.
+       */
+      loadForms() {
+        const manifest = loadManifest(this.prebuildDir);
+        if (!manifest || isPrebuildExpired(manifest, this.maxPrebuildAgeSec)) {
+          return null;
+        }
+        const cacheFile = loadJsonFile(
+          this.prebuildDir,
+          "forms/forms.json"
+        );
+        if (!cacheFile) {
+          return null;
+        }
+        return {
+          data: cacheFile.forms,
+          prebuildAgeSec: getPrebuildAgeSec(manifest)
+        };
+      }
       /**
        * Get the manifest for inspection.
        */
@@ -745,6 +765,245 @@ zod.z.object({
   tags: zod.z.array(zod.z.string()).optional(),
   icon: zod.z.string().optional()
 });
+var TipTapNodeSchema = zod.z.lazy(
+  () => zod.z.object({
+    type: zod.z.string(),
+    content: zod.z.array(TipTapNodeSchema).optional(),
+    text: zod.z.string().optional(),
+    attrs: zod.z.record(zod.z.string(), zod.z.any()).optional(),
+    marks: zod.z.array(zod.z.any()).optional()
+  })
+);
+var RichTextValueSchema = zod.z.union([
+  // New format: TipTap document directly
+  TipTapNodeSchema,
+  // Legacy format: wrapped in { doc: {...} }
+  zod.z.object({
+    doc: TipTapNodeSchema
+  })
+]);
+function buildRichTextSchema(options) {
+  let schema = RichTextValueSchema;
+  return schema;
+}
+
+// ../blocks/src/system/manifest/validation.ts
+function createManifestValidator(manifestOrFields, options = {}) {
+  const allowNull = options.allowNull ?? true;
+  const allowIncomplete = options.allowIncomplete ?? false;
+  const shape = {};
+  const fields4 = Array.isArray(manifestOrFields) ? manifestOrFields : manifestOrFields.fields ?? [];
+  for (const field of fields4) {
+    shape[field.id] = buildFieldSchema(field, allowNull, allowIncomplete);
+  }
+  return zod.z.object(shape).catchall(zod.z.unknown()).passthrough();
+}
+function buildFieldSchema(field, allowNull, allowIncomplete = false) {
+  const required = Boolean(field.required);
+  let schema;
+  switch (field.type) {
+    case "text":
+      schema = buildTextSchema(field);
+      break;
+    case "richText":
+      schema = buildRichTextSchema2();
+      break;
+    case "media": {
+      const baseMediaSchema = zod.z.record(zod.z.string(), zod.z.unknown());
+      const isRequired = Boolean(field.required);
+      schema = isRequired ? baseMediaSchema : baseMediaSchema.nullable();
+      break;
+    }
+    case "boolean":
+      schema = zod.z.boolean();
+      break;
+    case "slug":
+      schema = buildSlugSchema(field);
+      break;
+    case "url":
+      schema = buildUrlSchema(field);
+      break;
+    case "link":
+      schema = buildLinkSchema();
+      break;
+    case "select":
+      schema = buildSelectSchema(field);
+      break;
+    case "reference":
+      schema = buildReferenceSchema(field);
+      break;
+    case "repeater":
+      schema = buildRepeaterSchema(field, allowNull, allowIncomplete);
+      break;
+    case "group":
+      schema = buildGroupSchema(field, allowNull, allowIncomplete);
+      break;
+    default:
+      schema = zod.z.unknown();
+      break;
+  }
+  return finalizeSchema(schema, required, allowNull, allowIncomplete);
+}
+function buildTextSchema(field) {
+  const ui = field?.ui ?? {};
+  const inputType = ui?.inputType;
+  let schema;
+  if (inputType === "number") {
+    schema = zod.z.coerce.number();
+    if (typeof ui?.min === "number") schema = schema.min(ui.min);
+    if (typeof ui?.max === "number") schema = schema.max(ui.max);
+  } else {
+    schema = zod.z.string();
+    if (inputType === "email") {
+      schema = schema.email(`${field.label} must be a valid email`);
+    }
+    if (inputType === "tel") {
+      const TEL_RE = /^[+()0-9\s\-]{3,}$/;
+      schema = schema.regex(TEL_RE, `${field.label} must be a valid phone number`);
+    }
+    if (ui?.pattern) {
+      try {
+        const re = new RegExp(ui.pattern);
+        schema = schema.regex(re, `${field.label} is not in the correct format`);
+      } catch {
+      }
+    }
+    if (field.maxLength) {
+      schema = schema.max(field.maxLength, `${field.label} must have at most ${field.maxLength} characters`);
+    }
+    if (field.required) {
+      schema = schema.min(1, `${field.label} is required`);
+    }
+  }
+  return schema;
+}
+function buildRichTextSchema2() {
+  return buildRichTextSchema();
+}
+var SLUG_PATTERN = /^(?:[a-z0-9]+(?:-[a-z0-9]+)*)(?:\/(?:[a-z0-9]+(?:-[a-z0-9]+)*))*$/;
+function buildSlugSchema(field) {
+  const message = `${field.label} must contain lowercase letters, numbers, and dashes`;
+  let schema = zod.z.string().regex(SLUG_PATTERN, message);
+  if (field.maxLength) {
+    schema = schema.max(field.maxLength, `${field.label} must be at most ${field.maxLength} characters`);
+  }
+  if (field.required) {
+    schema = schema.min(1, `${field.label} is required`);
+  }
+  return schema;
+}
+var ALLOWED_URL_PROTOCOLS = ["http:", "https:"];
+function buildUrlSchema(field) {
+  const message = `${field.label} must be a valid URL`;
+  const validate = (value) => {
+    if (!value) {
+      return !field.required;
+    }
+    if (field.allowRelative && value.startsWith("/")) {
+      return true;
+    }
+    try {
+      const parsed = new URL(value);
+      return ALLOWED_URL_PROTOCOLS.includes(parsed.protocol);
+    } catch {
+      return false;
+    }
+  };
+  let schema = zod.z.string().trim().refine(validate, message);
+  if (field.required) {
+    schema = schema.min(1, `${field.label} is required`);
+  }
+  return schema;
+}
+function buildLinkSchema() {
+  const nullableString = zod.z.union([zod.z.string().min(1), zod.z.null()]);
+  const internal = zod.z.object({
+    kind: zod.z.literal("internal"),
+    routeId: zod.z.string().min(1),
+    entityId: zod.z.string().min(1).optional(),
+    entityType: zod.z.enum(["page", "content"]).optional(),
+    href: nullableString.optional(),
+    title: nullableString.optional(),
+    typeLabel: nullableString.optional(),
+    contentTypeKey: nullableString.optional(),
+    contentTypeName: nullableString.optional(),
+    updatedAt: nullableString.optional()
+  }).passthrough();
+  const external = zod.z.object({
+    kind: zod.z.literal("external"),
+    href: zod.z.string().min(1)
+  }).passthrough();
+  const custom = zod.z.object({
+    kind: zod.z.literal("url"),
+    href: zod.z.string().min(1)
+  }).passthrough();
+  return zod.z.union([internal, external, custom]);
+}
+function buildSelectSchema(field) {
+  const ui = field.ui;
+  if (ui?.widget === "sdkSelect") {
+    const anyStringSchema = zod.z.string();
+    if (field.multiple) {
+      const arraySchema = zod.z.array(anyStringSchema);
+      return field.required ? arraySchema : arraySchema.nullable();
+    }
+    return field.required ? anyStringSchema : anyStringSchema.nullable();
+  }
+  const values = field.options.map((option) => option.value);
+  const valueSchema = zod.z.string().refine((value) => values.includes(value), `${field.label} must be one of: ${values.join(", ")}`);
+  if (field.multiple) {
+    const arraySchema = zod.z.array(valueSchema);
+    return field.required ? arraySchema : arraySchema.nullable();
+  }
+  return field.required ? valueSchema : valueSchema.nullable();
+}
+function buildReferenceSchema(field) {
+  let schema = zod.z.string();
+  if (field.required) {
+    schema = schema.min(1, `${field.label} is required`);
+  }
+  return schema;
+}
+function buildRepeaterSchema(field, allowNull, allowIncomplete) {
+  const parsed = fieldSchema.array().parse(field.schema?.fields ?? []);
+  const childShape = {};
+  for (const child of parsed) {
+    if (child.type === "group" && child.ui?.flattenInRepeater) {
+      const groupParsed = fieldSchema.array().parse(child.schema?.fields ?? []);
+      for (const gc of groupParsed) {
+        childShape[gc.id] = buildFieldSchema(gc, allowNull, allowIncomplete);
+      }
+    } else {
+      childShape[child.id] = buildFieldSchema(child, allowNull, allowIncomplete);
+    }
+  }
+  let schema = zod.z.object(childShape).catchall(zod.z.unknown()).passthrough();
+  let arraySchema = zod.z.array(schema);
+  if (typeof field.minItems === "number") {
+    arraySchema = arraySchema.min(field.minItems);
+  }
+  if (typeof field.maxItems === "number") {
+    arraySchema = arraySchema.max(field.maxItems);
+  }
+  return arraySchema;
+}
+function buildGroupSchema(field, allowNull, allowIncomplete) {
+  const parsed = fieldSchema.array().parse(field.schema?.fields ?? []);
+  const childShape = {};
+  for (const child of parsed) {
+    childShape[child.id] = buildFieldSchema(child, allowNull, allowIncomplete);
+  }
+  return zod.z.object(childShape).catchall(zod.z.unknown()).passthrough();
+}
+function finalizeSchema(schema, required, allowNull, allowIncomplete = false) {
+  if (required) {
+    if (allowIncomplete) {
+      return allowNull ? schema.or(zod.z.null()).optional() : schema.optional();
+    }
+    return allowNull ? schema.or(zod.z.null()) : schema;
+  }
+  return allowNull ? schema.optional().nullable() : schema.optional();
+}
 
 // ../blocks/src/utils/env.ts
 function isDevEnvironment() {
@@ -1984,7 +2243,7 @@ var formEmbedFragment = defineFragment({
   description: "Embeds a saved form with configurable submit button copy.",
   fields: [
     {
-      id: "formId",
+      id: "formSlug",
       type: "reference",
       label: "Form",
       description: "Pick a saved form to render.",
@@ -2020,7 +2279,7 @@ var formEmbedFragment = defineFragment({
     loader: {
       endpoint: "getPublicFormById",
       params: {
-        formId: { $bind: { from: "formId" } }
+        formSlug: { $bind: { from: "formSlug" } }
       },
       mode: "server"
     }
@@ -5866,7 +6125,7 @@ function createBlockOperations(http) {
     async reorder(pageIdentifier, blockIdentifiers) {
       await http.post(
         `/pages/${encodeURIComponent(pageIdentifier)}/blocks/reorder`,
-        { order: blockIdentifiers }
+        { identifiers: blockIdentifiers }
       );
     },
     async delete(pageIdentifier, blockIdentifier) {
@@ -5916,6 +6175,36 @@ function createSettingsOperations(http) {
   };
 }
 
+// src/client/management/forms.ts
+function createFormOperations(http) {
+  return {
+    async list() {
+      const result = await http.get("/forms");
+      return result.forms;
+    },
+    async get(slug) {
+      try {
+        const result = await http.get(
+          `/forms/${encodeURIComponent(slug)}`
+        );
+        return result.form;
+      } catch (error) {
+        if (is404Error(error)) {
+          return null;
+        }
+        throw error;
+      }
+    },
+    async upsert(input) {
+      const result = await http.post("/forms", input);
+      return result.form;
+    },
+    async delete(slug) {
+      await http.delete(`/forms/${encodeURIComponent(slug)}`);
+    }
+  };
+}
+
 // src/client/management/pull.ts
 function createPullOperations(http) {
   return {
@@ -5940,18 +6229,23 @@ function createPullOperations(http) {
     async settings() {
       return http.get("/pull/settings");
     },
+    async forms() {
+      return http.get("/pull/forms");
+    },
     async all() {
-      const [entriesResult, pagesResult, navigationResult, settingsResult] = await Promise.all([
+      const [entriesResult, pagesResult, navigationResult, settingsResult, formsResult] = await Promise.all([
         http.get("/pull/entries/all"),
         http.get("/pull/pages"),
         http.get("/pull/navigation"),
-        http.get("/pull/settings")
+        http.get("/pull/settings"),
+        http.get("/pull/forms")
       ]);
       return {
         entries: entriesResult?.entries || {},
         pages: pagesResult?.pages || [],
         navigation: navigationResult?.menus || [],
         settings: settingsResult?.settings || {},
+        forms: formsResult?.forms || [],
         meta: {
           pulledAt: (/* @__PURE__ */ new Date()).toISOString(),
           entries: entriesResult?.meta?.entries,
@@ -6129,6 +6423,7 @@ function createManagementClient(config3) {
     blocks: createBlockOperations(http),
     navigation: createNavigationOperations(http),
     settings: createSettingsOperations(http),
+    forms: createFormOperations(http),
     pull: createPullOperations(http),
     preview: createPreviewOperations(http),
     identifiers: createIdentifiersOperations(http),
@@ -6160,6 +6455,7 @@ function loadEnvironment(remote) {
   const siteId = requireEnv(`${prefix}_SITE_ID`);
   const dashboardUrl = requireEnv(`${prefix}_DASHBOARD_URL`);
   const managementApiKey = requireEnv(`${prefix}_MGMT_API_KEY`);
+  const apiKey = getEnv(`${prefix}_API_KEY`);
   const supabaseUrl = getEnv(`${prefix}_SUPABASE_URL`);
   if (!managementApiKey.startsWith("bld_mgmt_sk_")) {
     throw new Error(
@@ -6186,6 +6482,7 @@ function loadEnvironment(remote) {
     siteId,
     dashboardUrl,
     managementApiKey,
+    apiKey,
     supabaseUrl
   };
 }
@@ -6357,7 +6654,7 @@ function formatDateShort(isoDate) {
 }
 async function parseJsonData(options) {
   if (options.file) {
-    const filePath = path9__namespace.resolve(options.file);
+    const filePath = path2__namespace.resolve(options.file);
     const content = await fs3__namespace.readFile(filePath, "utf-8");
     return JSON.parse(content);
   }
@@ -6587,9 +6884,13 @@ async function pushToDashboard(output, dashboardUrl, siteId, apiKey, config3) {
     try {
       const errorBody = await response.json();
       if (errorBody.error) {
-        errorMessage = errorBody.error;
-        if (errorBody.details) {
-          errorMessage += ":\n" + errorBody.details.map((d) => `  - ${d.path}: ${d.message}`).join("\n");
+        if (typeof errorBody.error === "string") {
+          errorMessage = errorBody.error;
+        } else if (errorBody.error.message) {
+          errorMessage = errorBody.error.message;
+          if (errorBody.error.details?.fieldErrors) {
+            errorMessage += ":\n" + errorBody.error.details.fieldErrors.map((d) => `  - ${d.field}: ${d.message}`).join("\n");
+          }
         }
       }
     } catch {
@@ -6599,6 +6900,7 @@ async function pushToDashboard(output, dashboardUrl, siteId, apiKey, config3) {
 }
 async function pushConfigAction(output, options) {
   try {
+    process.env.RIVERBANK_ENV = options.isRemote ? "remote" : "local";
     const rawConfig = await loadConfigFile(options.config);
     output.info("Validating config...");
     const parseResult = riverbankSiteConfigSchema.safeParse(rawConfig);
@@ -6707,8 +7009,8 @@ async function writeJsonFile(filePath, data) {
   await fs3__namespace.writeFile(filePath, content, "utf-8");
 }
 async function writeEntries(contentDir, pulledEntries) {
-  const entriesDir = path9__namespace.join(contentDir, "entries");
-  const metaDir = path9__namespace.join(contentDir, ".meta");
+  const entriesDir = path2__namespace.join(contentDir, "entries");
+  const metaDir = path2__namespace.join(contentDir, ".meta");
   await ensureDir(entriesDir);
   await ensureDir(metaDir);
   const { contentType, entries, meta } = pulledEntries;
@@ -6716,21 +7018,21 @@ async function writeEntries(contentDir, pulledEntries) {
     contentType,
     entries: entries.map(mapEntryForOutput)
   };
-  const filePath = path9__namespace.join(entriesDir, `${contentType}.json`);
+  const filePath = path2__namespace.join(entriesDir, `${contentType}.json`);
   await writeJsonFile(filePath, entriesFile);
-  const metaPath = path9__namespace.join(metaDir, `${contentType}.json`);
+  const metaPath = path2__namespace.join(metaDir, `${contentType}.json`);
   await writeJsonFile(metaPath, meta);
   return { filePath, metaPath };
 }
 async function writePages(contentDir, pulledPages) {
-  const pagesDir = path9__namespace.join(contentDir, "pages");
-  const metaDir = path9__namespace.join(contentDir, ".meta");
+  const pagesDir = path2__namespace.join(contentDir, "pages");
+  const metaDir = path2__namespace.join(contentDir, ".meta");
   await ensureDir(pagesDir);
   await ensureDir(metaDir);
   const filePaths = [];
   const pagesMeta = {};
   for (const page of pulledPages.pages) {
-    const filePath = path9__namespace.join(pagesDir, `${page.identifier}.json`);
+    const filePath = path2__namespace.join(pagesDir, `${page.identifier}.json`);
     await writeJsonFile(filePath, page);
     filePaths.push(filePath);
     pagesMeta[page.identifier] = {
@@ -6738,7 +7040,7 @@ async function writePages(contentDir, pulledPages) {
       updatedAt: page.updatedAt
     };
   }
-  const metaPath = path9__namespace.join(metaDir, "pages.json");
+  const metaPath = path2__namespace.join(metaDir, "pages.json");
   await writeJsonFile(metaPath, {
     pulledAt: pulledPages.meta.pulledAt,
     pages: pagesMeta
@@ -6746,10 +7048,10 @@ async function writePages(contentDir, pulledPages) {
   return { filePaths, metaPath };
 }
 async function writeNavigation(contentDir, pulledNavigation) {
-  const metaDir = path9__namespace.join(contentDir, ".meta");
+  const metaDir = path2__namespace.join(contentDir, ".meta");
   await ensureDir(contentDir);
   await ensureDir(metaDir);
-  const filePath = path9__namespace.join(contentDir, "navigation.json");
+  const filePath = path2__namespace.join(contentDir, "navigation.json");
   const localNavigation = convertPulledNavigationToLocal(pulledNavigation.menus);
   await writeJsonFile(filePath, localNavigation);
   const menusMeta = {};
@@ -6759,7 +7061,7 @@ async function writeNavigation(contentDir, pulledNavigation) {
       updatedAt: menu.updatedAt
     };
   }
-  const metaPath = path9__namespace.join(metaDir, "navigation.json");
+  const metaPath = path2__namespace.join(metaDir, "navigation.json");
   await writeJsonFile(metaPath, {
     pulledAt: pulledNavigation.meta.pulledAt,
     menus: menusMeta
@@ -6768,16 +7070,44 @@ async function writeNavigation(contentDir, pulledNavigation) {
 }
 async function writeSettings(contentDir, pulledSettings) {
   await ensureDir(contentDir);
-  const filePath = path9__namespace.join(contentDir, "settings.json");
+  const filePath = path2__namespace.join(contentDir, "settings.json");
   await writeJsonFile(filePath, pulledSettings.settings);
   return filePath;
 }
+async function writeForms(contentDir, pulledForms) {
+  const formsDir = path2__namespace.join(contentDir, "forms");
+  const metaDir = path2__namespace.join(contentDir, ".meta");
+  await ensureDir(formsDir);
+  await ensureDir(metaDir);
+  const filePaths = [];
+  const formsMeta = {};
+  for (const form2 of pulledForms.forms) {
+    const filePath = path2__namespace.join(formsDir, `${form2.slug}.json`);
+    await writeJsonFile(filePath, {
+      slug: form2.slug,
+      name: form2.name,
+      schema: form2.schema,
+      settings: form2.settings ?? {}
+    });
+    filePaths.push(filePath);
+    formsMeta[form2.slug] = {
+      createdAt: form2.createdAt,
+      updatedAt: form2.updatedAt
+    };
+  }
+  const metaPath = path2__namespace.join(metaDir, "forms.json");
+  await writeJsonFile(metaPath, {
+    pulledAt: pulledForms.meta.pulledAt,
+    forms: formsMeta
+  });
+  return { filePaths, metaPath };
+}
 async function updateMetadataAfterPush(contentDir, remoteContent) {
-  const metaDir = path9__namespace.join(contentDir, ".meta");
+  const metaDir = path2__namespace.join(contentDir, ".meta");
   await ensureDir(metaDir);
   const now = (/* @__PURE__ */ new Date()).toISOString();
   for (const [contentType, entries] of Object.entries(remoteContent.entries)) {
-    const metaPath = path9__namespace.join(metaDir, `${contentType}.json`);
+    const metaPath = path2__namespace.join(metaDir, `${contentType}.json`);
     const entriesMeta = {};
     for (const entry of entries) {
       entriesMeta[entry.identifier] = {
@@ -6791,7 +7121,7 @@ async function updateMetadataAfterPush(contentDir, remoteContent) {
     });
   }
   if (remoteContent.pages.length > 0) {
-    const metaPath = path9__namespace.join(metaDir, "pages.json");
+    const metaPath = path2__namespace.join(metaDir, "pages.json");
     const pagesMeta = {};
     for (const page of remoteContent.pages) {
       pagesMeta[page.identifier] = {
@@ -6805,7 +7135,7 @@ async function updateMetadataAfterPush(contentDir, remoteContent) {
     });
   }
   if (remoteContent.navigation.length > 0) {
-    const metaPath = path9__namespace.join(metaDir, "navigation.json");
+    const metaPath = path2__namespace.join(metaDir, "navigation.json");
     const menusMeta = {};
     for (const menu of remoteContent.navigation) {
       menusMeta[menu.name] = {
@@ -6818,6 +7148,20 @@ async function updateMetadataAfterPush(contentDir, remoteContent) {
       menus: menusMeta
     });
   }
+  if (remoteContent.forms && remoteContent.forms.length > 0) {
+    const metaPath = path2__namespace.join(metaDir, "forms.json");
+    const formsMeta = {};
+    for (const form2 of remoteContent.forms) {
+      formsMeta[form2.slug] = {
+        createdAt: form2.createdAt,
+        updatedAt: form2.updatedAt
+      };
+    }
+    await writeJsonFile(metaPath, {
+      pulledAt: now,
+      forms: formsMeta
+    });
+  }
 }
 async function fileExists(filePath) {
   try {
@@ -6834,13 +7178,13 @@ async function readJsonFile(filePath) {
 async function listFiles(dirPath, extension) {
   try {
     const files = await fs3__namespace.readdir(dirPath);
-    return files.filter((f) => f.endsWith(extension)).map((f) => path9__namespace.join(dirPath, f));
+    return files.filter((f) => f.endsWith(extension)).map((f) => path2__namespace.join(dirPath, f));
   } catch {
     return [];
   }
 }
 async function readEntries(contentDir, contentType) {
-  const entriesDir = path9__namespace.join(contentDir, "entries");
+  const entriesDir = path2__namespace.join(contentDir, "entries");
   const result = /* @__PURE__ */ new Map();
   {
     const files = await listFiles(entriesDir, ".json");
@@ -6856,7 +7200,7 @@ async function readEntries(contentDir, contentType) {
   return result;
 }
 async function readPages(contentDir) {
-  const pagesDir = path9__namespace.join(contentDir, "pages");
+  const pagesDir = path2__namespace.join(contentDir, "pages");
   const pages = [];
   const files = await listFiles(pagesDir, ".json");
   for (const filePath of files) {
@@ -6870,27 +7214,42 @@ async function readPages(contentDir) {
   return pages;
 }
 async function readNavigation(contentDir) {
-  const filePath = path9__namespace.join(contentDir, "navigation.json");
+  const filePath = path2__namespace.join(contentDir, "navigation.json");
   if (!await fileExists(filePath)) {
     return null;
   }
   return readJsonFile(filePath);
 }
 async function readSettings(contentDir) {
-  const filePath = path9__namespace.join(contentDir, "settings.json");
+  const filePath = path2__namespace.join(contentDir, "settings.json");
   if (!await fileExists(filePath)) {
     return null;
   }
   return readJsonFile(filePath);
 }
+async function readForms(contentDir) {
+  const formsDir = path2__namespace.join(contentDir, "forms");
+  const forms = [];
+  const files = await listFiles(formsDir, ".json");
+  for (const filePath of files) {
+    try {
+      const form2 = await readJsonFile(filePath);
+      forms.push(form2);
+    } catch (error) {
+      console.warn(`Warning: Could not parse ${filePath}:`, error);
+    }
+  }
+  return forms;
+}
 async function readAllContent(contentDir) {
-  const [entries, pages, navigation, settings] = await Promise.all([
+  const [entries, pages, navigation, settings, forms] = await Promise.all([
     readEntries(contentDir),
     readPages(contentDir),
     readNavigation(contentDir),
-    readSettings(contentDir)
+    readSettings(contentDir),
+    readForms(contentDir)
   ]);
-  return { entries, pages, navigation, settings };
+  return { entries, pages, navigation, settings, forms };
 }
 async function contentDirExists(contentDir) {
   return fileExists(contentDir);
@@ -6910,11 +7269,13 @@ async function getContentSummary(contentDir) {
     pageCount: content.pages.length,
     hasNavigation: content.navigation !== null && content.navigation.menus.length > 0,
     menuCount: content.navigation?.menus.length ?? 0,
-    hasSettings: content.settings !== null
+    hasSettings: content.settings !== null,
+    hasForms: content.forms.length > 0,
+    formCount: content.forms.length
   };
 }
 async function readEntriesMeta(contentDir, contentType) {
-  const metaPath = path9__namespace.join(contentDir, ".meta", `${contentType}.json`);
+  const metaPath = path2__namespace.join(contentDir, ".meta", `${contentType}.json`);
   try {
     const content = await fs3__namespace.readFile(metaPath, "utf-8");
     return JSON.parse(content);
@@ -6926,12 +7287,12 @@ async function readEntriesMeta(contentDir, contentType) {
   }
 }
 async function readAllMeta(contentDir) {
-  const metaDir = path9__namespace.join(contentDir, ".meta");
+  const metaDir = path2__namespace.join(contentDir, ".meta");
   const metaMap = /* @__PURE__ */ new Map();
   try {
     const files = await fs3__namespace.readdir(metaDir);
     for (const file of files) {
-      if (file.endsWith(".json") && file !== "pages.json" && file !== "navigation.json") {
+      if (file.endsWith(".json") && file !== "pages.json" && file !== "navigation.json" && file !== "forms.json") {
         const contentType = file.replace(".json", "");
         const meta = await readEntriesMeta(contentDir, contentType);
         if (meta) metaMap.set(contentType, meta);
@@ -6943,7 +7304,7 @@ async function readAllMeta(contentDir) {
   return metaMap;
 }
 async function readPagesMeta(contentDir) {
-  const metaPath = path9__namespace.join(contentDir, ".meta", "pages.json");
+  const metaPath = path2__namespace.join(contentDir, ".meta", "pages.json");
   try {
     const content = await fs3__namespace.readFile(metaPath, "utf-8");
     return JSON.parse(content);
@@ -6955,7 +7316,19 @@ async function readPagesMeta(contentDir) {
   }
 }
 async function readNavigationMeta(contentDir) {
-  const metaPath = path9__namespace.join(contentDir, ".meta", "navigation.json");
+  const metaPath = path2__namespace.join(contentDir, ".meta", "navigation.json");
+  try {
+    const content = await fs3__namespace.readFile(metaPath, "utf-8");
+    return JSON.parse(content);
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return null;
+    }
+    throw error;
+  }
+}
+async function readFormsMeta(contentDir) {
+  const metaPath = path2__namespace.join(contentDir, ".meta", "forms.json");
   try {
     const content = await fs3__namespace.readFile(metaPath, "utf-8");
     return JSON.parse(content);
@@ -7067,397 +7440,71 @@ var DownloadError = class extends Error {
     this.name = "DownloadError";
   }
 };
-
-// src/cli/commands/pull.ts
-var DEFAULT_PAGE_LIMIT = 500;
-async function pullEntriesWithPagination(client, contentType, output) {
-  const allEntries = [];
-  const aggregatedMeta = {};
-  let page = 1;
-  let hasMore = true;
-  let pulledAt = (/* @__PURE__ */ new Date()).toISOString();
-  while (hasMore) {
-    const result = await client.pull.entries(contentType, {
-      page,
-      limit: DEFAULT_PAGE_LIMIT
-    });
-    allEntries.push(...result.entries);
-    if (result.meta.entries) {
-      Object.assign(aggregatedMeta, result.meta.entries);
-    }
-    pulledAt = result.meta.pulledAt;
-    hasMore = result.pagination.hasMore;
-    if (hasMore) {
-      output.info(`Fetched ${allEntries.length} entries (page ${page})...`);
+function findChangedFields(local, remote, prefix = "") {
+  const changes = [];
+  const allKeys = /* @__PURE__ */ new Set([...Object.keys(local), ...Object.keys(remote)]);
+  for (const key of allKeys) {
+    const path13 = prefix ? `${prefix}.${key}` : key;
+    const localVal = local[key];
+    const remoteVal = remote[key];
+    if (!equal__default.default(localVal, remoteVal)) {
+      changes.push(path13);
     }
-    page++;
   }
-  return {
-    contentType,
-    entries: allEntries,
-    meta: { pulledAt, entries: aggregatedMeta },
-    pagination: {
-      page: 1,
-      limit: allEntries.length,
-      total: allEntries.length,
-      hasMore: false
-    }
-  };
+  return changes;
 }
-async function writeAllEntries(contentDir, entriesByType, pulledAt, entriesMeta) {
-  let totalCount = 0;
-  const files = [];
-  for (const [contentType, entries] of Object.entries(entriesByType)) {
-    const ctMeta = {};
-    for (const entry of entries) {
-      const key = `${contentType}:${entry.identifier}`;
-      if (entriesMeta?.[key]) {
-        ctMeta[entry.identifier] = entriesMeta[key];
+function buildJsonDiff(diff, local, remote, mode) {
+  const summary = { creates: 0, updates: 0, deletes: 0 };
+  const changes = [];
+  const localPages = new Map(local.pages.map((page) => [page.identifier, page]));
+  const remotePages = new Map(remote.pages.map((page) => [page.identifier, page]));
+  const localEntries = local.entries;
+  const remoteEntries = remote.entries;
+  const localMenus = new Map((local.navigation?.menus ?? []).map((menu) => [menu.name, menu]));
+  const remoteMenus = new Map(remote.navigation.map((menu) => [menu.name, menu]));
+  const localForms = new Map(local.forms.map((form2) => [form2.slug, form2]));
+  const remoteForms = new Map(remote.forms.map((form2) => [form2.slug, form2]));
+  const addChange = (change) => {
+    if (change.operation === "create") summary.creates += 1;
+    if (change.operation === "update") summary.updates += 1;
+    if (change.operation === "delete") summary.deletes += 1;
+    changes.push(change);
+  };
+  for (const [contentType, entryDiffs] of diff.entries) {
+    for (const entryDiff of entryDiffs) {
+      if (entryDiff.type === "unchanged") continue;
+      if (entryDiff.type !== "create" && entryDiff.type !== "update") continue;
+      const identifier = `${contentType}/${entryDiff.identifier}`;
+      const localEntry = localEntries.get(contentType)?.find((entry) => entry.identifier === entryDiff.identifier);
+      const remoteEntry = remoteEntries[contentType]?.find((entry) => entry.identifier === entryDiff.identifier);
+      const change = {
+        type: "entry",
+        identifier,
+        operation: entryDiff.type
+      };
+      if (mode === "full") {
+        change.before = remoteEntry ?? null;
+        change.after = localEntry ?? null;
+        if (entryDiff.changes) change.diff = { changes: entryDiff.changes };
       }
+      addChange(change);
     }
-    const { filePath } = await writeEntries(contentDir, {
-      contentType,
-      entries,
-      meta: { pulledAt, entries: ctMeta },
-      pagination: { limit: entries.length, total: entries.length}
-    });
-    totalCount += entries.length;
-    files.push(filePath);
   }
-  return { totalCount, files };
-}
-async function fetchAllContentPaginated(client, contentTypes, output) {
-  const allEntries = {};
-  const allMeta = {};
-  for (const contentType of contentTypes) {
-    output.info(`Fetching ${contentType} entries...`);
-    const result = await pullEntriesWithPagination(client, contentType, output);
-    allEntries[contentType] = result.entries.map(mapEntryForOutput);
-    for (const [id, meta] of Object.entries(result.meta.entries || {})) {
-      allMeta[`${contentType}:${id}`] = meta;
-    }
-    output.info(`  ${result.entries.length} entries`);
-  }
-  output.info("Fetching pages...");
-  const pagesResult = await client.pull.pages();
-  output.info("Fetching navigation...");
-  const navigationResult = await client.pull.navigation();
-  output.info("Fetching settings...");
-  const settingsResult = await client.pull.settings();
-  return {
-    entries: allEntries,
-    pages: pagesResult.pages,
-    navigation: navigationResult.menus,
-    settings: settingsResult.settings,
-    meta: { pulledAt: (/* @__PURE__ */ new Date()).toISOString(), entries: allMeta }
-  };
-}
-async function syncMediaFiles(content, sourceSupabaseUrl, sourceSiteId, targetSiteId, targetClient, output) {
-  const mediaPaths = extractMediaPaths(content);
-  if (mediaPaths.size === 0) {
-    output.info("No media files found in content");
-    return;
-  }
-  output.info(`Found ${mediaPaths.size} media files to sync`);
-  let synced = 0;
-  let skipped = 0;
-  let failed = 0;
-  for (const relativePath of mediaPaths) {
-    const filename = relativePath.split("/").pop() ?? "file";
-    const targetPath = `sites/${targetSiteId}/${relativePath}`;
-    try {
-      const exists = await targetClient.media.exists(targetPath);
-      if (exists) {
-        skipped++;
-        continue;
-      }
-    } catch (error) {
-      if (process.env.DEBUG) {
-        const message = error instanceof Error ? error.message : "Unknown error";
-        console.warn(`[media-sync] Could not check if ${filename} exists: ${message}`);
-      }
-    }
-    const url = buildStorageUrl(sourceSupabaseUrl, relativePath, sourceSiteId);
-    const downloaded = await downloadMedia(url);
-    if (!downloaded) {
-      output.warn(`  Failed to download: ${filename}`);
-      failed++;
-      continue;
-    }
-    try {
-      await targetClient.media.upload({
-        data: downloaded.data,
-        filename,
-        contentType: downloaded.contentType,
-        storagePath: targetPath
-      });
-      synced++;
-    } catch (error) {
-      output.warn(`  Failed to upload: ${filename}`);
-      failed++;
-    }
-  }
-  output.info(`Media sync: ${synced} synced, ${skipped} skipped (already exist), ${failed} failed`);
-}
-var pullCommand = new commander.Command("pull").description("Pull content from CMS").argument("[scope]", "What to pull: entries, pages, navigation, settings, or all (default)").argument("[type]", 'Content type (when scope is "entries")').option("--output <dir>", "Output directory", "./content").option("--force", "Overwrite existing files without prompting").option("--yes", "Skip confirmation prompt (same as --force)").option("--sync-media", "Sync media files from source to target environment").addHelpText("after", `
-Examples:
-  $ riverbankcms pull                         # Pull all content
-  $ riverbankcms pull --remote                # Pull from production
-  $ riverbankcms pull --remote --sync-media   # Pull from production and sync media to local
-  $ riverbankcms pull entries                 # Pull all entries
-  $ riverbankcms pull entries blog-post       # Pull specific content type
-  $ riverbankcms pull pages                   # Pull pages with blocks
-  $ riverbankcms pull navigation              # Pull navigation menus
-  $ riverbankcms pull settings                # Pull site settings
-  $ riverbankcms pull --output ./src/content  # Custom output directory
-
-Media Sync:
-  When using --sync-media, media files are:
-  1. Downloaded from the source environment's Supabase storage
-  2. Uploaded to the target environment via the management API
-
-  The storage URL is automatically fetched from the source CMS API.
-  No additional environment variables are required beyond the standard
-  RIVERBANK_*_DASHBOARD_URL, RIVERBANK_*_SITE_ID, and RIVERBANK_*_MGMT_API_KEY.
-`).action(
-  withErrorHandling(
-    async (scope, type, options, command) => {
-      const { output, client, isRemote } = createCommandContext(command);
-      const contentDir = path9__namespace.resolve(options.output ?? "./content");
-      let targetClient = null;
-      let sourceSupabaseUrl = null;
-      let sourceSiteId = null;
-      let targetSiteId = null;
-      if (options.syncMedia) {
-        const sourceEnv = loadEnvironment(isRemote);
-        const targetEnv = loadEnvironment(!isRemote);
-        output.info("Fetching storage configuration from source...");
-        try {
-          const siteInfo = await client.pull.siteInfo();
-          sourceSupabaseUrl = siteInfo.supabaseUrl;
-        } catch (error) {
-          const message = error instanceof Error ? error.message : "Unknown error";
-          output.error(`Failed to get storage configuration from source: ${message}`, {
-            suggestion: "Ensure the source CMS is running and accessible"
-          });
-          return;
-        }
-        sourceSiteId = sourceEnv.siteId;
-        targetSiteId = targetEnv.siteId;
-        targetClient = createManagementClient({
-          dashboardUrl: targetEnv.dashboardUrl,
-          managementApiKey: targetEnv.managementApiKey,
-          siteId: targetEnv.siteId
-        });
-        output.info(`Media sync enabled: ${isRemote ? "remote" : "local"} -> ${isRemote ? "local" : "remote"}`);
-      }
-      if (await contentDirExists(contentDir) && !options.force && !options.yes) {
-        if (!process.stdin.isTTY) {
-          output.error("Content directory already exists and --yes not specified", {
-            suggestion: "Use --yes or --force to overwrite in non-interactive mode"
-          });
-          return;
-        }
-        const response = await prompts__default.default({
-          type: "confirm",
-          name: "overwrite",
-          message: `Content directory '${path9__namespace.basename(contentDir)}' already exists. Overwrite?`,
-          initial: false
-        });
-        if (!response.overwrite) {
-          output.info("Aborted.");
-          return;
-        }
-      }
-      const pullScope = scope?.toLowerCase() ?? "all";
-      switch (pullScope) {
-        case "entries": {
-          if (type) {
-            output.info(`Pulling entries for content type: ${type}`);
-            const result = await pullEntriesWithPagination(client, type, output);
-            const { filePath, metaPath } = await writeEntries(contentDir, result);
-            output.success(`Pulled ${result.entries.length} entries`, {
-              contentType: type,
-              file: filePath,
-              meta: metaPath
-            });
-          } else {
-            output.info("Pulling all entries");
-            let result = await client.pull.all();
-            if (result.meta.truncated) {
-              output.warn("Content was truncated due to size limits.");
-              output.info("Fetching complete data via pagination...");
-              const contentTypes = Object.keys(result.entries);
-              result = await fetchAllContentPaginated(client, contentTypes, output);
-            }
-            const { totalCount, files } = await writeAllEntries(
-              contentDir,
-              result.entries,
-              result.meta.pulledAt,
-              result.meta.entries
-            );
-            output.success(`Pulled ${totalCount} entries across ${Object.keys(result.entries).length} content types`, {
-              files
-            });
-          }
-          break;
-        }
-        case "pages": {
-          output.info("Pulling pages");
-          const result = await client.pull.pages();
-          const { filePaths, metaPath } = await writePages(contentDir, result);
-          output.success(`Pulled ${result.pages.length} pages`, { files: filePaths, meta: metaPath });
-          break;
-        }
-        case "navigation": {
-          output.info("Pulling navigation menus");
-          const result = await client.pull.navigation();
-          const { filePath, metaPath } = await writeNavigation(contentDir, result);
-          output.success(`Pulled ${result.menus.length} navigation menus`, { file: filePath, meta: metaPath });
-          break;
-        }
-        case "settings": {
-          output.info("Pulling site settings");
-          const result = await client.pull.settings();
-          const filePath = await writeSettings(contentDir, result);
-          output.success("Pulled site settings", { file: filePath });
-          break;
-        }
-        case "all":
-        default: {
-          output.info("Pulling all content");
-          let result = await client.pull.all();
-          if (result.meta.truncated) {
-            output.warn("Content was truncated due to size limits.");
-            output.info("Fetching complete data via pagination...");
-            const contentTypes = Object.keys(result.entries);
-            result = await fetchAllContentPaginated(client, contentTypes, output);
-          }
-          if (targetClient && sourceSupabaseUrl && sourceSiteId && targetSiteId) {
-            output.info("Syncing media files...");
-            await syncMediaFiles(
-              result,
-              sourceSupabaseUrl,
-              sourceSiteId,
-              targetSiteId,
-              targetClient,
-              output
-            );
-          }
-          const { totalCount: totalEntries } = await writeAllEntries(
-            contentDir,
-            result.entries,
-            result.meta.pulledAt,
-            result.meta.entries
-          );
-          await writePages(contentDir, { pages: result.pages, meta: result.meta });
-          await writeNavigation(contentDir, { menus: result.navigation, meta: result.meta });
-          await writeSettings(contentDir, { settings: result.settings, meta: result.meta });
-          output.success("Pull complete", {
-            entries: { count: totalEntries, types: Object.keys(result.entries).length },
-            pages: { count: result.pages.length },
-            navigation: { count: result.navigation.length },
-            directory: contentDir
-          });
-          break;
-        }
-      }
-    }
-  )
-);
-
-// src/cli/config-loader.ts
-init_load_config();
-var DEFAULT_SYNC_CONFIG = {
-  existingEntries: "skip",
-  contentTarget: "draft"
-};
-async function loadCliConfig(configPath) {
-  try {
-    const rawConfig = await loadConfigFile(configPath);
-    const configObj = rawConfig;
-    const contentDir = typeof configObj.contentDir === "string" ? configObj.contentDir : "./content";
-    const syncConfig = configObj.sync;
-    return {
-      contentDir,
-      sync: {
-        existingEntries: syncConfig?.existingEntries ?? DEFAULT_SYNC_CONFIG.existingEntries,
-        contentTarget: syncConfig?.contentTarget ?? DEFAULT_SYNC_CONFIG.contentTarget
-      }
-    };
-  } catch (error) {
-    if (error instanceof Error && error.message.includes("Config file not found")) {
-      return {
-        contentDir: "./content",
-        sync: { ...DEFAULT_SYNC_CONFIG }
-      };
-    }
-    throw error;
-  }
-}
-function findChangedFields(local, remote, prefix = "") {
-  const changes = [];
-  const allKeys = /* @__PURE__ */ new Set([...Object.keys(local), ...Object.keys(remote)]);
-  for (const key of allKeys) {
-    const path13 = prefix ? `${prefix}.${key}` : key;
-    const localVal = local[key];
-    const remoteVal = remote[key];
-    if (!equal__default.default(localVal, remoteVal)) {
-      changes.push(path13);
-    }
-  }
-  return changes;
-}
-function buildJsonDiff(diff, local, remote, mode) {
-  const summary = { creates: 0, updates: 0, deletes: 0 };
-  const changes = [];
-  const localPages = new Map(local.pages.map((page) => [page.identifier, page]));
-  const remotePages = new Map(remote.pages.map((page) => [page.identifier, page]));
-  const localEntries = local.entries;
-  const remoteEntries = remote.entries;
-  const localMenus = new Map((local.navigation?.menus ?? []).map((menu) => [menu.name, menu]));
-  const remoteMenus = new Map(remote.navigation.map((menu) => [menu.name, menu]));
-  const addChange = (change) => {
-    if (change.operation === "create") summary.creates += 1;
-    if (change.operation === "update") summary.updates += 1;
-    if (change.operation === "delete") summary.deletes += 1;
-    changes.push(change);
-  };
-  for (const [contentType, entryDiffs] of diff.entries) {
-    for (const entryDiff of entryDiffs) {
-      if (entryDiff.type === "unchanged") continue;
-      if (entryDiff.type !== "create" && entryDiff.type !== "update") continue;
-      const identifier = `${contentType}/${entryDiff.identifier}`;
-      const localEntry = localEntries.get(contentType)?.find((entry) => entry.identifier === entryDiff.identifier);
-      const remoteEntry = remoteEntries[contentType]?.find((entry) => entry.identifier === entryDiff.identifier);
-      const change = {
-        type: "entry",
-        identifier,
-        operation: entryDiff.type
-      };
-      if (mode === "full") {
-        change.before = remoteEntry ?? null;
-        change.after = localEntry ?? null;
-        if (entryDiff.changes) change.diff = { changes: entryDiff.changes };
-      }
-      addChange(change);
-    }
-  }
-  for (const pageDiff of diff.pages) {
-    if (pageDiff.type === "unchanged") continue;
-    if (pageDiff.type !== "create" && pageDiff.type !== "update") continue;
-    const identifier = pageDiff.identifier;
-    const localPage = localPages.get(identifier);
-    const remotePage = remotePages.get(identifier);
-    const change = {
-      type: "page",
-      identifier,
-      operation: pageDiff.type
-    };
-    if (mode === "full") {
-      change.before = remotePage ?? null;
-      change.after = localPage ?? null;
-      if (pageDiff.changes) change.diff = { changes: pageDiff.changes };
+  for (const pageDiff of diff.pages) {
+    if (pageDiff.type === "unchanged") continue;
+    if (pageDiff.type !== "create" && pageDiff.type !== "update") continue;
+    const identifier = pageDiff.identifier;
+    const localPage = localPages.get(identifier);
+    const remotePage = remotePages.get(identifier);
+    const change = {
+      type: "page",
+      identifier,
+      operation: pageDiff.type
+    };
+    if (mode === "full") {
+      change.before = remotePage ?? null;
+      change.after = localPage ?? null;
+      if (pageDiff.changes) change.diff = { changes: pageDiff.changes };
     }
     addChange(change);
     if (pageDiff.blocks) {
@@ -7523,6 +7570,24 @@ function buildJsonDiff(diff, local, remote, mode) {
     }
     addChange(change);
   }
+  for (const formDiff of diff.forms) {
+    if (formDiff.type === "unchanged") continue;
+    if (formDiff.type !== "create" && formDiff.type !== "update") continue;
+    const identifier = formDiff.slug;
+    const localForm = localForms.get(identifier);
+    const remoteForm = remoteForms.get(identifier);
+    const change = {
+      type: "form",
+      identifier,
+      operation: formDiff.type
+    };
+    if (mode === "full") {
+      change.before = remoteForm ?? null;
+      change.after = localForm ?? null;
+      if (formDiff.changes) change.diff = { changes: formDiff.changes };
+    }
+    addChange(change);
+  }
   return { summary, changes };
 }
 function calculateEntryDiffs(localEntries, remoteEntries, options) {
@@ -7694,14 +7759,24 @@ function calculateBlockDiffs(localBlocks, remoteBlocks, pageIdentifier, summary)
       summary.delete++;
     }
   }
-  const localOrder = localBlocks.filter((b) => remoteLookup.has(b.identifier)).map((b) => b.identifier);
-  const remoteOrder = remoteBlocks.filter((b) => seenRemoteIds.has(b.identifier)).sort((a, b) => a.position - b.position).map((b) => b.identifier);
-  if (localOrder.length > 1 && !equal__default.default(localOrder, remoteOrder)) {
+  const hasCreates = diffs.some((d) => d.type === "create");
+  const existingBlockCount = remoteBlocks.length;
+  if (hasCreates && existingBlockCount > 0) {
     diffs.push({
       type: "reorder",
       identifier: pageIdentifier,
       pageIdentifier
     });
+  } else {
+    const localOrder = localBlocks.filter((b) => remoteLookup.has(b.identifier)).map((b) => b.identifier);
+    const remoteOrder = remoteBlocks.filter((b) => seenRemoteIds.has(b.identifier)).sort((a, b) => a.position - b.position).map((b) => b.identifier);
+    if (localOrder.length > 1 && !equal__default.default(localOrder, remoteOrder)) {
+      diffs.push({
+        type: "reorder",
+        identifier: pageIdentifier,
+        pageIdentifier
+      });
+    }
   }
   return diffs;
 }
@@ -7762,6 +7837,53 @@ function calculateSettingsDiff(localSettings, remoteSettings) {
   summary.unchanged = 1;
   return { diff: null, summary };
 }
+function calculateFormDiffs(localForms, remoteForms, options) {
+  const diffs = [];
+  const summary = { create: 0, update: 0, unchanged: 0 };
+  const remoteLookup = /* @__PURE__ */ new Map();
+  for (const form2 of remoteForms) {
+    remoteLookup.set(form2.slug, form2);
+  }
+  for (const localForm of localForms) {
+    const remoteForm = remoteLookup.get(localForm.slug);
+    if (!remoteForm) {
+      diffs.push({
+        type: "create",
+        slug: localForm.slug
+      });
+      summary.create++;
+    } else if (options.existingEntries === "skip") {
+      diffs.push({
+        type: "unchanged",
+        slug: localForm.slug
+      });
+      summary.unchanged++;
+    } else {
+      const nameChanged = localForm.name !== remoteForm.name;
+      const schemaChanged = !equal__default.default(localForm.schema, remoteForm.schema);
+      const settingsChanged = !equal__default.default(localForm.settings, remoteForm.settings);
+      if (nameChanged || schemaChanged || settingsChanged) {
+        const changes = [];
+        if (nameChanged) changes.push("name");
+        if (schemaChanged) changes.push("schema");
+        if (settingsChanged) changes.push("settings");
+        diffs.push({
+          type: "update",
+          slug: localForm.slug,
+          changes
+        });
+        summary.update++;
+      } else {
+        diffs.push({
+          type: "unchanged",
+          slug: localForm.slug
+        });
+        summary.unchanged++;
+      }
+    }
+  }
+  return { diffs, summary };
+}
 function calculateDiff(local, remote, options) {
   const { diffs: entryDiffs, summary: entrySummary } = calculateEntryDiffs(
     local.entries,
@@ -7781,23 +7903,30 @@ function calculateDiff(local, remote, options) {
     local.settings,
     remote.settings
   );
+  const { diffs: formDiffs, summary: formsSummary } = calculateFormDiffs(
+    local.forms,
+    remote.forms,
+    options
+  );
   return {
     entries: entryDiffs,
     pages: pageDiffs,
     navigation: navDiffs,
     settings: settingsDiff,
+    forms: formDiffs,
     summary: {
       entries: entrySummary,
       pages: pageSummary,
       blocks: blockSummary,
       navigation: navSummary,
-      settings: settingsSummary
+      settings: settingsSummary,
+      forms: formsSummary
     }
   };
 }
 function hasPendingChanges(diff) {
   const { summary } = diff;
-  return summary.entries.create > 0 || summary.entries.update > 0 || summary.pages.create > 0 || summary.pages.update > 0 || summary.blocks.create > 0 || summary.blocks.update > 0 || summary.blocks.delete > 0 || summary.navigation.create > 0 || summary.navigation.update > 0 || summary.settings.update > 0;
+  return summary.entries.create > 0 || summary.entries.update > 0 || summary.pages.create > 0 || summary.pages.update > 0 || summary.blocks.create > 0 || summary.blocks.update > 0 || summary.blocks.delete > 0 || summary.navigation.create > 0 || summary.navigation.update > 0 || summary.settings.update > 0 || summary.forms.create > 0 || summary.forms.update > 0;
 }
 function formatDiffSummary(diff) {
   const lines = [];
@@ -7817,6 +7946,9 @@ function formatDiffSummary(diff) {
   if (summary.settings.update > 0) {
     lines.push(`Settings: ~${summary.settings.update}`);
   }
+  if (summary.forms.create > 0 || summary.forms.update > 0) {
+    lines.push(`Forms: +${summary.forms.create} ~${summary.forms.update}`);
+  }
   if (lines.length === 0) {
     return "No changes detected";
   }
@@ -7874,8 +8006,374 @@ ${contentType} (updated):`);
     lines.push("\nSettings (updated):");
     lines.push(`  ~ [${diff.settings.changes.join(", ")}]`);
   }
+  const formCreates = diff.forms.filter((d) => d.type === "create");
+  const formUpdates = diff.forms.filter((d) => d.type === "update");
+  if (formCreates.length > 0) {
+    lines.push("\nForms (new):");
+    for (const d of formCreates) {
+      lines.push(`  + ${d.slug}`);
+    }
+  }
+  if (formUpdates.length > 0) {
+    lines.push("\nForms (updated):");
+    for (const d of formUpdates) {
+      lines.push(`  ~ ${d.slug}${d.changes ? ` [${d.changes.join(", ")}]` : ""}`);
+    }
+  }
   return lines.join("\n");
 }
+function calculatePullDiff(remote, local) {
+  const entryDiffs = /* @__PURE__ */ new Map();
+  const entrySummary = { create: 0, update: 0, unchanged: 0 };
+  const localEntriesLookup = /* @__PURE__ */ new Map();
+  if (local) {
+    for (const [contentType, entries] of local.entries) {
+      const typeMap = /* @__PURE__ */ new Map();
+      for (const entry of entries) {
+        typeMap.set(entry.identifier, entry.data);
+      }
+      localEntriesLookup.set(contentType, typeMap);
+    }
+  }
+  for (const [contentType, remoteEntries] of Object.entries(remote.entries)) {
+    const typeDiffs = [];
+    const localTypeMap = localEntriesLookup.get(contentType) ?? /* @__PURE__ */ new Map();
+    for (const remoteEntry of remoteEntries) {
+      const localData = localTypeMap.get(remoteEntry.identifier);
+      if (!localData) {
+        typeDiffs.push({
+          type: "create",
+          identifier: remoteEntry.identifier,
+          contentType
+        });
+        entrySummary.create++;
+      } else if (!equal__default.default(remoteEntry.data, localData)) {
+        const changes = findChangedFields(remoteEntry.data, localData);
+        typeDiffs.push({
+          type: "update",
+          identifier: remoteEntry.identifier,
+          contentType,
+          changes
+        });
+        entrySummary.update++;
+      } else {
+        typeDiffs.push({
+          type: "unchanged",
+          identifier: remoteEntry.identifier,
+          contentType
+        });
+        entrySummary.unchanged++;
+      }
+    }
+    if (typeDiffs.length > 0) {
+      entryDiffs.set(contentType, typeDiffs);
+    }
+  }
+  const pageDiffs = [];
+  const pageSummary = { create: 0, update: 0, unchanged: 0 };
+  const blockSummary = { create: 0, update: 0, delete: 0, unchanged: 0 };
+  const localPagesLookup = /* @__PURE__ */ new Map();
+  if (local) {
+    for (const page of local.pages) {
+      localPagesLookup.set(page.identifier, page);
+    }
+  }
+  for (const remotePage of remote.pages) {
+    const localPage = localPagesLookup.get(remotePage.identifier);
+    if (!localPage) {
+      const blockDiffs = (remotePage.blocks ?? []).map((block) => {
+        blockSummary.create++;
+        return {
+          type: "create",
+          identifier: block.identifier,
+          pageIdentifier: remotePage.identifier
+        };
+      });
+      pageDiffs.push({
+        type: "create",
+        identifier: remotePage.identifier,
+        blocks: blockDiffs
+      });
+      pageSummary.create++;
+    } else {
+      const pageChanged = remotePage.title !== localPage.title || remotePage.path !== localPage.path;
+      const blockDiffs = calculatePullBlockDiffs(
+        remotePage.blocks ?? [],
+        localPage.blocks ?? [],
+        remotePage.identifier,
+        blockSummary
+      );
+      if (pageChanged || blockDiffs.some((b) => b.type !== "unchanged")) {
+        const changes = [];
+        if (remotePage.title !== localPage.title) changes.push("title");
+        if (remotePage.path !== localPage.path) changes.push("path");
+        pageDiffs.push({
+          type: "update",
+          identifier: remotePage.identifier,
+          changes: changes.length > 0 ? changes : void 0,
+          blocks: blockDiffs
+        });
+        pageSummary.update++;
+      } else {
+        pageDiffs.push({
+          type: "unchanged",
+          identifier: remotePage.identifier
+        });
+        pageSummary.unchanged++;
+      }
+    }
+  }
+  const navDiffs = [];
+  const navSummary = { create: 0, update: 0, unchanged: 0 };
+  const localNavLookup = /* @__PURE__ */ new Map();
+  if (local?.navigation?.menus) {
+    for (const menu of local.navigation.menus) {
+      localNavLookup.set(menu.name, menu);
+    }
+  }
+  for (const remoteMenu of remote.navigation) {
+    const localMenu = localNavLookup.get(remoteMenu.name);
+    if (!localMenu) {
+      navDiffs.push({ type: "create", name: remoteMenu.name });
+      navSummary.create++;
+    } else if (!equal__default.default(stripNavigationItemIds(remoteMenu.items), localMenu.items)) {
+      navDiffs.push({ type: "update", name: remoteMenu.name, changes: ["items"] });
+      navSummary.update++;
+    } else {
+      navDiffs.push({ type: "unchanged", name: remoteMenu.name });
+      navSummary.unchanged++;
+    }
+  }
+  let settingsDiff = null;
+  const settingsSummary = { update: 0, unchanged: 0 };
+  if (remote.settings && local?.settings) {
+    const changes = [];
+    if (remote.settings.homepageId !== local.settings.homepageId) {
+      changes.push("homepageId");
+    }
+    if (!equal__default.default(remote.settings.seoDefaults, local.settings.seoDefaults)) {
+      changes.push("seoDefaults");
+    }
+    if (changes.length > 0) {
+      settingsDiff = { type: "update", changes };
+      settingsSummary.update = 1;
+    } else {
+      settingsSummary.unchanged = 1;
+    }
+  } else if (remote.settings && !local?.settings) {
+    settingsDiff = { type: "update", changes: ["homepageId", "seoDefaults"] };
+    settingsSummary.update = 1;
+  }
+  const formDiffs = [];
+  const formsSummary = { create: 0, update: 0, unchanged: 0 };
+  const localFormsLookup = /* @__PURE__ */ new Map();
+  if (local?.forms) {
+    for (const form2 of local.forms) {
+      localFormsLookup.set(form2.slug, form2);
+    }
+  }
+  for (const remoteForm of remote.forms) {
+    const localForm = localFormsLookup.get(remoteForm.slug);
+    if (!localForm) {
+      formDiffs.push({ type: "create", slug: remoteForm.slug });
+      formsSummary.create++;
+    } else {
+      const changes = [];
+      if (remoteForm.name !== localForm.name) changes.push("name");
+      if (!equal__default.default(remoteForm.schema, localForm.schema)) changes.push("schema");
+      if (!equal__default.default(remoteForm.settings, localForm.settings)) changes.push("settings");
+      if (changes.length > 0) {
+        formDiffs.push({ type: "update", slug: remoteForm.slug, changes });
+        formsSummary.update++;
+      } else {
+        formDiffs.push({ type: "unchanged", slug: remoteForm.slug });
+        formsSummary.unchanged++;
+      }
+    }
+  }
+  return {
+    entries: entryDiffs,
+    pages: pageDiffs,
+    navigation: navDiffs,
+    settings: settingsDiff,
+    forms: formDiffs,
+    summary: {
+      entries: entrySummary,
+      pages: pageSummary,
+      blocks: blockSummary,
+      navigation: navSummary,
+      settings: settingsSummary,
+      forms: formsSummary
+    }
+  };
+}
+function calculatePullBlockDiffs(remoteBlocks, localBlocks, pageIdentifier, summary) {
+  const diffs = [];
+  const localLookup = /* @__PURE__ */ new Map();
+  for (const block of localBlocks) {
+    localLookup.set(block.identifier, block);
+  }
+  for (const remoteBlock of remoteBlocks) {
+    const localBlock = localLookup.get(remoteBlock.identifier);
+    if (!localBlock) {
+      diffs.push({
+        type: "create",
+        identifier: remoteBlock.identifier,
+        pageIdentifier
+      });
+      summary.create++;
+    } else if (!equal__default.default(remoteBlock.data, localBlock.data) || remoteBlock.kind !== localBlock.kind) {
+      const changes = findChangedFields(remoteBlock.data, localBlock.data);
+      if (remoteBlock.kind !== localBlock.kind) {
+        changes.push("kind");
+      }
+      diffs.push({
+        type: "update",
+        identifier: remoteBlock.identifier,
+        pageIdentifier,
+        changes
+      });
+      summary.update++;
+    } else {
+      diffs.push({
+        type: "unchanged",
+        identifier: remoteBlock.identifier,
+        pageIdentifier
+      });
+      summary.unchanged++;
+    }
+  }
+  return diffs;
+}
+function extractFieldIds(fields4) {
+  const ids = /* @__PURE__ */ new Set();
+  function processField(field) {
+    ids.add(field.id);
+    switch (field.type) {
+      case "group":
+      case "modal":
+        if (field.schema?.fields) {
+          for (const nestedField of field.schema.fields) {
+            processField(nestedField);
+          }
+        }
+        break;
+      case "repeater":
+        if (field.schema?.fields) {
+          for (const nestedField of field.schema.fields) {
+            processField(nestedField);
+          }
+        }
+        if ("itemTypes" in field && field.itemTypes) {
+          for (const itemType of Object.values(field.itemTypes)) {
+            if (itemType.fields) {
+              for (const nestedField of itemType.fields) {
+                processField(nestedField);
+              }
+            }
+          }
+        }
+        break;
+      case "tabGroup":
+        if ("tabs" in field && field.tabs) {
+          for (const tab of field.tabs) {
+            if (tab.fields) {
+              for (const nestedField of tab.fields) {
+                processField(nestedField);
+              }
+            }
+          }
+        }
+        break;
+    }
+  }
+  for (const field of fields4) {
+    processField(field);
+  }
+  return ids;
+}
+function extractRequiredFieldIds(fields4) {
+  const required = /* @__PURE__ */ new Set();
+  for (const field of fields4) {
+    if (field.required) {
+      required.add(field.id);
+    }
+  }
+  return required;
+}
+function getDataKeys(data) {
+  return new Set(Object.keys(data));
+}
+function validateBlockContent(data, manifest, customFields) {
+  const warnings = [];
+  try {
+    const manifestWithCustomFields = customFields ? { ...manifest, fields: [...manifest.fields, ...customFields] } : manifest;
+    const validator = createManifestValidator(manifestWithCustomFields, {
+      allowNull: true,
+      allowIncomplete: true
+    });
+    validator.parse(data);
+  } catch (error) {
+    if (error instanceof zod.ZodError) {
+      for (const issue of error.issues) {
+        const fieldPath = issue.path.join(".");
+        if (issue.code === "invalid_type" && issue.received === "undefined") {
+          continue;
+        }
+        warnings.push({
+          type: "invalid_content",
+          field: fieldPath || "(root)",
+          message: `Invalid content${fieldPath ? ` in "${fieldPath}"` : ""}: ${issue.message}`
+        });
+      }
+    }
+  }
+  return warnings;
+}
+function validateBlockData(data, manifest, customFields) {
+  const warnings = [];
+  const errors = [];
+  const allFields = customFields ? [...manifest.fields, ...customFields] : manifest.fields;
+  const validFieldIds = extractFieldIds(allFields);
+  const requiredFieldIds = extractRequiredFieldIds(allFields);
+  const dataKeys = getDataKeys(data);
+  for (const key of dataKeys) {
+    if (!validFieldIds.has(key)) {
+      warnings.push({
+        type: "unknown_field",
+        field: key,
+        message: `Unknown field "${key}" - will be ignored. Valid fields: ${Array.from(validFieldIds).join(", ")}`
+      });
+    }
+  }
+  for (const requiredId of requiredFieldIds) {
+    if (!(requiredId in data) || data[requiredId] === void 0) {
+      errors.push({
+        type: "missing_required",
+        field: requiredId,
+        message: `Required field "${requiredId}" is missing`
+      });
+    }
+  }
+  const contentWarnings = validateBlockContent(data, manifest, customFields);
+  warnings.push(...contentWarnings);
+  return {
+    valid: errors.length === 0,
+    warnings,
+    errors
+  };
+}
+function formatValidationResult(pageIdentifier, blockIdentifier, blockKind, result) {
+  const lines = [];
+  const prefix = `${pageIdentifier}/${blockIdentifier} (${blockKind})`;
+  for (const warning of result.warnings) {
+    lines.push(`\u26A0 ${prefix}: ${warning.message}`);
+  }
+  for (const error of result.errors) {
+    lines.push(`\u2717 ${prefix}: ${error.message}`);
+  }
+  return lines;
+}
 
 // src/cli/sync/executor.ts
 function hasFieldErrors(details) {
@@ -7902,7 +8400,9 @@ function createEmptyResult() {
     blocks: { created: 0, updated: 0, deleted: 0, failed: 0 },
     navigation: { created: 0, updated: 0, failed: 0 },
     settings: { updated: 0, failed: 0 },
-    errors: []
+    forms: { created: 0, updated: 0, failed: 0 },
+    errors: [],
+    warnings: []
   };
 }
 async function syncEntries(client, diff, local, options, result) {
@@ -7947,6 +8447,16 @@ async function syncPages(client, diff, local, options, result) {
     const localPage = pageLookup.get(pageDiff.identifier);
     if (!localPage) continue;
     try {
+      let failedBlocks = /* @__PURE__ */ new Set();
+      if (pageDiff.blocks && localPage.blocks) {
+        failedBlocks = validateBlocksForPage(
+          pageDiff.identifier,
+          pageDiff.blocks,
+          localPage.blocks,
+          options,
+          result
+        );
+      }
       if (options.dryRun) ;
       await client.pages.upsert({
         identifier: localPage.identifier,
@@ -7961,8 +8471,8 @@ async function syncPages(client, diff, local, options, result) {
           pageDiff.identifier,
           pageDiff.blocks,
           localPage.blocks,
-          options,
-          result
+          result,
+          failedBlocks
         );
       }
       if (options.contentTarget === "publish") {
@@ -7983,10 +8493,45 @@ async function syncPages(client, diff, local, options, result) {
     }
   }
 }
-async function syncBlocks(client, pageIdentifier, blockDiffs, localBlocks, options, result) {
+function validateBlocksForPage(pageIdentifier, blockDiffs, localBlocks, options, result) {
+  const failedBlocks = /* @__PURE__ */ new Set();
+  const getCustomFields = (kind) => options.blockFieldExtensions?.[kind]?.fields;
+  const blockLookup = new Map(localBlocks.map((b) => [b.identifier, b]));
+  for (const blockDiff of blockDiffs) {
+    if (blockDiff.type === "unchanged" || blockDiff.type === "delete" || blockDiff.type === "reorder") {
+      continue;
+    }
+    const localBlock = blockLookup.get(blockDiff.identifier);
+    if (!localBlock) continue;
+    const blockDefinition = getBlockDefinition(localBlock.kind);
+    if (blockDefinition) {
+      const customFields = getCustomFields(localBlock.kind);
+      const validation = validateBlockData(localBlock.data, blockDefinition.manifest, customFields);
+      const formattedMessages = formatValidationResult(
+        pageIdentifier,
+        localBlock.identifier,
+        localBlock.kind,
+        validation
+      );
+      result.warnings.push(...formattedMessages);
+      if (!validation.valid) {
+        failedBlocks.add(blockDiff.identifier);
+        result.blocks.failed++;
+        result.errors.push({
+          resource: "block",
+          identifier: `${pageIdentifier}/${blockDiff.identifier}`,
+          error: validation.errors.map((e) => e.message).join("; ")
+        });
+      }
+    }
+  }
+  return failedBlocks;
+}
+async function syncBlocks(client, pageIdentifier, blockDiffs, localBlocks, result, failedBlocks) {
   const blockLookup = new Map(localBlocks.map((b) => [b.identifier, b]));
   for (const blockDiff of blockDiffs) {
     if (blockDiff.type === "unchanged") continue;
+    if (failedBlocks.has(blockDiff.identifier)) continue;
     try {
       if (blockDiff.type === "delete") {
         await client.blocks.delete(pageIdentifier, blockDiff.identifier);
@@ -8014,116 +8559,618 @@ async function syncBlocks(client, pageIdentifier, blockDiffs, localBlocks, optio
       });
     }
   }
-  const hasReorderDiff = blockDiffs.some((d) => d.type === "reorder");
-  if (hasReorderDiff) {
-    const localIdentifiers = localBlocks.map((b) => b.identifier);
-    if (localIdentifiers.length > 1) {
-      try {
-        await client.blocks.reorder(pageIdentifier, localIdentifiers);
-      } catch {
+  const hasReorderDiff = blockDiffs.some((d) => d.type === "reorder");
+  if (hasReorderDiff) {
+    const localIdentifiers = localBlocks.map((b) => b.identifier);
+    if (localIdentifiers.length > 1) {
+      try {
+        await client.blocks.reorder(pageIdentifier, localIdentifiers);
+      } catch (error) {
+        console.warn("Block reorder failed:", error);
+      }
+    }
+  }
+}
+async function syncNavigation(client, diff, local, options, result) {
+  if (!local.navigation?.menus) return;
+  const menuLookup = new Map(local.navigation.menus.map((m) => [m.name, m]));
+  for (const navDiff of diff.navigation) {
+    if (navDiff.type === "unchanged") continue;
+    const localMenu = menuLookup.get(navDiff.name);
+    if (!localMenu) continue;
+    try {
+      if (options.dryRun) ;
+      await client.navigation.upsert({
+        name: localMenu.name,
+        items: localMenu.items
+      });
+      if (navDiff.type === "create") {
+        result.navigation.created++;
+      } else {
+        result.navigation.updated++;
+      }
+    } catch (error) {
+      result.navigation.failed++;
+      result.errors.push({
+        resource: "navigation",
+        identifier: navDiff.name,
+        error: formatApiError(error)
+      });
+    }
+  }
+}
+async function syncSettings(client, diff, local, options, result) {
+  if (!diff.settings || !local.settings) return;
+  try {
+    if (options.dryRun) ;
+    await client.settings.update({
+      homepageId: local.settings.homepageId,
+      seoDefaults: local.settings.seoDefaults
+    });
+    result.settings.updated++;
+  } catch (error) {
+    result.settings.failed++;
+    result.errors.push({
+      resource: "settings",
+      identifier: "site",
+      error: formatApiError(error)
+    });
+  }
+}
+async function syncForms(client, diff, local, options, result) {
+  const formLookup = new Map(local.forms.map((f) => [f.slug, f]));
+  for (const formDiff of diff.forms) {
+    if (formDiff.type === "unchanged") continue;
+    const localForm = formLookup.get(formDiff.slug);
+    if (!localForm) continue;
+    try {
+      if (options.dryRun) ;
+      await client.forms.upsert({
+        slug: localForm.slug,
+        name: localForm.name,
+        schema: localForm.schema,
+        settings: localForm.settings
+      });
+      if (formDiff.type === "create") {
+        result.forms.created++;
+      } else {
+        result.forms.updated++;
+      }
+    } catch (error) {
+      result.forms.failed++;
+      result.errors.push({
+        resource: "form",
+        identifier: formDiff.slug,
+        error: formatApiError(error)
+      });
+    }
+  }
+}
+async function executeSyncPlan(client, diff, local, options, output) {
+  const result = createEmptyResult();
+  const totalOps = diff.summary.entries.create + diff.summary.entries.update + diff.summary.pages.create + diff.summary.pages.update + diff.summary.blocks.create + diff.summary.blocks.update + diff.summary.blocks.delete + diff.summary.navigation.create + diff.summary.navigation.update + diff.summary.settings.update + diff.summary.forms.create + diff.summary.forms.update;
+  if (totalOps === 0) {
+    output.info("No changes to sync");
+    return result;
+  }
+  const prefix = "Syncing";
+  output.info(`${prefix} ${totalOps} operations...`);
+  await syncEntries(client, diff, local, options, result);
+  await syncPages(client, diff, local, options, result);
+  await syncNavigation(client, diff, local, options, result);
+  await syncSettings(client, diff, local, options, result);
+  await syncForms(client, diff, local, options, result);
+  return result;
+}
+function formatSyncResult(result, dryRun) {
+  const lines = [];
+  const verb = "";
+  if (result.entries.created > 0 || result.entries.updated > 0) {
+    lines.push(
+      `Entries: ${verb} created ${result.entries.created}, updated ${result.entries.updated}` + (result.entries.failed > 0 ? `, failed ${result.entries.failed}` : "")
+    );
+  }
+  if (result.pages.created > 0 || result.pages.updated > 0) {
+    lines.push(
+      `Pages: ${verb} created ${result.pages.created}, updated ${result.pages.updated}` + (result.pages.failed > 0 ? `, failed ${result.pages.failed}` : "")
+    );
+  }
+  if (result.blocks.created > 0 || result.blocks.updated > 0 || result.blocks.deleted > 0) {
+    lines.push(
+      `Blocks: ${verb} created ${result.blocks.created}, updated ${result.blocks.updated}, deleted ${result.blocks.deleted}` + (result.blocks.failed > 0 ? `, failed ${result.blocks.failed}` : "")
+    );
+  }
+  if (result.navigation.created > 0 || result.navigation.updated > 0) {
+    lines.push(
+      `Navigation: ${verb} created ${result.navigation.created}, updated ${result.navigation.updated}` + (result.navigation.failed > 0 ? `, failed ${result.navigation.failed}` : "")
+    );
+  }
+  if (result.settings.updated > 0) {
+    lines.push(
+      `Settings: ${verb} updated ${result.settings.updated}` + (result.settings.failed > 0 ? `, failed ${result.settings.failed}` : "")
+    );
+  }
+  if (result.forms.created > 0 || result.forms.updated > 0) {
+    lines.push(
+      `Forms: ${verb} created ${result.forms.created}, updated ${result.forms.updated}` + (result.forms.failed > 0 ? `, failed ${result.forms.failed}` : "")
+    );
+  }
+  if (result.warnings.length > 0) {
+    lines.push("\nWarnings:");
+    for (const warning of result.warnings) {
+      lines.push(`  ${warning}`);
+    }
+  }
+  if (result.errors.length > 0) {
+    lines.push("\nErrors:");
+    for (const error of result.errors) {
+      lines.push(`  ${error.resource}/${error.identifier}: ${error.error}`);
+    }
+  }
+  if (lines.length === 0) {
+    return "Everything is in sync - no changes needed";
+  }
+  return lines.join("\n");
+}
+
+// src/cli/commands/pull.ts
+var DEFAULT_PAGE_LIMIT = 500;
+async function pullEntriesWithPagination(client, contentType, output) {
+  const allEntries = [];
+  const aggregatedMeta = {};
+  let page = 1;
+  let hasMore = true;
+  let pulledAt = (/* @__PURE__ */ new Date()).toISOString();
+  while (hasMore) {
+    const result = await client.pull.entries(contentType, {
+      page,
+      limit: DEFAULT_PAGE_LIMIT
+    });
+    allEntries.push(...result.entries);
+    if (result.meta.entries) {
+      Object.assign(aggregatedMeta, result.meta.entries);
+    }
+    pulledAt = result.meta.pulledAt;
+    hasMore = result.pagination.hasMore;
+    if (hasMore) {
+      output.info(`Fetched ${allEntries.length} entries (page ${page})...`);
+    }
+    page++;
+  }
+  return {
+    contentType,
+    entries: allEntries,
+    meta: { pulledAt, entries: aggregatedMeta },
+    pagination: {
+      page: 1,
+      limit: allEntries.length,
+      total: allEntries.length,
+      hasMore: false
+    }
+  };
+}
+async function writeAllEntries(contentDir, entriesByType, pulledAt, entriesMeta) {
+  let totalCount = 0;
+  const files = [];
+  for (const [contentType, entries] of Object.entries(entriesByType)) {
+    const ctMeta = {};
+    for (const entry of entries) {
+      const key = `${contentType}:${entry.identifier}`;
+      if (entriesMeta?.[key]) {
+        ctMeta[entry.identifier] = entriesMeta[key];
+      }
+    }
+    const { filePath } = await writeEntries(contentDir, {
+      contentType,
+      entries,
+      meta: { pulledAt, entries: ctMeta },
+      pagination: { limit: entries.length, total: entries.length}
+    });
+    totalCount += entries.length;
+    files.push(filePath);
+  }
+  return { totalCount, files };
+}
+async function fetchAllContentPaginated(client, contentTypes, output) {
+  const allEntries = {};
+  const allMeta = {};
+  for (const contentType of contentTypes) {
+    output.info(`Fetching ${contentType} entries...`);
+    const result = await pullEntriesWithPagination(client, contentType, output);
+    allEntries[contentType] = result.entries.map(mapEntryForOutput);
+    for (const [id, meta] of Object.entries(result.meta.entries || {})) {
+      allMeta[`${contentType}:${id}`] = meta;
+    }
+    output.info(`  ${result.entries.length} entries`);
+  }
+  output.info("Fetching pages...");
+  const pagesResult = await client.pull.pages();
+  output.info("Fetching navigation...");
+  const navigationResult = await client.pull.navigation();
+  output.info("Fetching settings...");
+  const settingsResult = await client.pull.settings();
+  output.info("Fetching forms...");
+  const formsResult = await client.pull.forms();
+  return {
+    entries: allEntries,
+    pages: pagesResult.pages,
+    navigation: navigationResult.menus,
+    settings: settingsResult.settings,
+    forms: formsResult.forms,
+    meta: { pulledAt: (/* @__PURE__ */ new Date()).toISOString(), entries: allMeta }
+  };
+}
+async function syncMediaFiles(content, sourceSupabaseUrl, sourceSiteId, targetSiteId, targetClient, output) {
+  const mediaPaths = extractMediaPaths(content);
+  if (mediaPaths.size === 0) {
+    output.info("No media files found in content");
+    return;
+  }
+  output.info(`Found ${mediaPaths.size} media files to sync`);
+  let synced = 0;
+  let skipped = 0;
+  let failed = 0;
+  for (const relativePath of mediaPaths) {
+    const filename = relativePath.split("/").pop() ?? "file";
+    const targetPath = `sites/${targetSiteId}/${relativePath}`;
+    try {
+      const exists = await targetClient.media.exists(targetPath);
+      if (exists) {
+        skipped++;
+        continue;
+      }
+    } catch (error) {
+      if (process.env.DEBUG) {
+        const message = error instanceof Error ? error.message : "Unknown error";
+        console.warn(`[media-sync] Could not check if ${filename} exists: ${message}`);
+      }
+    }
+    const url = buildStorageUrl(sourceSupabaseUrl, relativePath, sourceSiteId);
+    const downloaded = await downloadMedia(url);
+    if (!downloaded) {
+      output.warn(`  Failed to download: ${filename}`);
+      failed++;
+      continue;
+    }
+    try {
+      await targetClient.media.upload({
+        data: downloaded.data,
+        filename,
+        contentType: downloaded.contentType,
+        storagePath: targetPath
+      });
+      synced++;
+    } catch (error) {
+      output.warn(`  Failed to upload: ${filename}`);
+      failed++;
+    }
+  }
+  output.info(`Media sync: ${synced} synced, ${skipped} skipped (already exist), ${failed} failed`);
+}
+function buildPullJsonDiff(diff, remoteContent, localContent, mode) {
+  const result = {
+    mode,
+    direction: "pull",
+    summary: diff.summary
+  };
+  if (mode === "full") {
+    const changes = [];
+    for (const [contentType, entryDiffs] of diff.entries) {
+      const remoteEntries = remoteContent.entries[contentType] ?? [];
+      const localEntries = localContent?.entries.get(contentType) ?? [];
+      const localLookup = new Map(localEntries.map((e) => [e.identifier, e.data]));
+      for (const entryDiff of entryDiffs) {
+        if (entryDiff.type === "unchanged") continue;
+        const remoteEntry = remoteEntries.find((e) => e.identifier === entryDiff.identifier);
+        const localData = localLookup.get(entryDiff.identifier);
+        changes.push({
+          type: "entry",
+          operation: entryDiff.type,
+          identifier: entryDiff.identifier,
+          contentType,
+          before: localData ?? null,
+          after: remoteEntry?.data ?? null
+        });
       }
     }
-  }
-}
-async function syncNavigation(client, diff, local, options, result) {
-  if (!local.navigation?.menus) return;
-  const menuLookup = new Map(local.navigation.menus.map((m) => [m.name, m]));
-  for (const navDiff of diff.navigation) {
-    if (navDiff.type === "unchanged") continue;
-    const localMenu = menuLookup.get(navDiff.name);
-    if (!localMenu) continue;
-    try {
-      if (options.dryRun) ;
-      await client.navigation.upsert({
-        name: localMenu.name,
-        items: localMenu.items
+    for (const pageDiff of diff.pages) {
+      if (pageDiff.type === "unchanged") continue;
+      const remotePage = remoteContent.pages.find((p) => p.identifier === pageDiff.identifier);
+      const localPage = localContent?.pages.find((p) => p.identifier === pageDiff.identifier);
+      changes.push({
+        type: "page",
+        operation: pageDiff.type,
+        identifier: pageDiff.identifier,
+        before: localPage ?? null,
+        after: remotePage ?? null
       });
-      if (navDiff.type === "create") {
-        result.navigation.created++;
-      } else {
-        result.navigation.updated++;
-      }
-    } catch (error) {
-      result.navigation.failed++;
-      result.errors.push({
-        resource: "navigation",
+    }
+    for (const navDiff of diff.navigation) {
+      if (navDiff.type === "unchanged") continue;
+      const remoteMenu = remoteContent.navigation.find((m) => m.name === navDiff.name);
+      const localMenu = localContent?.navigation?.menus.find((m) => m.name === navDiff.name);
+      changes.push({
+        type: "navigation",
+        operation: navDiff.type,
         identifier: navDiff.name,
-        error: formatApiError(error)
+        before: localMenu ?? null,
+        after: remoteMenu ?? null
       });
     }
+    if (diff.settings?.type === "update") {
+      changes.push({
+        type: "settings",
+        operation: "update",
+        identifier: "site-settings",
+        before: localContent?.settings ?? null,
+        after: remoteContent.settings ?? null
+      });
+    }
+    result.changes = changes;
   }
+  return result;
 }
-async function syncSettings(client, diff, local, options, result) {
-  if (!diff.settings || !local.settings) return;
-  try {
-    if (options.dryRun) ;
-    await client.settings.update({
-      homepageId: local.settings.homepageId,
-      seoDefaults: local.settings.seoDefaults
-    });
-    result.settings.updated++;
+var pullCommand = new commander.Command("pull").description("Pull content from CMS").argument("[scope]", "What to pull: entries, pages, navigation, settings, forms, or all (default)").argument("[type]", 'Content type (when scope is "entries")').option("--output <dir>", "Output directory", "./content").option("--force", "Overwrite existing files without prompting").option("--yes", "Skip confirmation prompt (same as --force)").option("--sync-media", "Sync media files from source to target environment").option("--dry-run", "Show what would be pulled without writing files").option("--json-diff [mode]", "Output diff as JSON (summary or full)", "summary").addHelpText("after", `
+Examples:
+  $ riverbankcms pull                         # Pull all content
+  $ riverbankcms pull --dry-run               # Preview what would be pulled
+  $ riverbankcms pull --remote                # Pull from production
+  $ riverbankcms pull --remote --sync-media   # Pull from production and sync media to local
+  $ riverbankcms pull entries                 # Pull all entries
+  $ riverbankcms pull entries blog-post       # Pull specific content type
+  $ riverbankcms pull pages                   # Pull pages with blocks
+  $ riverbankcms pull navigation              # Pull navigation menus
+  $ riverbankcms pull settings                # Pull site settings
+  $ riverbankcms pull forms                   # Pull forms
+  $ riverbankcms pull --output ./src/content  # Custom output directory
+  $ riverbankcms pull --dry-run --json-diff=summary  # JSON summary for agents
+  $ riverbankcms pull --dry-run --json-diff=full     # Full JSON with before/after
+
+Dry Run:
+  When using --dry-run, no files are written. Instead, the command shows:
+  - What entries, pages, navigation, and settings would be created or updated
+  - A summary of changes (or full JSON with --json-diff=full)
+  Exit code: 0 if no changes, 1 if changes would be made
+
+Media Sync:
+  When using --sync-media, media files are:
+  1. Downloaded from the source environment's Supabase storage
+  2. Uploaded to the target environment via the management API
+
+  The storage URL is automatically fetched from the source CMS API.
+  No additional environment variables are required beyond the standard
+  RIVERBANK_*_DASHBOARD_URL, RIVERBANK_*_SITE_ID, and RIVERBANK_*_MGMT_API_KEY.
+`).action(
+  withErrorHandling(
+    async (scope, type, options, command) => {
+      const { output, client, isRemote } = createCommandContext(command);
+      const contentDir = path2__namespace.resolve(options.output ?? "./content");
+      const envLabel = isRemote ? "REMOTE" : "LOCAL";
+      const jsonDiffMode = options.jsonDiff ? options.jsonDiff === "summary" || options.jsonDiff === "full" ? options.jsonDiff : null : void 0;
+      if (options.jsonDiff && !jsonDiffMode && options.jsonDiff !== true) {
+        output.error('Invalid value for --json-diff. Use "summary" or "full".');
+        return;
+      }
+      if (options.dryRun) {
+        const pullScope2 = scope?.toLowerCase() ?? "all";
+        if (pullScope2 !== "all") {
+          output.error("--dry-run currently only supports pulling all content.", {
+            suggestion: 'Use "riverbankcms pull --dry-run" without scope arguments.'
+          });
+          return;
+        }
+        output.info(`[DRY RUN] Fetching content from ${envLabel}...`);
+        let remoteContent = await client.pull.all();
+        if (remoteContent.meta.truncated) {
+          output.warn("Content was truncated due to size limits.");
+          output.info("Fetching complete data via pagination...");
+          const contentTypes = Object.keys(remoteContent.entries);
+          remoteContent = await fetchAllContentPaginated(client, contentTypes, output);
+        }
+        let localContent = null;
+        if (await contentDirExists(contentDir)) {
+          output.info("Reading local content for comparison...");
+          localContent = await readAllContent(contentDir);
+        }
+        const diff = calculatePullDiff(remoteContent, localContent);
+        if (!hasPendingChanges(diff)) {
+          output.success("No changes detected - local content is already in sync");
+          process.exitCode = 0;
+          return;
+        }
+        if (jsonDiffMode) {
+          const jsonDiff = buildPullJsonDiff(diff, remoteContent, localContent, jsonDiffMode);
+          output.json(jsonDiff);
+        } else {
+          output.info(`[DRY RUN] Changes that would be pulled from ${envLabel}:`);
+          output.info(formatDiffSummary(diff));
+          output.info(formatDiffDetail(diff));
+          output.info('\nUse "riverbankcms pull" (without --dry-run) to apply changes.');
+        }
+        process.exitCode = 1;
+        return;
+      }
+      let targetClient = null;
+      let sourceSupabaseUrl = null;
+      let sourceSiteId = null;
+      let targetSiteId = null;
+      if (options.syncMedia) {
+        const sourceEnv = loadEnvironment(isRemote);
+        const targetEnv = loadEnvironment(!isRemote);
+        output.info("Fetching storage configuration from source...");
+        try {
+          const siteInfo = await client.pull.siteInfo();
+          sourceSupabaseUrl = siteInfo.supabaseUrl;
+        } catch (error) {
+          const message = error instanceof Error ? error.message : "Unknown error";
+          output.error(`Failed to get storage configuration from source: ${message}`, {
+            suggestion: "Ensure the source CMS is running and accessible"
+          });
+          return;
+        }
+        sourceSiteId = sourceEnv.siteId;
+        targetSiteId = targetEnv.siteId;
+        targetClient = createManagementClient({
+          dashboardUrl: targetEnv.dashboardUrl,
+          managementApiKey: targetEnv.managementApiKey,
+          siteId: targetEnv.siteId
+        });
+        output.info(`Media sync enabled: ${isRemote ? "remote" : "local"} -> ${isRemote ? "local" : "remote"}`);
+      }
+      if (await contentDirExists(contentDir) && !options.force && !options.yes) {
+        if (!process.stdin.isTTY) {
+          output.error("Content directory already exists and --yes not specified", {
+            suggestion: "Use --yes or --force to overwrite in non-interactive mode"
+          });
+          return;
+        }
+        const response = await prompts__default.default({
+          type: "confirm",
+          name: "overwrite",
+          message: `Content directory '${path2__namespace.basename(contentDir)}' already exists. Overwrite?`,
+          initial: false
+        });
+        if (!response.overwrite) {
+          output.info("Aborted.");
+          return;
+        }
+      }
+      const pullScope = scope?.toLowerCase() ?? "all";
+      switch (pullScope) {
+        case "entries": {
+          if (type) {
+            output.info(`Pulling entries for content type: ${type}`);
+            const result = await pullEntriesWithPagination(client, type, output);
+            const { filePath, metaPath } = await writeEntries(contentDir, result);
+            output.success(`Pulled ${result.entries.length} entries`, {
+              contentType: type,
+              file: filePath,
+              meta: metaPath
+            });
+          } else {
+            output.info("Pulling all entries");
+            let result = await client.pull.all();
+            if (result.meta.truncated) {
+              output.warn("Content was truncated due to size limits.");
+              output.info("Fetching complete data via pagination...");
+              const contentTypes = Object.keys(result.entries);
+              result = await fetchAllContentPaginated(client, contentTypes, output);
+            }
+            const { totalCount, files } = await writeAllEntries(
+              contentDir,
+              result.entries,
+              result.meta.pulledAt,
+              result.meta.entries
+            );
+            output.success(`Pulled ${totalCount} entries across ${Object.keys(result.entries).length} content types`, {
+              files
+            });
+          }
+          break;
+        }
+        case "pages": {
+          output.info("Pulling pages");
+          const result = await client.pull.pages();
+          const { filePaths, metaPath } = await writePages(contentDir, result);
+          output.success(`Pulled ${result.pages.length} pages`, { files: filePaths, meta: metaPath });
+          break;
+        }
+        case "navigation": {
+          output.info("Pulling navigation menus");
+          const result = await client.pull.navigation();
+          const { filePath, metaPath } = await writeNavigation(contentDir, result);
+          output.success(`Pulled ${result.menus.length} navigation menus`, { file: filePath, meta: metaPath });
+          break;
+        }
+        case "settings": {
+          output.info("Pulling site settings");
+          const result = await client.pull.settings();
+          const filePath = await writeSettings(contentDir, result);
+          output.success("Pulled site settings", { file: filePath });
+          break;
+        }
+        case "forms": {
+          output.info("Pulling forms");
+          const result = await client.pull.forms();
+          const { filePaths, metaPath } = await writeForms(contentDir, result);
+          output.success(`Pulled ${result.forms.length} forms`, { files: filePaths, meta: metaPath });
+          break;
+        }
+        case "all":
+        default: {
+          output.info("Pulling all content");
+          let result = await client.pull.all();
+          if (result.meta.truncated) {
+            output.warn("Content was truncated due to size limits.");
+            output.info("Fetching complete data via pagination...");
+            const contentTypes = Object.keys(result.entries);
+            result = await fetchAllContentPaginated(client, contentTypes, output);
+          }
+          if (targetClient && sourceSupabaseUrl && sourceSiteId && targetSiteId) {
+            output.info("Syncing media files...");
+            await syncMediaFiles(
+              result,
+              sourceSupabaseUrl,
+              sourceSiteId,
+              targetSiteId,
+              targetClient,
+              output
+            );
+          }
+          const { totalCount: totalEntries } = await writeAllEntries(
+            contentDir,
+            result.entries,
+            result.meta.pulledAt,
+            result.meta.entries
+          );
+          await writePages(contentDir, { pages: result.pages, meta: result.meta });
+          await writeNavigation(contentDir, { menus: result.navigation, meta: result.meta });
+          await writeSettings(contentDir, { settings: result.settings, meta: result.meta });
+          await writeForms(contentDir, { forms: result.forms, meta: result.meta });
+          output.success("Pull complete", {
+            entries: { count: totalEntries, types: Object.keys(result.entries).length },
+            pages: { count: result.pages.length },
+            navigation: { count: result.navigation.length },
+            forms: { count: result.forms.length },
+            directory: contentDir
+          });
+          break;
+        }
+      }
+    }
+  )
+);
+
+// src/cli/config-loader.ts
+init_load_config();
+var DEFAULT_SYNC_CONFIG = {
+  existingEntries: "skip",
+  contentTarget: "draft"
+};
+async function loadCliConfig(configPath) {
+  try {
+    const rawConfig = await loadConfigFile(configPath);
+    const configObj = rawConfig;
+    const contentDir = typeof configObj.contentDir === "string" ? configObj.contentDir : "./content";
+    const syncConfig = configObj.sync;
+    const blockFieldExtensions = configObj.blockFieldExtensions;
+    return {
+      contentDir,
+      sync: {
+        existingEntries: syncConfig?.existingEntries ?? DEFAULT_SYNC_CONFIG.existingEntries,
+        contentTarget: syncConfig?.contentTarget ?? DEFAULT_SYNC_CONFIG.contentTarget
+      },
+      blockFieldExtensions
+    };
   } catch (error) {
-    result.settings.failed++;
-    result.errors.push({
-      resource: "settings",
-      identifier: "site",
-      error: formatApiError(error)
-    });
-  }
-}
-async function executeSyncPlan(client, diff, local, options, output) {
-  const result = createEmptyResult();
-  const totalOps = diff.summary.entries.create + diff.summary.entries.update + diff.summary.pages.create + diff.summary.pages.update + diff.summary.blocks.create + diff.summary.blocks.update + diff.summary.blocks.delete + diff.summary.navigation.create + diff.summary.navigation.update + diff.summary.settings.update;
-  if (totalOps === 0) {
-    output.info("No changes to sync");
-    return result;
-  }
-  const prefix = "Syncing";
-  output.info(`${prefix} ${totalOps} operations...`);
-  await syncEntries(client, diff, local, options, result);
-  await syncPages(client, diff, local, options, result);
-  await syncNavigation(client, diff, local, options, result);
-  await syncSettings(client, diff, local, options, result);
-  return result;
-}
-function formatSyncResult(result, dryRun) {
-  const lines = [];
-  const verb = "";
-  if (result.entries.created > 0 || result.entries.updated > 0) {
-    lines.push(
-      `Entries: ${verb} created ${result.entries.created}, updated ${result.entries.updated}` + (result.entries.failed > 0 ? `, failed ${result.entries.failed}` : "")
-    );
-  }
-  if (result.pages.created > 0 || result.pages.updated > 0) {
-    lines.push(
-      `Pages: ${verb} created ${result.pages.created}, updated ${result.pages.updated}` + (result.pages.failed > 0 ? `, failed ${result.pages.failed}` : "")
-    );
-  }
-  if (result.blocks.created > 0 || result.blocks.updated > 0 || result.blocks.deleted > 0) {
-    lines.push(
-      `Blocks: ${verb} created ${result.blocks.created}, updated ${result.blocks.updated}, deleted ${result.blocks.deleted}` + (result.blocks.failed > 0 ? `, failed ${result.blocks.failed}` : "")
-    );
-  }
-  if (result.navigation.created > 0 || result.navigation.updated > 0) {
-    lines.push(
-      `Navigation: ${verb} created ${result.navigation.created}, updated ${result.navigation.updated}` + (result.navigation.failed > 0 ? `, failed ${result.navigation.failed}` : "")
-    );
-  }
-  if (result.settings.updated > 0) {
-    lines.push(
-      `Settings: ${verb} updated ${result.settings.updated}` + (result.settings.failed > 0 ? `, failed ${result.settings.failed}` : "")
-    );
-  }
-  if (result.errors.length > 0) {
-    lines.push("\nErrors:");
-    for (const error of result.errors) {
-      lines.push(`  ${error.resource}/${error.identifier}: ${error.error}`);
+    if (error instanceof Error && error.message.includes("Config file not found")) {
+      return {
+        contentDir: "./content",
+        sync: { ...DEFAULT_SYNC_CONFIG }
+      };
     }
+    throw error;
   }
-  if (lines.length === 0) {
-    return "Everything is in sync - no changes needed";
-  }
-  return lines.join("\n");
 }
 
 // src/cli/commands/push.ts
@@ -8135,15 +9182,18 @@ function filterLocalContent(localContent, scope, contentType) {
       if (entries) {
         filtered.set(contentType, entries);
       }
-      return { ...localContent, entries: filtered, pages: [], navigation: null };
+      return { ...localContent, entries: filtered, pages: [], navigation: null, forms: [] };
     }
-    return { ...localContent, pages: [], navigation: null };
+    return { ...localContent, pages: [], navigation: null, forms: [] };
   }
   if (scope === "pages") {
-    return { ...localContent, entries: /* @__PURE__ */ new Map(), navigation: null };
+    return { ...localContent, entries: /* @__PURE__ */ new Map(), navigation: null, forms: [] };
   }
   if (scope === "navigation") {
-    return { ...localContent, entries: /* @__PURE__ */ new Map(), pages: [] };
+    return { ...localContent, entries: /* @__PURE__ */ new Map(), pages: [], forms: [] };
+  }
+  if (scope === "forms") {
+    return { ...localContent, entries: /* @__PURE__ */ new Map(), pages: [], navigation: null };
   }
   return localContent;
 }
@@ -8178,7 +9228,7 @@ function reportSyncResults(output, result, hasErrors) {
   }
   output.info(formatSyncResult(result));
 }
-function checkForStaleContent(localContent, localMeta, pagesMeta, navigationMeta, remoteContent) {
+function checkForStaleContent(localContent, localMeta, pagesMeta, navigationMeta, formsMeta, remoteContent) {
   const staleItems = [];
   for (const [contentType, localEntries] of localContent.entries) {
     const meta = localMeta.get(contentType);
@@ -8217,17 +9267,30 @@ function checkForStaleContent(localContent, localMeta, pagesMeta, navigationMeta
       }
     });
   }
+  if (formsMeta) {
+    localContent.forms.forEach((localForm) => {
+      const remoteForm = remoteContent.forms.find((f) => f.slug === localForm.slug);
+      const localBaseTime = formsMeta.forms[localForm.slug]?.updatedAt;
+      if (remoteForm && localBaseTime) {
+        if (new Date(remoteForm.updatedAt) > new Date(localBaseTime)) {
+          staleItems.push(`Form: ${localForm.slug} (Remote updated: ${remoteForm.updatedAt})`);
+        }
+      }
+    });
+  }
   return staleItems;
 }
-var pushCommand = new commander.Command("push").description("Push content to CMS").argument("[scope]", "What to push: entries, pages, navigation, or all (default)").argument("[type]", 'Content type (when scope is "entries")').option("--content-dir <dir>", "Content directory (overrides config)").option("--dry-run", "Show what would be pushed without making changes").option("--yes", "Skip confirmation prompt (required for --remote)").option("--force", "Push even if remote content is newer (skip stale check)").option("--allow-truncated", "Push even if remote content was truncated (may cause incomplete sync)").option("--json-diff [mode]", "Output JSON diff (summary or full)", "summary").addHelpText("after", `
+var pushCommand = new commander.Command("push").description("Push content to CMS").argument("[scope]", "What to push: entries, pages, navigation, forms, or all (default)").argument("[type]", 'Content type (when scope is "entries")').option("--content-dir <dir>", "Content directory (overrides config)").option("--dry-run", "Show what would be pushed without making changes").option("--yes", "Skip confirmation prompt (required for --remote)").option("--force", "Push even if remote content is newer (skip stale check)").option("--allow-truncated", "Push even if remote content was truncated (may cause incomplete sync)").option("--json-diff [mode]", "Output JSON diff (summary or full)", "summary").option("--with-config", "Also push SDK config after content").addHelpText("after", `
 Examples:
   $ riverbankcms push                         # Push all content
   $ riverbankcms push --dry-run               # Preview changes
   $ riverbankcms push --remote --yes          # Push to production
+  $ riverbankcms push --with-config           # Push content and config together
   $ riverbankcms push entries                 # Push all entries
   $ riverbankcms push entries blog-post       # Push specific content type
   $ riverbankcms push pages                   # Push pages with blocks
   $ riverbankcms push navigation              # Push navigation menus
+  $ riverbankcms push forms                   # Push forms
   $ riverbankcms push --content-dir ./src/content  # Custom content directory
   $ riverbankcms push --dry-run --json-diff=summary  # JSON summary for agents
   $ riverbankcms push --dry-run --json-diff=full     # Full JSON before/after payloads
@@ -8255,14 +9318,14 @@ Safety:
   }
   try {
     const cliConfig = await loadCliConfig();
-    const contentDir = path9__namespace.resolve(options.contentDir ?? cliConfig.contentDir);
+    const contentDir = path2__namespace.resolve(options.contentDir ?? cliConfig.contentDir);
     if (!await contentDirExists(contentDir)) {
       return output.error(`Content directory not found: ${contentDir}`, {
         suggestion: 'Run "riverbankcms pull" first to download content, or specify a different directory with --content-dir'
       });
     }
     const summary = await getContentSummary(contentDir);
-    if (summary.totalEntries === 0 && summary.pageCount === 0 && !summary.hasNavigation) {
+    if (summary.totalEntries === 0 && summary.pageCount === 0 && !summary.hasNavigation && !summary.hasForms) {
       output.warn("No content found to push");
       return;
     }
@@ -8276,6 +9339,20 @@ Safety:
     const localContent = await readAllContent(contentDir);
     const pushScope = scope?.toLowerCase() ?? "all";
     const filteredLocal = filterLocalContent(localContent, pushScope, type);
+    const pathToIdentifiers = /* @__PURE__ */ new Map();
+    for (const page of filteredLocal.pages) {
+      const ids = pathToIdentifiers.get(page.path) ?? [];
+      ids.push(page.identifier);
+      pathToIdentifiers.set(page.path, ids);
+    }
+    const duplicatePaths = Array.from(pathToIdentifiers.entries()).filter(([_, ids]) => ids.length > 1);
+    if (duplicatePaths.length > 0) {
+      output.error("Duplicate page paths detected", {
+        details: duplicatePaths.map(([pagePath, ids]) => `  ${pagePath}: ${ids.join(", ")}`).join("\n"),
+        suggestion: "Each page must have a unique path. Delete or rename one of the files."
+      });
+      return;
+    }
     output.info("Fetching remote content for comparison...");
     const remoteContent = await client.pull.all();
     if (remoteContent.meta.truncated) {
@@ -8294,12 +9371,13 @@ Safety:
     }
     if (!options.force) {
       output.info("Checking for stale content...");
-      const [localMeta, pagesMeta, navigationMeta] = await Promise.all([
+      const [localMeta, pagesMeta, navigationMeta, formsMeta] = await Promise.all([
         readAllMeta(contentDir),
         readPagesMeta(contentDir),
-        readNavigationMeta(contentDir)
+        readNavigationMeta(contentDir),
+        readFormsMeta(contentDir)
       ]);
-      const staleItems = checkForStaleContent(filteredLocal, localMeta, pagesMeta, navigationMeta, remoteContent);
+      const staleItems = checkForStaleContent(filteredLocal, localMeta, pagesMeta, navigationMeta, formsMeta, remoteContent);
       if (staleItems.length > 0) {
         output.warn("WARNING: The following remote content has changed since you last pulled:");
         staleItems.forEach((item) => output.warn(`  - ${item}`));
@@ -8338,7 +9416,11 @@ Safety:
       client,
       diff,
       filteredLocal,
-      { dryRun: false, contentTarget: cliConfig.sync.contentTarget },
+      {
+        dryRun: false,
+        contentTarget: cliConfig.sync.contentTarget,
+        blockFieldExtensions: cliConfig.blockFieldExtensions
+      },
       output
     );
     reportSyncResults(output, result, result.errors.length > 0);
@@ -8373,11 +9455,31 @@ Safety:
             name: n.name,
             updatedAt: n.updatedAt,
             createdAt: n.createdAt
+          })),
+          forms: freshRemote.forms.map((f) => ({
+            slug: f.slug,
+            updatedAt: f.updatedAt,
+            createdAt: f.createdAt
           }))
         });
       } catch (metaError) {
         output.warn('Push succeeded but metadata update failed. Run "pull" to sync metadata.');
       }
+      if (options.withConfig) {
+        output.info("\nPushing config...");
+        try {
+          await pushConfigAction(output, {
+            dashboard: env.dashboardUrl,
+            isRemote
+          });
+        } catch (configError) {
+          output.warn("Content was pushed successfully, but config push failed:");
+          const message = configError instanceof Error ? configError.message : String(configError);
+          output.error(message);
+        }
+      }
+    } else if (options.withConfig) {
+      output.warn("Skipping config push due to content push errors.");
     }
   } catch (error) {
     handleCommandError(error, output);
@@ -8746,7 +9848,7 @@ async function captureScreenshot(options) {
     colorScheme: playwright_config_default.use.colorScheme
   });
   await page.setContent(html, { waitUntil: "load" });
-  await page.screenshot({ path: path9__namespace.resolve(outputPath), fullPage: true });
+  await page.screenshot({ path: path2__namespace.resolve(outputPath), fullPage: true });
   await browser.close();
 }
 function resolveOutputMode(options) {
@@ -8759,8 +9861,8 @@ function resolveOutputMode(options) {
   return "terminal";
 }
 async function writePreviewHtmlFile(html) {
-  const dir = await fs3__namespace.mkdtemp(path9__namespace.join(os__namespace.tmpdir(), "riverbank-preview-"));
-  const filePath = path9__namespace.join(dir, "index.html");
+  const dir = await fs3__namespace.mkdtemp(path2__namespace.join(os__namespace.tmpdir(), "riverbank-preview-"));
+  const filePath = path2__namespace.join(dir, "index.html");
   await fs3__namespace.writeFile(filePath, html, "utf-8");
   return filePath;
 }
@@ -8789,7 +9891,7 @@ function runCommand(command, args) {
 async function readCssFiles(paths) {
   if (!paths || paths.length === 0) return "";
   const chunks = await Promise.all(paths.map(async (filePath) => {
-    const resolved = path9__namespace.resolve(filePath);
+    const resolved = path2__namespace.resolve(filePath);
     const { readFile: readFile4 } = await import('fs/promises');
     return readFile4(resolved, "utf-8");
   }));
@@ -8833,7 +9935,7 @@ ${extraCss}` : response.cssText;
       return;
     }
     if (mode === "screenshot") {
-      const outputPath = options.output ?? path9__namespace.resolve(process.cwd(), "block-preview.png");
+      const outputPath = options.output ?? path2__namespace.resolve(process.cwd(), "block-preview.png");
       await captureScreenshot({ html: htmlDocument, outputPath });
       output.success("Screenshot saved", { outputPath });
       return;
@@ -9186,60 +10288,62 @@ var AGENTS_END = "<!-- RIVERBANK-CONTEXT-END -->";
 function getContentDir() {
   const isBundled = __dirname.includes("/dist/cli") || __dirname.endsWith("/dist/cli");
   if (isBundled) {
-    return path9__namespace.join(__dirname, "init-docs", "content");
+    return path2__namespace.join(__dirname, "init-docs", "content");
   }
-  return path9__namespace.join(__dirname, "content");
+  return path2__namespace.join(__dirname, "content");
 }
 function loadTemplate(name) {
   const contentDir = getContentDir();
-  const filePath = path9__namespace.join(contentDir, `${name}.md`);
+  const filePath = path2__namespace.join(contentDir, `${name}.md`);
   return fs6.readFileSync(filePath, "utf-8");
 }
 async function initDocs(options) {
   const { rootDir, configPath, agentsPath } = options;
-  const docsDir = path9__namespace.join(rootDir, "docs");
-  const contextDir = path9__namespace.join(rootDir, "context");
-  const workflowsDir = path9__namespace.join(docsDir, "workflows");
-  const siteWorkflowsDir = path9__namespace.join(docsDir, "site-workflows");
-  const knowledgeDir = path9__namespace.join(contextDir, "knowledge");
-  const brandDir = path9__namespace.join(contextDir, "brand");
+  const docsDir = path2__namespace.join(rootDir, "docs");
+  const contextDir = path2__namespace.join(rootDir, "context");
+  const workflowsDir = path2__namespace.join(docsDir, "workflows");
+  const siteWorkflowsDir = path2__namespace.join(docsDir, "site-workflows");
+  const knowledgeDir = path2__namespace.join(contextDir, "knowledge");
+  const brandDir = path2__namespace.join(contextDir, "brand");
   await ensureDir2(workflowsDir);
   await ensureDir2(siteWorkflowsDir);
   await ensureDir2(knowledgeDir);
   await ensureDir2(brandDir);
-  await writeFileIfMissing(path9__namespace.join(docsDir, "getting-started.md"), loadTemplate("getting-started"));
-  await writeFileIfMissing(path9__namespace.join(docsDir, "cli-reference.md"), loadTemplate("cli-reference"));
+  await writeFileIfMissing(path2__namespace.join(docsDir, "getting-started.md"), loadTemplate("getting-started"));
+  await writeFileIfMissing(path2__namespace.join(docsDir, "cli-reference.md"), loadTemplate("cli-reference"));
   await writeFileIfMissing(
-    path9__namespace.join(docsDir, "content-management.md"),
+    path2__namespace.join(docsDir, "content-management.md"),
     loadTemplate("content-management")
   );
-  await writeFileIfMissing(
-    path9__namespace.join(workflowsDir, "create-page.md"),
-    loadTemplate("workflow-create-page")
-  );
-  await writeFileIfMissing(
-    path9__namespace.join(workflowsDir, "add-block.md"),
-    loadTemplate("workflow-add-block")
-  );
-  await writeFileIfMissing(
-    path9__namespace.join(workflowsDir, "publish-workflow.md"),
-    loadTemplate("workflow-publish")
+  const coreWorkflows = [
+    { filename: "create-page.md", template: "workflow-create-page" },
+    { filename: "add-block.md", template: "workflow-add-block" },
+    { filename: "publish-workflow.md", template: "workflow-publish" },
+    { filename: "block-extensions.md", template: "workflow-block-extensions" },
+    { filename: "custom-block.md", template: "workflow-custom-block" },
+    { filename: "content-types.md", template: "workflow-content-types" },
+    { filename: "cmsify-page.md", template: "workflow-cmsify-page" }
+  ];
+  await Promise.all(
+    coreWorkflows.map(
+      ({ filename, template }) => fs3__namespace.writeFile(path2__namespace.join(workflowsDir, filename), loadTemplate(template), "utf-8")
+    )
   );
   await writeFileIfMissing(
-    path9__namespace.join(siteWorkflowsDir, "README.md"),
+    path2__namespace.join(siteWorkflowsDir, "README.md"),
     loadTemplate("site-workflows-readme")
   );
-  await writeFileIfMissing(path9__namespace.join(contextDir, "brief.md"), loadTemplate("context-brief"));
-  await writeFileIfMissing(path9__namespace.join(knowledgeDir, "README.md"), loadTemplate("context-knowledge"));
-  await writeFileIfMissing(path9__namespace.join(brandDir, "README.md"), loadTemplate("context-brand"));
+  await writeFileIfMissing(path2__namespace.join(contextDir, "brief.md"), loadTemplate("context-brief"));
+  await writeFileIfMissing(path2__namespace.join(knowledgeDir, "README.md"), loadTemplate("context-knowledge"));
+  await writeFileIfMissing(path2__namespace.join(brandDir, "README.md"), loadTemplate("context-brand"));
   const { config: config3, errorMessage } = await loadConfig(configPath, options.output);
   await upsertGeneratedDoc(
-    path9__namespace.join(docsDir, "schema.md"),
+    path2__namespace.join(docsDir, "schema.md"),
     buildSchemaTemplate({ config: config3, errorMessage }),
     buildSchemaGeneratedSection({ config: config3, errorMessage })
   );
   await upsertGeneratedDoc(
-    path9__namespace.join(docsDir, "block-types.md"),
+    path2__namespace.join(docsDir, "block-types.md"),
     buildBlockTypesTemplate(),
     buildBlockTypesGeneratedSection()
   );
@@ -9314,9 +10418,9 @@ async function upsertAgentsSection(filePath) {
 // src/cli/commands/init-docs.ts
 async function runInitDocs(options, command) {
   const { output, isJsonOutput } = createCommandContext(command);
-  const rootDir = path9__namespace.resolve(options.path ?? ".riverbank");
-  const configPath = path9__namespace.resolve(options.config ?? path9__namespace.join(process.cwd(), "riverbank.config.ts"));
-  const agentsPath = path9__namespace.resolve(process.cwd(), "AGENTS.md");
+  const rootDir = path2__namespace.resolve(options.path ?? ".riverbank");
+  const configPath = path2__namespace.resolve(options.config ?? path2__namespace.join(process.cwd(), "riverbank.config.ts"));
+  const agentsPath = path2__namespace.resolve(process.cwd(), "AGENTS.md");
   await initDocs({
     rootDir,
     configPath,
@@ -10826,6 +11930,15 @@ var ENDPOINT_DEFINITIONS = {
     auth: "public",
     responseKind: "json"
   },
+  // List all forms for a site (for prebuild cache)
+  listPublicForms: {
+    path: "/public/sites/{siteId}/forms",
+    method: "GET",
+    revalidate: 60,
+    tags: ["site-forms-{siteId}"],
+    auth: "public",
+    responseKind: "json"
+  },
   // Public booking services
   getPublicBookingServices: {
     path: "/public/bookings/services",
@@ -11012,6 +12125,194 @@ var ENDPOINT_DEFINITIONS = {
     tags: ["admin", "billing", "price-override"],
     auth: "admin",
     responseKind: "json"
+  },
+  // Bookings - Event Series
+  listEventSeries: {
+    path: "/sites/{siteId}/bookings/event-series",
+    method: "GET",
+    tags: ["site-{siteId}", "event-series-{siteId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  createEventSeries: {
+    path: "/sites/{siteId}/bookings/event-series",
+    method: "POST",
+    tags: ["site-{siteId}", "event-series-{siteId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  getEventSeries: {
+    path: "/sites/{siteId}/bookings/event-series/{seriesId}",
+    method: "GET",
+    tags: ["site-{siteId}", "event-series-{seriesId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  updateEventSeries: {
+    path: "/sites/{siteId}/bookings/event-series/{seriesId}",
+    method: "PATCH",
+    tags: ["site-{siteId}", "event-series-{seriesId}", "event-series-{siteId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  deleteEventSeries: {
+    path: "/sites/{siteId}/bookings/event-series/{seriesId}",
+    method: "DELETE",
+    tags: ["site-{siteId}", "event-series-{seriesId}", "event-series-{siteId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  listEventSeriesAttendees: {
+    path: "/sites/{siteId}/bookings/event-series/{seriesId}/attendees",
+    method: "GET",
+    tags: ["site-{siteId}", "event-series-{seriesId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  listEventSeriesOccurrences: {
+    path: "/sites/{siteId}/bookings/event-series/{seriesId}/occurrences",
+    method: "GET",
+    tags: ["site-{siteId}", "event-series-{seriesId}", "occurrences-{seriesId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  generateEventOccurrences: {
+    path: "/sites/{siteId}/bookings/event-series/{seriesId}/occurrences/generate",
+    method: "POST",
+    tags: ["site-{siteId}", "event-series-{seriesId}", "occurrences-{seriesId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  updateEventOccurrence: {
+    path: "/sites/{siteId}/bookings/event-series/{seriesId}/occurrences/{occurrenceId}",
+    method: "PATCH",
+    tags: ["site-{siteId}", "event-series-{seriesId}", "occurrences-{seriesId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  // Bookings - Venues
+  listVenues: {
+    path: "/sites/{siteId}/bookings/venues",
+    method: "GET",
+    tags: ["site-{siteId}", "venues-{siteId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  createVenue: {
+    path: "/sites/{siteId}/bookings/venues",
+    method: "POST",
+    tags: ["site-{siteId}", "venues-{siteId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  // AI Playground
+  aiPlaygroundApply: {
+    path: "/sites/{siteId}/ai/playground/apply",
+    method: "POST",
+    tags: ["site-{siteId}"],
+    auth: "user",
+    responseKind: "json"
+  },
+  // Billing status endpoints
+  billingStatus: {
+    path: "/billing/status",
+    method: "GET",
+    auth: "user",
+    responseKind: "json"
+  },
+  billingSummary: {
+    path: "/billing/summary",
+    method: "GET",
+    auth: "user",
+    responseKind: "json"
+  },
+  siteBillingCost: {
+    path: "/sites/{siteId}/billing/cost",
+    method: "GET",
+    tags: ["site-{siteId}", "billing"],
+    auth: "user",
+    responseKind: "json"
+  },
+  // Account
+  deleteAccount: {
+    path: "/account/delete",
+    method: "POST",
+    auth: "user",
+    responseKind: "json"
+  },
+  // Fonts
+  listFonts: {
+    path: "/fonts",
+    method: "GET",
+    revalidate: 3600,
+    // 1 hour - fonts rarely change
+    auth: "public",
+    responseKind: "json"
+  },
+  // Binary download endpoints
+  exportSiteBackup: {
+    path: "/sites/{siteId}/backup/export",
+    method: "POST",
+    tags: ["site-{siteId}", "backup"],
+    auth: "user",
+    responseKind: "blob"
+  },
+  downloadMediaAsset: {
+    path: "/media/{mediaId}/download",
+    method: "GET",
+    auth: "user",
+    responseKind: "blob"
+  },
+  exportSeoCsv: {
+    path: "/sites/{siteId}/seo/export",
+    method: "GET",
+    tags: ["site-{siteId}", "seo"],
+    auth: "user",
+    responseKind: "blob"
+  },
+  // Admin site cost (for admin panel)
+  adminSiteCost: {
+    path: "/admin/sites/{siteId}/cost",
+    method: "GET",
+    tags: ["admin", "site-{siteId}", "billing"],
+    auth: "admin",
+    responseKind: "json"
+  },
+  adminUpdateSiteCost: {
+    path: "/admin/sites/{siteId}/cost",
+    method: "POST",
+    tags: ["admin", "site-{siteId}", "billing"],
+    auth: "admin",
+    responseKind: "json"
+  },
+  // Admin GSC/SEO endpoints
+  adminGscVerifyStart: {
+    path: "/admin/seo/gsc/properties/verify/start",
+    method: "POST",
+    tags: ["admin", "seo"],
+    auth: "admin",
+    responseKind: "json"
+  },
+  adminGscVerifyConfirm: {
+    path: "/admin/seo/gsc/properties/verify/confirm",
+    method: "POST",
+    tags: ["admin", "seo"],
+    auth: "admin",
+    responseKind: "json"
+  },
+  adminGscMetaPersist: {
+    path: "/admin/seo/gsc/meta/persist",
+    method: "POST",
+    tags: ["admin", "seo"],
+    auth: "admin",
+    responseKind: "json"
+  },
+  adminSeoIngestRun: {
+    path: "/admin/seo/ingest/run",
+    method: "POST",
+    tags: ["admin", "seo"],
+    auth: "admin",
+    responseKind: "json"
   }
 };
 var API_ENDPOINTS = ENDPOINT_DEFINITIONS;
@@ -11203,6 +12504,10 @@ async function parseSuccessResponse(endpoint, response, config3) {
       const stream = body;
       return buildSuccessEnvelope(stream, requestId);
     }
+    case "blob": {
+      const blob = await response.blob();
+      return buildSuccessEnvelope(blob, requestId);
+    }
     case "void": {
       return buildSuccessEnvelope(void 0, requestId);
     }
@@ -11478,7 +12783,7 @@ var SimpleCache = class {
 };
 
 // src/version.ts
-var SDK_VERSION = "0.8.1";
+var SDK_VERSION = "0.9.0";
 
 // src/client/error.ts
 var RiverbankApiError = class _RiverbankApiError extends Error {
@@ -12022,7 +13327,8 @@ function createRiverbankClient(config3) {
   const circuitBreaker = new CircuitBreaker(circuitBreakerConfig);
   const prebuildDir = config3.resilience?.prebuildDir;
   const prebuildMod = prebuildDir ? getPrebuildModule() : null;
-  const prebuildLoader = prebuildMod?.canUsePrebuild() && prebuildDir ? new prebuildMod.PrebuildLoader({
+  const canUsePrebuild2 = prebuildMod?.canUsePrebuild() ?? false;
+  const prebuildLoader = canUsePrebuild2 && prebuildMod && prebuildDir ? new prebuildMod.PrebuildLoader({
     prebuildDir,
     maxPrebuildAgeSec: config3.resilience?.maxPrebuildAgeSec
   }) : null;
@@ -12240,15 +13546,35 @@ function createRiverbankClient(config3) {
       }, { signal });
     },
     async getPublicFormById(params) {
-      const { formId, signal } = params;
+      const { formId, siteId, signal } = params;
       if (!formId) {
         throw new Error("getPublicFormById() requires formId");
       }
-      const cacheKey = `public-form:${formId}`;
+      const cacheKey = siteId ? `public-form:${siteId}:${formId}` : `public-form:${formId}`;
       return resilientFetch(cacheKey, async (sig) => {
-        return await apiClient({ endpoint: "getPublicFormById", params: { formId }, options: { signal: sig } });
+        const apiParams = siteId ? { formId, siteId } : { formId };
+        return await apiClient({ endpoint: "getPublicFormById", params: apiParams, options: { signal: sig } });
       }, { signal });
     },
+    async getForms(params) {
+      const { siteId, signal } = params;
+      if (!siteId) {
+        throw new Error("getForms() requires siteId");
+      }
+      const cacheKey = `forms:${siteId}`;
+      return resilientFetch(cacheKey, async (sig) => {
+        return await apiClient({ endpoint: "listPublicForms", params: { siteId }, options: { signal: sig } });
+      }, {
+        signal,
+        prebuildFallback: prebuildLoader ? () => {
+          const result = prebuildLoader.loadForms();
+          if (result) {
+            return { data: { forms: result.data }, prebuildAgeSec: result.prebuildAgeSec };
+          }
+          return null;
+        } : void 0
+      });
+    },
     async getPublicBookingServices(params) {
       const { siteId, ids, signal } = params;
       if (!siteId) {
@@ -12381,7 +13707,7 @@ async function fetchAllEntries(client, siteId, contentType, onProgress) {
 async function prebuildSite(client, siteId, outputDir) {
   const site = await client.getSite({ id: siteId });
   const filename = "site.json";
-  const filePath = path9__namespace.join(outputDir, filename);
+  const filePath = path2__namespace.join(outputDir, filename);
   const cacheFile = {
     data: site,
     generatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -12390,9 +13716,10 @@ async function prebuildSite(client, siteId, outputDir) {
   return { files: [filename], size, siteData: site };
 }
 async function prebuildPages(client, siteId, routes, outputDir, onProgress) {
-  const pagesDir = path9__namespace.join(outputDir, "pages");
+  const pagesDir = path2__namespace.join(outputDir, "pages");
   ensureDir3(pagesDir);
   const files = [];
+  const pathMappings = {};
   let totalSize = 0;
   const publishedPaths = Object.entries(routes).filter(([_, route]) => route.status === "published").map(([_, route]) => route.path);
   const pageIndex = [];
@@ -12409,7 +13736,7 @@ async function prebuildPages(client, siteId, routes, outputDir, onProgress) {
     try {
       const pageData = await client.getPage({ siteId, path: pagePath, preview: false });
       const filename = pathToFilename(pagePath);
-      const filePath = path9__namespace.join(pagesDir, filename);
+      const filePath = path2__namespace.join(pagesDir, filename);
       const cacheFile = {
         data: pageData,
         path: pagePath,
@@ -12417,6 +13744,7 @@ async function prebuildPages(client, siteId, routes, outputDir, onProgress) {
       };
       totalSize += writeJsonFile2(filePath, cacheFile);
       files.push(`pages/${filename}`);
+      pathMappings[pagePath] = `pages/${filename}`;
       if ("page" in pageData) {
         pageIndex.push({
           path: pagePath,
@@ -12433,13 +13761,13 @@ async function prebuildPages(client, siteId, routes, outputDir, onProgress) {
     totalCount: pageIndex.length,
     generatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  const indexPath = path9__namespace.join(pagesDir, "_index.json");
+  const indexPath = path2__namespace.join(pagesDir, "_index.json");
   totalSize += writeJsonFile2(indexPath, indexFile);
   files.push("pages/_index.json");
-  return { files, size: totalSize };
+  return { files, size: totalSize, pathMappings };
 }
 async function prebuildEntries(client, siteId, contentTypes, outputDir, onProgress) {
-  const entriesDir = path9__namespace.join(outputDir, "entries");
+  const entriesDir = path2__namespace.join(outputDir, "entries");
   ensureDir3(entriesDir);
   const files = [];
   let totalSize = 0;
@@ -12460,7 +13788,7 @@ async function prebuildEntries(client, siteId, contentTypes, outputDir, onProgre
         });
       }
     );
-    const typeDir = path9__namespace.join(entriesDir, contentType);
+    const typeDir = path2__namespace.join(entriesDir, contentType);
     ensureDir3(typeDir);
     const cacheFile = {
       entries,
@@ -12469,14 +13797,14 @@ async function prebuildEntries(client, siteId, contentTypes, outputDir, onProgre
       generatedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
     const filename = `entries/${contentType}/all.json`;
-    const filePath = path9__namespace.join(entriesDir, contentType, "all.json");
+    const filePath = path2__namespace.join(entriesDir, contentType, "all.json");
     totalSize += writeJsonFile2(filePath, cacheFile);
     files.push(filename);
   }
   return { files, size: totalSize };
 }
 async function prebuildNavigation(siteData, outputDir, onProgress) {
-  const navDir = path9__namespace.join(outputDir, "navigation");
+  const navDir = path2__namespace.join(outputDir, "navigation");
   ensureDir3(navDir);
   const files = [];
   let totalSize = 0;
@@ -12497,17 +13825,51 @@ async function prebuildNavigation(siteData, outputDir, onProgress) {
     generatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   const filename = "navigation/menus.json";
-  const filePath = path9__namespace.join(navDir, "menus.json");
+  const filePath = path2__namespace.join(navDir, "menus.json");
   totalSize += writeJsonFile2(filePath, cacheFile);
   files.push(filename);
   return { files, size: totalSize };
 }
+async function prebuildForms(client, siteId, outputDir, onProgress) {
+  const formsDir = path2__namespace.join(outputDir, "forms");
+  ensureDir3(formsDir);
+  const files = [];
+  let totalSize = 0;
+  onProgress?.({
+    current: 1,
+    total: 1,
+    item: "Forms",
+    contentType: "forms"
+  });
+  try {
+    const response = await client.getForms({ siteId });
+    const forms = response.forms || [];
+    const cacheFile = {
+      forms: forms.map((form2) => ({
+        id: form2.id,
+        slug: form2.slug,
+        name: form2.name,
+        schema: form2.schema,
+        settings: form2.settings
+      })),
+      totalCount: forms.length,
+      generatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+    const filename = "forms/forms.json";
+    const filePath = path2__namespace.join(formsDir, "forms.json");
+    totalSize += writeJsonFile2(filePath, cacheFile);
+    files.push(filename);
+  } catch (error) {
+    console.warn("[Prebuild] Failed to fetch forms:", error.message);
+  }
+  return { files, size: totalSize };
+}
 async function prebuildCache(options) {
   const {
     client,
     siteId,
     outputDir = DEFAULT_PREBUILD_DIR,
-    include = ["site", "pages", "entries", "navigation"],
+    include = ["site", "pages", "entries", "navigation", "forms"],
     contentTypes,
     onProgress
   } = options;
@@ -12516,6 +13878,7 @@ async function prebuildCache(options) {
   let totalSize = 0;
   const errors = [];
   let siteData = null;
+  let pagePathMappings = {};
   ensureDir3(outputDir);
   if (include.includes("site") || include.includes("pages") || include.includes("navigation")) {
     try {
@@ -12541,6 +13904,7 @@ async function prebuildCache(options) {
       );
       files.push(...result.files);
       totalSize += result.size;
+      pagePathMappings = result.pathMappings;
     } catch (error) {
       errors.push(`Pages prebuild failed: ${error.message}`);
     }
@@ -12574,20 +13938,28 @@ async function prebuildCache(options) {
       errors.push(`Navigation prebuild failed: ${error.message}`);
     }
   }
+  if (include.includes("forms")) {
+    try {
+      const result = await prebuildForms(client, siteId, outputDir, onProgress);
+      files.push(...result.files);
+      totalSize += result.size;
+    } catch (error) {
+      errors.push(`Forms prebuild failed: ${error.message}`);
+    }
+  }
   const keyToFile = {};
   if (files.includes("site.json")) {
     keyToFile[`site:${siteId}`] = "site.json";
   }
-  for (const file of files) {
-    if (file.startsWith("pages/") && file !== "pages/_index.json") {
-      const filename = file.replace("pages/", "").replace(".json", "");
-      const pagePath = filename === "_home" ? "/" : "/" + filename.replace(/-/g, "/");
-      keyToFile[`page:${siteId}:${pagePath}:false`] = file;
-    }
-    if (file.startsWith("entries/") && file.endsWith("/all.json")) {
-      const contentType = file.split("/")[1];
-      keyToFile[`entries-all:${siteId}:${contentType}`] = file;
-    }
+  for (const [pagePath, file] of Object.entries(pagePathMappings)) {
+    keyToFile[`page:${siteId}:${pagePath}:false`] = file;
+  }
+  for (const file of files.filter((f) => f.startsWith("entries/") && f.endsWith("/all.json"))) {
+    const contentType = file.split("/")[1];
+    keyToFile[`entries-all:${siteId}:${contentType}`] = file;
+  }
+  if (files.includes("forms/forms.json")) {
+    keyToFile[`forms:${siteId}`] = "forms/forms.json";
   }
   const manifest = {
     version: MANIFEST_VERSION,
@@ -12601,7 +13973,7 @@ async function prebuildCache(options) {
   };
   const checksum = calculateChecksum(manifest);
   manifest.checksum = checksum;
-  const manifestPath = path9__namespace.join(outputDir, MANIFEST_FILENAME);
+  const manifestPath = path2__namespace.join(outputDir, MANIFEST_FILENAME);
   writeJsonFile2(manifestPath, manifest);
   return {
     success: errors.length === 0,
@@ -12728,13 +14100,19 @@ Notes:
       output.info("Generating prebuild cache...");
       try {
         const env = loadEnvironment(true);
+        if (!env.apiKey) {
+          return output.error("Missing RIVERBANK_REMOTE_API_KEY", {
+            suggestion: "Set RIVERBANK_REMOTE_API_KEY in .env.local (your bld_live_sk_... key)"
+          });
+        }
         const client = createRiverbankClient({
-          apiKey: env.managementApiKey,
-          baseUrl: env.dashboardUrl
+          apiKey: env.apiKey,
+          baseUrl: `${env.dashboardUrl}/api`
         });
         const result = await prebuildCache({
           client,
-          siteId: config3.siteId,
+          siteId: env.siteId,
+          // Use remote site ID, not config (which may be local)
           outputDir: prebuildOutput,
           contentTypes: config3.contentTypes,
           onProgress: (p) => {