meno-core 1.0.48 → 1.0.50

package/dist/chunks/{chunk-TPQ7APVQ.js → chunk-CVLFID6V.js}

@@ -1,6 +1,6 @@
 import {
   configService
-} from "./chunk-BJRKEPMP.js";
+} from "./chunk-PQ2HRXDR.js";
 import {
   projectPaths,
   resolveProjectPath,
@@ -13,10 +13,12 @@ import {
   writeFile
 } from "./chunk-WQFG7PAH.js";
 import {
+  CMS_DRAFT_SUFFIX,
+  isReservedDraftFilename,
   isSafePathSegment,
   isValidIdentifier,
   resolvePaletteColor
-} from "./chunk-EK4KESLU.js";
+} from "./chunk-J23ZX5AP.js";
 import {
   extractAttributesFromNode,
   isHtmlMapping,
@@ -24,7 +26,7 @@ import {
   processStructure,
   resolveHtmlMapping,
   skipEmptyTemplateAttributes
-} from "./chunk-NP76N4HQ.js";
+} from "./chunk-EDQSMAMP.js";
 import {
   DEFAULT_PREFETCH_CONFIG,
   SSRRegistry,
@@ -61,20 +63,26 @@ import {
   resolveTemplateRawValue,
   responsiveStylesToClasses,
   singularize,
+  validateCMSDraftItem,
   validateCMSItem,
   validateComponentDefinition
-} from "./chunk-3FHJUHAS.js";
+} from "./chunk-7NIC4I3V.js";
 import {
   DEFAULT_BREAKPOINTS,
+  DEFAULT_FLUID_RANGE,
   DEFAULT_I18N_CONFIG,
+  DEFAULT_SITE_MARGIN,
+  buildFluidPropertyValue,
   buildLocalizedPath,
+  buildSiteMarginClamp,
   extractLocaleFromPath,
+  getSmallestBreakpointName,
   isI18nValue,
   migrateI18nConfig,
   normalizeBreakpointConfig,
   resolveI18nValue,
   scalePropertyValue
-} from "./chunk-B2RTLDXY.js";
+} from "./chunk-AZQYF6KE.js";
 import {
   isTiptapDocument,
   tiptapToHtml
@@ -717,6 +725,7 @@ var CMSService = class {
   schemaCache = /* @__PURE__ */ new Map();
   routePatterns = [];
   provider;
+  previewMode;
   /** Item cache with TTL-based expiration */
   itemsCache = /* @__PURE__ */ new Map();
   /** Cache TTL in milliseconds (5 seconds) */
@@ -724,9 +733,11 @@ var CMSService = class {
   /**
    * Creates a new CMSService instance
    * @param provider - Optional CMSProvider for loading data (enables DI for testing)
+   * @param options - Service-level flags (preview mode for dev server)
    */
-  constructor(provider) {
+  constructor(provider, options = {}) {
     this.provider = provider;
+    this.previewMode = options.previewMode === true;
   }
   /**
    * Set the CMS provider
@@ -737,9 +748,14 @@ var CMSService = class {
     this.provider = provider;
   }
   /**
-   * Get items with caching
-   * Returns cached items if available and not expired, otherwise fetches fresh data
-   * Rich-text fields are automatically preprocessed to HTML for template interpolation
+   * Get items with caching, used by SSR-facing read methods.
+   *
+   * In preview mode (dev server) drafts are merged over published — drafts
+   * win on a per-`_filename` basis and draft-only items are included — so
+   * the editor preview reflects unpublished edits. Returns published-only
+   * otherwise. Rich-text fields are preprocessed to HTML for template
+   * interpolation either way.
+   *
    * @param collection - Collection ID to fetch items for
    * @returns Array of CMSItems with rich-text fields converted to HTML markers
    */
@@ -749,7 +765,20 @@ var CMSService = class {
     if (cached && now - cached.timestamp < this.ITEMS_CACHE_TTL) {
       return cached.items;
     }
-    const rawItems = await this.provider.getItems(collection);
+    let rawItems = await this.provider.getItems(collection);
+    if (this.previewMode) {
+      const drafts = await this.provider.getAllDrafts(collection);
+      if (drafts.length > 0) {
+        const byFilename = /* @__PURE__ */ new Map();
+        for (const item of rawItems) {
+          if (item._filename) byFilename.set(item._filename, item);
+        }
+        for (const draft of drafts) {
+          if (draft._filename) byFilename.set(draft._filename, draft);
+        }
+        rawItems = Array.from(byFilename.values());
+      }
+    }
     const items = this.preprocessRichTextFields(collection, rawItems);
     this.itemsCache.set(collection, { items, timestamp: now });
     return items;
@@ -987,6 +1016,71 @@ var CMSService = class {
    * Only clears items cache and provider cache before re-initializing.
    * Schema/route caches are swapped atomically inside initialize().
    */
+  // ----------------------------------------------------------------------
+  // Draft-version methods (Studio-only — never used by SSR / static export)
+  // ----------------------------------------------------------------------
+  /**
+   * Load both published and draft versions of an item, used by the editor.
+   * Returns `{}` when neither version exists.
+   */
+  async getItemVersions(collection, filename) {
+    if (!this.provider) return {};
+    const [published, draft] = await Promise.all([
+      this.provider.getItemByFilename(collection, filename),
+      this.provider.getDraft(collection, filename)
+    ]);
+    const result = {};
+    if (published) result.published = published;
+    if (draft) result.draft = draft;
+    return result;
+  }
+  /**
+   * List all items in a collection for the Studio item list:
+   * - Published items annotated with `_hasDraft: true` when a draft sibling exists.
+   * - Draft-only items (no published file yet) returned with `_isDraft: true`.
+   */
+  async listItemsWithDraftFlag(collection) {
+    if (!this.provider) return [];
+    const [published, drafts] = await Promise.all([
+      this.provider.getItems(collection),
+      this.provider.getAllDrafts(collection)
+    ]);
+    const draftFilenames = new Set(drafts.map((d) => d._filename).filter(Boolean));
+    const annotatedPublished = published.map((item) => {
+      if (item._filename && draftFilenames.has(item._filename)) {
+        return { ...item, _hasDraft: true };
+      }
+      return item;
+    });
+    const publishedFilenames = new Set(published.map((i) => i._filename).filter(Boolean));
+    const draftOnly = drafts.filter((d) => d._filename && !publishedFilenames.has(d._filename));
+    return [...annotatedPublished, ...draftOnly];
+  }
+  /** Pass-through to provider; no caching (drafts are read fresh in the editor). */
+  async getDraft(collection, filename) {
+    if (!this.provider) return null;
+    return this.provider.getDraft(collection, filename);
+  }
+  async hasDraft(collection, filename) {
+    if (!this.provider) return false;
+    return this.provider.hasDraft(collection, filename);
+  }
+  async saveDraft(collection, item) {
+    if (!this.provider) throw new Error("CMS provider not configured");
+    await this.provider.saveDraft(collection, item);
+    this.itemsCache.delete(collection);
+  }
+  async discardDraft(collection, filename) {
+    if (!this.provider) throw new Error("CMS provider not configured");
+    await this.provider.discardDraft(collection, filename);
+    this.itemsCache.delete(collection);
+  }
+  async publishDraft(collection, filename) {
+    if (!this.provider) throw new Error("CMS provider not configured");
+    const item = await this.provider.publishDraft(collection, filename);
+    this.itemsCache.delete(collection);
+    return item;
+  }
   async refreshSchemas() {
     if (!this.provider) {
       return;
@@ -1295,20 +1389,45 @@ ${cssVars.join("\n")}
   return cssBlocks.join("\n\n");
 }
 function generateVariablesCSS(config, breakpoints, responsiveScales) {
-  if (!config.variables || config.variables.length === 0) {
+  const cssBlocks = [];
+  const fluidActive = responsiveScales?.enabled === true && responsiveScales?.mode === "fluid";
+  const fluidRange = responsiveScales?.fluidRange ?? DEFAULT_FLUID_RANGE;
+  const fluidBaseRef = responsiveScales?.baseReference || 16;
+  const smallestBp = fluidActive ? getSmallestBreakpointName(breakpoints) : null;
+  const baseVars = (config.variables ?? []).map((v) => {
+    if (fluidActive && smallestBp && v.type !== "none") {
+      const categoryScales = responsiveScales?.[v.type];
+      const scale = categoryScales?.[smallestBp];
+      if (scale != null && scale !== 1) {
+        const fluid = buildFluidPropertyValue(
+          v.value,
+          scale,
+          fluidRange.min,
+          fluidRange.max,
+          fluidBaseRef
+        );
+        if (fluid) return `  ${v.cssVar}: ${fluid};`;
+      }
+    }
+    return `  ${v.cssVar}: ${v.value};`;
+  });
+  if (fluidActive) {
+    const siteMargin = responsiveScales?.siteMargin ?? DEFAULT_SITE_MARGIN;
+    baseVars.push(`  --site-margin: ${buildSiteMarginClamp(siteMargin, fluidRange)};`);
+  }
+  if (baseVars.length === 0) {
     return "";
   }
-  const cssBlocks = [];
-  const baseVars = config.variables.map((v) => `  ${v.cssVar}: ${v.value};`);
   cssBlocks.push(`:root {
 ${baseVars.join("\n")}
 }`);
-  if (breakpoints && responsiveScales?.enabled) {
+  const userVariables = config.variables ?? [];
+  if (breakpoints && responsiveScales?.enabled && !fluidActive && userVariables.length > 0) {
     const baseRef = responsiveScales.baseReference || 16;
     const sortedBreakpoints = Object.entries(breakpoints).sort((a, b) => b[1].breakpoint - a[1].breakpoint);
     for (const [bpName, bpEntry] of sortedBreakpoints) {
       const scaledVars = [];
-      for (const variable of config.variables) {
+      for (const variable of userVariables) {
         if (variable.scales && variable.scales[bpName]) {
           const overrideValue = variable.scales[bpName];
           if (overrideValue !== variable.value) {
@@ -1389,6 +1508,27 @@ function buildAttributes(props, exclude = []) {
   }
   return attrs.length > 0 ? " " + attrs.join(" ") : "";
 }
+function buildEditorAttrs(opts) {
+  const { elementPath } = opts;
+  if (!elementPath) return "";
+  const parts = [`data-element-path="${escapeHtml(elementPath.join(","))}"`];
+  if (opts.cmsItemIndexPath && opts.cmsItemIndexPath.length > 0) {
+    parts.push(`data-cms-item-index="${escapeHtml(opts.cmsItemIndexPath.join("."))}"`);
+    if (opts.cmsListPaths && opts.cmsListPaths.length === opts.cmsItemIndexPath.length) {
+      const ctx = JSON.stringify({ itemIndexPath: opts.cmsItemIndexPath, listPaths: opts.cmsListPaths });
+      parts.push(`data-cms-context="${escapeHtml(ctx)}"`);
+    }
+  }
+  if (opts.isCMSListContainer) parts.push(`data-cms-list="true"`);
+  if (opts.isComponentRoot) parts.push(`data-component-root="true"`);
+  if (opts.parentComponentName) {
+    parts.push(`data-parent-component="${escapeHtml(opts.parentComponentName)}"`);
+  }
+  if (opts.componentContext && !opts.isSlotContent) {
+    parts.push(`data-component-context="${escapeHtml(opts.componentContext)}"`);
+  }
+  return " " + parts.join(" ");
+}
 function styleToString(style) {
   if (!style || Object.keys(style).length === 0) return "";
   const declarations = [];
@@ -1898,9 +2038,27 @@ function getDOMPurify() {
   }
   return _DOMPurify;
 }
+function resolveI18nAttrs(attrs, locale, i18nConfig) {
+  let mutated = null;
+  const config = i18nConfig ?? DEFAULT_I18N_CONFIG;
+  const effectiveLocale = locale || config.defaultLocale;
+  for (const [key, value] of Object.entries(attrs)) {
+    if (isI18nValue(value)) {
+      mutated = mutated ?? { ...attrs };
+      mutated[key] = resolveI18nValue(value, effectiveLocale, config);
+    }
+  }
+  return mutated ?? attrs;
+}
 function getTemplateContext(ctx) {
   return ctx.templateContext || null;
 }
+function buildListResolutionScope(ctx) {
+  const tplCtx = ctx.templateContext;
+  const props = ctx.componentResolvedProps;
+  if (!tplCtx && !props) return void 0;
+  return { ...props ?? {}, ...tplCtx ?? {} };
+}
 function getI18nResolver(ctx) {
   return createI18nResolver(ctx.locale, ctx.i18nConfig);
 }
@@ -1939,7 +2097,11 @@ function processStyleToClasses(style, ctx) {
       getI18nResolver(ctx)
     );
   }
-  return responsiveStylesToClasses(processedStyle);
+  const fluidActive = ctx.responsiveScales?.enabled === true && ctx.responsiveScales?.mode === "fluid";
+  return responsiveStylesToClasses(
+    processedStyle,
+    { fluidActive, responsiveScales: ctx.responsiveScales }
+  );
 }
 function evaluateIfCondition(node, ctx) {
   const ifValue = hasIf(node) ? node.if : void 0;
@@ -1971,31 +2133,31 @@ function evaluateIfCondition(node, ctx) {
   }
   return true;
 }
-function resolveFilterValue(value, templateContext) {
-  if (!templateContext || typeof value !== "string" || !value.startsWith("{{") || !value.endsWith("}}")) {
+function resolveFilterValue(value, scope) {
+  if (!scope || typeof value !== "string" || !value.startsWith("{{") || !value.endsWith("}}")) {
     return value;
   }
   const path2 = value.slice(2, -2).trim();
-  const resolved = getNestedValue(templateContext, path2);
+  const resolved = getNestedValue(scope, path2);
   return resolved !== void 0 ? resolved : value;
 }
-function resolveFilterTemplates(filter, templateContext) {
-  if (!filter || !templateContext) return filter;
+function resolveFilterTemplates(filter, scope) {
+  if (!filter || !scope) return filter;
   if (Array.isArray(filter)) {
     return filter.map((cond) => ({
       ...cond,
-      value: resolveFilterValue(cond.value, templateContext)
+      value: resolveFilterValue(cond.value, scope)
     }));
   }
   if ("field" in filter && "value" in filter) {
     return {
       ...filter,
-      value: resolveFilterValue(filter.value, templateContext)
+      value: resolveFilterValue(filter.value, scope)
     };
   }
   const resolved = {};
   for (const [key, value] of Object.entries(filter)) {
-    resolved[key] = resolveFilterValue(value, templateContext);
+    resolved[key] = resolveFilterValue(value, scope);
   }
   return resolved;
 }
@@ -2032,7 +2194,7 @@ async function expandRichTextComponents(html, ctx) {
   return resolved.join("");
 }
 var ssrComponentRegistry = new SSRRegistry();
-async function buildComponentHTML(node, globalComponents = {}, pageComponents = {}, locale, i18nConfig, slugMappings, pagePath, cmsContext, cmsService, isProductionBuild) {
+async function buildComponentHTML(node, globalComponents = {}, pageComponents = {}, locale, i18nConfig, slugMappings, pagePath, cmsContext, cmsService, isProductionBuild, injectEditorAttrs) {
   const interactiveStylesMap = /* @__PURE__ */ new Map();
   const preloadImages = [];
   const neededCollections = /* @__PURE__ */ new Set();
@@ -2067,7 +2229,9 @@ async function buildComponentHTML(node, globalComponents = {}, pageComponents =
     // Collect SSR fallback HTML for complex nodes
     processedRawHtmlCollector,
     // Collect raw→processed HTML for Astro exporter
-    imageFormat: configService.getImageFormat()
+    imageFormat: configService.getImageFormat(),
+    injectEditorAttrs,
+    responsiveScales: configService.getResponsiveScales()
   };
   const html = await renderNode(node, ctx);
   return { html, interactiveStylesMap, preloadImages, neededCollections, ssrFallbackCollector, processedRawHtmlCollector };
@@ -2098,7 +2262,7 @@ async function renderNestedListPlaceholder(node, ctx) {
   };
   const templateContent = node.children ? await renderChildrenAsync(node.children, childTemplateCtx) : "";
   const configJson = escapeHtml(JSON.stringify(config));
-  return `<div data-cms-list-nested="true" data-collection="${escapeHtml(sourceStr)}" data-cms-config="${configJson}"><template data-nested-template>${templateContent}</template></div>`;
+  return `<div data-cms-list-nested="true" data-collection="${escapeHtml(sourceStr)}" data-cms-config="${configJson}"${editorAttrs(ctx, { isCMSListContainer: true })}><template data-nested-template>${templateContent}</template></div>`;
 }
 async function processList(node, ctx) {
   const nodeType = node.type;
@@ -2157,7 +2321,9 @@ async function processList(node, ctx) {
     );
     const itemCtx = {
       ...ctx,
-      templateContext
+      templateContext,
+      cmsItemIndexPath: [...ctx.cmsItemIndexPath ?? [], i],
+      cmsListPaths: [...ctx.cmsListPaths ?? [], ctx.elementPath ?? []]
     };
     const childrenHtml = await renderChildrenAsync(node.children || [], itemCtx);
     renderedItems.push(childrenHtml);
@@ -2201,7 +2367,8 @@ async function getCollectionItems(node, source, ctx) {
           resolvedIds = Array.isArray(value) ? value.map((v) => String(v)) : String(value);
         }
       } else {
-        const parentContext = ctx.templateContext || { _type: "template" };
+        const mergedScope = buildListResolutionScope(ctx) ?? {};
+        const parentContext = { _type: "template", ...mergedScope };
         resolvedIds = resolveItemsTemplate(node.items, parentContext);
       }
       if (!resolvedIds) {
@@ -2219,7 +2386,7 @@ async function getCollectionItems(node, source, ctx) {
   } else {
     const query = {
       collection: source,
-      filter: resolveFilterTemplates(node.filter, ctx.templateContext),
+      filter: resolveFilterTemplates(node.filter, buildListResolutionScope(ctx)),
       sort: node.sort,
       limit: node.limit,
       offset: node.offset,
@@ -2274,11 +2441,13 @@ function buildNodeElementClass(ctx, label, isSlotContent2) {
   const useComponentContext = !isSlotContent2 && Boolean(ctx.componentContext);
   const effectiveFileType = useComponentContext ? "component" : "page";
   const effectiveFileName = useComponentContext ? ctx.componentContext : pagePath ? pagePath.replace(/^\//, "").replace(/\//g, "_") || "index" : "page";
+  const rawPath = ctx.elementPath || [];
+  const path2 = useComponentContext && ctx.componentRootPath ? rawPath.slice(ctx.componentRootPath.length) : rawPath;
   const elementClassCtx = {
     fileType: effectiveFileType,
     fileName: effectiveFileName || "page",
     label,
-    path: ctx.elementPath || []
+    path: path2
   };
   return generateElementClassName(elementClassCtx);
 }
@@ -2298,6 +2467,26 @@ function buildCssVariableStyleAttr(cssVariables) {
   const styleString = Object.entries(cssVariables).map(([k, v]) => `${k}: ${v}`).join("; ");
   return ` style="${escapeHtml(styleString)}"`;
 }
+function arraysEqual(a, b) {
+  if (!a || !b || a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
+  return true;
+}
+function editorAttrs(ctx, opts = {}) {
+  if (!ctx.injectEditorAttrs) return "";
+  const isComponentRoot = !!ctx.componentContext && !opts.isSlotContent && arraysEqual(ctx.elementPath, ctx.componentRootPath);
+  const effectiveParent = opts.isSlotContent ? ctx.parentComponentName : isComponentRoot ? ctx.parentComponentName : ctx.componentContext ?? ctx.parentComponentName;
+  return buildEditorAttrs({
+    elementPath: ctx.elementPath,
+    cmsItemIndexPath: ctx.cmsItemIndexPath,
+    cmsListPaths: ctx.cmsListPaths,
+    componentContext: ctx.componentContext,
+    parentComponentName: effectiveParent,
+    isComponentRoot,
+    isSlotContent: opts.isSlotContent,
+    isCMSListContainer: opts.isCMSListContainer
+  });
+}
 async function renderNode(node, ctx) {
   const { breakpoints, viewportWidth, locale, i18nConfig, slugMappings, pagePath } = ctx;
   if (node === null || node === void 0) return "";
@@ -2343,6 +2532,15 @@ async function renderNode(node, ctx) {
     }))).join("");
   }
   if (typeof node !== "object") return "";
+  if (isI18nValue(node)) {
+    const i18nResolveConfig = i18nConfig ?? DEFAULT_I18N_CONFIG;
+    const i18nEffectiveLocale = locale || i18nResolveConfig.defaultLocale;
+    const resolved = resolveI18nValue(node, i18nEffectiveLocale, i18nResolveConfig);
+    return renderNode(
+      resolved,
+      ctx
+    );
+  }
   if (!evaluateIfCondition(node, ctx)) {
     return "";
   }
@@ -2382,7 +2580,7 @@ async function renderNode(node, ctx) {
       KEEP_CONTENT: true
     }) : htmlContent;
     const optimizedHtml = ctx.imageMetadataMap ? rewriteRichTextImages(sanitizedHtml, ctx.imageMetadataMap, ctx.imageFormat) : sanitizedHtml;
-    const nodeAttributes2 = extractAttributesFromNode(node);
+    const nodeAttributes2 = resolveI18nAttrs(extractAttributesFromNode(node), locale, i18nConfig);
     const classNames = ["oem"];
     if (nodeStyle) {
       const utilityClasses2 = processStyleToClasses(nodeStyle, ctx);
@@ -2406,7 +2604,7 @@ async function renderNode(node, ctx) {
       delete nodeAttributes2.class;
       const attrs2 = buildAttributes(nodeAttributes2);
       const classAttr2 = classNames.length > 0 ? ` class="${escapeHtml(classNames.filter(Boolean).join(" "))}"` : "";
-      return `<span${classAttr2}${embedStyleAttr}${attrs2}>${optimizedHtml}</span>`;
+      return `<span${classAttr2}${embedStyleAttr}${attrs2}${editorAttrs(ctx, { isSlotContent: isSlotContent(node) })}>${optimizedHtml}</span>`;
     }
     const attrClassName2 = nodeAttributes2.className || nodeAttributes2.class || "";
     if (attrClassName2) {
@@ -2416,7 +2614,7 @@ async function renderNode(node, ctx) {
     delete nodeAttributes2.class;
     const attrs = buildAttributes(nodeAttributes2);
     const classAttr = classNames.length > 0 ? ` class="${escapeHtml(classNames.filter(Boolean).join(" "))}"` : "";
-    return `<span${classAttr}${attrs}>${optimizedHtml}</span>`;
+    return `<span${classAttr}${attrs}${editorAttrs(ctx, { isSlotContent: isSlotContent(node) })}>${optimizedHtml}</span>`;
   }
   if (isLinkNode(node)) {
     let href = typeof node.href === "string" ? node.href : "#";
@@ -2441,7 +2639,7 @@ async function renderNode(node, ctx) {
       href = processCMSTemplate(href, ctx.cmsContext.cms, locale, i18nConfig);
     }
     href = localizeHref(href, ctx);
-    const nodeAttributes2 = extractAttributesFromNode(node);
+    const nodeAttributes2 = resolveI18nAttrs(extractAttributesFromNode(node), locale, i18nConfig);
     const classNames = ["olink"];
     if (nodeStyle) {
       const utilityClasses2 = processStyleToClasses(nodeStyle, ctx);
@@ -2477,7 +2675,7 @@ async function renderNode(node, ctx) {
       const childPath = ctx.elementPath ? [...ctx.elementPath, index] : [index];
       return renderNode(child, { ...ctx, elementPath: childPath });
     }))).join("") : await renderNode(children, { ...ctx, elementPath: ctx.elementPath ? [...ctx.elementPath, 0] : [0] });
-    return `<a href="${escapeHtml(String(href))}"${classAttr}${olinkStyleAttr}${attrs}>${childrenHTML}</a>`;
+    return `<a href="${escapeHtml(String(href))}"${classAttr}${olinkStyleAttr}${attrs}${editorAttrs(ctx, { isSlotContent: isSlotContent(node) })}>${childrenHTML}</a>`;
   }
   if (isLocaleListNode(node)) {
     return renderLocaleList(node, ctx);
@@ -2493,7 +2691,7 @@ async function renderNode(node, ctx) {
   if (!ctx.templateMode && templateCtx && Object.keys(nodeProps).length > 0) {
     nodeProps = processItemPropsTemplate(nodeProps, templateCtx, i18nResolver);
   }
-  let nodeAttributes = extractAttributesFromNode(node);
+  let nodeAttributes = resolveI18nAttrs(extractAttributesFromNode(node), locale, i18nConfig);
   const originalAttributes = { ...nodeAttributes };
   if (ctx.cmsContext?.cms && Object.keys(nodeAttributes).length > 0) {
     nodeAttributes = processCMSPropsTemplate(nodeAttributes, ctx.cmsContext.cms, locale, i18nConfig);
@@ -2651,8 +2849,10 @@ async function renderComponent(componentName, propsWithStyleAndAttrs, children,
     }
     return await renderNode(processedStructure, {
       ...ctx,
+      // The previously-active component (if any) becomes the parent for editor attrs
+      parentComponentName: ctx.componentContext,
       componentContext: componentName,
-      elementPath: [0],
+      componentRootPath: ctx.elementPath,
       componentResolvedProps: resolvedProps
     });
   } catch (error) {
@@ -2672,7 +2872,7 @@ async function renderLinkNode(propsWithStyleAndAttrs, children, ctx) {
     const childPath = ctx.elementPath ? [...ctx.elementPath, index] : [index];
     return renderNode(child, { ...ctx, elementPath: childPath });
   }))).join("") : await renderNode(children, { ...ctx, elementPath: ctx.elementPath ? [...ctx.elementPath, 0] : [0] });
-  return `<a href="${escapeHtml(String(href))}"${linkClassAttr}${attrs}>${childrenHTML}</a>`;
+  return `<a href="${escapeHtml(String(href))}"${linkClassAttr}${attrs}${editorAttrs(ctx)}>${childrenHTML}</a>`;
 }
 async function renderHtmlElement(tag, propsWithStyleAndAttrs, children, ctx) {
   let classValue = propsWithStyleAndAttrs.className ? String(propsWithStyleAndAttrs.className) : "";
@@ -2694,18 +2894,32 @@ async function renderHtmlElement(tag, propsWithStyleAndAttrs, children, ctx) {
   const imageProps = ["src", "alt", "loading", "width", "height", "sizes", "srcset", "fetchpriority"];
   const excludeProps = tag.toLowerCase() === "img" ? ["style", "className", ...imageProps] : ["style", "className"];
   const attrs = buildAttributes(propsWithStyleAndAttrs, excludeProps);
-  const childrenHTML = Array.isArray(children) ? (await Promise.all(children.map((child, index) => {
-    const childPath = ctx.elementPath ? [...ctx.elementPath, index] : [index];
-    return renderNode(child, { ...ctx, elementPath: childPath });
-  }))).join("") : await renderNode(children, { ...ctx, elementPath: ctx.elementPath ? [...ctx.elementPath, 0] : [0] });
+  const isRawTextElement = tag.toLowerCase() === "style" || tag.toLowerCase() === "script";
+  let childrenHTML;
+  if (isRawTextElement) {
+    const flatten = (node) => {
+      if (node == null) return "";
+      if (typeof node === "string") return node;
+      if (typeof node === "number") return String(node);
+      if (Array.isArray(node)) return node.map(flatten).join("");
+      return "";
+    };
+    childrenHTML = flatten(children);
+  } else {
+    childrenHTML = Array.isArray(children) ? (await Promise.all(children.map((child, index) => {
+      const childPath = ctx.elementPath ? [...ctx.elementPath, index] : [index];
+      return renderNode(child, { ...ctx, elementPath: childPath });
+    }))).join("") : await renderNode(children, { ...ctx, elementPath: ctx.elementPath ? [...ctx.elementPath, 0] : [0] });
+  }
+  const ea = editorAttrs(ctx);
   const voidElements = ["img", "input", "br", "hr", "meta", "link", "area", "base", "col", "embed", "source", "track", "wbr"];
   if (voidElements.includes(tag.toLowerCase())) {
     if (tag.toLowerCase() === "img") {
-      return renderImageElement(propsWithStyleAndAttrs, classAttr, styleAttr, attrs, ctx);
+      return renderImageElement(propsWithStyleAndAttrs, classAttr, styleAttr, attrs + ea, ctx);
     }
-    return `<${tag}${classAttr}${styleAttr}${attrs} />`;
+    return `<${tag}${classAttr}${styleAttr}${attrs}${ea} />`;
   }
-  return `<${tag}${classAttr}${styleAttr}${attrs}>${childrenHTML}</${tag}>`;
+  return `<${tag}${classAttr}${styleAttr}${attrs}${ea}>${childrenHTML}</${tag}>`;
 }
 function renderImageElement(propsWithStyleAndAttrs, classAttr, styleAttr, attrs, ctx) {
   const imgProps = propsWithStyleAndAttrs;
@@ -2793,9 +3007,13 @@ function renderLocaleList(node, ctx) {
         localeIconMap.set(localeConfig.code, localeConfig.icon);
       }
     }
+    const localeStyleOpts = {
+      fluidActive: ctx.responsiveScales?.enabled === true && ctx.responsiveScales?.mode === "fluid",
+      responsiveScales: ctx.responsiveScales
+    };
     let containerClasses = [];
     if (nodeStyle) {
-      containerClasses = responsiveStylesToClasses(nodeStyle);
+      containerClasses = responsiveStylesToClasses(nodeStyle, localeStyleOpts);
     }
     const localeListInteractiveStyles = node.interactiveStyles;
     const localeListGenerateElementClass = node.generateElementClass;
@@ -2812,21 +3030,21 @@ function renderLocaleList(node, ctx) {
     const containerClassAttr = containerClasses.length > 0 ? ` class="${escapeHtml(containerClasses.join(" "))}"` : "";
     let itemClasses = [];
     if (node.itemStyle) {
-      itemClasses = responsiveStylesToClasses(node.itemStyle);
+      itemClasses = responsiveStylesToClasses(node.itemStyle, localeStyleOpts);
     }
     const itemClassAttr = itemClasses.length > 0 ? ` class="${escapeHtml(itemClasses.join(" "))}"` : "";
     let activeItemClasses = [];
     if (node.activeItemStyle) {
-      activeItemClasses = responsiveStylesToClasses(node.activeItemStyle);
+      activeItemClasses = responsiveStylesToClasses(node.activeItemStyle, localeStyleOpts);
     }
     let separatorClasses = [];
     if (node.separatorStyle) {
-      separatorClasses = responsiveStylesToClasses(node.separatorStyle);
+      separatorClasses = responsiveStylesToClasses(node.separatorStyle, localeStyleOpts);
     }
     const separatorClassAttr = separatorClasses.length > 0 ? ` class="${escapeHtml(separatorClasses.join(" "))}"` : "";
     let flagClasses = [];
     if (node.flagStyle) {
-      flagClasses = responsiveStylesToClasses(node.flagStyle);
+      flagClasses = responsiveStylesToClasses(node.flagStyle, localeStyleOpts);
     }
     const flagClassAttr = flagClasses.length > 0 ? ` class="${escapeHtml(flagClasses.join(" "))}"` : "";
     const currentItemClasses = [...itemClasses, ...activeItemClasses];
@@ -2859,9 +3077,9 @@ function renderLocaleList(node, ctx) {
       links.push(`<a href="${escapeHtml(link.path)}"${hreflangAttr}${currentAttr} data-locale="${escapeHtml(link.locale)}"${classAttrForLink}>${linkContent}</a>`);
     }
     const linksHTML = showSeparator ? links.join(`<span${separatorClassAttr}></span>`) : links.join("");
-    const nodeAttributes = extractAttributesFromNode(node);
+    const nodeAttributes = resolveI18nAttrs(extractAttributesFromNode(node), locale, i18nConfig);
     const attrsStr = buildAttributes(nodeAttributes);
-    const localeListResult = `<div data-locale-list="true"${containerClassAttr}${localeListStyleAttr}${attrsStr}>${linksHTML}</div>`;
+    const localeListResult = `<div data-locale-list="true"${containerClassAttr}${localeListStyleAttr}${attrsStr}${editorAttrs(ctx)}>${linksHTML}</div>`;
     if (ctx.ssrFallbackCollector && ctx.elementPath) {
       ctx.ssrFallbackCollector.set(ctx.elementPath.join("."), localeListResult);
     }
@@ -2869,7 +3087,7 @@ function renderLocaleList(node, ctx) {
   }
   return '<div data-locale-list="true"></div>';
 }
-async function renderPageSSR(pageData, globalComponents = {}, pagePath = "/", baseUrl = "", locale, i18nConfig, slugMappings, cmsContext, cmsService, isProductionBuild) {
+async function renderPageSSR(pageData, globalComponents = {}, pagePath = "/", baseUrl = "", locale, i18nConfig, slugMappings, cmsContext, cmsService, isProductionBuild, injectEditorAttrs) {
   const rootNode = pageData?.root || void 0;
   if (!rootNode) {
     throw new Error("Page data must have a root node");
@@ -2893,7 +3111,7 @@ async function renderPageSSR(pageData, globalComponents = {}, pagePath = "/", ba
     }
   }
   const pageComponents = pageData?.components || {};
-  const { html: contentHTML, interactiveStylesMap, preloadImages, neededCollections, ssrFallbackCollector, processedRawHtmlCollector } = rootNode ? await buildComponentHTML(rootNode, globalComponents, pageComponents, effectiveLocale, config, slugMappings, pagePath, cmsContext, cmsService, isProductionBuild) : { html: "", interactiveStylesMap: /* @__PURE__ */ new Map(), preloadImages: [], neededCollections: /* @__PURE__ */ new Set(), ssrFallbackCollector: /* @__PURE__ */ new Map(), processedRawHtmlCollector: /* @__PURE__ */ new Map() };
+  const { html: contentHTML, interactiveStylesMap, preloadImages, neededCollections, ssrFallbackCollector, processedRawHtmlCollector } = rootNode ? await buildComponentHTML(rootNode, globalComponents, pageComponents, effectiveLocale, config, slugMappings, pagePath, cmsContext, cmsService, isProductionBuild, injectEditorAttrs) : { html: "", interactiveStylesMap: /* @__PURE__ */ new Map(), preloadImages: [], neededCollections: /* @__PURE__ */ new Set(), ssrFallbackCollector: /* @__PURE__ */ new Map(), processedRawHtmlCollector: /* @__PURE__ */ new Map() };
   const javascript = await collectComponentJavaScript(globalComponents, pageComponents);
   const componentCSS = collectComponentCSS(globalComponents, pageComponents);
   const fullUrl = baseUrl ? `${baseUrl}${pagePath}` : pagePath;
@@ -3217,7 +3435,7 @@ function generateImagePreloadTags(preloadImages) {
 }
 function minifyCSS(code) {
   if (!code.trim()) return code;
-  return code.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\s*([{};:,>~+])\s*/g, "$1").replace(/\s+/g, " ").replace(/\{\s+/g, "{").replace(/\s+\}/g, "}").replace(/;}/g, "}").trim();
+  return code.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\s*([{};:,>~])\s*/g, "$1").replace(/\s+/g, " ").replace(/\{\s+/g, "{").replace(/\s+\}/g, "}").replace(/;}/g, "}").trim();
 }
 async function generateSSRHTML(pageDataOrOptions, globalComponents = {}, pagePath = "/", baseUrl = "", useBuiltBundle = false, locale, slugMappings, cmsContext, cmsService, externalScriptPath) {
   let options;
@@ -3254,11 +3472,12 @@ async function generateSSRHTML(pageDataOrOptions, globalComponents = {}, pagePat
     pageCustomCode,
     clientDataCollections,
     injectLiveReload = false,
+    injectEditorAttrs = false,
     isEditor = false,
     isProductionBuild = false,
     serverPort
   } = options;
-  const rendered = await renderPageSSR(pageData, components, path2, base, loc, void 0, slugs, cms, cmsServ, isProductionBuild);
+  const rendered = await renderPageSSR(pageData, components, path2, base, loc, void 0, slugs, cms, cmsServ, isProductionBuild, injectEditorAttrs);
   let finalClientDataCollections = clientDataCollections;
   if (rendered.neededCollections.size > 0 && cmsServ) {
     finalClientDataCollections = clientDataCollections ? new Map(clientDataCollections) : /* @__PURE__ */ new Map();
@@ -3434,13 +3653,15 @@ picture {
   const cmsInlineScript = cmsTemplatePath && cms && (!useBundled || injectLiveReload) ? `<script>window.__MENO_CMS__=${JSON.stringify({ item: cms.cms, templatePath: cmsTemplatePath })}</script>
   ` : "";
   const clientDataScripts = finalClientDataCollections && finalClientDataCollections.size > 0 ? generateAllInlineDataScripts(finalClientDataCollections) + "\n  " : "";
-  const faviconTag = iconsConfig.favicon ? `<link rel="icon" href="${escapeHtml(iconsConfig.favicon)}" />` : "";
+  const hasDarkFavicon = !!(iconsConfig.favicon && iconsConfig.faviconDark);
+  const faviconTag = iconsConfig.favicon ? `<link rel="icon" href="${escapeHtml(iconsConfig.favicon)}"${hasDarkFavicon ? ' media="(prefers-color-scheme: light)"' : ""} />` : "";
+  const faviconDarkTag = iconsConfig.faviconDark ? `<link rel="icon" href="${escapeHtml(iconsConfig.faviconDark)}" media="(prefers-color-scheme: dark)" />` : "";
   const appleTouchIconTag = iconsConfig.appleTouchIcon ? `<link rel="apple-touch-icon" href="${escapeHtml(iconsConfig.appleTouchIcon)}" />` : "";
-  const iconTags = [faviconTag, appleTouchIconTag].filter(Boolean).join("\n  ");
+  const iconTags = [faviconTag, faviconDarkTag, appleTouchIconTag].filter(Boolean).join("\n  ");
   const scriptPreloadTag = extScriptPath ? `<link rel="preload" href="${extScriptPath}" as="script">` : "";
   const imagePreloadTags = generateImagePreloadTags(rendered.preloadImages);
   const wsUrl = serverPort ? `'ws://localhost:${serverPort}/hmr'` : `location.origin.replace('http','ws')+'/hmr'`;
-  const liveReloadScript = injectLiveReload ? `<script>(function(){var ws,timer,gen=0;function connect(){ws=new WebSocket(${wsUrl});ws.onmessage=function(e){var d=JSON.parse(e.data);if(d.type==='hmr:libraries-update'){location.reload()}else if(d.type==='hmr:update'||d.type==='hmr:cms-update'||d.type==='hmr:colors-update'||d.type==='hmr:variables-update')hotReload()};ws.onclose=function(){clearTimeout(timer);timer=setTimeout(connect,1000)}}function hotReload(){var g=++gen;var sx=window.scrollX,sy=window.scrollY;fetch(location.href,{cache:'no-store'}).then(function(r){return r.text()}).then(function(html){if(g!==gen)return;var p=new DOMParser();var d=p.parseFromString(html,'text/html');var or=document.getElementById('root');var nr=d.getElementById('root');if(or&&nr)or.innerHTML=nr.innerHTML;var os=document.getElementById('meno-styles');var ns=d.getElementById('meno-styles');if(os&&ns){os.parentNode.replaceChild(ns.cloneNode(true),os)}var nh=d.documentElement;if(nh){document.documentElement.setAttribute('lang',nh.getAttribute('lang')||'en');document.documentElement.setAttribute('theme',nh.getAttribute('theme')||'light')}document.querySelectorAll('script[id^="meno-cms-"]').forEach(function(s){s.remove()});d.querySelectorAll('script[id^="meno-cms-"]').forEach(function(s){var c=document.createElement('script');c.type=s.type;c.id=s.id;c.textContent=s.textContent;document.head.appendChild(c)});window.__menoHotReload=true;document.querySelectorAll('body > script[src^="/libraries/"]').forEach(function(o){o.remove()});d.querySelectorAll('body > script[src^="/libraries/"]').forEach(function(n){var ls=document.createElement('script');ls.src=n.getAttribute('src')+(n.getAttribute('src').indexOf('?')>-1?'&':'?')+'_r='+Date.now();document.body.appendChild(ls)});var oscr=document.querySelector('script[src^="/_scripts/"]');var nscr=d.querySelector('script[src^="/_scripts/"]');if(nscr){var src=nscr.getAttribute('src');if(oscr)oscr.remove();var s=document.createElement('script');s.src=src+(src.indexOf('?')>-1?'&':'?')+'_r='+Date.now();s.onload=function(){document.dispatchEvent(new Event('DOMContentLoaded'));window.scrollTo(sx,sy)};s.onerror=function(){window.scrollTo(sx,sy)};document.body.appendChild(s)}else{if(oscr)oscr.remove();document.dispatchEvent(new Event('DOMContentLoaded'));window.scrollTo(sx,sy)}}).catch(function(){location.reload()})}connect()})()</script>` : "";
+  const liveReloadScript = injectLiveReload ? `<script>(function(){var ws,timer,gen=0,lastSrvRoot=null;function strip(s){return s?s.replace(/[?&]_r=\\d+/,''):''}function classList(el){return (el.getAttribute('class')||'').split(/\\s+/).filter(Boolean)}function syncEl(cur,srv,old){var cc=classList(cur),sc=classList(srv),oc=old?new Set(classList(old)):new Set();var rt=cc.filter(function(c){return !oc.has(c)});var seen=new Set(),fin=[];sc.concat(rt).forEach(function(c){if(!seen.has(c)){seen.add(c);fin.push(c)}});var fs=fin.join(' ');if((cur.getAttribute('class')||'')!==fs){if(fs)cur.setAttribute('class',fs);else cur.removeAttribute('class')}for(var i=0;i<srv.attributes.length;i++){var a=srv.attributes[i];if(a.name==='class')continue;if(cur.getAttribute(a.name)!==a.value)cur.setAttribute(a.name,a.value)}if(old){for(var i=0;i<old.attributes.length;i++){var a=old.attributes[i];if(a.name==='class')continue;if(!srv.hasAttribute(a.name)&&cur.hasAttribute(a.name))cur.removeAttribute(a.name)}}}function syncText(cur,srv){var cc=cur.childNodes,sc=srv.childNodes;for(var i=0;i<sc.length;i++){var s=sc[i],c=cc[i];if(s.nodeType===3&&c&&c.nodeType===3){if(c.textContent!==s.textContent)c.textContent=s.textContent}}}function smartUpdate(curR,srvR,oldR){var ce=curR.querySelectorAll('[data-element-path]'),se=srvR.querySelectorAll('[data-element-path]');if(ce.length!==se.length){if(curR.innerHTML!==srvR.innerHTML)curR.innerHTML=srvR.innerHTML;return}var sbp={};for(var i=0;i<se.length;i++)sbp[se[i].getAttribute('data-element-path')]=se[i];var obp={};if(oldR){var oe=oldR.querySelectorAll('[data-element-path]');for(var i=0;i<oe.length;i++)obp[oe[i].getAttribute('data-element-path')]=oe[i]}for(var i=0;i<ce.length;i++){var c=ce[i],p=c.getAttribute('data-element-path'),s=sbp[p];if(!s){if(curR.innerHTML!==srvR.innerHTML)curR.innerHTML=srvR.innerHTML;return}syncEl(c,s,obp[p]);syncText(c,s)}syncText(curR,srvR)}function connect(){ws=new WebSocket(${wsUrl});ws.onmessage=function(e){var d=JSON.parse(e.data);if(d.type==='hmr:libraries-update'){location.reload()}else if(d.type==='hmr:update'||d.type==='hmr:cms-update'||d.type==='hmr:colors-update'||d.type==='hmr:variables-update')hotReload()};ws.onclose=function(){clearTimeout(timer);timer=setTimeout(connect,1000)}}function hotReload(){var g=++gen;var sx=window.scrollX,sy=window.scrollY;fetch(location.href,{cache:'no-store'}).then(function(r){return r.text()}).then(function(html){if(g!==gen)return;var p=new DOMParser();var d=p.parseFromString(html,'text/html');var or=document.getElementById('root'),nr=d.getElementById('root');if(or&&nr)smartUpdate(or,nr,lastSrvRoot);if(nr)lastSrvRoot=nr.cloneNode(true);var os=document.getElementById('meno-styles'),ns=d.getElementById('meno-styles');if(os&&ns&&os.textContent!==ns.textContent)os.parentNode.replaceChild(ns.cloneNode(true),os);var nh=d.documentElement;if(nh){var nl=nh.getAttribute('lang')||'en',nt=nh.getAttribute('theme')||'light';if(document.documentElement.getAttribute('lang')!==nl)document.documentElement.setAttribute('lang',nl);if(document.documentElement.getAttribute('theme')!==nt)document.documentElement.setAttribute('theme',nt)}var ocms=document.querySelectorAll('script[id^="meno-cms-"]'),ncms=d.querySelectorAll('script[id^="meno-cms-"]');var ock=JSON.stringify(Array.prototype.map.call(ocms,function(s){return [s.id,s.textContent]}));var nck=JSON.stringify(Array.prototype.map.call(ncms,function(s){return [s.id,s.textContent]}));if(ock!==nck){ocms.forEach(function(s){s.remove()});ncms.forEach(function(s){var c=document.createElement('script');c.type=s.type;c.id=s.id;c.textContent=s.textContent;document.head.appendChild(c)})}window.__menoHotReload=true;var olib=document.querySelectorAll('body > script[src^="/libraries/"]'),nlib=d.querySelectorAll('body > script[src^="/libraries/"]');var olk=JSON.stringify(Array.prototype.map.call(olib,function(s){return strip(s.getAttribute('src'))}).sort());var nlk=JSON.stringify(Array.prototype.map.call(nlib,function(s){return strip(s.getAttribute('src'))}).sort());if(olk!==nlk){olib.forEach(function(o){o.remove()});nlib.forEach(function(n){var src=n.getAttribute('src');var ls=document.createElement('script');ls.src=src+(src.indexOf('?')>-1?'&':'?')+'_r='+Date.now();document.body.appendChild(ls)})}var oscr=document.querySelector('script[src^="/_scripts/"]'),nscr=d.querySelector('script[src^="/_scripts/"]');var oss=oscr?strip(oscr.getAttribute('src')):'',nss=nscr?strip(nscr.getAttribute('src')):'';if(oss===nss){window.scrollTo(sx,sy)}else{if(oscr)oscr.remove();if(nscr){var src=nscr.getAttribute('src');var s=document.createElement('script');s.src=src+(src.indexOf('?')>-1?'&':'?')+'_r='+Date.now();s.onload=function(){document.dispatchEvent(new Event('DOMContentLoaded'));window.scrollTo(sx,sy)};s.onerror=function(){window.scrollTo(sx,sy)};document.body.appendChild(s)}else{document.dispatchEvent(new Event('DOMContentLoaded'));window.scrollTo(sx,sy)}}}).catch(function(){location.reload()})}var iR=document.getElementById('root');if(iR)lastSrvRoot=iR.cloneNode(true);connect()})()</script>` : "";
   const scrollHandlerScript = injectLiveReload ? `<script>(function(){window.addEventListener('message',function(e){if(e.data.type==='GET_SCROLL_POSITION'){window.parent.postMessage({type:'SCROLL_POSITION_RESPONSE',scrollX:window.scrollX,scrollY:window.scrollY},'*')}else if(e.data.type==='SET_SCROLL_POSITION'){window.scrollTo(e.data.scrollX,e.data.scrollY)}})})()</script>` : "";
   const styleContent = useBundled ? finalCSS : `
     ${combinedCSS.split("\n").join("\n    ")}
@@ -5622,6 +5843,7 @@ autoInit();
 // lib/server/providers/fileSystemCMSProvider.ts
 import { existsSync as existsSync2, readdirSync as readdirSync2, mkdirSync } from "fs";
 import { join as join2 } from "path";
+var DRAFT_FILE_SUFFIX = `${CMS_DRAFT_SUFFIX}.json`;
 async function loadJSONFile2(filePath) {
   try {
     if (await fileExists(filePath)) {
@@ -5633,12 +5855,24 @@ async function loadJSONFile2(filePath) {
     return null;
   }
 }
-function normalizeItem(content, filename) {
-  return {
-    ...content,
+function normalizeItem(content, filename, isDraft = false) {
+  const raw = content;
+  const base = {
+    ...raw,
+    _id: raw._id || filename,
     _slug: filename,
     _filename: filename
   };
+  if (isDraft) base._isDraft = true;
+  return base;
+}
+function stripTransient(item) {
+  const { _slug, _isDraft, _hasDraft, _url, _filename, ...rest } = item;
+  const out = rest;
+  if (typeof _filename === "string" && _filename !== out._id) {
+    out._filename = _filename;
+  }
+  return out;
 }
 var FileSystemCMSProvider = class {
   constructor(templatesDir, cmsDir) {
@@ -5656,13 +5890,16 @@ var FileSystemCMSProvider = class {
     }
   }
   /**
-   * Validate filename to prevent path traversal attacks
+   * Validate filename to prevent path traversal attacks and reserved-suffix collisions.
    * @throws Error if filename is invalid
    */
   validateFilename(filename) {
     if (!isSafePathSegment(filename)) {
       throw new Error(`Invalid filename: "${filename}". Filenames cannot contain path separators or traversal sequences.`);
     }
+    if (isReservedDraftFilename(filename)) {
+      throw new Error(`Invalid filename: "${filename}". The "${CMS_DRAFT_SUFFIX}" suffix is reserved for draft files.`);
+    }
   }
   /**
    * Load all CMS schemas from page files with source: 'cms' in templates/
@@ -5709,7 +5946,7 @@ var FileSystemCMSProvider = class {
       return [];
     }
     const files = readdirSync2(collectionDir);
-    const jsonFiles = files.filter((f) => f.endsWith(".json"));
+    const jsonFiles = files.filter((f) => f.endsWith(".json") && !f.endsWith(DRAFT_FILE_SUFFIX));
     const results = await Promise.all(
       jsonFiles.map(async (file) => {
         const filePath = join2(collectionDir, file);
@@ -5766,8 +6003,10 @@ var FileSystemCMSProvider = class {
     return items.find((item) => item._id === id) || null;
   }
   /**
-   * Save item to file system
-   * Uses _filename for file path (stable, doesn't change when slug changes)
+   * Save item to file system.
+   * The on-disk filename is derived from `_filename` (legacy alias) when set,
+   * otherwise from `_id` (canonical identifier; equals the filename for new
+   * items). Falls back to the slugField value as a last resort.
    */
   async saveItem(collection, item) {
     this.validateCollection(collection);
@@ -5783,32 +6022,193 @@ var FileSystemCMSProvider = class {
     } else {
       const slugField = schemaInfo.schema.slugField;
       const slugValue = item[slugField];
-      filename = typeof slugValue === "string" ? slugValue : String(slugValue);
+      if (typeof slugValue === "string" && slugValue) {
+        filename = slugValue;
+      } else if (typeof item._id === "string" && item._id) {
+        filename = item._id;
+      } else {
+        filename = String(slugValue);
+      }
     }
     if (!filename || filename === "[object Object]") {
-      throw new Error("Missing _filename field. Items must have _filename set on creation.");
+      throw new Error("Cannot derive filename: item is missing _id, _filename, and a usable slug-field value.");
     }
     this.validateFilename(filename);
     const collectionDir = join2(this.cmsDir, collection);
     if (!existsSync2(collectionDir)) {
       mkdirSync(collectionDir, { recursive: true });
     }
-    const { _slug, ...itemData } = item;
+    const itemData = stripTransient(item);
     const filePath = join2(collectionDir, `${filename}.json`);
     await writeFile2(filePath, JSON.stringify(itemData, null, 2), "utf-8");
   }
   /**
-   * Delete item by filename (or slug for backward compat)
+   * Delete item by filename. Removes the published file AND any draft sibling.
    */
   async deleteItem(collection, filename) {
     this.validateCollection(collection);
     this.validateFilename(filename);
     const { unlink } = await import("fs/promises");
-    const filePath = join2(this.cmsDir, collection, `${filename}.json`);
+    const publishedPath = join2(this.cmsDir, collection, `${filename}.json`);
+    if (existsSync2(publishedPath)) {
+      await unlink(publishedPath);
+    }
+    const draftPath = this.draftPath(collection, filename);
+    if (existsSync2(draftPath)) {
+      await unlink(draftPath);
+    }
+  }
+  // ---- Draft helpers ----------------------------------------------------
+  draftPath(collection, filename) {
+    return join2(this.cmsDir, collection, `${filename}${DRAFT_FILE_SUFFIX}`);
+  }
+  /**
+   * Get the draft version of an item, or null if no draft file exists.
+   * Drafts skip strict validation — they may be partial / WIP.
+   */
+  async getDraft(collection, filename) {
+    this.validateCollection(collection);
+    this.validateFilename(filename);
+    const filePath = this.draftPath(collection, filename);
+    const content = await loadJSONFile2(filePath);
+    if (!content || typeof content !== "object") {
+      return null;
+    }
+    return normalizeItem(
+      content,
+      filename,
+      /*isDraft*/
+      true
+    );
+  }
+  /**
+   * List all drafts in a collection. Used by the Studio item list to mark
+   * items that have an outstanding draft sibling (or are draft-only).
+   */
+  async getAllDrafts(collection) {
+    this.validateCollection(collection);
+    const collectionDir = join2(this.cmsDir, collection);
+    if (!existsSync2(collectionDir)) return [];
+    const files = readdirSync2(collectionDir).filter((f) => f.endsWith(DRAFT_FILE_SUFFIX));
+    const results = await Promise.all(
+      files.map(async (file) => {
+        const filePath = join2(collectionDir, file);
+        const content = await loadJSONFile2(filePath);
+        return { file, content };
+      })
+    );
+    const drafts = [];
+    for (const { file, content } of results) {
+      if (content && typeof content === "object") {
+        const filename = file.slice(0, -DRAFT_FILE_SUFFIX.length);
+        drafts.push(normalizeItem(
+          content,
+          filename,
+          /*isDraft*/
+          true
+        ));
+      }
+    }
+    return drafts;
+  }
+  async hasDraft(collection, filename) {
+    this.validateCollection(collection);
+    this.validateFilename(filename);
+    return existsSync2(this.draftPath(collection, filename));
+  }
+  /**
+   * Save the draft version of an item. Loose validation — drafts may have
+   * missing required fields or partial data. Strict validation only runs at
+   * publish time. The on-disk filename is derived the same way as for
+   * `saveItem` (prefer `_filename`, fall back to `_id`).
+   */
+  async saveDraft(collection, item) {
+    this.validateCollection(collection);
+    const { writeFile: writeFile2 } = await import("fs/promises");
+    const schemas = await this.getAllSchemas();
+    const schemaInfo = schemas.get(collection);
+    if (!schemaInfo) {
+      throw new Error(`Unknown collection: ${collection}`);
+    }
+    let filename;
+    if (item._filename) {
+      filename = item._filename;
+    } else {
+      const slugField = schemaInfo.schema.slugField;
+      const slugValue = item[slugField];
+      if (typeof slugValue === "string" && slugValue) {
+        filename = slugValue;
+      } else if (typeof item._id === "string" && item._id) {
+        filename = item._id;
+      } else {
+        filename = String(slugValue);
+      }
+    }
+    if (!filename || filename === "[object Object]") {
+      throw new Error("Cannot derive draft filename: item is missing _id, _filename, and a usable slug-field value.");
+    }
+    this.validateFilename(filename);
+    const collectionDir = join2(this.cmsDir, collection);
+    if (!existsSync2(collectionDir)) {
+      mkdirSync(collectionDir, { recursive: true });
+    }
+    const itemData = stripTransient(item);
+    const validation = validateCMSDraftItem(itemData);
+    if (!validation.valid) {
+      const messages = validation.errors.map((e) => `${e.path}: ${e.message}`).join(", ");
+      throw new Error(`Invalid draft: ${messages}`);
+    }
+    const filePath = this.draftPath(collection, filename);
+    await writeFile2(filePath, JSON.stringify(itemData, null, 2), "utf-8");
+  }
+  /**
+   * Discard the draft version of an item. No-op if no draft exists.
+   */
+  async discardDraft(collection, filename) {
+    this.validateCollection(collection);
+    this.validateFilename(filename);
+    const { unlink } = await import("fs/promises");
+    const filePath = this.draftPath(collection, filename);
     if (existsSync2(filePath)) {
       await unlink(filePath);
     }
   }
+  /**
+   * Promote a draft to published. Reads `{filename}.draft.json`, writes the
+   * content to `{filename}.json`, then unlinks the draft. The published write
+   * happens first so a crash mid-operation leaves a valid published file plus
+   * an orphan draft (recoverable via the editor's Discard button) — never a
+   * gap with no published content.
+   *
+   * Throws if no draft exists.
+   */
+  async publishDraft(collection, filename) {
+    this.validateCollection(collection);
+    this.validateFilename(filename);
+    const { writeFile: writeFile2, unlink } = await import("fs/promises");
+    const draftFilePath = this.draftPath(collection, filename);
+    const content = await loadJSONFile2(draftFilePath);
+    if (!content || typeof content !== "object") {
+      throw new Error(`No draft to publish for ${collection}/${filename}`);
+    }
+    const item = normalizeItem(content, filename);
+    const validation = validateCMSItem(item);
+    if (!validation.valid) {
+      const messages = validation.errors.map((e) => `${e.path}: ${e.message}`).join(", ");
+      throw new Error(`Cannot publish invalid draft: ${messages}`);
+    }
+    const collectionDir = join2(this.cmsDir, collection);
+    if (!existsSync2(collectionDir)) {
+      mkdirSync(collectionDir, { recursive: true });
+    }
+    const itemData = stripTransient(validation.data);
+    const publishedPath = join2(collectionDir, `${filename}.json`);
+    await writeFile2(publishedPath, JSON.stringify(itemData, null, 2), "utf-8");
+    if (existsSync2(draftFilePath)) {
+      await unlink(draftFilePath);
+    }
+    return normalizeItem(itemData, filename);
+  }
   /**
    * Clear schema cache (useful when pages are modified)
    */
@@ -5932,4 +6332,4 @@ export {
   FileSystemCMSProvider,
   migrateTemplatesDirectory
 };
-//# sourceMappingURL=chunk-TPQ7APVQ.js.map
+//# sourceMappingURL=chunk-CVLFID6V.js.map