@brightsideoy/kama 1.0.0-alpha.3 → 1.0.0-alpha.5

package/dist/{dist-cK3xGnBZ.js → dist-BmDMKgKk.js}

@@ -183,13 +183,13 @@ function C(e) {
 	let t = new g();
 	return e.forEach((e) => t.put(e)), [...t.values()];
 }
-function ee(e) {
+function w(e) {
 	return typeof e == "string";
 }
-function w(e) {
+function T(e) {
 	return Object.fromEntries(Object.entries(e).sort(([e], [t]) => e.localeCompare(t)));
 }
-var T = m(), E = class {
+var ee = m(), E = class {
 	static collectMetadata(e, t) {
 		let n = this.getMetadataFromRegistry(e), r = Object.assign(Object.assign({}, n?._internal), t?._internal), i = Object.assign(Object.assign({}, n?.param), t?.param), a = Object.assign(Object.assign(Object.assign(Object.assign({}, Object.keys(r).length > 0 ? { _internal: r } : {}), n), t), Object.keys(i).length > 0 ? { param: i } : {});
 		if (l(e, [
@@ -257,7 +257,7 @@ var T = m(), E = class {
 		return t ? void 0 : e;
 	}
 	static getMetadataFromInternalRegistry(e) {
-		return T.get(e);
+		return ee.get(e);
 	}
 	static getMetadataFromRegistry(e) {
 		let t = this.getMetadataFromInternalRegistry(e), n = e.meta();
@@ -266,7 +266,7 @@ var T = m(), E = class {
 		return Object.assign(Object.assign(Object.assign({ _internal: Object.assign(Object.assign({}, o ? { refId: o } : {}), r) }, i), c ? { description: c } : {}), l);
 	}
 	static setMetadataInRegistry(e, t) {
-		T.add(e, t);
+		ee.add(e, t);
 	}
 };
 function D(e, t) {
@@ -427,7 +427,7 @@ var oe = class extends A {
 	getDiscriminatorValues(e, t) {
 		if (l(e, "ZodObject")) {
 			let n = e.def.shape?.[t];
-			return n ? l(n, "ZodEnum") ? Object.values(n._zod.def.entries).filter(ee) : l(n, "ZodLiteral") ? n.def.values.filter(ee) : [] : [];
+			return n ? l(n, "ZodEnum") ? Object.values(n._zod.def.entries).filter(w) : l(n, "ZodLiteral") ? n.def.values.filter(w) : [] : [];
 		}
 		if (l(e, "ZodDiscriminatedUnion")) {
 			let n = e.def.options.filter(u);
@@ -436,20 +436,20 @@ var oe = class extends A {
 		return [];
 	}
 };
-function j(e) {
+function ue(e) {
 	let t = Object.keys(e).filter((t) => typeof e[e[t]] != "number").map((t) => e[t]), n = t.filter((e) => typeof e == "number").length;
 	return {
 		values: t,
 		type: n === 0 ? "string" : n === t.length ? "numeric" : "mixed"
 	};
 }
-var ue = class {
+var de = class {
 	transform(e, t, n) {
-		let { type: r, values: i } = j(e._zod.def.entries);
+		let { type: r, values: i } = ue(e._zod.def.entries);
 		if (r === "mixed") throw new A("Enum has mixed string and number values, please specify the OpenAPI type manually");
 		return Object.assign(Object.assign({}, n(r === "numeric" ? "integer" : "string")), { enum: t ? [...i, null] : i });
 	}
-}, de = class {
+}, j = class {
 	transform(e, t, n, r) {
 		let i = { allOf: this.flattenIntersectionTypes(e).map(r) };
 		return t ? { anyOf: n([i], t) } : i;
@@ -497,7 +497,7 @@ var ue = class {
 	transform(e, t, n) {
 		let r = e.valueType, i = e.keyType, a = u(r) ? n(r) : {};
 		if (l(i, "ZodEnum")) {
-			let e = Object.values(i._zod.def.entries).filter(ee).reduce((e, t) => Object.assign(Object.assign({}, e), { [t]: a }), {});
+			let e = Object.values(i._zod.def.entries).filter(w).reduce((e, t) => Object.assign(Object.assign({}, e), { [t]: a }), {});
 			return Object.assign(Object.assign({}, t("object")), { properties: e });
 		}
 		return Object.assign(Object.assign({}, t("object")), { additionalProperties: a });
@@ -588,7 +588,7 @@ var ve = class {
 		if (l(e, "ZodNumber")) return "[+-]?\\d+(\\.\\d+)?";
 		if (l(e, "ZodBoolean")) return "(true|false)";
 		if (l(e, "ZodEnum")) {
-			let { values: t } = j(e.def.entries);
+			let { values: t } = ue(e.def.entries);
 			return `(${t.map((e) => this.escapeRegex(String(e))).join("|")})`;
 		}
 		return ".*";
@@ -598,7 +598,7 @@ var ve = class {
 	}
 }, we = class {
 	constructor(e, t) {
-		this.versionSpecifics = e, this.objectTransformer = new me(), this.stringTransformer = new ve(), this.numberTransformer = new pe(), this.bigIntTransformer = new ce(), this.dateTransformer = new xe(), this.lazyTransformer = new Se(), this.literalTransformer = new fe(), this.templateLiteralTransformer = new Ce(), this.enumTransformer = new ue(), this.arrayTransformer = new se(), this.discriminatedUnionTransformer = new le(), this.intersectionTransformer = new de(), this.recordTransformer = new he(), this.tupleTransformer = new ye(e), this.unionTransformer = new be(t);
+		this.versionSpecifics = e, this.objectTransformer = new me(), this.stringTransformer = new ve(), this.numberTransformer = new pe(), this.bigIntTransformer = new ce(), this.dateTransformer = new xe(), this.lazyTransformer = new Se(), this.literalTransformer = new fe(), this.templateLiteralTransformer = new Ce(), this.enumTransformer = new de(), this.arrayTransformer = new se(), this.discriminatedUnionTransformer = new le(), this.intersectionTransformer = new j(), this.recordTransformer = new he(), this.tupleTransformer = new ye(e), this.unionTransformer = new be(t);
 	}
 	transform(e, t, n, r, i) {
 		if (l(e, "ZodNull")) return this.versionSpecifics.nullType;
@@ -648,7 +648,7 @@ var ve = class {
 		this.rawComponents.forEach(({ componentType: t, name: n, component: r }) => {
 			e[t] ?? (e[t] = {}), e[t][n] = r;
 		});
-		let t = e.schemas ?? {}, n = Object.assign(Object.assign({}, t), this.filteredSchemaRefs), r = this.options?.sortComponents === "alphabetically" ? w(n) : n, i = e.parameters ?? {}, a = Object.assign(Object.assign({}, i), this.paramRefs), o = this.options?.sortComponents === "alphabetically" ? w(a) : a;
+		let t = e.schemas ?? {}, n = Object.assign(Object.assign({}, t), this.filteredSchemaRefs), r = this.options?.sortComponents === "alphabetically" ? T(n) : n, i = e.parameters ?? {}, a = Object.assign(Object.assign({}, i), this.paramRefs), o = this.options?.sortComponents === "alphabetically" ? T(a) : a;
 		return Object.assign(Object.assign({}, e), {
 			schemas: r,
 			parameters: o
@@ -21888,18 +21888,18 @@ var Fb = { hasSubscribers: !1 }, Ib = Fb, Lb = Fb, Rb = typeof performance == "o
 		return this.#i;
 	}
 	constructor(t) {
-		let { max: n = 0, ttl: r, ttlResolution: i = 1, ttlAutopurge: a, updateAgeOnGet: o, updateAgeOnHas: s, allowStale: c, dispose: l, onInsert: u, disposeAfter: d, noDisposeOnSet: f, noUpdateTTL: p, maxSize: m = 0, maxEntrySize: h = 0, sizeCalculation: g, fetchMethod: _, memoMethod: v, noDeleteOnFetchRejection: y, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: x, allowStaleOnFetchAbort: S, ignoreFetchAbort: C, backgroundFetchSize: ee = 1, perf: w } = t;
-		if (this.backgroundFetchSize = ee, w !== void 0 && typeof w?.now != "function") throw TypeError("perf option must have a now() method if specified");
-		if (this.#s = w ?? Rb, n !== 0 && !Wb(n)) throw TypeError("max option must be a nonnegative integer");
-		let T = n ? Gb(n) : Array;
-		if (!T) throw Error("invalid max value: " + n);
+		let { max: n = 0, ttl: r, ttlResolution: i = 1, ttlAutopurge: a, updateAgeOnGet: o, updateAgeOnHas: s, allowStale: c, dispose: l, onInsert: u, disposeAfter: d, noDisposeOnSet: f, noUpdateTTL: p, maxSize: m = 0, maxEntrySize: h = 0, sizeCalculation: g, fetchMethod: _, memoMethod: v, noDeleteOnFetchRejection: y, noDeleteOnStaleGet: b, allowStaleOnFetchRejection: x, allowStaleOnFetchAbort: S, ignoreFetchAbort: C, backgroundFetchSize: w = 1, perf: T } = t;
+		if (this.backgroundFetchSize = w, T !== void 0 && typeof T?.now != "function") throw TypeError("perf option must have a now() method if specified");
+		if (this.#s = T ?? Rb, n !== 0 && !Wb(n)) throw TypeError("max option must be a nonnegative integer");
+		let ee = n ? Gb(n) : Array;
+		if (!ee) throw Error("invalid max value: " + n);
 		if (this.#e = n, this.#t = m, this.maxEntrySize = h || this.#t, this.sizeCalculation = g, this.sizeCalculation) {
 			if (!this.#t && !this.maxEntrySize) throw TypeError("cannot set sizeCalculation without setting maxSize or maxEntrySize");
 			if (typeof this.sizeCalculation != "function") throw TypeError("sizeCalculation set to non-function");
 		}
 		if (v !== void 0 && typeof v != "function") throw TypeError("memoMethod must be a function if defined");
 		if (this.#o = v, _ !== void 0 && typeof _ != "function") throw TypeError("fetchMethod must be a function if specified");
-		if (this.#a = _, this.#w = !!_, this.#u = /* @__PURE__ */ new Map(), this.#d = Array.from({ length: n }).fill(void 0), this.#f = Array.from({ length: n }).fill(void 0), this.#p = new T(n), this.#m = new T(n), this.#h = 0, this.#g = 0, this.#_ = qb.create(n), this.#c = 0, this.#l = 0, typeof l == "function" && (this.#n = l), typeof u == "function" && (this.#r = u), typeof d == "function" ? (this.#i = d, this.#v = []) : (this.#i = void 0, this.#v = void 0), this.#C = !!this.#n, this.#E = !!this.#r, this.#T = !!this.#i, this.noDisposeOnSet = !!f, this.noUpdateTTL = !!p, this.noDeleteOnFetchRejection = !!y, this.allowStaleOnFetchRejection = !!x, this.allowStaleOnFetchAbort = !!S, this.ignoreFetchAbort = !!C, this.maxEntrySize !== 0) {
+		if (this.#a = _, this.#w = !!_, this.#u = /* @__PURE__ */ new Map(), this.#d = Array.from({ length: n }).fill(void 0), this.#f = Array.from({ length: n }).fill(void 0), this.#p = new ee(n), this.#m = new ee(n), this.#h = 0, this.#g = 0, this.#_ = qb.create(n), this.#c = 0, this.#l = 0, typeof l == "function" && (this.#n = l), typeof u == "function" && (this.#r = u), typeof d == "function" ? (this.#i = d, this.#v = []) : (this.#i = void 0, this.#v = void 0), this.#C = !!this.#n, this.#E = !!this.#r, this.#T = !!this.#i, this.noDisposeOnSet = !!f, this.noUpdateTTL = !!p, this.noDeleteOnFetchRejection = !!y, this.allowStaleOnFetchRejection = !!x, this.allowStaleOnFetchAbort = !!S, this.ignoreFetchAbort = !!C, this.maxEntrySize !== 0) {
 			if (this.#t !== 0 && !Wb(this.#t)) throw TypeError("maxSize must be a positive integer if specified");
 			if (!Wb(this.maxEntrySize)) throw TypeError("maxEntrySize must be a positive integer if specified");
 			this.#M();
@@ -23006,7 +23006,7 @@ var fx = class {
 			});
 			return clearTimeout(n), r;
 		} catch (e) {
-			return e.name === "AbortError" ? console.info(`[CacheManager] Purge request to ${c} timed out (dev server un-responsive).`) : e?.cause?.code === "ECONNREFUSED" || e?.code === "ECONNREFUSED" ? console.info(`[CacheManager] Frontend purge listener offline at ${s} (port not reachable).`) : console.warn(`[CacheManager] Non-fatal purge warning for ${c}:`, e?.message || e), new Response(JSON.stringify({ error: "Connection refused or timed out" }), { status: 503 });
+			return e.name === "AbortError" ? console.info(`[CacheManager] Purge request to ${c} timed out (dev server un-responsive).`) : e?.cause?.code === "ECONNREFUSED" || e?.code === "ECONNREFUSED" ? console.info(`[CacheManager] Frontend purge listener offline at ${s}.`) : console.warn(`[CacheManager] Non-fatal purge warning for ${c}:`, e?.message || e), new Response(JSON.stringify({ error: "Connection refused or timed out" }), { status: 503 });
 		}
 	}
 	async purgeInternalWorkerCache(e, t, n, r, i) {
@@ -23029,67 +23029,70 @@ var fx = class {
 		}
 	}
 	purgeNode(e, t, n, r = !1, i = []) {
+		if (r) {
+			console.log(`[CacheManager] Structural change detected on nodeId ${n}. Escalating to Global Purge.`), this.purgeGlobalCache(e, t);
+			return;
+		}
 		let a = (async () => {
 			try {
-				let a = t.prepare("SELECT slug, status, language FROM content_nodes WHERE id = ?"), o = (typeof a.get == "function" ? await a.get(n) : (await a.bind(n).all())?.results?.[0]) || {};
-				if (!o.slug) return;
-				let s = t.prepare("\n                    SELECT c.id, c.key, c.baseUrl, c.defaultLanguage \n                    FROM node_channels nc \n                    JOIN channels c ON nc.channelId = c.id \n                    WHERE nc.nodeId = ?\n                "), c = typeof s.all == "function" ? await s.all(n) : await s.bind(n).all(), l = Array.isArray(c) ? c : c?.results || [], u = l.length > 0 ? l[0]?.defaultLanguage?.trim() : null, d = o.language?.trim() || u || null, f = String(o.slug).replace(/^\/+|\/+$/g, ""), p = this.getEnv(e).frontendUrl, m = /* @__PURE__ */ new Set();
-				for (let e of l) if (e.baseUrl && typeof e.baseUrl == "string" && e.baseUrl.trim() !== "") {
+				let r = t.prepare("SELECT slug, status, language FROM content_nodes WHERE id = ?"), a = (typeof r.get == "function" ? await r.get(n) : (await r.bind(n).all())?.results?.[0]) || {};
+				if (!a.slug) return;
+				let o = t.prepare("\n                    SELECT c.id, c.key, c.baseUrl, c.defaultLanguage \n                    FROM node_channels nc \n                    JOIN channels c ON nc.channelId = c.id \n                    WHERE nc.nodeId = ?\n                "), s = typeof o.all == "function" ? await o.all(n) : await o.bind(n).all(), c = Array.isArray(s) ? s : s?.results || [], l = c.length > 0 ? c[0]?.defaultLanguage?.trim() : null, u = a.language?.trim() || l || null, d = String(a.slug).replace(/^\/+|\/+$/g, ""), f = this.getEnv(e).frontendUrl, p = /* @__PURE__ */ new Set();
+				for (let e of c) if (e.baseUrl && typeof e.baseUrl == "string" && e.baseUrl.trim() !== "") {
 					let t = e.baseUrl.trim();
-					!t.startsWith("http://") && !t.startsWith("https://") && (t = `https://${t}`), m.add(t.replace(/\/+$/, ""));
+					!t.startsWith("http://") && !t.startsWith("https://") && (t = `https://${t}`), p.add(t.replace(/\/+$/, ""));
 				}
-				m.size === 0 && p && m.add(p);
-				let h = t.prepare("\n                    SELECT DISTINCT a.cdnUrl, a.storageKeyPrivate\n                    FROM node_assets na\n                    JOIN assets a ON na.assetId = a.id\n                    WHERE na.nodeId = ?\n                "), g = typeof h.all == "function" ? await h.all(n) : await h.bind(n).all(), _ = (Array.isArray(g) ? g : g?.results || []).map((t) => t.url || this.getSafeUrl(t.cdnUrl, t.storageKeyPrivate, this.getEnv(e).cdnDomain)).filter(Boolean);
-				await this.purgeInternalWorkerCache(e, t, n, f, d);
-				let v = this.getEnv(e).cdnDomain, { zoneId: y, apiToken: b } = this.getEnv(e), x = e.env?.BUNDLED_DEFINITIONS || {}, S = /* @__PURE__ */ new Set();
-				if (i.length > 0 && x.layouts) for (let e of Object.values(x.layouts)) for (let t of i) {
+				p.size === 0 && f && p.add(f);
+				let m = t.prepare("\n                    SELECT DISTINCT a.cdnUrl, a.storageKeyPrivate\n                    FROM node_assets na\n                    JOIN assets a ON na.assetId = a.id\n                    WHERE na.nodeId = ?\n                "), h = typeof m.all == "function" ? await m.all(n) : await m.bind(n).all(), g = (Array.isArray(h) ? h : h?.results || []).map((t) => t.url || this.getSafeUrl(t.cdnUrl, t.storageKeyPrivate, this.getEnv(e).cdnDomain)).filter(Boolean);
+				await this.purgeInternalWorkerCache(e, t, n, d, u);
+				let _ = this.getEnv(e).cdnDomain, { zoneId: v, apiToken: y } = this.getEnv(e), b = e.env?.BUNDLED_DEFINITIONS || {}, x = /* @__PURE__ */ new Set();
+				if (i.length > 0 && b.layouts) for (let e of Object.values(b.layouts)) for (let t of i) {
 					let n = e.regions?.[t];
 					if (n) {
 						let e = n.purgeTargets || n.purgeTarget;
 						if (e) {
 							let t = Array.isArray(e) ? e : [e];
-							for (let e of t) typeof e == "string" && e.trim() && S.add(e.trim());
+							for (let e of t) typeof e == "string" && e.trim() && x.add(e.trim());
 						}
 					}
 				}
-				for (let t of m) {
-					let n = f === "home" || !f ? t : `${t}/${f}`, i = [n, `${n}/`];
-					r && i.push(`${t}/partials/nav`);
-					for (let e of S) {
+				for (let t of p) {
+					let n = d === "home" || !d ? t : `${t}/${d}`, r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set();
+					r.add(n), r.add(`${n}/`), i.add(n), i.add(`${n}/`);
+					for (let e of x) {
 						let n = e.startsWith("/") ? e : `/${e}`;
-						i.push(`${t}${n}`);
+						r.add(`${t}${n}`), i.add(`${t}${n}`);
 					}
-					let a = d ? `&lang=${d}` : "";
-					if (l.length > 0) for (let e of l) e.id && i.push(`https://${v}/api/v1/node/${f}?channelId=${e.id}${a}`), e.key && i.push(`https://${v}/api/v1/node/${f}?channelId=${e.key}${a}`), r && (e.id && i.push(`https://${v}/api/v1/tree/main-nav?channelId=${e.id}`), e.key && i.push(`https://${v}/api/v1/tree/main-nav?channelId=${e.key}`));
-					else i.push(`https://${v}/api/v1/node/${f}${d ? `?lang=${d}` : ""}`), r && i.push(`https://${v}/api/v1/tree/main-nav`);
-					for (let e of _) e && i.push(`${t}${e.startsWith("/") ? e : `/${e}`}`);
-					if (await this.callAstroPurge(e, { urls: i }, t), y && b && !this.isLocalEnv(e, t) && fetch(`https://api.cloudflare.com/client/v4/zones/${y}/purge_cache`, {
-						method: "POST",
-						headers: {
-							Authorization: `Bearer ${b}`,
-							"Content-Type": "application/json"
-						},
-						body: JSON.stringify({ files: i })
-					}).catch(() => {}), r) {
-						let e = `${t}/partials/nav?_warmer=${Date.now()}`;
-						console.log(`[CacheManager] Prewarming cache at: ${e}`), fetch(e, { headers: {
-							"X-Cache-Warmer": "true",
-							"User-Agent": "Kama-Cache-Warmer/1.0"
-						} }).catch((e) => console.warn("[CacheManager] Prewarm fetch error:", e));
-					} else {
-						let e = `${n}${n.includes("?") ? "&" : "?"} _warmer=${Date.now()}`;
-						console.log(`[CacheManager] Prewarming cache at: ${e}`), fetch(e, { headers: {
-							"X-Cache-Warmer": "true",
-							"User-Agent": "Kama-Cache-Warmer/1.0"
-						} }).catch((e) => console.warn("[CacheManager] Prewarm fetch error:", e));
+					let a = u ? `&lang=${u}` : "";
+					if (c.length > 0) for (let e of c) e.id && i.add(`https://${_}/api/v1/node/${d}?channelId=${e.id}${a}`), e.key && i.add(`https://${_}/api/v1/node/${d}?channelId=${e.key}${a}`);
+					else i.add(`https://${_}/api/v1/node/${d}${u ? `?lang=${u}` : ""}`);
+					for (let e of g) e && i.add(`${t}${e.startsWith("/") ? e : `/${e}`}`);
+					if (await this.callAstroPurge(e, { urls: Array.from(r) }, t), v && y && !this.isLocalEnv(e, t)) try {
+						let e = await (await fetch(`https://api.cloudflare.com/client/v4/zones/${v}/purge_cache`, {
+							method: "POST",
+							headers: {
+								Authorization: `Bearer ${y}`,
+								"Content-Type": "application/json"
+							},
+							body: JSON.stringify({ files: Array.from(i) })
+						})).json();
+						console.log("[CacheManager] CF Zone Purge Result:", e?.success ? "SUCCESS" : JSON.stringify(e));
+					} catch (e) {
+						console.warn("[CacheManager] CF Zone Purge failed to dispatch:", e);
 					}
-					for (let e of S) {
-						let n = `${t}${e.startsWith("/") ? e : `/${e}`}?_warmer=${Date.now()}`;
-						console.log(`[CacheManager] Prewarming custom target: ${n}`), fetch(n, { headers: {
+					let o = [], s = Date.now(), l = `${n}${n.includes("?") ? "&" : "?"}_warmer=${s}`;
+					console.log(`[CacheManager] Prewarming cache at: ${l}`), o.push(fetch(l, { headers: {
+						"X-Cache-Warmer": "true",
+						"User-Agent": "Kama-Cache-Warmer/1.0"
+					} }).catch((e) => console.warn("[CacheManager] Prewarm fetch error:", e)));
+					for (let e of x) {
+						let n = `${t}${e.startsWith("/") ? e : `/${e}`}?_warmer=${s}`;
+						console.log(`[CacheManager] Prewarming custom target: ${n}`), o.push(fetch(n, { headers: {
 							"X-Cache-Warmer": "true",
 							"User-Agent": "Kama-Cache-Warmer/1.0"
-						} }).catch(() => {});
+						} }).catch(() => {}));
 					}
+					await Promise.all(o);
 				}
 			} catch (e) {
 				console.warn("[CacheManager] Dynamic purgeNode failed:", e);
@@ -23115,17 +23118,26 @@ var fx = class {
 		try {
 			let { zoneId: n, apiToken: r } = this.getEnv(e);
 			if (!(await this.callAstroPurge(e, { purge_everything: !0 })).ok) return;
-			if (n && r && !this.isLocalEnv(e) && fetch(`https://api.cloudflare.com/client/v4/zones/${n}/purge_cache`, {
-				method: "POST",
-				headers: {
-					Authorization: `Bearer ${r}`,
-					"Content-Type": "application/json"
-				},
-				body: JSON.stringify({ purge_everything: !0 })
-			}).catch(() => {}), await new Promise((e) => setTimeout(e, 100)), t) await this.warmAllPublishedPages(e, t);
+			if (n && r && !this.isLocalEnv(e)) try {
+				let e = await (await fetch(`https://api.cloudflare.com/client/v4/zones/${n}/purge_cache`, {
+					method: "POST",
+					headers: {
+						Authorization: `Bearer ${r}`,
+						"Content-Type": "application/json"
+					},
+					body: JSON.stringify({ purge_everything: !0 })
+				})).json();
+				console.log("[CacheManager] CF Global Purge Result:", e?.success ? "SUCCESS" : JSON.stringify(e));
+			} catch (e) {
+				console.warn("[CacheManager] CF Global Purge failed to dispatch:", e);
+			}
+			if (t) await this.warmAllPublishedPages(e, t);
 			else {
 				let { frontendUrl: t } = this.getEnv(e);
-				fetch(`${t.replace(/\/+$/, "")}/?_warmer=${Date.now()}`, { headers: { "X-Cache-Warmer": "true" } }).catch(() => {});
+				await fetch(`${t.replace(/\/+$/, "")}/?_warmer=${Date.now()}`, { headers: {
+					"X-Cache-Warmer": "true",
+					"User-Agent": "Kama-Cache-Warmer/1.0"
+				} }).catch(() => {});
 			}
 		} catch (e) {
 			console.warn("[CacheManager] Direct Global Purge skipped:", e);
@@ -23473,38 +23485,50 @@ mx.get("/", async (e) => {
 	let x = `
     WITH filtered_nodes AS (
       SELECT cn.* FROM content_nodes cn ${g} ORDER BY ${y} ${l} LIMIT ? OFFSET ?
+    ),
+    node_asset_counts AS (
+      SELECT 
+        na.nodeId,
+        COUNT(DISTINCT CASE WHEN a.mimeType LIKE 'image/%' THEN COALESCE(a.parentAssetId, a.id) END) as imageCount,
+        COUNT(DISTINCT CASE WHEN a.mimeType LIKE 'video/%' OR a.mimeType LIKE 'audio/%' THEN COALESCE(a.parentAssetId, a.id) END) as videoCount,
+        COUNT(DISTINCT CASE WHEN a.mimeType LIKE 'application/pdf%' OR a.mimeType LIKE 'application/msword%' OR a.mimeType LIKE 'application/vnd%' OR a.mimeType LIKE 'text/%' THEN COALESCE(a.parentAssetId, a.id) END) as documentCount,
+        COUNT(DISTINCT CASE WHEN a.mimeType NOT LIKE 'image/%' AND a.mimeType NOT LIKE 'video/%' AND a.mimeType NOT LIKE 'audio/%' AND a.mimeType NOT LIKE 'application/pdf%' AND a.mimeType NOT LIKE 'application/msword%' AND a.mimeType NOT LIKE 'application/vnd%' AND a.mimeType NOT LIKE 'text/%' THEN COALESCE(a.parentAssetId, a.id) END) as otherCount,
+        COUNT(DISTINCT COALESCE(a.parentAssetId, a.id)) as assetCount
+      FROM node_assets na
+      JOIN assets a ON na.assetId = a.id
+      GROUP BY na.nodeId
     )
-    SELECT fn.*, 
-           COUNT(DISTINCT CASE WHEN a.mimeType LIKE 'image/%' THEN COALESCE(a.parentAssetId, a.id) END) as imageCount,
-           COUNT(DISTINCT CASE WHEN a.mimeType LIKE 'video/%' OR a.mimeType LIKE 'audio/%' THEN COALESCE(a.parentAssetId, a.id) END) as videoCount,
-           COUNT(DISTINCT CASE WHEN a.mimeType LIKE 'application/pdf%' OR a.mimeType LIKE 'application/msword%' OR a.mimeType LIKE 'application/vnd%' OR a.mimeType LIKE 'text/%' THEN COALESCE(a.parentAssetId, a.id) END) as documentCount,
-           COUNT(DISTINCT CASE WHEN a.id IS NOT NULL AND a.mimeType NOT LIKE 'image/%' AND a.mimeType NOT LIKE 'video/%' AND a.mimeType NOT LIKE 'audio/%' AND a.mimeType NOT LIKE 'application/pdf%' AND a.mimeType NOT LIKE 'application/msword%' AND a.mimeType NOT LIKE 'application/vnd%' AND a.mimeType NOT LIKE 'text/%' THEN COALESCE(a.parentAssetId, a.id) END) as otherCount,
-           COUNT(DISTINCT COALESCE(a.parentAssetId, a.id)) as assetCount,
-           (SELECT path FROM node_routes nr WHERE nr.nodeId = fn.id AND isCanonical = 1 LIMIT 1) as routePath
+    SELECT 
+      fn.*, 
+      COALESCE(nac.imageCount, 0) as imageCount,
+      COALESCE(nac.videoCount, 0) as videoCount,
+      COALESCE(nac.documentCount, 0) as documentCount,
+      COALESCE(nac.otherCount, 0) as otherCount,
+      COALESCE(nac.assetCount, 0) as assetCount,
+      (SELECT path FROM node_routes nr WHERE nr.nodeId = fn.id AND isCanonical = 1 LIMIT 1) as routePath
     FROM filtered_nodes fn
-    LEFT JOIN node_assets na ON fn.id = na.nodeId
-    LEFT JOIN assets a ON na.assetId = a.id
-    GROUP BY fn.id ORDER BY ${y.replace("cn.", "fn.")} ${l}
+    LEFT JOIN node_asset_counts nac ON fn.id = nac.nodeId
+    ORDER BY ${y.replace("cn.", "fn.")} ${l}
   `, S = [
 		...m,
 		f,
 		p
-	], C = await t.prepare(x).all(...S), ee = Array.isArray(C) ? C : C?.results || [], w = ee.map((e) => e.id), T = {}, E = {};
-	if (w.length > 0) {
-		let e = w.map(() => "?").join(","), n = await t.prepare(`
+	], C = await t.prepare(x).all(...S), w = Array.isArray(C) ? C : C?.results || [], T = w.map((e) => e.id), ee = {}, E = {};
+	if (T.length > 0) {
+		let e = T.map(() => "?").join(","), n = await t.prepare(`
       SELECT nc.nodeId, c.label FROM node_channels nc JOIN channels c ON nc.channelId = c.id WHERE nc.nodeId IN (${e})
-    `).all(...w);
+    `).all(...T);
 		(Array.isArray(n) ? n : n?.results || []).forEach((e) => {
-			T[e.nodeId] || (T[e.nodeId] = []), T[e.nodeId].push(e.label);
+			ee[e.nodeId] || (ee[e.nodeId] = []), ee[e.nodeId].push(e.label);
 		});
 		let r = await t.prepare(`
       SELECT tn.contentId as nodeId, t.label FROM tree_nodes tn JOIN trees t ON tn.treeId = t.id WHERE tn.contentId IN (${e})
-    `).all(...w);
+    `).all(...T);
 		(Array.isArray(r) ? r : r?.results || []).forEach((e) => {
 			E[e.nodeId] || (E[e.nodeId] = []), E[e.nodeId].includes(e.label) || E[e.nodeId].push(e.label);
 		});
 	}
-	let D = await Promise.all(ee.map(async (e) => {
+	let D = await Promise.all(w.map(async (e) => {
 		let n = e.status === "draft" || !!e.hasUnpublishedChanges, r = {
 			id: e.id,
 			title: e.title,
@@ -23522,7 +23546,7 @@ mx.get("/", async (e) => {
 			updatedById: e.updatedById || null,
 			createdAt: e.createdAt,
 			updatedAt: e.updatedAt,
-			channelNames: T[e.id] || [],
+			channelNames: ee[e.id] || [],
 			treeNames: E[e.id] || [],
 			assetCount: e.assetCount || 0,
 			imageCount: e.imageCount || 0,
@@ -23544,9 +23568,9 @@ mx.get("/", async (e) => {
 		limit: f
 	});
 }), mx.post("/", async (e) => {
-	let t = e.get("db"), n = await e.req.json(), r = n.node || n.activeNode || n, i = r.id || n.id, a = i != null && i !== "" && !isNaN(Number(i)) ? Number(i) : null, { title: o, slug: s, language: c, nodeType: l, contentType: u, isHidden: d, hidden: f, is_hidden: p, blocks: m, channels: h, trees: g, ..._ } = r, { cleanedData: v, assetRefs: y, termRefs: b } = ax(bx(_)), x = vx(d === void 0 ? f === void 0 ? p : f : d), S = l || u || "page", C = e.get("user")?.id || null, ee = typeof c == "string" && c.trim() !== "" ? c.trim() : null, w = g && Array.isArray(g) && g.length > 0 ? g[0] : null, T = w ? w.treeId || w.id : null, E = null;
-	if (T) {
-		let e = await t.prepare("SELECT dataJson FROM trees WHERE id = ? OR key = ? LIMIT 1").get(Number(T) || -1, String(T));
+	let t = e.get("db"), n = await e.req.json(), r = n.node || n.activeNode || n, i = r.id || n.id, a = i != null && i !== "" && !isNaN(Number(i)) ? Number(i) : null, { title: o, slug: s, language: c, nodeType: l, contentType: u, isHidden: d, hidden: f, is_hidden: p, blocks: m, channels: h, trees: g, ..._ } = r, { cleanedData: v, assetRefs: y, termRefs: b } = ax(bx(_)), x = vx(d === void 0 ? f === void 0 ? p : f : d), S = l || u || "page", C = e.get("user")?.id || null, w = typeof c == "string" && c.trim() !== "" ? c.trim() : null, T = g && Array.isArray(g) && g.length > 0 ? g[0] : null, ee = T ? T.treeId || T.id : null, E = null;
+	if (ee) {
+		let e = await t.prepare("SELECT dataJson FROM trees WHERE id = ? OR key = ? LIMIT 1").get(Number(ee) || -1, String(ee));
 		if (e?.dataJson) try {
 			let t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
 			E = t.defaultLanguage?.trim() || t.language?.trim() || null;
@@ -23565,7 +23589,7 @@ mx.get("/", async (e) => {
 			}
 		}
 	}
-	ee && E && ee === E && (ee = null);
+	w && E && w === E && (w = null);
 	let D = a, te = /* @__PURE__ */ new Set(), ne = !1, O = "draft", k = 0, A = s === void 0 ? null : _x(s);
 	if (A) {
 		let n = [];
@@ -23616,7 +23640,7 @@ mx.get("/", async (e) => {
 			...r,
 			...v
 		}), l = !1;
-		if (o !== void 0 && o.trim() !== (e?.title || "Untitled") && (l = !0), s !== void 0 && A !== e?.slug && (l = !0), c !== void 0 && ee !== e?.language && (l = !0), !l && Object.keys(v).length > 0) {
+		if (o !== void 0 && o.trim() !== (e?.title || "Untitled") && (l = !0), s !== void 0 && A !== e?.slug && (l = !0), c !== void 0 && w !== e?.language && (l = !0), !l && Object.keys(v).length > 0) {
 			for (let e of Object.keys(v)) if (JSON.stringify(v[e]) !== JSON.stringify(r[e])) {
 				l = !0;
 				break;
@@ -23638,13 +23662,13 @@ mx.get("/", async (e) => {
 				}
 			}
 		}
-		let u = o === void 0 ? e?.title || "Untitled" : o, d = A ?? e?.slug ?? null, f = S || e?.contentType || "page", p = c === void 0 ? e?.language : ee;
+		let u = o === void 0 ? e?.title || "Untitled" : o, d = A ?? e?.slug ?? null, f = S || e?.contentType || "page", p = c === void 0 ? e?.language : w;
 		O = e?.status === "published" || e?.publishedAt ? "published" : "draft";
 		let h = e?.hasUnpublishedChanges === 1 || e?.hasUnpublishedChanges === !0;
 		k = l ? 1 : +!!h, await t.prepare("\n      UPDATE content_nodes \n      SET title = ?, slug = ?, language = ?, contentType = ?, isHidden = ?, status = ?, draftDataJson = ?, hasUnpublishedChanges = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n      WHERE id = ?\n    ").run(u, d, p, f, x, O, i, k, C, a);
 	} else {
 		ne = !0;
-		let e = await t.prepare("\n      INSERT INTO content_nodes (contentType, title, slug, language, isHidden, status, draftDataJson, dataJson, hasUnpublishedChanges, createdById, updatedById)\n      VALUES (?, ?, ?, ?, ?, 'draft', ?, NULL, 0, ?, ?)\n    ").run(S, o || "Untitled", A, ee, x, JSON.stringify(v), C, C);
+		let e = await t.prepare("\n      INSERT INTO content_nodes (contentType, title, slug, language, isHidden, status, draftDataJson, dataJson, hasUnpublishedChanges, createdById, updatedById)\n      VALUES (?, ?, ?, ?, ?, 'draft', ?, NULL, 0, ?, ?)\n    ").run(S, o || "Untitled", A, w, x, JSON.stringify(v), C, C);
 		D = Number(e.lastInsertRowid);
 	}
 	if (h !== void 0 && Array.isArray(h) && D) {
@@ -24178,18 +24202,19 @@ kx.get("/", async (e) => {
 	}
 }), kx.post("/", async (e) => {
 	try {
-		let t = e.get("db"), n = await e.req.json(), r = n.channel || n.data || n, i = r.id, a = i != null && i !== "" && !isNaN(Number(i)) ? Number(i) : null, { key: o, label: s, channelType: c = "website", domain: l = "localhost", baseUrl: u = "http://localhost:4321", defaultLanguage: d, default_language: f, language: p, isHidden: m, hidden: h, trees: g = [], createdById: _ = null, updatedById: v = null, id: y, createdAt: b, updatedAt: x, ...S } = r, C = o?.trim() || "main", ee = s?.trim() || "Untitled Channel", w = d || f || p || "";
-		typeof w == "object" && w && (w = w.value || w.id || ""), w = String(w).trim();
-		let T = m === !0 || m === "true" || m === 1 || h === !0 || h === "true" || h === 1, E = Array.isArray(g) ? g : [], D = JSON.stringify(S || {}), te = e.get("user")?.id || v || _ || null;
+		let t = e.get("db"), n = await e.req.json(), r = n.channel || n.data || n, i = r.id, a = i != null && i !== "" && !isNaN(Number(i)) ? Number(i) : null, { key: o, label: s, channelType: c = "website", domain: l = "localhost", baseUrl: u = "http://localhost:4321", defaultLanguage: d, default_language: f, language: p, isHidden: m, hidden: h, trees: g = [], createdById: _ = null, updatedById: v = null, id: y, createdAt: b, updatedAt: x, ...S } = r, C = o?.trim() || "main", w = s?.trim() || "Untitled Channel", T = d || f || p || "";
+		typeof T == "object" && T && (T = T.value || T.id || ""), T = String(T).trim();
+		let ee = m === !0 || m === "true" || m === 1 || h === !0 || h === "true" || h === 1, E = Array.isArray(g) ? g : [], D = JSON.stringify(S || {}), te = e.get("user")?.id || v || _ || null;
 		if (await t.prepare("SELECT id FROM channels WHERE key = ? AND id != ? LIMIT 1").get(C, a ?? -1)) return e.json({
 			error: `Channel API key "${C}" is already in use.`,
 			field: "key"
 		}, 409);
 		let ne = a;
-		if (a) await t.prepare("\n        UPDATE channels \n        SET key = ?, label = ?, channelType = ?, domain = ?, baseUrl = ?, defaultLanguage = ?, \n            isHidden = ?, dataJson = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n        WHERE id = ?\n      ").run(C, ee, c, l, u, w, +!!T, D, te, a);
+		if (a) await t.prepare("\n        UPDATE channels \n        SET key = ?, label = ?, channelType = ?, domain = ?, baseUrl = ?, defaultLanguage = ?, \n            isHidden = ?, dataJson = ?, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n        WHERE id = ?\n      ").run(C, w, c, l, u, T, +!!ee, D, te, a);
 		else {
-			let e = await t.prepare("\n        INSERT INTO channels (key, label, channelType, domain, baseUrl, defaultLanguage, isHidden, dataJson, createdById, updatedById)\n        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\n      ").run(C, ee, c, l, u, w, +!!T, D, te, te);
-			ne = Number(e.lastInsertRowid);
+			let e = await t.prepare("\n        INSERT INTO channels (key, label, channelType, domain, baseUrl, defaultLanguage, isHidden, dataJson, createdById, updatedById)\n        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\n        RETURNING id\n      ").get(C, w, c, l, u, T, +!!ee, D, te, te), n = e?.results?.[0] || e;
+			if (!n || !n.id) throw Error("Failed to retrieve newly created Channel ID from Cloudflare D1.");
+			ne = Number(n.id);
 		}
 		await t.prepare("DELETE FROM channel_trees WHERE channelId = ?").run(ne);
 		let O = E.filter((e) => e && e.treeId && e.key);
@@ -24538,7 +24563,7 @@ function Yx(e) {
 		channelTemplate: null,
 		userTemplate: null
 	};
-	let { rawNodes: t = {}, rawTrees: n = {}, rawChannels: r = {}, channels: i = {}, rawTaxonomies: a = {}, taxonomies: o = {}, rawBlocks: s = {}, rawElements: c = {}, rawNodeLayouts: l = {}, rawBlockLayouts: u = {}, rawLayouts: d = {}, rawFieldSets: f = {}, rawTemplates: p = {}, nodeTemplate: m = null, treeTemplate: h = null, channelTemplate: g = null, userTemplate: _ = null, nodes: v = {}, trees: y = {}, blocks: b = {}, nodeLayouts: x = {}, blockLayouts: S = {} } = e, C = Object.keys(t).length > 0 ? t : v, ee = Object.keys(n).length > 0 ? n : y, w = Object.keys(r).length > 0 ? r : i, T = Object.keys(a).length > 0 ? a : o, E = Object.keys(s).length > 0 ? s : Object.keys(c).length > 0 ? c : b, D = Object.keys(l).length > 0 ? l : Object.keys(d).length > 0 ? d : x, te = Object.keys(u).length > 0 ? u : S, ne = m?.fields || {}, O = {
+	let { rawNodes: t = {}, rawTrees: n = {}, rawChannels: r = {}, channels: i = {}, rawTaxonomies: a = {}, taxonomies: o = {}, rawBlocks: s = {}, rawElements: c = {}, rawNodeLayouts: l = {}, rawBlockLayouts: u = {}, rawLayouts: d = {}, rawFieldSets: f = {}, rawTemplates: p = {}, nodeTemplate: m = null, treeTemplate: h = null, channelTemplate: g = null, userTemplate: _ = null, nodes: v = {}, trees: y = {}, blocks: b = {}, nodeLayouts: x = {}, blockLayouts: S = {} } = e, C = Object.keys(t).length > 0 ? t : v, w = Object.keys(n).length > 0 ? n : y, T = Object.keys(r).length > 0 ? r : i, ee = Object.keys(a).length > 0 ? a : o, E = Object.keys(s).length > 0 ? s : Object.keys(c).length > 0 ? c : b, D = Object.keys(l).length > 0 ? l : Object.keys(d).length > 0 ? d : x, te = Object.keys(u).length > 0 ? u : S, ne = m?.fields || {}, O = {
 		...p,
 		...f
 	}, k = (e, t = "settings", n, r) => {
@@ -24666,7 +24691,7 @@ function Yx(e) {
 		};
 	});
 	let ie = {};
-	Object.entries(ee).forEach(([e, t]) => {
+	Object.entries(w).forEach(([e, t]) => {
 		let n = A(t.tabs), r = k(t.fields || [], "settings", n);
 		Array.isArray(t.fieldSets) && t.fieldSets.forEach((e) => {
 			let t = O[e] || {}, i = t.fields || t, a = k(i, "settings", n);
@@ -24686,7 +24711,7 @@ function Yx(e) {
 		};
 	});
 	let ae = {};
-	Object.entries(w).forEach(([e, t]) => {
+	Object.entries(T).forEach(([e, t]) => {
 		let n = A(t.tabs), r = k(t.fields || [], "settings", n);
 		Array.isArray(t.fieldSets) && t.fieldSets.forEach((e) => {
 			let t = O[e] || {}, n = t.fields || t, i = k(n);
@@ -24707,7 +24732,7 @@ function Yx(e) {
 		};
 	});
 	let oe = {};
-	Object.entries(T).forEach(([e, t]) => {
+	Object.entries(ee).forEach(([e, t]) => {
 		let n = A(t.tabs), r = k(t.fields || [], "settings", n);
 		Array.isArray(t.fieldSets) && t.fieldSets.forEach((e) => {
 			let t = O[e] || {}, i = t.fields || t, a = k(i, "settings", n);
@@ -24789,26 +24814,26 @@ function Yx(e) {
 			tabs: n
 		};
 	});
-	let j = g?.fields || {};
+	let ue = g?.fields || {};
 	Array.isArray(g?.fieldSets) && g?.fieldSets.forEach((e) => {
 		let t = O[e] || {}, n = t.fields || t, r = k(n);
 		Object.entries(r).forEach(([e, t]) => {
-			j[e] = Bx(j[e] || {}, t);
+			ue[e] = Bx(ue[e] || {}, t);
 		});
 	});
-	let ue = g ? {
+	let de = g ? {
 		...g,
-		fields: j
-	} : null, de = _?.fields || {};
+		fields: ue
+	} : null, j = _?.fields || {};
 	Array.isArray(_?.fieldSets) && _?.fieldSets.forEach((e) => {
 		let t = O[e] || {}, n = t.fields || t, r = k(n);
 		Object.entries(r).forEach(([e, t]) => {
-			de[e] = Bx(de[e] || {}, t);
+			j[e] = Bx(j[e] || {}, t);
 		});
 	});
 	let fe = _ ? {
 		..._,
-		fields: de
+		fields: j
 	} : null;
 	return {
 		nodes: re,
@@ -24821,7 +24846,7 @@ function Yx(e) {
 		fieldSets: O,
 		nodeTemplate: m || null,
 		treeTemplate: h || null,
-		channelTemplate: ue,
+		channelTemplate: de,
 		userTemplate: fe
 	};
 }
@@ -25084,9 +25109,9 @@ nS.get("/", async (e) => {
 		}
 		let p = crypto.randomUUID().replace(/-/g, "").slice(0, 12), m = (/* @__PURE__ */ new Date()).toISOString().slice(0, 7).replace("-", "/"), h = a || i.name.startsWith("crop_"), g = h ? `kama/cache/${m}/${p}` : `kama/uploads/${m}/${p}`, _ = await n.upload(i, g), v = typeof _ == "string" ? _ : _?.key || _?.storageKeyPrivate || _?.storageKey || `${g}/${p}_${i.name}`;
 		if (!v) throw Error("Storage provider failed to return a valid storage key");
-		let y = e.env.CDN_DOMAIN, b = v.replace(/^\//, ""), x = y ? `https://${y}/media/${b}` : `/media/${b}`, S = i.type || "application/octet-stream", C = i.size || 0, ee = e.get("userId"), w = typeof ee == "string" && ee.trim().length > 0 ? ee : null;
-		w && (await rS(t, "SELECT id FROM users WHERE id = ?", [w])).length === 0 && (w = null);
-		let T = new fx(e.env);
+		let y = e.env.CDN_DOMAIN, b = v.replace(/^\//, ""), x = y ? `https://${y}/media/${b}` : `/media/${b}`, S = i.type || "application/octet-stream", C = i.size || 0, w = e.get("userId"), T = typeof w == "string" && w.trim().length > 0 ? w : null;
+		T && (await rS(t, "SELECT id FROM users WHERE id = ?", [T])).length === 0 && (T = null);
+		let ee = new fx(e.env);
 		if (s) {
 			let r = await rS(t, "SELECT storageKeyPrivate, isSystemVariant, parentAssetId FROM assets WHERE id = ?", [s]);
 			if (r.length > 0) {
@@ -25103,7 +25128,7 @@ nS.get("/", async (e) => {
 				} catch (e) {
 					console.warn("Failed to cleanup old asset", e);
 				}
-				T.purgeAsset(e, t, s);
+				ee.purgeAsset(e, t, s);
 				let o = `${x}?v=${Date.now()}`;
 				return e.json({
 					id: s,
@@ -25127,7 +25152,7 @@ nS.get("/", async (e) => {
 			C,
 			v,
 			x,
-			w,
+			T,
 			D,
 			l,
 			d
@@ -25135,7 +25160,7 @@ nS.get("/", async (e) => {
 		let te = x;
 		if (l) {
 			let n = await rS(t, "SELECT cdnUrl, storageKeyPrivate FROM assets WHERE id = ?", [l]);
-			n.length > 0 && (te = aS(n[0].cdnUrl, n[0].storageKeyPrivate, y)), T.purgeAsset(e, t, l);
+			n.length > 0 && (te = aS(n[0].cdnUrl, n[0].storageKeyPrivate, y)), ee.purgeAsset(e, t, l);
 		}
 		return e.json({
 			id: E,
@@ -25288,7 +25313,18 @@ function sS() {
 		assetUrls: /* @__PURE__ */ new Map()
 	};
 }
-function cS(e, t) {
+function cS(e, t, n = []) {
+	let r = Date.now();
+	if (e && String(e).trim() !== "") {
+		let t = Date.parse(e);
+		!isNaN(t) && t > r && n.push(t);
+	}
+	if (t && String(t).trim() !== "") {
+		let e = Date.parse(t);
+		!isNaN(e) && e > r && n.push(e);
+	}
+}
+function lS(e, t) {
 	let n = Date.now();
 	if (e && String(e).trim() !== "") {
 		let t = Date.parse(e);
@@ -25300,37 +25336,37 @@ function cS(e, t) {
 	}
 	return !0;
 }
-async function lS(e, t, n, r) {
-	let i = t.filter((e) => e.componentId === "content-feed" || e.componentId === "article-list");
-	await Promise.all(i.map(async (t) => {
-		let i = t.data || {}, a = i.nodeType || "article", o = Number(i.limit) || 12, s = i.sortBy || "updatedAt", c = "FROM content_nodes WHERE contentType = ? AND isHidden = 0 AND (status = 'published' OR status IS NULL)", l = [a];
-		n && n !== "all" && (c += " AND id IN (SELECT nodeId FROM node_channels WHERE channelId = ?)", l.push(Number(n) || n));
-		let u = i.taxonomies || i.taxonomyFilters || {}, d = Object.keys(u);
-		if (d.length > 0) for (let e of d) {
-			let t = Array.isArray(u[e]) ? u[e] : [u[e]];
+async function uS(e, t, n, r, i) {
+	let a = t.filter((e) => e.componentId === "content-feed" || e.componentId === "article-list");
+	await Promise.all(a.map(async (t) => {
+		let a = t.data || {}, o = a.nodeType || "article", s = Number(a.limit) || 12, c = a.sortBy || "updatedAt", l = "FROM content_nodes WHERE contentType = ? AND isHidden = 0 AND (status = 'published' OR status IS NULL)", u = [o];
+		n && n !== "all" && (l += " AND id IN (SELECT nodeId FROM node_channels WHERE channelId = ?)", u.push(Number(n) || n));
+		let d = a.taxonomies || a.taxonomyFilters || {}, f = Object.keys(d);
+		if (f.length > 0) for (let e of f) {
+			let t = Array.isArray(d[e]) ? d[e] : [d[e]];
 			if (t.length > 0) {
 				let n = t.map(() => "?").join(",");
-				c += ` AND EXISTS (
+				l += ` AND EXISTS (
               SELECT 1 FROM node_terms nt
               INNER JOIN taxonomy_terms tt ON nt.termId = tt.id
               WHERE nt.nodeId = content_nodes.id 
                 AND tt.taxonomy = ? 
                 AND tt.key IN (${n})
-            )`, l.push(e, ...t);
+            )`, u.push(e, ...t);
 			}
 		}
-		let f = "ORDER BY updatedAt DESC";
-		s === "published_desc" || s === "createdAt" ? f = "ORDER BY createdAt DESC" : s === "title_asc" && (f = "ORDER BY LOWER(title) ASC");
-		let p = `SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${c} ${f} LIMIT ?`;
-		l.push(o);
+		let p = "ORDER BY updatedAt DESC";
+		c === "published_desc" || c === "createdAt" ? p = "ORDER BY createdAt DESC" : c === "title_asc" && (p = "ORDER BY LOWER(title) ASC");
+		let m = `SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${l} ${p} LIMIT ?`;
+		u.push(s);
 		try {
-			let n = await e.prepare(p).all(...l), i = Array.isArray(n) ? n : n?.results || [];
-			t.data.initialItems = i.map((e) => {
+			let n = await e.prepare(m).all(...u), a = Array.isArray(n) ? n : n?.results || [];
+			t.data.initialItems = a.map((e) => {
 				let t = {};
 				if (e.dataJson) try {
 					t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
 				} catch {}
-				return cS(t.startShowingAt, t.stopShowingAt) ? {
+				return i && cS(t.startShowingAt, t.stopShowingAt, i), lS(t.startShowingAt, t.stopShowingAt) ? {
 					id: e.id,
 					title: e.title,
 					slug: e.slug,
@@ -25347,23 +25383,23 @@ async function lS(e, t, n, r) {
 		}
 	}));
 }
-async function uS(e, t, n, r, i, a = !1, o) {
+async function dS(e, t, n, r, i, a = !1, o, s) {
 	if (!t) return { blocks: [] };
-	let s = await e.prepare("\n    WITH RECURSIVE ancestor_path(contentId, title, slug, parentId, level) AS (\n      SELECT t.contentId, c.title, c.slug, t.parentId, 0 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.contentId = ? AND t.treeId = ?\n      UNION ALL\n      SELECT t.contentId, c.title, c.slug, t.parentId, ap.level + 1 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id INNER JOIN ancestor_path ap ON t.contentId = ap.parentId AND t.treeId = ?\n    )\n    SELECT * FROM ancestor_path ORDER BY level ASC\n  ").all(t, n, n), c = Array.isArray(s) ? s : s?.results || [];
-	if (!c || c.length === 0) return { blocks: [] };
-	let l = c.map((e) => e.contentId).filter((e) => e != null);
-	if (l.length === 0) return { blocks: [] };
-	let u = l.map(() => "?").join(","), d = +!!a, f = await e.prepare(`SELECT * FROM content_blocks WHERE contentId IN (${u}) AND isDraft = ? ORDER BY contentId ASC, sortOrder ASC`).all(...l, d), p = Array.isArray(f) ? f : f?.results || [], m = /* @__PURE__ */ new Map();
-	p.forEach((e) => {
+	let c = await e.prepare("\n    WITH RECURSIVE ancestor_path(contentId, title, slug, parentId, level) AS (\n      SELECT t.contentId, c.title, c.slug, t.parentId, 0 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.contentId = ? AND t.treeId = ?\n      UNION ALL\n      SELECT t.contentId, c.title, c.slug, t.parentId, ap.level + 1 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id INNER JOIN ancestor_path ap ON t.contentId = ap.parentId AND t.treeId = ?\n    )\n    SELECT * FROM ancestor_path ORDER BY level ASC\n  ").all(t, n, n), l = Array.isArray(c) ? c : c?.results || [];
+	if (!l || l.length === 0) return { blocks: [] };
+	let u = l.map((e) => e.contentId).filter((e) => e != null);
+	if (u.length === 0) return { blocks: [] };
+	let d = u.map(() => "?").join(","), f = +!!a, p = await e.prepare(`SELECT * FROM content_blocks WHERE contentId IN (${d}) AND isDraft = ? ORDER BY contentId ASC, sortOrder ASC`).all(...u, f), m = Array.isArray(p) ? p : p?.results || [], h = /* @__PURE__ */ new Map();
+	m.forEach((e) => {
 		let t = String(e.contentId);
-		m.has(t) || m.set(t, []), m.get(t).push(e);
+		h.has(t) || h.set(t, []), h.get(t).push(e);
 	});
-	for (let t of c) {
-		let n = m.get(String(t.contentId)) || [];
+	for (let t of l) {
+		let n = h.get(String(t.contentId)) || [];
 		if (n.filter((e) => e.region === r).length === 0) continue;
-		let o = /* @__PURE__ */ new Set([r]), s = !0;
-		for (; s;) {
-			s = !1;
+		let o = /* @__PURE__ */ new Set([r]), c = !0;
+		for (; c;) {
+			c = !1;
 			for (let e of n) {
 				if (!o.has(e.region)) continue;
 				let t = {};
@@ -25374,39 +25410,40 @@ async function uS(e, t, n, r, i, a = !1, o) {
 				for (let e of n) {
 					if (!e.region || o.has(e.region)) continue;
 					let t = e.region;
-					(t.startsWith(`${r}-`) || t.startsWith(`${r}_`) || i && i !== "undefined" && i !== "null" && (t.startsWith(`${i}-`) || t.startsWith(`${i}_`) || t.startsWith(i))) && (o.add(t), s = !0);
+					(t.startsWith(`${r}-`) || t.startsWith(`${r}_`) || i && i !== "undefined" && i !== "null" && (t.startsWith(`${i}-`) || t.startsWith(`${i}_`) || t.startsWith(i))) && (o.add(t), c = !0);
 				}
 			}
 		}
-		let c = await Promise.all(n.filter((e) => o.has(e.region)).map(async (t) => {
+		let l = await Promise.all(n.filter((e) => o.has(e.region)).map(async (t) => {
 			let n = {};
 			try {
 				n = (typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : t.dataJson) || {};
 			} catch {}
-			let o = n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = cS(n.startShowingAt, n.stopShowingAt);
-			if (!a && (o || !s)) return null;
-			let c = t.elementType || t.componentId || "text-block", l = i.blocks?.[c]?.fields || i.elements?.[c]?.fields || i.components?.[c]?.fields || {}, u = String(n.blockId || n._instanceId || n.id || t.blockId || t.id), d = dS(n, l);
-			return d = await ux(e, d), d = fS(d), d.blockId = u, {
+			s && cS(n.startShowingAt, n.stopShowingAt, s);
+			let o = n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", c = lS(n.startShowingAt, n.stopShowingAt);
+			if (!a && (o || !c)) return null;
+			let l = t.elementType || t.componentId || "text-block", u = i.blocks?.[l]?.fields || i.elements?.[l]?.fields || i.components?.[l]?.fields || {}, d = String(n.blockId || n._instanceId || n.id || t.blockId || t.id), f = fS(n, u);
+			return f = await ux(e, f), f = pS(f), f.blockId = d, {
 				region: t.region || r,
 				block: {
 					instanceId: t.id,
-					blockId: u,
-					componentId: c,
-					data: d
+					blockId: d,
+					componentId: l,
+					data: f
 				}
 			};
-		})), l = {};
-		for (let e of c) e && (l[e.region] || (l[e.region] = []), l[e.region].push(e.block));
-		if (l[r] && l[r].length > 0) return {
-			blocks: l[r],
-			subRegions: l,
+		})), u = {};
+		for (let e of l) e && (u[e.region] || (u[e.region] = []), u[e.region].push(e.block));
+		if (u[r] && u[r].length > 0) return {
+			blocks: u[r],
+			subRegions: u,
 			inheritedFromId: String(t.contentId),
 			inheritedFromTitle: t.title || t.slug
 		};
 	}
 	return { blocks: [] };
 }
-function dS(e, t = {}) {
+function fS(e, t = {}) {
 	let n = {};
 	for (let [r, i] of Object.entries(e)) r.endsWith("_meta") || [
 		"disabledRegions",
@@ -25422,14 +25459,14 @@ function dS(e, t = {}) {
 	].includes(r) || r.startsWith("_") || (!t[r] || t[r].public !== !1) && (n[r] = i);
 	return n;
 }
-function fS(e) {
-	if (Array.isArray(e)) return e.map(fS);
+function pS(e) {
+	if (Array.isArray(e)) return e.map(pS);
 	if (!e || typeof e != "object") return e;
 	if (typeof e.id == "string" && e.id.startsWith("ast_") && typeof e.url == "string") {
 		let t = e.metadataOverrides || {}, n = e.variants && typeof e.variants == "object" ? e.variants : {}, r = Object.entries(n).find(([, t]) => t?.id === e.id)?.[0], i = r ? {
 			...t,
 			...t.crops?.[r] || {}
-		} : t, a = Object.fromEntries(Object.entries(n).filter(([, t]) => t?.id !== e.id).map(([t, n]) => [t, fS({
+		} : t, a = Object.fromEntries(Object.entries(n).filter(([, t]) => t?.id !== e.id).map(([t, n]) => [t, pS({
 			...n,
 			title: n?.title ?? e.title ?? "",
 			alt: n?.alt ?? e.alt ?? "",
@@ -25443,9 +25480,9 @@ function fS(e) {
 			...Object.keys(a).length > 0 ? { variants: a } : {}
 		};
 	}
-	return Object.fromEntries(Object.entries(e).map(([e, t]) => [e, fS(t)]));
+	return Object.fromEntries(Object.entries(e).map(([e, t]) => [e, pS(t)]));
 }
-async function pS(e, t, n, r) {
+async function mS(e, t, n, r) {
 	if (typeof t == "string") {
 		if (!t.includes("#node:") && !t.includes("data-node-id") && !t.includes("#asset:") && !t.includes("data-asset-id")) return t;
 		let r = (e, t) => {
@@ -25478,25 +25515,25 @@ async function pS(e, t, n, r) {
 			return /href\s*=\s*["'][^"']*["']/i.test(d) ? d = d.replace(/href\s*=\s*["'][^"']*["']/i, `href="${u}"`) : d += ` href="${u}"`, `<a ${d}>`;
 		});
 	}
-	if (Array.isArray(t)) return Promise.all(t.map((t) => pS(e, t, n, r)));
+	if (Array.isArray(t)) return Promise.all(t.map((t) => mS(e, t, n, r)));
 	if (t && typeof t == "object") {
 		if (typeof t.href == "string" && (t.href.startsWith("#node:") || t.href.startsWith("#asset:"))) return {
 			...t,
-			href: await mS(e, t, n, r)
+			href: await hS(e, t, n, r)
 		};
-		let i = await Promise.all(Object.entries(t).map(async ([t, i]) => [t, await pS(e, i, n, r)]));
+		let i = await Promise.all(Object.entries(t).map(async ([t, i]) => [t, await mS(e, i, n, r)]));
 		return Object.fromEntries(i);
 	}
 	return t;
 }
-async function mS(e, t, n, r) {
+async function hS(e, t, n, r) {
 	let i = t.href.match(/^#node:(.+)$/), a = t.href.match(/^#asset:(.+)$/);
-	if (a) return hS(e, a[1], r);
+	if (a) return gS(e, a[1], r);
 	if (!i) return t.href;
 	let o = i[1];
 	return (await e.prepare("SELECT path FROM node_routes WHERE nodeId = ? AND channelId = ? AND isCanonical = 1 LIMIT 1").get(Number(o), n))?.path || "#";
 }
-async function hS(e, t, n) {
+async function gS(e, t, n) {
 	let r = String(t), i = n.assetUrls.get(r);
 	if (i) return i;
 	let a = (async () => {
@@ -25505,7 +25542,7 @@ async function hS(e, t, n) {
 	})();
 	return n.assetUrls.set(r, a), a;
 }
-function gS(e) {
+function _S(e) {
 	let t = e.socialImage;
 	if (!t || typeof t != "object") return null;
 	let n = (e, t) => {
@@ -25536,7 +25573,7 @@ function gS(e) {
 		])
 	};
 }
-async function _S(e, t, n, r, i) {
+async function vS(e, t, n, r, i) {
 	let a = {}, o = null;
 	if (t) {
 		let i = await e.prepare("\n      WITH RECURSIVE ancestor_path(contentId, title, slug, parentId, level) AS (\n        SELECT t.contentId, c.title, c.slug, t.parentId, 0 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.contentId = ? AND t.treeId = ?\n        UNION ALL\n        SELECT t.contentId, c.title, c.slug, t.parentId, ap.level + 1 FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id INNER JOIN ancestor_path ap ON t.contentId = ap.parentId AND t.treeId = ?\n      )\n      SELECT c.dataJson, c.draftDataJson FROM ancestor_path ap INNER JOIN content_nodes c ON ap.contentId = c.id ORDER BY ap.level ASC\n    ").all(t, n, n), s = Array.isArray(i) ? i : i?.results || [], c = /* @__PURE__ */ new Set([
@@ -25574,151 +25611,160 @@ async function _S(e, t, n, r, i) {
 		inheritedFields: a
 	};
 }
-function vS(e) {
+function yS(e) {
 	let t = Number(e?.env?.CMS_NODE_CACHE_TTL);
 	return Number.isFinite(t) && t >= 60 ? Math.floor(t) : 300;
 }
-async function yS(e, t, n, r) {
+async function bS(e, t, n, r) {
 	try {
 		await e.set(t, n, r);
 	} catch (e) {
 		console.warn("[CMS Cache] Failed to write node response to cache:", e);
 	}
 }
-async function bS(e) {
+async function xS(e) {
 	try {
-		let t = e.get("db"), n = sS(), r = new URL(e.req.url), i = r.searchParams.get("channelId") || r.searchParams.get("channel"), a = r.searchParams.get("lang"), o = r.searchParams.get("preview") === "true", s = r.searchParams.get("revisionId"), c = r.searchParams.get("treeId"), l = r.pathname, u = "";
-		l.includes("/node/") ? u = l.substring(l.indexOf("/node/") + 6) : l.endsWith("/node") && (u = "");
+		let t = e.get("db"), n = sS(), r = [], i = new URL(e.req.url), a = i.searchParams.get("channelId") || i.searchParams.get("channel"), o = i.searchParams.get("lang"), s = i.searchParams.get("preview") === "true", c = i.searchParams.get("revisionId"), l = i.searchParams.get("treeId"), u = i.pathname, d = "";
+		u.includes("/node/") ? d = u.substring(u.indexOf("/node/") + 6) : u.endsWith("/node") && (d = "");
 		try {
-			u = decodeURIComponent(u);
+			d = decodeURIComponent(d);
 		} catch {}
-		u = u.replace(/^\/+|\/+$/g, "");
-		let d = u === "" || u === "index" ? "/" : `/${u}`, f = i || "1", p = isNaN(Number(f)) ? await t.prepare("SELECT * FROM channels WHERE key = ?").get(f) : await t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(f));
-		if (!p) return e.json({ error: `Channel '${f}' not found` }, 404);
-		let m = p.status === "disabled" || p.status === "inactive" || p.isEnabled === 0 || p.isEnabled === !1;
-		if (!o && m) return e.json({ error: `Channel '${p.key || f}' is currently inactive` }, 404);
-		let h = p.id, g = p.key || f, _ = await t.prepare("\n      SELECT * FROM node_routes WHERE path = ? AND channelId = ? LIMIT 1\n    ").get(d, h);
-		if (_?.redirectUrl) return e.json({
-			redirect: _.redirectUrl,
+		d = d.replace(/^\/+|\/+$/g, "");
+		let f = d === "" || d === "index" ? "/" : `/${d}`, p = a || "1", m = isNaN(Number(p)) ? await t.prepare("SELECT * FROM channels WHERE key = ?").get(p) : await t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(p));
+		if (!m) return e.json({ error: `Channel '${p}' not found` }, 404);
+		let h = m.status === "disabled" || m.status === "inactive" || m.isEnabled === 0 || m.isEnabled === !1;
+		if (!s && h) return e.json({ error: `Channel '${m.key || p}' is currently inactive` }, 404);
+		let g = m.id, _ = m.key || p, v = await t.prepare("\n      SELECT * FROM node_routes WHERE path = ? AND channelId = ? LIMIT 1\n    ").get(f, g);
+		if (v?.redirectUrl) return e.json({
+			redirect: v.redirectUrl,
 			isCanonical: !1
 		});
-		let v = null, y = _?.treeId || c || null;
-		if (_?.nodeId) v = await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(_.nodeId);
-		else if (/^\d+$/.test(u)) v = await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(Number(u));
+		let y = null, b = v?.treeId || l || null;
+		if (v?.nodeId) y = await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(v.nodeId);
+		else if (/^\d+$/.test(d)) y = await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(Number(d));
 		else {
-			let e = u.split("/").pop() || u;
-			v = await t.prepare("SELECT * FROM content_nodes WHERE slug = ?").get(e);
+			let e = d.split("/").pop() || d;
+			y = await t.prepare("SELECT * FROM content_nodes WHERE slug = ?").get(e);
 		}
-		if (!v) return e.json({ error: `Node '${u}' not found for Channel '${f}'` }, 404);
-		let b = null;
-		if (s) {
-			let e = await t.prepare("SELECT snapshotJson FROM node_revisions WHERE nodeId = ? AND version = ?").get(v.id, Number(s));
+		if (!y) return e.json({ error: `Node '${d}' not found for Channel '${p}'` }, 404);
+		let x = null;
+		if (c) {
+			let e = await t.prepare("SELECT snapshotJson FROM node_revisions WHERE nodeId = ? AND version = ?").get(y.id, Number(c));
 			if (e && e.snapshotJson) try {
-				b = JSON.parse(e.snapshotJson), b.node && (b.node.title && (v.title = b.node.title), b.node.slug && (v.slug = b.node.slug));
+				x = JSON.parse(e.snapshotJson), x.node && (x.node.title && (y.title = x.node.title), x.node.slug && (y.slug = x.node.slug));
 			} catch (e) {
 				console.error("[CMS] Failed to parse snapshotJson", e);
 			}
 		}
-		let x = await t.prepare(`SELECT contentId as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${y ? "AND treeId = ?" : ""} LIMIT 1`).get(v.id, ...y ? [y] : []);
-		!y && x?.treeId && (y = x.treeId), y ||= "main-nav";
-		let S = null;
-		if (y) {
-			let e = await t.prepare("SELECT dataJson FROM trees WHERE id = ? OR key = ? LIMIT 1").get(Number(y) || -1, String(y));
+		let S = await t.prepare(`SELECT contentId as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${b ? "AND treeId = ?" : ""} LIMIT 1`).get(y.id, ...b ? [b] : []);
+		!b && S?.treeId && (b = S.treeId), b ||= "main-nav";
+		let C = null;
+		if (b) {
+			let e = await t.prepare("SELECT dataJson FROM trees WHERE id = ? OR key = ? LIMIT 1").get(Number(b) || -1, String(b));
 			if (e?.dataJson) try {
 				let t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
-				t.defaultLanguage ? S = String(t.defaultLanguage).trim() : t.language && (S = String(t.language).trim());
+				t.defaultLanguage ? C = String(t.defaultLanguage).trim() : t.language && (C = String(t.language).trim());
 			} catch {}
 		}
-		let C = null;
-		if (p) {
-			if (p.defaultLanguage) C = String(p.defaultLanguage).trim();
-			else if (p.dataJson) try {
-				let e = typeof p.dataJson == "string" ? JSON.parse(p.dataJson) : p.dataJson;
-				e.defaultLanguage ? C = String(e.defaultLanguage).trim() : e.language && (C = String(e.language).trim());
+		let w = null;
+		if (m) {
+			if (m.defaultLanguage) w = String(m.defaultLanguage).trim();
+			else if (m.dataJson) try {
+				let e = typeof m.dataJson == "string" ? JSON.parse(m.dataJson) : m.dataJson;
+				e.defaultLanguage ? w = String(e.defaultLanguage).trim() : e.language && (w = String(e.language).trim());
 			} catch {}
 		}
-		let ee = v.language?.trim() || null, w = S || C || a?.trim() || null, T = ee || w || null, E = `node:${h || g}:${T || "default"}:${u}`, D = e.req.header("x-bypass-cache") === "true" || !!s, te = $b(e);
-		if (!o && !D) {
-			let t = await te.get(E);
-			if (t) return e.header("X-Cache", "HIT"), e.json(t);
-		}
-		let ne = x?.parentId || null, O = _?.path || (d === "" ? "/" : d), k = {
-			id: v.id,
-			title: v.title,
-			slug: v.slug,
-			language: T,
-			path: O,
-			nodeType: v.contentType,
-			createdAt: v.createdAt,
-			updatedAt: v.updatedAt
-		}, A = dx(e.env?.BUNDLED_DEFINITIONS), re = v.contentType || "node", ie = A.nodes?.[re] || Object.values(A.nodes || {})[0] || {}, ae = { ...ie.fields || {} };
-		ie.tabs && Object.values(ie.tabs).forEach((e) => {
-			Object.assign(ae, e.fields || {});
+		let T = y.language?.trim() || null, ee = C || w || o?.trim() || null, E = T || ee || null, D = `node:${g || _}:${E || "default"}:${d}`, te = e.req.header("x-bypass-cache") === "true" || !!c, ne = $b(e), O = yS(e);
+		if (!s && !te) {
+			let t = await ne.get(D);
+			if (t) {
+				e.header("X-Cache", "HIT");
+				let n = O;
+				if (t.meta && t.meta.nextEventTimestamp) {
+					let e = Math.floor((t.meta.nextEventTimestamp - Date.now()) / 1e3);
+					e > 0 && e < n ? n = e : e <= 0 && (n = 0);
+				}
+				return n > 0 ? e.header("Cache-Control", `public, max-age=${n}, s-maxage=${n}`) : e.header("Cache-Control", "no-cache, no-store, must-revalidate"), e.json(t);
+			}
+		}
+		let k = S?.parentId || null, A = v?.path || (f === "" ? "/" : f), re = {
+			id: y.id,
+			title: y.title,
+			slug: y.slug,
+			language: E,
+			path: A,
+			nodeType: y.contentType,
+			createdAt: y.createdAt,
+			updatedAt: y.updatedAt
+		}, ie = dx(e.env?.BUNDLED_DEFINITIONS), ae = y.contentType || "node", oe = ie.nodes?.[ae] || Object.values(ie.nodes || {})[0] || {}, se = { ...oe.fields || {} };
+		oe.tabs && Object.values(oe.tabs).forEach((e) => {
+			Object.assign(se, e.fields || {});
 		});
-		let oe = {}, se = null, ce = null, le = !1, j = {}, ue = o && v.draftDataJson || v.dataJson;
-		if (b && b.node && b.node.dataJson && (ue = b.node.dataJson), ue) try {
-			j = typeof ue == "string" ? JSON.parse(ue) : ue;
+		let ce = {}, le = null, ue = null, de = !1, j = {}, fe = s && y.draftDataJson || y.dataJson;
+		if (x && x.node && x.node.dataJson && (fe = x.node.dataJson), fe) try {
+			j = typeof fe == "string" ? JSON.parse(fe) : fe;
 		} catch {}
-		j.disabledRegions && (oe = j.disabledRegions), le = j.hidden === !0 || j.hidden === 1 || j.hidden === "1" || j.hidden === "true", se = j.startShowingAt || null, ce = j.stopShowingAt || null;
-		let de = j.layoutId, fe = de && de !== "inherit", { resolvedLayoutId: pe, inheritedFields: me } = await _S(t, ne, y, o, ae), he = fe ? de : pe || ie.defaultLayout || null;
-		for (let [e, t] of Object.entries(me)) (j[e] === void 0 || j[e] === null || j[e] === "" || j[e] === "inherit") && t !== void 0 && (j[e] = t);
-		let ge = await ux(t, dS(j, ae));
-		ge = fS(ge), ge = await pS(t, ge, h, n), delete ge.language;
-		let _e = gS(ge);
-		delete ge.socialImage, delete ge.fbImage, delete ge.xImage, delete ge.whatsappImage, _e && (ge.socialImages = _e), Object.assign(k, ge), k.id = v.id, k.slug = v.slug, k.title = v.title, k.path = O, k.layoutId = he;
-		let ve = Number(v.isHidden) === 1 || le, ye = !cS(se, ce), be = v.status === "draft" || v.status === "new", xe = v.dataJson && v.dataJson !== "{}" && v.dataJson !== "null";
-		if (!o && (ve || ye || be && !xe)) return e.json({ error: "Node is hidden, offline, or has never been published." }, 404);
-		let Se = [];
-		if (x?.treeNodeId) {
-			let e = await t.prepare("\n        SELECT t.contentId as treeNodeId, t.contentId as id, c.title, c.slug, c.language, c.contentType as nodeType, c.isHidden, c.dataJson, c.draftDataJson\n        FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.parentId = ? AND t.treeId = ? ORDER BY t.sortOrder ASC\n      ").all(x.treeNodeId, y), n = Array.isArray(e) ? e : e?.results || [], r = k.path || "", i = r === "/" ? "" : r;
-			Se = n.map((e) => {
-				let t = {}, n = o && e.draftDataJson || e.dataJson;
+		j.disabledRegions && (ce = j.disabledRegions), de = j.hidden === !0 || j.hidden === 1 || j.hidden === "1" || j.hidden === "true", le = j.startShowingAt || null, ue = j.stopShowingAt || null, cS(le, ue, r);
+		let pe = j.layoutId, me = pe && pe !== "inherit", { resolvedLayoutId: he, inheritedFields: ge } = await vS(t, k, b, s, se), _e = me ? pe : he || oe.defaultLayout || null;
+		for (let [e, t] of Object.entries(ge)) (j[e] === void 0 || j[e] === null || j[e] === "" || j[e] === "inherit") && t !== void 0 && (j[e] = t);
+		let ve = await ux(t, fS(j, se));
+		ve = pS(ve), ve = await mS(t, ve, g, n), delete ve.language;
+		let ye = _S(ve);
+		delete ve.socialImage, delete ve.fbImage, delete ve.xImage, delete ve.whatsappImage, ye && (ve.socialImages = ye), Object.assign(re, ve), re.id = y.id, re.slug = y.slug, re.title = y.title, re.path = A, re.layoutId = _e;
+		let be = Number(y.isHidden) === 1 || de, xe = !lS(le, ue), Se = y.status === "draft" || y.status === "new", Ce = y.dataJson && y.dataJson !== "{}" && y.dataJson !== "null";
+		if (!s && (be || xe || Se && !Ce)) return e.json({ error: "Node is hidden, offline, or has never been published." }, 404);
+		let we = [];
+		if (S?.treeNodeId) {
+			let e = await t.prepare("\n        SELECT t.contentId as treeNodeId, t.contentId as id, c.title, c.slug, c.language, c.contentType as nodeType, c.isHidden, c.dataJson, c.draftDataJson\n        FROM tree_nodes t INNER JOIN content_nodes c ON t.contentId = c.id WHERE t.parentId = ? AND t.treeId = ? ORDER BY t.sortOrder ASC\n      ").all(S.treeNodeId, b), n = Array.isArray(e) ? e : e?.results || [], i = re.path || "", a = i === "/" ? "" : i;
+			we = n.map((e) => {
+				let t = {}, n = s && e.draftDataJson || e.dataJson;
 				if (!n) return null;
 				try {
 					t = (typeof n == "string" ? JSON.parse(n) : n) || {};
 				} catch {}
-				let r = Number(e.isHidden) === 1 || t.hidden === !0 || t.hidden === 1 || t.hidden === "1", a = cS(t.startShowingAt, t.stopShowingAt), s = (e.slug || "").replace(/^\/+|\/+$/g, "");
-				return !o && (r || !a) ? null : {
+				let i = Number(e.isHidden) === 1 || t.hidden === !0 || t.hidden === 1 || t.hidden === "1", o = lS(t.startShowingAt, t.stopShowingAt), c = (e.slug || "").replace(/^\/+|\/+$/g, "");
+				return cS(t.startShowingAt, t.stopShowingAt, r), !s && (i || !o) ? null : {
 					treeNodeId: e.treeNodeId,
 					id: e.id,
 					title: e.title,
-					slug: s,
-					language: e.language?.trim() || T || null,
-					path: `${i}/${s}`.replace(/\/+/g, "/"),
+					slug: c,
+					language: e.language?.trim() || E || null,
+					path: `${a}/${c}`.replace(/\/+/g, "/"),
 					nodeType: e.nodeType
 				};
 			}).filter(Boolean);
 		}
-		k.children = Se;
-		let Ce = [];
-		if (b && b.blocks && Array.isArray(b.blocks)) Ce = b.blocks.map((e) => ({
+		re.children = we;
+		let Te = [];
+		if (x && x.blocks && Array.isArray(x.blocks)) Te = x.blocks.map((e) => ({
 			...e,
 			isDraft: 1
 		}));
 		else {
-			let e = +!!o, n = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = ? ORDER BY sortOrder ASC").all(v.id, e);
-			Ce = Array.isArray(n) ? n : n?.results || [];
+			let e = +!!s, n = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = ? ORDER BY sortOrder ASC").all(y.id, e);
+			Te = Array.isArray(n) ? n : n?.results || [];
 		}
-		let we = {}, Te = {}, Ee = await Promise.all(Ce.map(async (e) => {
-			let r = e.region || "main", i = {};
+		let Ee = {}, De = {}, Oe = await Promise.all(Te.map(async (e) => {
+			let i = e.region || "main", a = {};
 			try {
-				i = (typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson) || {};
+				a = (typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson) || {};
 			} catch {}
-			let a = i.hidden === !0 || i.hidden === 1 || i.hidden === "1" || i.hidden === "true", s = cS(i.startShowingAt, i.stopShowingAt);
-			if (!o && (a || !s)) return null;
-			let c = e.elementType || e.componentId || "text-block", l = A.blocks?.[c]?.fields || A.elements?.[c]?.fields || A.components?.[c]?.fields || {}, u = String(i.blockId || i._instanceId || i.id || e.blockId || e.id), d = dS(i, l);
-			return d = await ux(t, d), d = fS(d), d = await pS(t, d, h, n), d.blockId = u, {
-				region: r,
+			cS(a.startShowingAt, a.stopShowingAt, r);
+			let o = a.hidden === !0 || a.hidden === 1 || a.hidden === "1" || a.hidden === "true", c = lS(a.startShowingAt, a.stopShowingAt);
+			if (!s && (o || !c)) return null;
+			let l = e.elementType || e.componentId || "text-block", u = ie.blocks?.[l]?.fields || ie.elements?.[l]?.fields || ie.components?.[l]?.fields || {}, d = String(a.blockId || a._instanceId || a.id || e.blockId || e.id), f = fS(a, u);
+			return f = await ux(t, f), f = pS(f), f = await mS(t, f, g, n), f.blockId = d, {
+				region: i,
 				block: {
 					instanceId: e.id,
-					blockId: u,
-					componentId: c,
-					data: d
+					blockId: d,
+					componentId: l,
+					data: f
 				}
 			};
 		}));
-		for (let e of Ee) e && (we[e.region] || (we[e.region] = [], Te[e.region] = { isInherited: !1 }), we[e.region].push(e.block));
-		let De = {
+		for (let e of Oe) e && (Ee[e.region] || (Ee[e.region] = [], De[e.region] = { isInherited: !1 }), Ee[e.region].push(e.block));
+		let ke = {
 			header: {
 				label: "Header",
 				inherit: "parent"
@@ -25727,33 +25773,43 @@ async function bS(e) {
 				label: "Footer",
 				inherit: "parent"
 			},
-			...(he ? A.nodeLayouts?.[he] || A.layouts?.[he] : null)?.regions || { main: { label: "Content" } }
+			...(_e ? ie.nodeLayouts?.[_e] || ie.layouts?.[_e] : null)?.regions || { main: { label: "Content" } }
 		};
-		for (let [e, r] of Object.entries(De)) {
-			let i = we[e] && we[e].length > 0, a = !!oe[e];
-			if (we[e] || (we[e] = [], Te[e] = { isInherited: !1 }), (r?.inherit === "parent" || r?.inherit === !0 || r?.inherit === "true" || e === "header" || e === "footer") && !i && !a && ne) {
-				let r = await uS(t, ne, String(y), e, A, o, n);
-				if (r.blocks.length > 0 && (we[e] = r.blocks, Te[e] = {
+		for (let [e, i] of Object.entries(ke)) {
+			let a = Ee[e] && Ee[e].length > 0, o = !!ce[e];
+			if (Ee[e] || (Ee[e] = [], De[e] = { isInherited: !1 }), (i?.inherit === "parent" || i?.inherit === !0 || i?.inherit === "true" || e === "header" || e === "footer") && !a && !o && k) {
+				let i = await dS(t, k, String(b), e, ie, s, n, r);
+				if (i.blocks.length > 0 && (Ee[e] = i.blocks, De[e] = {
 					isInherited: !0,
-					inheritedFromId: r.inheritedFromId,
-					inheritedFromTitle: r.inheritedFromTitle
-				}, r.subRegions)) for (let [t, n] of Object.entries(r.subRegions)) t !== e && (we[t] = n, Te[t] = {
+					inheritedFromId: i.inheritedFromId,
+					inheritedFromTitle: i.inheritedFromTitle
+				}, i.subRegions)) for (let [t, n] of Object.entries(i.subRegions)) t !== e && (Ee[t] = n, De[t] = {
 					isInherited: !0,
-					inheritedFromId: r.inheritedFromId,
-					inheritedFromTitle: r.inheritedFromTitle
+					inheritedFromId: i.inheritedFromId,
+					inheritedFromTitle: i.inheritedFromTitle
 				});
 			}
 		}
-		await Promise.all(Object.keys(we).map((e) => lS(t, we[e], h, T)));
-		let Oe = {
-			channelId: h || g,
-			treeId: y,
-			language: T,
-			node: k,
-			content: we,
-			regionMeta: Te
+		await Promise.all(Object.keys(Ee).map((e) => uS(t, Ee[e], g, E, r)));
+		let Ae = O, je = null;
+		if (r.length > 0) {
+			je = Math.min(...r);
+			let e = Math.floor((je - Date.now()) / 1e3);
+			e > 0 && e < O && (Ae = e);
+		}
+		let Me = {
+			channelId: g || _,
+			treeId: b,
+			language: E,
+			meta: {
+				cacheTtl: Ae,
+				nextEventTimestamp: je
+			},
+			node: re,
+			content: Ee,
+			regionMeta: De
 		};
-		return !o && !D && (e.header("X-Cache", "MISS"), await yS(te, E, Oe, vS(e))), e.json(Oe, 200);
+		return !s && !te ? (e.header("X-Cache", "MISS"), e.header("Cache-Control", `public, max-age=${Ae}, s-maxage=${Ae}`), await bS(ne, D, Me, Ae)) : e.header("Cache-Control", "no-cache, no-store, must-revalidate"), e.json(Me, 200);
 	} catch (t) {
 		return console.error("[CMS Public API] Error fetching node by path:", t), e.json({
 			error: "Failed to fetch JSON payload",
@@ -25761,20 +25817,24 @@ async function bS(e) {
 		}, 500);
 	}
 }
-var xS = X({
+var SS = X({
 	channelId: J().optional().openapi({ description: "The ID or key of the channel" }),
 	channel: J().optional().openapi({ description: "Legacy alias for channelId" }),
 	lang: J().optional().openapi({ description: "Requested language code" }),
 	preview: lv(["true", "false"]).optional().openapi({ description: "Request unpublished draft data" }),
 	revisionId: J().optional().openapi({ description: "Historical revision version to load" }),
 	treeId: J().optional().openapi({ description: "The ID of the tree to resolve paths against" })
-}), SS = X({
+}), CS = X({
 	error: J(),
 	details: J().optional()
-}).openapi("ErrorResponse"), CS = X({
+}).openapi("ErrorResponse"), wS = X({
 	channelId: G_([J(), c_()]),
 	treeId: J().nullable(),
 	language: J().nullable(),
+	meta: X({
+		cacheTtl: c_(),
+		nextEventTimestamp: c_().nullable()
+	}).optional(),
 	node: tv(k_()),
 	content: tv(z_(k_())),
 	regionMeta: tv(X({
@@ -25782,7 +25842,7 @@ var xS = X({
 		inheritedFromId: J().optional(),
 		inheritedFromTitle: J().optional()
 	}))
-}).openapi("NodeResponse"), wS = eb({
+}).openapi("NodeResponse"), TS = eb({
 	method: "get",
 	path: "/{path}",
 	summary: "Fetch CMS Node Content",
@@ -25790,26 +25850,26 @@ var xS = X({
 	tags: ["Public Node API"],
 	request: {
 		params: X({ path: J().optional().openapi({ description: "The full URL path or slug of the requested node" }) }),
-		query: xS
+		query: SS
 	},
 	responses: {
 		200: {
 			description: "Fully hydrated CMS Node",
-			content: { "application/json": { schema: CS } }
+			content: { "application/json": { schema: wS } }
 		},
 		404: {
 			description: "Node or Channel not found",
-			content: { "application/json": { schema: SS } }
+			content: { "application/json": { schema: CS } }
 		},
 		500: {
 			description: "Server error during hydration",
-			content: { "application/json": { schema: SS } }
+			content: { "application/json": { schema: CS } }
 		}
 	}
 });
-oS.openapi(wS, bS), oS.get("*", bS);
-var TS = new $y();
-function ES(e, t) {
+oS.openapi(TS, xS), oS.get("*", xS);
+var ES = new $y();
+function DS(e, t) {
 	let n = /* @__PURE__ */ new Date();
 	if (e && String(e).trim() !== "") {
 		let t = new Date(e);
@@ -25821,22 +25881,22 @@ function ES(e, t) {
 	}
 	return !0;
 }
-async function DS(e, t, n, r) {
+async function OS(e, t, n, r) {
 	try {
 		await e.set(t, n, r);
 	} catch (e) {
 		console.warn("[CMS Cache] Failed to write tree response to cache:", e);
 	}
 }
-var OS = X({ treeParam: J().openapi({ description: "The ID or key of the requested tree (e.g., \"main-nav\")" }) }), kS = X({
+var kS = X({ treeParam: J().openapi({ description: "The ID or key of the requested tree (e.g., \"main-nav\")" }) }), AS = X({
 	channelId: J().optional().openapi({ description: "Channel ID to resolve context-aware routing" }),
 	channel: J().optional().openapi({ description: "Legacy alias for channelId" }),
 	lang: J().optional().openapi({ description: "Requested language code for tree nodes" }),
 	preview: lv(["true", "false"]).optional().openapi({ description: "Set to true to retrieve unpublished draft data" })
-}), AS = X({
+}), jS = X({
 	error: J(),
 	details: J().optional()
-}).openapi("ErrorResponse"), jS = qv(() => X({
+}).openapi("ErrorResponse"), MS = qv(() => X({
 	id: G_([J(), c_()]),
 	treeNodeId: G_([J(), c_()]),
 	parentId: G_([J(), c_()]).nullable(),
@@ -25849,40 +25909,40 @@ var OS = X({ treeParam: J().openapi({ description: "The ID or key of the request
 	summary: J(),
 	url: J().optional(),
 	target: J().optional(),
-	children: z_(jS).optional()
-})).openapi("TreeItem"), MS = X({
+	children: z_(MS).optional()
+})).openapi("TreeItem"), NS = X({
 	treeId: G_([c_(), J()]),
 	key: J(),
 	channelId: J(),
 	language: J().nullable(),
 	label: J(),
-	items: z_(jS)
-}).catchall(k_()).openapi("TreeResponse"), NS = eb({
+	items: z_(MS)
+}).catchall(k_()).openapi("TreeResponse"), PS = eb({
 	method: "get",
 	path: "/{treeParam}",
 	summary: "Fetch CMS Navigation Tree",
 	description: "Retrieves a fully hydrated, recursive navigation tree structure. Uses $O(1)$ pre-computed routing table paths.",
 	tags: ["Public Tree API"],
 	request: {
-		params: OS,
-		query: kS
+		params: kS,
+		query: AS
 	},
 	responses: {
 		200: {
 			description: "Fully hydrated CMS Tree payload",
-			content: { "application/json": { schema: MS } }
+			content: { "application/json": { schema: NS } }
 		},
 		404: {
 			description: "Tree or Channel not found / inactive",
-			content: { "application/json": { schema: AS } }
+			content: { "application/json": { schema: jS } }
 		},
 		500: {
 			description: "Server error during hydration",
-			content: { "application/json": { schema: AS } }
+			content: { "application/json": { schema: jS } }
 		}
 	}
 });
-TS.openapi(NS, async (e) => {
+ES.openapi(PS, async (e) => {
 	try {
 		let t = e.get("db"), { treeParam: n } = e.req.valid("param"), r = e.req.valid("query"), i = r.channelId || r.channel || "default", a = r.lang, o = r.preview === "true", s = null, c = -1;
 		if (i && i !== "default" && i !== "all") {
@@ -25945,7 +26005,7 @@ TS.openapi(NS, async (e) => {
 			return (y.get(n) || []).map((e) => {
 				let n = b.get(String(e.id)) || {}, r = {};
 				for (let [e, t] of Object.entries(n)) e !== "_isTreeDraft" && e !== "_draftParentId" && e !== "isNew" && e !== "hidden" && e !== "is_hidden" && e !== "isHidden" && e !== "status" && (r[e] = t);
-				let i = !o && (e.status === "draft" || e.status === "new"), a = Number(e.isHidden) === 1 || i || n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = ES(n.startShowingAt, n.stopShowingAt), c = (e.slug || "").replace(/^\/+|\/+$/g, ""), l = !e.parentId || e.parentId === "null" || e.parentId === "", u = e.materializedPath || (l ? `/${c}` : `${t}/${c}`.replace(/\/+/g, "/")), d = e.language && String(e.language).trim() !== "" ? e.language.trim() : f, p = {
+				let i = !o && (e.status === "draft" || e.status === "new"), a = Number(e.isHidden) === 1 || i || n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = DS(n.startShowingAt, n.stopShowingAt), c = (e.slug || "").replace(/^\/+|\/+$/g, ""), l = !e.parentId || e.parentId === "null" || e.parentId === "", u = e.materializedPath || (l ? `/${c}` : `${t}/${c}`.replace(/\/+/g, "/")), d = e.language && String(e.language).trim() !== "" ? e.language.trim() : f, p = {
 					id: e.id,
 					treeNodeId: e.id,
 					parentId: e.parentId || null,
@@ -25971,7 +26031,7 @@ TS.openapi(NS, async (e) => {
 			..._,
 			items: x(null)
 		};
-		return !o && !h && (e.header("X-Cache", "MISS"), await DS(p, m, S, 300)), e.json(S, 200);
+		return !o && !h && (e.header("X-Cache", "MISS"), await OS(p, m, S, 300)), e.json(S, 200);
 	} catch (t) {
 		return console.error("[CMS Public Tree API] Error:", t), e.json({
 			error: "Failed to fetch public tree",
@@ -25979,19 +26039,19 @@ TS.openapi(NS, async (e) => {
 		}, 500);
 	}
 });
-var PS = new $y();
-function FS(e) {
+var FS = new $y();
+function IS(e) {
 	let t = Number(e?.env?.CMS_CHANNEL_CACHE_TTL);
 	return Number.isFinite(t) && t >= 60 ? Math.floor(t) : 300;
 }
-async function IS(e, t, n, r) {
+async function LS(e, t, n, r) {
 	try {
 		await e.set(t, n, r);
 	} catch (e) {
 		console.warn("[CMS Cache] Failed to write channel response to cache:", e);
 	}
 }
-function LS(e, t) {
+function RS(e, t) {
 	let n = {}, r = (e) => {
 		if (!e || typeof e != "string") return;
 		let n = t?.fieldSets?.[e] || t?.fieldsets?.[e] || t?.definitions?.[e] || t?.channels?.[e] || t?.[e];
@@ -26002,7 +26062,7 @@ function LS(e, t) {
 	if (e?.fieldSets && Array.isArray(e.fieldSets) && e.fieldSets.forEach((e) => r(e)), e?.fields && i(e.fields), e?.tabs && typeof e.tabs == "object") for (let t of Object.values(e.tabs)) t?.fields && i(t.fields);
 	return n;
 }
-function RS(e, t = {}) {
+function zS(e, t = {}) {
 	let n = {}, r = Object.keys(t).length > 0;
 	for (let [i, a] of Object.entries(e)) {
 		if (i.endsWith("_meta") || [
@@ -26021,14 +26081,14 @@ function RS(e, t = {}) {
 	}
 	return n;
 }
-function zS(e) {
-	if (Array.isArray(e)) return e.map(zS);
+function BS(e) {
+	if (Array.isArray(e)) return e.map(BS);
 	if (!e || typeof e != "object") return e;
 	if (typeof e.id == "string" && e.id.startsWith("ast_") && typeof e.url == "string") {
 		let t = e.metadataOverrides || {}, n = e.variants && typeof e.variants == "object" ? e.variants : {}, r = Object.entries(n).find(([, t]) => t?.id === e.id)?.[0], i = r ? {
 			...t,
 			...t.crops?.[r] || {}
-		} : t, a = Object.fromEntries(Object.entries(n).filter(([, t]) => t?.id !== e.id).map(([t, n]) => [t, zS({
+		} : t, a = Object.fromEntries(Object.entries(n).filter(([, t]) => t?.id !== e.id).map(([t, n]) => [t, BS({
 			...n,
 			title: n?.title ?? e.title ?? "",
 			alt: n?.alt ?? e.alt ?? "",
@@ -26042,9 +26102,9 @@ function zS(e) {
 			...Object.keys(a).length > 0 ? { variants: a } : {}
 		};
 	}
-	return Object.fromEntries(Object.entries(e).map(([e, t]) => [e, zS(t)]));
+	return Object.fromEntries(Object.entries(e).map(([e, t]) => [e, BS(t)]));
 }
-async function BS(e, t, n) {
+async function VS(e, t, n) {
 	if (typeof t == "string") {
 		if (!t.includes("#node:") && !t.includes("data-node-id") && !t.includes("#asset:") && !t.includes("data-asset-id")) return t;
 		let r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set();
@@ -26077,45 +26137,45 @@ async function BS(e, t, n) {
 			return /href\s*=\s*["'][^"']*["']/i.test(d) ? d = d.replace(/href\s*=\s*["'][^"']*["']/i, `href="${u}"`) : d += ` href="${u}"`, `<a ${d}>`;
 		});
 	}
-	if (Array.isArray(t)) return Promise.all(t.map((t) => BS(e, t, n)));
+	if (Array.isArray(t)) return Promise.all(t.map((t) => VS(e, t, n)));
 	if (t && typeof t == "object") {
-		let r = await Promise.all(Object.entries(t).map(async ([t, r]) => [t, await BS(e, r, n)]));
+		let r = await Promise.all(Object.entries(t).map(async ([t, r]) => [t, await VS(e, r, n)]));
 		return Object.fromEntries(r);
 	}
 	return t;
 }
-var VS = X({ channelParam: J().openapi({ description: "The ID or key (slug) of the requested channel" }) }), HS = X({ preview: lv(["true", "false"]).optional().openapi({ description: "Set to true to retrieve unpublished draft data" }) }), US = X({
+var HS = X({ channelParam: J().openapi({ description: "The ID or key (slug) of the requested channel" }) }), US = X({ preview: lv(["true", "false"]).optional().openapi({ description: "Set to true to retrieve unpublished draft data" }) }), WS = X({
 	error: J(),
 	details: J().optional()
-}).openapi("ErrorResponse"), WS = X({
+}).openapi("ErrorResponse"), GS = X({
 	id: G_([c_(), J()]),
 	key: J()
-}).catchall(k_()).openapi("ChannelResponse"), GS = eb({
+}).catchall(k_()).openapi("ChannelResponse"), KS = eb({
 	method: "get",
 	path: "/{channelParam}",
 	summary: "Fetch CMS Channel Settings",
 	description: "Retrieves the fully hydrated, public-facing settings and payload for a specific CMS channel.",
 	tags: ["Public Channel API"],
 	request: {
-		params: VS,
-		query: HS
+		params: HS,
+		query: US
 	},
 	responses: {
 		200: {
 			description: "Fully hydrated CMS Channel payload",
-			content: { "application/json": { schema: WS } }
+			content: { "application/json": { schema: GS } }
 		},
 		404: {
 			description: "Channel not found or inactive",
-			content: { "application/json": { schema: US } }
+			content: { "application/json": { schema: WS } }
 		},
 		500: {
 			description: "Server error during hydration",
-			content: { "application/json": { schema: US } }
+			content: { "application/json": { schema: WS } }
 		}
 	}
 });
-PS.openapi(GS, async (e) => {
+FS.openapi(KS, async (e) => {
 	try {
 		let t = e.get("db"), { channelParam: n } = e.req.valid("param"), { preview: r } = e.req.valid("query"), i = r === "true", a = e.req.header("x-bypass-cache") === "true", o = `channel:${n}:${i ? "preview" : "live"}`, s = $b(e);
 		if (!i && !a) {
@@ -26126,23 +26186,23 @@ PS.openapi(GS, async (e) => {
 		if (!c) return e.json({ error: `Channel '${n}' not found` }, 404);
 		let l = c.status === "disabled" || c.status === "inactive" || c.isEnabled === 0 || c.isEnabled === !1;
 		if (!i && l) return e.json({ error: `Channel '${c.key || n}' is currently inactive` }, 404);
-		let u = Number(c.id), d = e.env?.BUNDLED_DEFINITIONS, f = dx(d), p = c.channelType || c.key || "website", m = LS(f.channels?.[p] || f.channels?.[c.key] || f.channels?.website || f.definitions?.["channel-base"] || {}, f), h = {}, g = i && c.draftDataJson || c.dataJson;
+		let u = Number(c.id), d = e.env?.BUNDLED_DEFINITIONS, f = dx(d), p = c.channelType || c.key || "website", m = RS(f.channels?.[p] || f.channels?.[c.key] || f.channels?.website || f.definitions?.["channel-base"] || {}, f), h = {}, g = i && c.draftDataJson || c.dataJson;
 		if (g) try {
 			h = typeof g == "string" ? JSON.parse(g) : g;
 		} catch (e) {
 			console.warn("[CMS Public Channel API] Failed to parse channel dataJson:", e);
 		}
-		let _ = RS({
+		let _ = zS({
 			...h,
 			...c
 		}, m);
-		_ = await ux(t, _), _ = zS(_), _ = await BS(t, _, u);
+		_ = await ux(t, _), _ = BS(_), _ = await VS(t, _, u);
 		let v = {
 			id: c.id,
 			key: c.key,
 			..._
 		};
-		return !i && !a && (e.header("X-Cache", "MISS"), await IS(s, o, v, FS(e))), e.json(v, 200);
+		return !i && !a && (e.header("X-Cache", "MISS"), await LS(s, o, v, IS(e))), e.json(v, 200);
 	} catch (t) {
 		return console.error("[CMS Public Channel API] Error:", t), e.json({
 			error: "Failed to fetch public channel",
@@ -26150,8 +26210,8 @@ PS.openapi(GS, async (e) => {
 		}, 500);
 	}
 });
-var KS = new $y();
-function qS(e, t) {
+var qS = new $y();
+function JS(e, t) {
 	if (t === "webp") return "image/webp";
 	if (t === "avif") return "image/avif";
 	if (t === "jpeg" || t === "jpg") return "image/jpeg";
@@ -26160,7 +26220,7 @@ function qS(e, t) {
 	let n = e.toLowerCase();
 	return n.endsWith(".jpg") || n.endsWith(".jpeg") ? "image/jpeg" : n.endsWith(".png") ? "image/png" : n.endsWith(".webp") ? "image/webp" : n.endsWith(".gif") ? "image/gif" : n.endsWith(".svg") ? "image/svg+xml" : n.endsWith(".pdf") ? "application/pdf" : n.endsWith(".mp4") ? "video/mp4" : "application/octet-stream";
 }
-var JS = eb({
+var YS = eb({
 	method: "get",
 	path: "/*",
 	summary: "Serve & Optimize Media Assets",
@@ -26217,12 +26277,15 @@ var JS = eb({
 		}
 	}
 });
-KS.openapi(JS, async (e) => {
+qS.openapi(YS, async (e) => {
 	try {
 		let t = e.req.path.replace(/^\/media\//, "").replace(/^\//, "");
 		if (!t) return e.text("Asset key missing", 400);
 		let { w: n, h: r, q: i, f: a } = e.req.valid("query"), o = !!(n || r || i || a), s = e.req.header("Accept") || "", c = "";
-		o && (a === "avif" || !a && s.includes("image/avif") ? c = "avif" : a === "webp" || !a && s.includes("image/webp") ? c = "webp" : a === "jpeg" || a === "jpg" ? c = "jpeg" : a === "png" && (c = "png"));
+		if (o) {
+			let e = !a || a === "auto";
+			a === "avif" || e && s.includes("image/avif") ? c = "avif" : a === "webp" || e && s.includes("image/webp") ? c = "webp" : a === "jpeg" || a === "jpg" ? c = "jpeg" : a === "png" && (c = "png");
+		}
 		let l = typeof caches < "u" && caches?.default ? caches.default : null, u = e.req.url;
 		if (o && c && !a) {
 			let e = new URL(u);
@@ -26237,7 +26300,7 @@ KS.openapi(JS, async (e) => {
 		if (!m) return e.text(`Asset not found: ${t}`, 404);
 		if (!o) {
 			let n = e.body(m, 200, {
-				"Content-Type": qS(t),
+				"Content-Type": JS(t),
 				"Cache-Control": "public, max-age=31536000, immutable"
 			});
 			return l && d && e.executionCtx?.waitUntil && e.executionCtx.waitUntil(l.put(d, n.clone())), n;
@@ -26251,7 +26314,7 @@ KS.openapi(JS, async (e) => {
 			key: t,
 			env: e.env,
 			req: e.req.raw
-		}), _ = qS(t, c), v = e.body(g, 200, {
+		}), _ = JS(t, c), v = e.body(g, 200, {
 			"Content-Type": _,
 			"Cache-Control": "public, max-age=31536000, immutable"
 		});
@@ -26260,8 +26323,8 @@ KS.openapi(JS, async (e) => {
 		return console.error("❌ [Public Assets Error]:", t), e.text("Internal Server Error", 500);
 	}
 });
-var YS = new $y();
-function XS(e, t) {
+var XS = new $y();
+function ZS(e, t) {
 	let n = /* @__PURE__ */ new Date();
 	if (e && String(e).trim() !== "") {
 		let t = new Date(e);
@@ -26273,31 +26336,31 @@ function XS(e, t) {
 	}
 	return !0;
 }
-var ZS = X({
+var QS = X({
 	channelId: J().optional().openapi({ description: "Optional channel ID/key to filter and resolve root paths for" }),
 	channel: J().optional().openapi({ description: "Legacy alias for channelId" })
-}), QS = z_(J()).openapi("PathsResponse"), $S = X({
+}), $S = z_(J()).openapi("PathsResponse"), eC = X({
 	error: J(),
 	details: J().optional()
-}).openapi("ErrorResponse"), eC = eb({
+}).openapi("ErrorResponse"), tC = eb({
 	method: "get",
 	path: "/",
 	summary: "Fetch All Public Paths",
 	description: "Retrieves a deduplicated array of all active, published node paths leveraging the $O(1)$ node_routes table. Includes both tree-bound and standalone pages.",
 	tags: ["Public Paths API"],
-	request: { query: ZS },
+	request: { query: QS },
 	responses: {
 		200: {
 			description: "Array of valid public URL paths",
-			content: { "application/json": { schema: QS } }
+			content: { "application/json": { schema: $S } }
 		},
 		500: {
 			description: "Server error fetching paths",
-			content: { "application/json": { schema: $S } }
+			content: { "application/json": { schema: eC } }
 		}
 	}
 });
-YS.openapi(eC, async (e) => {
+XS.openapi(tC, async (e) => {
 	try {
 		let t = e.get("db"), n = e.req.valid("query"), r = n.channelId || n.channel, i = "", a = [];
 		if (r && r !== "all") {
@@ -26322,7 +26385,7 @@ YS.openapi(eC, async (e) => {
 			let t = !0;
 			if (e.dataJson) try {
 				let n = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
-				t = XS(n?.startShowingAt, n?.stopShowingAt);
+				t = ZS(n?.startShowingAt, n?.stopShowingAt);
 			} catch {}
 			t && c.push(e.path);
 		}
@@ -26332,12 +26395,12 @@ YS.openapi(eC, async (e) => {
 		return console.error("[CMS Paths API] Error:", t), e.json({ error: "Failed to fetch paths" }, 500);
 	}
 });
-var tC = new $y();
-function nC(e) {
+var nC = new $y();
+function rC(e) {
 	let t = (e || "").trim().toLowerCase(), n = dx()?.taxonomies || {};
 	return n[t] ? t : n[`${t}s`] ? `${t}s` : t.endsWith("s") && n[t.slice(0, -1)] ? t.slice(0, -1) : t;
 }
-var rC = X({
+var iC = X({
 	id: c_(),
 	taxonomy: J(),
 	key: J(),
@@ -26347,14 +26410,14 @@ var rC = X({
 	data: tv(k_()),
 	createdAt: J(),
 	updatedAt: J()
-}), iC = X({
+}), aC = X({
 	taxonomy: J(),
-	items: z_(rC),
+	items: z_(iC),
 	total: c_()
-}).openapi("TaxonomyResponse"), aC = X({
+}).openapi("TaxonomyResponse"), oC = X({
 	error: J(),
 	details: J().optional()
-}).openapi("ErrorResponse"), oC = eb({
+}).openapi("ErrorResponse"), sC = eb({
 	method: "get",
 	path: "/{taxonomy}",
 	summary: "Fetch Public Taxonomy Terms",
@@ -26364,17 +26427,17 @@ var rC = X({
 	responses: {
 		200: {
 			description: "List of taxonomy terms",
-			content: { "application/json": { schema: iC } }
+			content: { "application/json": { schema: aC } }
 		},
 		500: {
 			description: "Server error",
-			content: { "application/json": { schema: aC } }
+			content: { "application/json": { schema: oC } }
 		}
 	}
 });
-tC.openapi(oC, async (e) => {
+nC.openapi(sC, async (e) => {
 	try {
-		let t = e.get("db"), n = $b(e), r = e.req.valid("param").taxonomy, i = nC(r), a = `taxonomy:public:${i}`, o = e.req.header("x-bypass-cache") === "true";
+		let t = e.get("db"), n = $b(e), r = e.req.valid("param").taxonomy, i = rC(r), a = `taxonomy:public:${i}`, o = e.req.header("x-bypass-cache") === "true";
 		if (!o) {
 			let t = await n.get(a);
 			if (t) return e.header("X-Cache", "HIT"), e.json(t);
@@ -26408,7 +26471,7 @@ tC.openapi(oC, async (e) => {
 		return console.error("[Public Taxonomy API] Error fetching terms:", t), e.json({ error: "Failed to fetch taxonomy terms" }, 500);
 	}
 });
-var $ = new $y(), sC = !1;
+var $ = new $y(), cC = !1;
 $.use("*", t()), $.use("/media/*", t({
 	origin: "*",
 	allowMethods: [
@@ -26429,13 +26492,13 @@ $.use("*", t()), $.use("/media/*", t({
 	let n = new URL(e.req.url), r = (e.req.header("host") || n.hostname).split(":")[0];
 	e.set("currentDomain", r);
 	let i = wb(e);
-	if (e.set("db", i), !sC) try {
-		await Mb(i), sC = !0;
+	if (e.set("db", i), !cC) try {
+		await Mb(i), cC = !0;
 	} catch (e) {
 		console.error("❌ [CMS Server] Failed to initialize system tables on cold start:", e);
 	}
 	await t();
-}), $.route("/media", KS), $.use("/media/*", Pb()), $.route("/api/cms/nodes", mx), $.route("/api/cms/nodes.json", mx), $.route("/api/cms/formcsv", mx), $.route("/api/cms/formcsv.json", mx), $.route("/api/cms/stats", tS), $.route("/api/cms/stats.json", tS), $.route("/api/cms", Tx), $.route("/api/cms/trees.json", Tx), $.route("/api/cms/channels", kx), $.route("/api/cms/channels.json", kx), $.route("/api/cms/taxonomies", Ax), $.route("/api/cms/taxonomies.json", Ax), $.route("/api/cms/schemas", Xx), $.route("/api/cms/schemas.json", Xx), $.route("/api/cms", Qx), $.route("/api/admin/assets", nS), $.route("/api/v1/node", oS), $.route("/api/v1/tree", TS), $.route("/api/v1/channel", PS), $.route("/api/v1/all-paths", YS), $.route("/api/v1/taxonomies", tC), $.doc("/api/openapi.json", {
+}), $.route("/media", qS), $.use("/media/*", Pb()), $.route("/api/cms/nodes", mx), $.route("/api/cms/nodes.json", mx), $.route("/api/cms/formcsv", mx), $.route("/api/cms/formcsv.json", mx), $.route("/api/cms/stats", tS), $.route("/api/cms/stats.json", tS), $.route("/api/cms", Tx), $.route("/api/cms/trees.json", Tx), $.route("/api/cms/channels", kx), $.route("/api/cms/channels.json", kx), $.route("/api/cms/taxonomies", Ax), $.route("/api/cms/taxonomies.json", Ax), $.route("/api/cms/schemas", Xx), $.route("/api/cms/schemas.json", Xx), $.route("/api/cms", Qx), $.route("/api/admin/assets", nS), $.route("/api/v1/node", oS), $.route("/api/v1/tree", ES), $.route("/api/v1/channel", FS), $.route("/api/v1/all-paths", XS), $.route("/api/v1/taxonomies", nC), $.doc("/api/openapi.json", {
 	openapi: "3.0.0",
 	info: {
 		title: "KAMA Engine Public API",