@brightsideoy/kama 0.1.0-alpha.155 → 0.1.0-alpha.157

package/dist/{dist-C-WAK7EF.js → dist-mic4UZBb.js}

@@ -4813,10 +4813,10 @@ var u = /* @__PURE__ */ o({
 	users: "\n    id TEXT PRIMARY KEY,\n    email TEXT UNIQUE NOT NULL,\n    name TEXT NOT NULL,\n    globalRole TEXT DEFAULT 'editor',\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP\n  ",
 	user_accounts: "\n    id TEXT PRIMARY KEY,\n    userId TEXT NOT NULL,\n    provider TEXT NOT NULL,\n    providerAccountId TEXT NOT NULL,\n    passwordHash TEXT NOT NULL,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (userId) REFERENCES users(id) ON DELETE CASCADE,\n    UNIQUE(provider, providerAccountId)\n  ",
 	sessions: "\n    id TEXT PRIMARY KEY,\n    userId TEXT NOT NULL,\n    expiresAt TEXT NOT NULL,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (userId) REFERENCES users(id) ON DELETE CASCADE\n  ",
-	channels: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    key TEXT UNIQUE NOT NULL,\n    label TEXT NOT NULL,\n    channelType TEXT,\n    domain TEXT,\n    baseUrl TEXT,\n    defaultLanguage TEXT DEFAULT 'en',\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    dataJson TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
+	channels: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    key TEXT UNIQUE NOT NULL,\n    label TEXT NOT NULL,\n    channelType TEXT,\n    domain TEXT,\n    baseUrl TEXT,\n    defaultLanguage TEXT,\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    dataJson TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
 	trees: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    key TEXT UNIQUE NOT NULL,\n    label TEXT NOT NULL,\n    treeType TEXT,\n    channelId INTEGER,\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    dataJson TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE SET NULL,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
 	channel_trees: "\n    channelId INTEGER NOT NULL,\n    treeId INTEGER NOT NULL,\n    key TEXT NOT NULL DEFAULT 'main',\n    metaJson TEXT,\n    PRIMARY KEY (channelId, treeId, key),\n    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE CASCADE,\n    FOREIGN KEY (treeId) REFERENCES trees(id) ON DELETE CASCADE\n  ",
-	content_nodes: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    contentType TEXT NOT NULL,\n    title TEXT NOT NULL,\n    slug TEXT,\n    language TEXT DEFAULT 'en',\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    status TEXT DEFAULT 'draft',\n    hasUnpublishedChanges INTEGER DEFAULT 0,\n    disabledRegionsJson TEXT DEFAULT '{}',\n    dataJson TEXT,\n    draftDataJson TEXT,\n    publishedDataJson TEXT,\n    publishedAt TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    deletedAt TEXT,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
+	content_nodes: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    contentType TEXT NOT NULL,\n    title TEXT NOT NULL,\n    slug TEXT,\n    language TEXT,\n    isHidden INTEGER NOT NULL DEFAULT 0,\n    status TEXT DEFAULT 'draft',\n    hasUnpublishedChanges INTEGER DEFAULT 0,\n    disabledRegionsJson TEXT DEFAULT '{}',\n    dataJson TEXT,\n    draftDataJson TEXT,\n    publishedDataJson TEXT,\n    publishedAt TEXT,\n    createdById TEXT,\n    updatedById TEXT,\n    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,\n    deletedAt TEXT,\n    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,\n    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL\n  ",
 	node_channels: "\n    nodeId INTEGER NOT NULL,\n    channelId INTEGER NOT NULL,\n    PRIMARY KEY (nodeId, channelId),\n    FOREIGN KEY (nodeId) REFERENCES content_nodes(id) ON DELETE CASCADE,\n    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE CASCADE\n  ",
 	tree_nodes: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    treeId INTEGER NOT NULL,\n    contentId INTEGER NOT NULL,\n    parentId INTEGER,\n    sortOrder INTEGER DEFAULT 0,\n    FOREIGN KEY (treeId) REFERENCES trees(id) ON DELETE CASCADE,\n    FOREIGN KEY (contentId) REFERENCES content_nodes(id) ON DELETE CASCADE,\n    FOREIGN KEY (parentId) REFERENCES tree_nodes(id) ON DELETE CASCADE\n  ",
 	content_blocks: "\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    contentId INTEGER NOT NULL,\n    region TEXT DEFAULT 'main',\n    elementType TEXT NOT NULL,\n    dataJson TEXT,\n    sortOrder INTEGER DEFAULT 0,\n    isDraft INTEGER NOT NULL DEFAULT 1,\n    FOREIGN KEY (contentId) REFERENCES content_nodes(id) ON DELETE CASCADE\n  ",
@@ -5577,7 +5577,7 @@ var b = { hasSubscribers: !1 }, x = b, S = b, C = typeof performance == "object"
 	async clear() {
 		this.cache.clear();
 	}
-}, te = class {
+}, P = class {
 	kv;
 	constructor(e) {
 		this.kv = e;
@@ -5594,7 +5594,7 @@ var b = { hasSubscribers: !1 }, x = b, S = b, C = typeof performance == "object"
 		this.kv && await this.kv.delete(e);
 	}
 	async clear() {}
-}, P = class {
+}, te = class {
 	async get() {
 		return null;
 	}
@@ -5604,7 +5604,7 @@ var b = { hasSubscribers: !1 }, x = b, S = b, C = typeof performance == "object"
 }, F = null;
 function I(e) {
 	let t = process.env.CACHE_DRIVER || "lru";
-	return t === "none" || t === "off" || t === "false" ? new P() : e?.env?.CMS_CACHE_KV ? new te(e.env.CMS_CACHE_KV) : t === "lru" ? (F ||= new ee(), F) : new P();
+	return t === "none" || t === "off" || t === "false" ? new te() : e?.env?.CMS_CACHE_KV ? new P(e.env.CMS_CACHE_KV) : t === "lru" ? (F ||= new ee(), F) : new te();
 }
 var L = class {
 	customStoragePath;
@@ -5675,7 +5675,7 @@ var L = class {
 			if (e.code !== "ENOENT") throw e;
 		}
 	}
-}, R = class {
+}, ne = class {
 	async process(e, t, n) {
 		let r = await import(
 			/* @vite-ignore */
@@ -5702,7 +5702,7 @@ var L = class {
 			return console.warn("⚠️ [SharpImageOptimizer] Processing failed, returning raw buffer."), e;
 		}
 	}
-}, ne = class {
+}, re = class {
 	bucket;
 	publicDomain;
 	constructor(e, t) {
@@ -5747,7 +5747,7 @@ var L = class {
 	async delete(e) {
 		await this.bucket.delete(e);
 	}
-}, re = class {
+}, ie = class {
 	async process(e, t, n) {
 		let { env: r, key: i, req: a } = n;
 		if (r.IMAGES) try {
@@ -5782,16 +5782,16 @@ var L = class {
 		return e;
 	}
 };
-function ie(e) {
+function ae(e) {
 	return e.KAMA_RUNTIME === "cloudflare" || e.MEDIA_BUCKET ? {
-		storage: new ne(e.MEDIA_BUCKET, e.CDN_DOMAIN || ""),
-		optimizer: new re()
+		storage: new re(e.MEDIA_BUCKET, e.CDN_DOMAIN || ""),
+		optimizer: new ie()
 	} : {
 		storage: new L(e.LOCAL_MEDIA_PATH),
-		optimizer: new R()
+		optimizer: new ne()
 	};
 }
-function ae(e) {
+function R(e) {
 	if (!e || typeof e != "object") return {
 		cleanedData: e,
 		assetRefs: []
@@ -5867,7 +5867,7 @@ function z(e) {
 	}
 	return null;
 }
-async function se(e, t) {
+async function B(e, t) {
 	if (!t || typeof t != "object") return t;
 	let n = /* @__PURE__ */ new Set(), r = (e) => {
 		if (!e) return;
@@ -5978,7 +5978,7 @@ async function se(e, t) {
 	};
 	return d(t);
 }
-function ce(e) {
+function se(e) {
 	return e ? {
 		nodes: e.nodes || {},
 		trees: e.trees || {},
@@ -5995,7 +5995,7 @@ function ce(e) {
 		channels: {}
 	};
 }
-var B = class {
+var V = class {
 	env;
 	constructor(e) {
 		this.env = e || {};
@@ -6007,7 +6007,8 @@ var B = class {
 			apiToken: e.env?.CLOUDFLARE_API_TOKEN || this.env.CLOUDFLARE_API_TOKEN,
 			frontendUrl: (e.env?.PUBLIC_FRONTEND_URL || this.env.PUBLIC_FRONTEND_URL || "http://localhost:4321").replace(/\/+$/, ""),
 			cdnDomain: t ? t.replace(/^https?:\/\//, "").replace(/\/+$/, "") : "localhost:8787",
-			frontendWorker: e.env?.FRONTEND_WORKER || this.env.FRONTEND_WORKER
+			frontendWorker: e.env?.FRONTEND_WORKER || this.env.FRONTEND_WORKER,
+			disableCachePurge: e.env?.DISABLE_CACHE_PURGE || this.env.DISABLE_CACHE_PURGE
 		};
 	}
 	isLocalEnv(e, t) {
@@ -6031,19 +6032,33 @@ var B = class {
 		return r && n && r.startsWith(`https://${n}/`) && !r.includes("/media/") && (r = r.replace(`https://${n}/`, `https://${n}/media/`)), r;
 	}
 	async callAstroPurge(e, t, n) {
-		let { apiToken: r, frontendUrl: i } = this.getEnv(e), a = (n || i).replace(/\/+$/, "");
-		if (this.isLocalEnv(e, a)) return console.log(`[CacheManager] Skipped external purge for local target: ${a}`), new Response(JSON.stringify({
-			success: !0,
-			local: !0
-		}), { status: 200 });
-		let o = `${a}/api/purge`, s = { "Content-Type": "application/json" };
-		return r && (s.Authorization = `Bearer ${r}`), console.log(`[CacheManager] Dispatching POST purge request to: ${o}`), fetch(o, {
-			method: "POST",
-			headers: s,
-			body: JSON.stringify(t)
-		});
+		let { apiToken: r, frontendUrl: i, frontendWorker: a, disableCachePurge: o } = this.getEnv(e);
+		if (o === "true" || o === !0 || o === "1") return new Response(JSON.stringify({ skipped: !0 }), { status: 200 });
+		let s = (n || i).replace(/\/+$/, ""), c = `${s}/api/purge`, l = { "Content-Type": "application/json" };
+		if (r && (l.Authorization = `Bearer ${r}`), a && typeof a.fetch == "function") try {
+			return await a.fetch(new Request(c, {
+				method: "POST",
+				headers: l,
+				body: JSON.stringify(t)
+			}));
+		} catch (e) {
+			return console.info(`[CacheManager] Worker binding purge call to ${c} failed silently:`, e?.message || e), new Response(JSON.stringify({ error: e?.message }), { status: 502 });
+		}
+		try {
+			let e = new AbortController(), n = setTimeout(() => e.abort(), 1500);
+			console.log(`[CacheManager] Dispatching POST purge request to: ${c}`);
+			let r = await fetch(c, {
+				method: "POST",
+				headers: l,
+				body: JSON.stringify(t),
+				signal: e.signal
+			});
+			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 });
+		}
 	}
-	async purgeInternalWorkerCache(e, t, n, r, i = "en") {
+	async purgeInternalWorkerCache(e, t, n, r, i) {
 		try {
 			let a = I(e);
 			if (n) {
@@ -6056,7 +6071,7 @@ var B = class {
 					let e = t.prepare("SELECT c.key, c.id FROM node_channels nc JOIN channels c ON nc.channelId = c.id WHERE nc.nodeId = ?"), r = typeof e.all == "function" ? await e.all(n) : await e.bind(n).all(), i = Array.isArray(r) ? r : r?.results || [];
 					i.length > 0 && (o = i.flatMap((e) => [String(e.id), e.key]).filter(Boolean));
 				}
-				for (let t of o) await a.delete(`node:${t}:${i}:${e}`), await a.delete(`node:${t}:${i}:/${e}`);
+				for (let t of o) i && (await a.delete(`node:${t}:${i}:${e}`), await a.delete(`node:${t}:${i}:/${e}`)), await a.delete(`node:${t}:${e}`), await a.delete(`node:${t}:/${e}`);
 			}
 		} catch (e) {
 			console.warn("[CacheManager] Failed to purge internal worker cache:", e);
@@ -6067,30 +6082,30 @@ var B = class {
 			try {
 				let i = t.prepare("SELECT slug, status, language FROM content_nodes WHERE id = ?"), a = (typeof i.get == "function" ? await i.get(n) : (await i.bind(n).all())?.results?.[0]) || {};
 				if (!a.slug) return;
-				let o = a.language || "en", s = String(a.slug).replace(/^\/+|\/+$/g, ""), c = t.prepare("\n                    SELECT c.id, c.key, c.baseUrl \n                    FROM node_channels nc \n                    JOIN channels c ON nc.channelId = c.id \n                    WHERE nc.nodeId = ?\n                "), l = typeof c.all == "function" ? await c.all(n) : await c.bind(n).all(), u = Array.isArray(l) ? l : l?.results || [], d = this.getEnv(e).frontendUrl, f = /* @__PURE__ */ new Set();
-				for (let e of u) if (e.baseUrl && typeof e.baseUrl == "string" && e.baseUrl.trim() !== "") {
+				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}`), f.add(t.replace(/\/+$/, ""));
+					!t.startsWith("http://") && !t.startsWith("https://") && (t = `https://${t}`), p.add(t.replace(/\/+$/, ""));
 				}
-				f.size === 0 && d && f.add(d);
-				let p = 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                "), m = typeof p.all == "function" ? await p.all(n) : await p.bind(n).all(), h = (Array.isArray(m) ? m : m?.results || []).map((t) => t.url || this.getSafeUrl(t.cdnUrl, t.storageKeyPrivate, this.getEnv(e).cdnDomain)).filter(Boolean);
-				await this.purgeInternalWorkerCache(e, t, n, s, o);
-				let g = this.getEnv(e).cdnDomain, { zoneId: _, apiToken: v } = this.getEnv(e);
-				for (let t of f) {
-					let n = s === "home" || !s ? t : `${t}/${s}`, i = [n, `${n}/`];
-					if (u.length > 0) for (let e of u) e.id && i.push(`https://${g}/api/v1/node/${s}?channelId=${e.id}&lang=${o}`), e.key && i.push(`https://${g}/api/v1/node/${s}?channelId=${e.key}&lang=${o}`);
-					else i.push(`https://${g}/api/v1/node/${s}?lang=${o}`);
-					for (let e of h) e && i.push(`${t}${e.startsWith("/") ? e : `/${e}`}`);
-					if (await this.callAstroPurge(e, { urls: i }, t), _ && v && !this.isLocalEnv(e, t) && fetch(`https://api.cloudflare.com/client/v4/zones/${_}/purge_cache`, {
+				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);
+				for (let t of p) {
+					let n = d === "home" || !d ? t : `${t}/${d}`, i = [n, `${n}/`], a = u ? `&lang=${u}` : "";
+					if (c.length > 0) for (let e of c) e.id && i.push(`https://${_}/api/v1/node/${d}?channelId=${e.id}${a}`), e.key && i.push(`https://${_}/api/v1/node/${d}?channelId=${e.key}${a}`);
+					else i.push(`https://${_}/api/v1/node/${d}${u ? `?lang=${u}` : ""}`);
+					for (let e of g) e && i.push(`${t}${e.startsWith("/") ? e : `/${e}`}`);
+					if (await this.callAstroPurge(e, { urls: i }, t), v && y && !this.isLocalEnv(e, t) && fetch(`https://api.cloudflare.com/client/v4/zones/${v}/purge_cache`, {
 						method: "POST",
 						headers: {
-							Authorization: `Bearer ${v}`,
+							Authorization: `Bearer ${y}`,
 							"Content-Type": "application/json"
 						},
 						body: JSON.stringify({ files: i })
 					}).catch(() => {}), !r) {
 						let e = `${n}${n.includes("?") ? "&" : "?"} _warmer=${Date.now()}`;
-						console.log(`[CacheManager] Prewarming cache at: ${e}`), await fetch(e, { headers: {
+						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));
@@ -6119,35 +6134,49 @@ var B = class {
 	}
 	async purgeGlobalCacheDirect(e, t) {
 		try {
-			let { zoneId: n, apiToken: r, frontendUrl: i } = this.getEnv(e);
-			if (this.isLocalEnv(e) || !(await this.callAstroPurge(e, { purge_everything: !0 })).ok) return;
-			n && r && fetch(`https://api.cloudflare.com/client/v4/zones/${n}/purge_cache`, {
+			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) : fetch(`${i.replace(/\/+$/, "")}/?_warmer=${Date.now()}`, { headers: { "X-Cache-Warmer": "true" } }).catch(() => {});
+			}).catch(() => {}), await new Promise((e) => setTimeout(e, 100)), 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(() => {});
+			}
 		} catch (e) {
 			console.warn("[CacheManager] Direct Global Purge skipped:", e);
 		}
 	}
 	async warmAllPublishedPages(e, t) {
 		try {
-			let { frontendUrl: n } = this.getEnv(e);
-			if (this.isLocalEnv(e)) return;
-			let r = t.prepare("SELECT DISTINCT slug FROM content_nodes WHERE status = 'published' AND slug IS NOT NULL AND (deletedAt IS NULL OR deletedAt = '')"), i = typeof r.all == "function" ? await r.all() : await r.bind().all(), a = Array.isArray(i) ? i : i?.results || [], o = { "X-Cache-Warmer": "true" }, s = Date.now(), c = a.map((e) => {
-				let t = String(e.slug).replace(/^\/+|\/+$/g, ""), r = t === "home" || !t ? n : `${n}/${t}`;
-				return fetch(`${r}?_warmer=${s}`, { headers: o }).catch(() => {});
-			});
-			c.push(fetch(`${n}/?_warmer=${s}`, { headers: o }).catch(() => {})), await Promise.all(c);
+			let n = t.prepare("\n                SELECT DISTINCT cn.slug, c.baseUrl\n                FROM content_nodes cn\n                LEFT JOIN node_channels nc ON cn.id = nc.nodeId\n                LEFT JOIN channels c ON nc.channelId = c.id\n                WHERE cn.status = 'published' AND cn.slug IS NOT NULL AND (cn.deletedAt IS NULL OR cn.deletedAt = '')\n                LIMIT 100\n            "), r = typeof n.all == "function" ? await n.all() : await n.bind().all(), i = Array.isArray(r) ? r : r?.results || [], a = this.getEnv(e).frontendUrl, o = {
+				"X-Cache-Warmer": "true",
+				"User-Agent": "Kama-Cache-Warmer/1.0"
+			}, s = Date.now(), c = /* @__PURE__ */ new Set();
+			for (let e of i) {
+				let t = String(e.slug).replace(/^\/+|\/+$/g, ""), n = a;
+				e.baseUrl && typeof e.baseUrl == "string" && e.baseUrl.trim() !== "" && (n = e.baseUrl.trim(), !n.startsWith("http://") && !n.startsWith("https://") && (n = `https://${n}`), n = n.replace(/\/+$/, ""));
+				let r = t === "home" || !t ? n : `${n}/${t}`;
+				c.add(`${r}?_warmer=${s}`);
+			}
+			c.add(`${a}/?_warmer=${s}`);
+			let l = Array.from(c);
+			for (let e = 0; e < l.length; e += 6) {
+				let t = l.slice(e, e + 6);
+				await Promise.all(t.map((e) => fetch(e, { headers: o }).catch((t) => console.warn(`[CacheWarmer] Skipped prewarm for ${e}:`, t?.message || t))));
+			}
+			console.log(`[CacheWarmer] Prewarmed ${l.length} published pages across ${Math.ceil(l.length / 6)} batches.`);
 		} catch (e) {
 			console.warn("⚠️ [CacheWarmer] Tree-wide warming failed:", e);
 		}
 	}
-}, V = new e();
-async function le(e, t, n = []) {
+}, H = new e();
+async function ce(e, t, n = []) {
 	let r = e.prepare(t);
 	if (typeof r.bind == "function") {
 		let e = await r.bind(...n).all();
@@ -6159,24 +6188,25 @@ async function le(e, t, n = []) {
 	}
 	return [];
 }
-async function ue(e, t, n = []) {
+async function le(e, t, n = []) {
 	let r = e.prepare(t);
 	if (typeof r.bind == "function") return r.bind(...n).run();
 	if (typeof r.run == "function") return r.run(...n);
 }
-function de(e) {
+function U(e) {
 	return !e || !e.trim() ? null : e.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().trim().replace(/[^a-z0-9\s-]/g, "").replace(/[\s-]+/g, "-").replace(/^-+|-+$/g, "") || null;
 }
-function fe(e) {
+function ue(e) {
 	return +(e === !0 || e === 1 || e === "1" || e === "true");
 }
-function pe(e) {
+function de(e) {
 	if (e == null || e === "null" || e === "" || typeof e == "string" && e.startsWith("draft-")) return null;
 	let t = Number(e);
 	return isNaN(t) ? null : t;
 }
-function H(e) {
+function fe(e) {
 	let t = { ...e };
+	delete t.language, delete t.defaultLanguage;
 	for (let e of [
 		"id",
 		"treeNodeId",
@@ -6187,7 +6217,6 @@ function H(e) {
 		"contentType",
 		"title",
 		"slug",
-		"language",
 		"hidden",
 		"is_hidden",
 		"isHidden",
@@ -6204,17 +6233,22 @@ function H(e) {
 	]) delete t[e];
 	return t;
 }
-function me(e, t = /* @__PURE__ */ new Set()) {
-	return e ? typeof e == "string" ? (e.startsWith("ast_") && t.add(e), t) : Array.isArray(e) ? (e.forEach((e) => me(e, t)), t) : (typeof e == "object" && Object.values(e).forEach((e) => me(e, t)), t) : t;
+function pe(e, t = /* @__PURE__ */ new Set()) {
+	return e ? typeof e == "string" ? (e.startsWith("ast_") && t.add(e), t) : Array.isArray(e) ? (e.forEach((e) => pe(e, t)), t) : (typeof e == "object" && Object.values(e).forEach((e) => pe(e, t)), t) : t;
 }
-async function U(e, t, n) {
+function me(e, t) {
+	if (!e) return !0;
+	let n = t.title !== void 0 && t.title?.trim() !== e.title?.trim(), r = t.slug !== void 0 && t.slug !== e.slug, i = t.isHidden !== void 0 && ue(t.isHidden) !== ue(e.isHidden), a = t.status !== void 0 && t.status !== e.status, o = typeof e.draftDataJson == "string" ? JSON.parse(e.draftDataJson || "{}") : e.draftDataJson || {}, s = t.sanitizedFields || {}, c = s.menuTitle !== void 0 && s.menuTitle !== o.menuTitle;
+	return n || r || i || a || c;
+}
+async function he(e, t, n) {
 	for (let r of n) {
-		let n = (await le(e, "\n      SELECT id, storageKeyPrivate, isSystemVariant, parentAssetId, filename\n      FROM assets WHERE id = ?\n    ", [r]))[0];
-		if (!n || (await le(e, "SELECT 1 FROM node_assets WHERE assetId = ? LIMIT 1", [n.id])).length > 0) continue;
+		let n = (await ce(e, "\n      SELECT id, storageKeyPrivate, isSystemVariant, parentAssetId, filename\n      FROM assets WHERE id = ?\n    ", [r]))[0];
+		if (!n || (await ce(e, "SELECT 1 FROM node_assets WHERE assetId = ? LIMIT 1", [n.id])).length > 0) continue;
 		let i = [n];
 		if (!n.isSystemVariant) {
-			let t = await le(e, "\n        SELECT id, storageKeyPrivate, isSystemVariant, parentAssetId, filename\n        FROM assets\n        WHERE parentAssetId = ? OR (isSystemVariant = 1 AND filename LIKE ?)\n      ", [n.id, `crop_%${String(n.filename || "").replace(/\.[^/.]+$/, "")}%`]), r = t.map((e) => e.id);
-			if (r.length > 0 && (await le(e, `SELECT DISTINCT assetId FROM node_assets WHERE assetId IN (${r.map(() => "?").join(",")})`, r)).length > 0) continue;
+			let t = await ce(e, "\n        SELECT id, storageKeyPrivate, isSystemVariant, parentAssetId, filename\n        FROM assets\n        WHERE parentAssetId = ? OR (isSystemVariant = 1 AND filename LIKE ?)\n      ", [n.id, `crop_%${String(n.filename || "").replace(/\.[^/.]+$/, "")}%`]), r = t.map((e) => e.id);
+			if (r.length > 0 && (await ce(e, `SELECT DISTINCT assetId FROM node_assets WHERE assetId IN (${r.map(() => "?").join(",")})`, r)).length > 0) continue;
 			i = [n, ...t];
 		}
 		for (let e of i) if (e.storageKeyPrivate) try {
@@ -6223,10 +6257,10 @@ async function U(e, t, n) {
 			console.warn(`[Asset Cleanup] Failed to delete ${e.storageKeyPrivate}:`, t);
 		}
 		let a = i.map((e) => e.id), o = a.map(() => "?").join(",");
-		await ue(e, `DELETE FROM node_assets WHERE assetId IN (${o})`, a), await ue(e, `DELETE FROM assets WHERE id IN (${o})`, a);
+		await le(e, `DELETE FROM node_assets WHERE assetId IN (${o})`, a), await le(e, `DELETE FROM assets WHERE id IN (${o})`, a);
 	}
 }
-async function W(e, t, n) {
+async function ge(e, t, n) {
 	let r = {}, i = null;
 	if (t) {
 		let n = await e.prepare("\n      WITH RECURSIVE ancestor_path(id, parentId, draftDataJson, dataJson, level) AS (\n        SELECT t.id, t.parentId, c.draftDataJson, c.dataJson, 0\n        FROM tree_nodes t\n        INNER JOIN content_nodes c ON t.contentId = c.id\n        WHERE t.id = ?\n        UNION ALL\n        SELECT t.id, t.parentId, c.draftDataJson, c.dataJson, ap.level + 1\n        FROM tree_nodes t\n        INNER JOIN content_nodes c ON t.contentId = c.id\n        INNER JOIN ancestor_path ap ON t.id = ap.parentId\n      )\n      SELECT draftDataJson, dataJson FROM ancestor_path ORDER BY level ASC\n    ").all(t), a = Array.isArray(n) ? n : n?.results || [];
@@ -6240,7 +6274,7 @@ async function W(e, t, n) {
 		}
 	}
 	if (!i) {
-		let t = await e.prepare("SELECT dataJson FROM trees WHERE id = ?").get(n);
+		let t = await e.prepare("SELECT dataJson FROM trees WHERE id = ? OR key = ? LIMIT 1").get(Number(n) || -1, String(n));
 		if (t && t.dataJson) try {
 			let e = typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : t.dataJson;
 			e.subpageLayoutId && e.subpageLayoutId !== "inherit" && (i = e.subpageLayoutId);
@@ -6251,7 +6285,7 @@ async function W(e, t, n) {
 		inheritedFields: r
 	};
 }
-V.get("/", async (e) => {
+H.get("/", async (e) => {
 	let t = e.get("db"), n = e.req.query("id"), r = e.req.query("type"), i = e.req.query("q") || e.req.query("search"), a = e.req.query("channelId"), o = e.req.query("trashed") === "true", s = e.req.query("assetId"), c = e.req.query("sort") || "updatedAt", l = (e.req.query("order") || "DESC").toUpperCase() === "ASC" ? "ASC" : "DESC", u = e.req.query("limit"), d = e.req.query("offset"), f = Math.max(1, Math.min(100, parseInt(u || "50", 10))), p = Math.max(0, parseInt(d || "0", 10));
 	if (n) {
 		let r = Number(n);
@@ -6262,7 +6296,7 @@ V.get("/", async (e) => {
 			id: i.id,
 			title: i.title,
 			slug: i.slug,
-			language: i.language || "en",
+			language: i.language || null,
 			nodeType: i.contentType,
 			contentType: i.contentType,
 			isHidden: !!i.isHidden,
@@ -6276,9 +6310,9 @@ V.get("/", async (e) => {
 			updatedAt: i.updatedAt
 		}, s = i.draftDataJson || i.dataJson;
 		if (s) try {
-			let n = typeof s == "string" ? JSON.parse(s) : s, a = await t.prepare("SELECT id as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? LIMIT 1").get(r), c = ce(e.env?.BUNDLED_DEFINITIONS).nodes?.[i.contentType] || {}, l = n.layoutId || null;
+			let n = typeof s == "string" ? JSON.parse(s) : s, a = await t.prepare("SELECT id as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? LIMIT 1").get(r), c = se(e.env?.BUNDLED_DEFINITIONS).nodes?.[i.contentType] || {}, l = n.layoutId || null;
 			if (a) {
-				let { resolvedLayoutId: e, inheritedFields: r } = await W(t, a.parentId, a.treeId);
+				let { resolvedLayoutId: e, inheritedFields: r } = await ge(t, a.parentId, a.treeId);
 				(l === "inherit" || !l) && (l = e);
 				for (let [e, t] of Object.entries(r)) e !== "layoutId" && e !== "subpageLayoutId" && (n[e] === void 0 || n[e] === null || n[e] === "") && t !== void 0 && (n[e] = t);
 			}
@@ -6293,7 +6327,7 @@ V.get("/", async (e) => {
 				let r = t.allowedLayouts;
 				return r ? typeof r == "string" ? r === e : !Array.isArray(r) || r.length === 0 || r.includes(e) : !0;
 			})(l) && (l = null), (l === "inherit" || !l) && (l = c.defaultLayout || null);
-			let u = await se(t, H(n));
+			let u = await B(t, fe(n));
 			Object.assign(o, u), o.resolvedLayoutId = l;
 		} catch {}
 		let c = await t.prepare("SELECT channelId FROM node_channels WHERE nodeId = ?").all(r);
@@ -6303,7 +6337,7 @@ V.get("/", async (e) => {
 		let u = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = 1 ORDER BY sortOrder ASC").all(r), d = Array.isArray(u) ? u : u?.results || [], f = await Promise.all(d.map(async (e) => {
 			let n = {};
 			try {
-				n = typeof e.dataJson == "string" ? JSON.parse(e.dataJson || "{}") : e.dataJson || {}, n && typeof n == "object" && (n = await se(t, n));
+				n = typeof e.dataJson == "string" ? JSON.parse(e.dataJson || "{}") : e.dataJson || {}, n && typeof n == "object" && (n = await B(t, n));
 			} catch {
 				n = {};
 			}
@@ -6374,7 +6408,7 @@ V.get("/", async (e) => {
 			id: e.id,
 			title: e.title,
 			slug: e.slug,
-			language: e.language || "en",
+			language: e.language || null,
 			contentType: e.contentType,
 			nodeType: e.contentType,
 			isHidden: !!e.isHidden,
@@ -6391,7 +6425,7 @@ V.get("/", async (e) => {
 			assetCount: e.assetCount || 0
 		}, i = e.draftDataJson || e.dataJson;
 		if (i) try {
-			let e = typeof i == "string" ? JSON.parse(i) : i, n = await se(t, H(e));
+			let e = typeof i == "string" ? JSON.parse(i) : i, n = await B(t, fe(e));
 			Object.assign(r, n);
 		} catch {}
 		return r;
@@ -6403,13 +6437,35 @@ V.get("/", async (e) => {
 		offset: p,
 		limit: f
 	});
-}), V.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 } = ae(H(_)), b = fe(d === void 0 ? f === void 0 ? p : f : d), x = c || "en", S = l || u || "page", C = e.get("user")?.id || null, w = a, T = /* @__PURE__ */ new Set(), E = s === void 0 ? null : de(s);
-	if (E) {
+}), H.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 } = R(fe(_)), b = ue(d === void 0 ? f === void 0 ? p : f : d), x = l || u || "page", S = e.get("user")?.id || null, C = 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));
+		if (e?.dataJson) try {
+			let t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
+			E = t.defaultLanguage?.trim() || t.language?.trim() || null;
+		} catch {}
+	}
+	if (!E && h && Array.isArray(h) && h.length > 0) {
+		let e = typeof h[0] == "object" ? h[0].id : h[0];
+		if (e && e !== "all") {
+			let n = await t.prepare("SELECT defaultLanguage, dataJson FROM channels WHERE id = ? LIMIT 1").get(Number(e));
+			if (n) {
+				if (n.defaultLanguage) E = n.defaultLanguage.trim();
+				else if (n.dataJson) try {
+					let e = typeof n.dataJson == "string" ? JSON.parse(n.dataJson) : n.dataJson;
+					E = e.defaultLanguage?.trim() || e.language?.trim() || null;
+				} catch {}
+			}
+		}
+	}
+	C && E && C === E && (C = null);
+	let D = a, O = /* @__PURE__ */ new Set(), k = !1, A = s === void 0 ? null : U(s);
+	if (A) {
 		let n = [];
 		if (g !== void 0 && Array.isArray(g) && g.length > 0) for (let e of g) n.push({
 			treeId: Number(e.treeId),
-			parentId: pe(e.parentId ?? e._draftParentId ?? null)
+			parentId: de(e.parentId ?? e._draftParentId ?? null)
 		});
 		else if (a) {
 			let e = await t.prepare("SELECT treeId, parentId FROM tree_nodes WHERE contentId = ?").all(a), r = Array.isArray(e) ? e : e?.results || [];
@@ -6419,94 +6475,103 @@ V.get("/", async (e) => {
 			});
 		}
 		for (let r of n) {
-			let n = r.parentId === null ? "tn.parentId IS NULL" : "tn.parentId = ?", i = r.parentId === null ? [r.treeId, E] : [
+			let n = r.parentId === null ? "tn.parentId IS NULL" : "tn.parentId = ?", i = r.parentId === null ? [r.treeId, A] : [
 				r.treeId,
 				r.parentId,
-				E
+				A
 			], o = `
         SELECT cn.id FROM tree_nodes tn
         INNER JOIN content_nodes cn ON tn.contentId = cn.id
         WHERE tn.treeId = ? AND ${n} AND cn.slug = ? AND (cn.deletedAt IS NULL OR cn.deletedAt = '')
       `;
 			if (a && (o += " AND cn.id != ?", i.push(a)), o += " LIMIT 1", await t.prepare(o).get(...i)) return e.json({
-				error: `The slug '${E}' is already in use by another page in this section.`,
+				error: `The slug '${A}' is already in use by another page in this section.`,
 				field: "slug"
 			}, 409);
 		}
 	}
 	if (a) {
-		let e = await t.prepare("SELECT title, slug, language, contentType, draftDataJson, dataJson, publishedAt, status FROM content_nodes WHERE id = ?").get(a), n = e?.draftDataJson || e?.dataJson || "{}";
+		let e = await t.prepare("SELECT title, slug, language, contentType, isHidden, draftDataJson, dataJson, publishedAt, status FROM content_nodes WHERE id = ?").get(a);
+		k = me(e, {
+			title: o,
+			slug: A,
+			isHidden: b,
+			sanitizedFields: v
+		});
+		let n = e?.draftDataJson || e?.dataJson || "{}";
 		try {
-			me(typeof n == "string" ? JSON.parse(n) : n, T);
+			pe(typeof n == "string" ? JSON.parse(n) : n, O);
 		} catch {}
 		if (m !== void 0) {
 			let e = await t.prepare("SELECT dataJson FROM content_blocks WHERE contentId = ? AND isDraft = 1").all(a);
 			(Array.isArray(e) ? e : e?.results || []).forEach((e) => {
 				try {
-					me(typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson, T);
+					pe(typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson, O);
 				} catch {}
 			});
 		}
-		let r = o === void 0 ? e?.title || "Untitled" : o, i = E ?? e?.slug ?? null, s = S || e?.contentType || "page", c = x || e?.language || "en", l = e?.draftDataJson || e?.dataJson || "{}", u = {};
+		let r = o === void 0 ? e?.title || "Untitled" : o, i = A ?? e?.slug ?? null, s = x || e?.contentType || "page", l = c === void 0 ? e?.language : C, u = e?.draftDataJson || e?.dataJson || "{}", d = {};
 		try {
-			u = JSON.parse(l);
+			d = JSON.parse(u);
 		} catch {}
-		let d = JSON.stringify({
-			...u,
+		let f = JSON.stringify({
+			...d,
 			...v
-		}), f = e?.status === "published" || e?.publishedAt ? "published" : "draft", p = +(f === "published");
-		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(r, i, c, s, b, f, d, p, C, a);
+		}), p = e?.status === "published" || e?.publishedAt ? "published" : "draft", h = +(p === "published");
+		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(r, i, l, s, b, p, f, h, S, a);
 	} else {
-		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", E, x, b, JSON.stringify(v), C, C);
-		w = Number(e.lastInsertRowid);
+		k = !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(x, o || "Untitled", A, C, b, JSON.stringify(v), S, S);
+		D = Number(e.lastInsertRowid);
 	}
-	if (h !== void 0 && Array.isArray(h) && w) {
-		await t.prepare("DELETE FROM node_channels WHERE nodeId = ?").run(w);
+	if (h !== void 0 && Array.isArray(h) && D) {
+		await t.prepare("DELETE FROM node_channels WHERE nodeId = ?").run(D);
 		let e = [...new Set(h.map((e) => typeof e == "object" && e ? e.id || e.channelId : e))].filter((e) => e && e !== "all").map((e) => Number(e) || e);
 		if (e.length > 0) {
-			let n = e.map(() => "(?, ?)").join(", "), r = e.flatMap((e) => [w, e]);
+			let n = e.map(() => "(?, ?)").join(", "), r = e.flatMap((e) => [D, e]);
 			await t.prepare(`INSERT OR IGNORE INTO node_channels (nodeId, channelId) VALUES ${n}`).run(...r);
 		}
 	}
-	if (g !== void 0 && Array.isArray(g) && g.length > 0 && w) for (let e of g) {
+	if (g !== void 0 && Array.isArray(g) && g.length > 0 && D) for (let e of g) {
 		if (!e || !e.treeId) continue;
-		let n = Number(e.treeId) || e.treeId, r = pe(e.parentId ?? e._draftParentId ?? null), i = typeof e.sortOrder == "number" ? e.sortOrder : 0, a = await t.prepare("SELECT id FROM tree_nodes WHERE treeId = ? AND contentId = ?").get(n, w);
-		a ? await t.prepare("UPDATE tree_nodes SET parentId = ?, sortOrder = ? WHERE id = ?").run(r, i, a.id) : await t.prepare("INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder) VALUES (?, ?, ?, ?)").run(n, w, r, i);
+		let n = Number(e.treeId) || e.treeId, r = de(e.parentId ?? e._draftParentId ?? null), i = typeof e.sortOrder == "number" ? e.sortOrder : 0, a = await t.prepare("SELECT id, parentId, sortOrder FROM tree_nodes WHERE treeId = ? AND contentId = ?").get(n, D);
+		a ? ((a.parentId !== r || a.sortOrder !== i) && (k = !0), await t.prepare("UPDATE tree_nodes SET parentId = ?, sortOrder = ? WHERE id = ?").run(r, i, a.id)) : (k = !0, await t.prepare("INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder) VALUES (?, ?, ?, ?)").run(n, D, r, i));
 	}
-	let D = [];
-	if (m !== void 0 && Array.isArray(m) && w) {
-		await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 1").run(w);
+	let j = [];
+	if (m !== void 0 && Array.isArray(m) && D) {
+		await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 1").run(D);
 		let e = [], n = [];
 		for (let t = 0; t < m.length; t++) {
-			let r = m[t], i = r.componentId || r.elementType || "text-block", a = r.data || {}, o = String(r.blockId || a.blockId || r.instanceId || r.id || `block-${Date.now()}`), { cleanedData: s, assetRefs: c } = ae({
+			let r = m[t], i = r.componentId || r.elementType || "text-block", a = r.data || {}, o = String(r.blockId || a.blockId || r.instanceId || r.id || `block-${Date.now()}`), { cleanedData: s, assetRefs: c } = R({
 				...a,
 				blockId: o,
 				_instanceId: o
 			});
-			c.forEach((e) => D.push({
+			c.forEach((e) => j.push({
 				...e,
 				fieldKey: `blocks[${t}].${e.fieldKey}`
 			}));
 			let l = r.region !== void 0 && r.region !== null && String(r.region).trim() !== "" ? String(r.region) : "content";
-			e.push("(?, ?, ?, ?, ?, 1)"), n.push(w, t, i, JSON.stringify(s), l);
+			e.push("(?, ?, ?, ?, ?, 1)"), n.push(D, t, i, JSON.stringify(s), l);
 		}
 		e.length > 0 && await t.prepare(`INSERT INTO content_blocks (contentId, sortOrder, elementType, dataJson, region, isDraft) VALUES ${e.join(", ")}`).run(...n);
 	}
-	if (w) {
-		let n = [...y, ...D];
-		await oe(t, w, n);
-		let r = new Set(n.map((e) => e.assetId)), i = new Set([...T].filter((e) => !r.has(e)));
+	if (D) {
+		let n = [...y, ...j];
+		await oe(t, D, n);
+		let r = new Set(n.map((e) => e.assetId)), i = new Set([...O].filter((e) => !r.has(e)));
 		if (i.size > 0) {
-			let { storage: n } = ie(e.env);
-			await U(t, n, i);
+			let { storage: n } = ae(e.env);
+			await he(t, n, i);
 		}
 	}
-	return await I(e).clear(), e.json({
+	return await I(e).clear(), D && new V(e.env).purgeNode(e, t, D, k), e.json({
 		success: !0,
-		id: w,
-		status: "draft"
+		id: D,
+		status: "draft",
+		isStructuralChange: k
 	});
-}), V.post("/publish", async (e) => {
+}), H.post("/publish", async (e) => {
 	let t = e.get("db"), n = await e.req.json(), r = n.id || n.nodeId;
 	if (!r || isNaN(Number(r))) return e.json({ error: "Node ID required for publishing" }, 400);
 	let i = Number(r), a = e.get("user")?.id || null, o = await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(i);
@@ -6519,57 +6584,58 @@ V.get("/", async (e) => {
 	try {
 		c = typeof o.draftDataJson == "string" ? JSON.parse(o.draftDataJson) : o.draftDataJson || {};
 	} catch {}
-	let l = (s.title ?? o.title ?? "").trim(), u = (c.title ?? n.title ?? o.title ?? "").trim(), d = (s.slug ?? o.slug ?? "").trim(), f = (c.slug ?? n.slug ?? o.slug ?? "").trim(), p = l !== "" && u !== "" && l !== u || d !== "" && f !== "" && d !== f, m = o.draftDataJson || o.dataJson || "{}";
-	await t.prepare("\n    UPDATE content_nodes\n    SET publishedDataJson = ?, dataJson = ?, publishedAt = CURRENT_TIMESTAMP, status = 'published', hasUnpublishedChanges = 0, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n    WHERE id = ?\n  ").run(m, m, a, i), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 0").run(i);
-	let h = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = 1 ORDER BY sortOrder ASC").all(i), g = Array.isArray(h) ? h : h?.results || [];
-	if (g.length > 0) {
+	let l = (s.title ?? o.title ?? "").trim(), u = (c.title ?? n.title ?? o.title ?? "").trim(), d = (s.slug ?? o.slug ?? "").trim(), f = (c.slug ?? n.slug ?? o.slug ?? "").trim(), p = (s.menuTitle ?? "").trim(), m = (c.menuTitle ?? "").trim(), h = l !== "" && u !== "" && l !== u || d !== "" && f !== "" && d !== f || p !== "" && m !== "" && p !== m, g = o.draftDataJson || o.dataJson || "{}";
+	await t.prepare("\n    UPDATE content_nodes\n    SET publishedDataJson = ?, dataJson = ?, publishedAt = CURRENT_TIMESTAMP, status = 'published', hasUnpublishedChanges = 0, updatedById = ?, updatedAt = CURRENT_TIMESTAMP\n    WHERE id = ?\n  ").run(g, g, a, i), await t.prepare("DELETE FROM content_blocks WHERE contentId = ? AND isDraft = 0").run(i);
+	let _ = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = 1 ORDER BY sortOrder ASC").all(i), v = Array.isArray(_) ? _ : _?.results || [];
+	if (v.length > 0) {
 		let e = [], n = [];
-		for (let t of g) {
+		for (let t of v) {
 			let r = t.region !== void 0 && t.region !== null && String(t.region).trim() !== "" ? String(t.region) : "content";
 			e.push("(?, ?, ?, ?, ?, 0)"), n.push(i, t.sortOrder, t.elementType, t.dataJson, r);
 		}
 		await t.prepare(`INSERT INTO content_blocks (contentId, sortOrder, elementType, dataJson, region, isDraft) VALUES ${e.join(", ")}`).run(...n);
 	}
-	let _ = ((await t.prepare("SELECT COUNT(*) as count FROM node_revisions WHERE nodeId = ?").get(i))?.count || 0) + 1, v = {
-		version: _,
+	let y = ((await t.prepare("SELECT COUNT(*) as count FROM node_revisions WHERE nodeId = ?").get(i))?.count || 0) + 1, b = {
+		version: y,
 		publishedAt: (/* @__PURE__ */ new Date()).toISOString(),
 		node: {
 			...o,
-			dataJson: m
+			dataJson: g
 		},
-		blocks: g
+		blocks: v
 	};
-	return await t.prepare("INSERT INTO node_revisions (nodeId, version, snapshotJson, createdById) VALUES (?, ?, ?, ?)").run(i, _, JSON.stringify(v), a), await I(e).clear(), new B(e.env).purgeNode(e, t, i, p), e.json({
+	return await t.prepare("INSERT INTO node_revisions (nodeId, version, snapshotJson, createdById) VALUES (?, ?, ?, ?)").run(i, y, JSON.stringify(b), a), await I(e).clear(), new V(e.env).purgeNode(e, t, i, h), e.json({
 		success: !0,
 		id: i,
 		status: "published",
-		version: _,
-		publishedAt: v.publishedAt,
-		hasUnpublishedChanges: !1
+		version: y,
+		publishedAt: b.publishedAt,
+		hasUnpublishedChanges: !1,
+		isStructuralChange: h
 	});
-}), V.delete("/", async (e) => {
+}), H.delete("/", async (e) => {
 	let t = e.get("db"), n = e.req.query("id");
 	if (!n) return e.json({ error: "Node ID required" }, 400);
 	let r = Number(n);
-	return await t.prepare("UPDATE content_nodes SET deletedAt = CURRENT_TIMESTAMP WHERE id = ?").run(r), await I(e).clear(), new B(e.env).purgeNode(e, t, r, !0), e.json({
+	return await t.prepare("UPDATE content_nodes SET deletedAt = CURRENT_TIMESTAMP WHERE id = ?").run(r), await I(e).clear(), new V(e.env).purgeNode(e, t, r, !0), e.json({
 		success: !0,
 		deletedNodeId: r
 	});
-}), V.post("/restore", async (e) => {
+}), H.post("/restore", async (e) => {
 	let t = e.get("db"), n = await e.req.json(), r = Number(n.id);
-	return r ? await t.prepare("SELECT id FROM content_nodes WHERE id = ?").get(r) ? (await t.prepare("UPDATE content_nodes SET deletedAt = NULL WHERE id = ?").run(r), await I(e).clear(), new B(e.env).purgeNode(e, t, r, !0), e.json({
+	return r ? await t.prepare("SELECT id FROM content_nodes WHERE id = ?").get(r) ? (await t.prepare("UPDATE content_nodes SET deletedAt = NULL WHERE id = ?").run(r), await I(e).clear(), new V(e.env).purgeNode(e, t, r, !0), e.json({
 		success: !0,
 		restoredNodeId: r
 	})) : e.json({ error: "Node not found" }, 404) : e.json({ error: "Node ID required" }, 400);
-}), V.delete("/purge", async (e) => {
+}), H.delete("/purge", async (e) => {
 	let t = e.get("db"), n = e.req.query("id");
 	if (!n) return e.json({ error: "Node ID required" }, 400);
 	let r = Number(n);
-	return new B(e.env).purgeNode(e, t, r, !0), await t.prepare("DELETE FROM node_channels WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM tree_nodes WHERE contentId = ?").run(r), await t.prepare("DELETE FROM content_blocks WHERE contentId = ?").run(r), await t.prepare("DELETE FROM node_revisions WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM node_assets WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM content_nodes WHERE id = ?").run(r), await I(e).clear(), e.json({
+	return new V(e.env).purgeNode(e, t, r, !0), await t.prepare("DELETE FROM node_channels WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM tree_nodes WHERE contentId = ?").run(r), await t.prepare("DELETE FROM content_blocks WHERE contentId = ?").run(r), await t.prepare("DELETE FROM node_revisions WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM node_assets WHERE nodeId = ?").run(r), await t.prepare("DELETE FROM content_nodes WHERE id = ?").run(r), await I(e).clear(), e.json({
 		success: !0,
 		purgedNodeId: r
 	});
-}), V.get("/:id/revisions", async (e) => {
+}), H.get("/:id/revisions", async (e) => {
 	let t = e.get("db"), n = Number(e.req.param("id"));
 	if (isNaN(n)) return e.json({ error: "Invalid Node ID" }, 400);
 	let r = await t.prepare("\n    SELECT version, createdById, snapshotJson \n    FROM node_revisions \n    WHERE nodeId = ? \n    ORDER BY version DESC\n  ").all(n), i = (Array.isArray(r) ? r : r?.results || []).map((e) => {
@@ -6585,7 +6651,7 @@ V.get("/", async (e) => {
 		};
 	});
 	return e.json({ revisions: i });
-}), V.get("/:id/revisions/:version", async (e) => {
+}), H.get("/:id/revisions/:version", async (e) => {
 	let t = e.get("db"), n = Number(e.req.param("id")), r = Number(e.req.param("version")), i = await t.prepare("SELECT snapshotJson FROM node_revisions WHERE nodeId = ? AND version = ?").get(n, r);
 	if (!i) return e.json({ error: "Snapshot not found" }, 404);
 	let a = {};
@@ -6595,7 +6661,7 @@ V.get("/", async (e) => {
 		return e.json({ error: "Corrupt snapshot data" }, 500);
 	}
 	return e.json({ snapshot: a });
-}), V.post("/:id/revisions/:version/restore", async (e) => {
+}), H.post("/:id/revisions/:version/restore", async (e) => {
 	let t = e.get("db"), n = Number(e.req.param("id")), r = Number(e.req.param("version")), i = e.get("user")?.id || null, a = await t.prepare("SELECT snapshotJson FROM node_revisions WHERE nodeId = ? AND version = ?").get(n, r);
 	if (!a) return e.json({ error: "Snapshot not found" }, 404);
 	let o = {};
@@ -6614,8 +6680,8 @@ V.get("/", async (e) => {
 		restoredVersion: r
 	});
 });
-var G = new e();
-function he(e, t = null) {
+var W = new e();
+function _e(e, t = null) {
 	let n = [];
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -6627,19 +6693,19 @@ function he(e, t = null) {
 			id: o,
 			parentId: t,
 			sortOrder: r
-		}), i.children && Array.isArray(i.children) && i.children.length > 0 && n.push(...he(i.children, o)));
+		}), i.children && Array.isArray(i.children) && i.children.length > 0 && n.push(..._e(i.children, o)));
 	}
 	return n;
 }
-function ge(e) {
+function G(e) {
 	if (e == null || e === "null" || e === "" || typeof e == "string" && e.startsWith("draft-")) return null;
 	let t = Number(e);
 	return isNaN(t) ? null : t;
 }
-function _e(e) {
+function ve(e) {
 	return +(e === !0 || e === 1 || e === "1" || e === "true");
 }
-G.get("/tree.json", async (e) => {
+W.get("/tree.json", async (e) => {
 	try {
 		let t = e.get("db"), n = e.req.query("treeId") || "main-nav", r = e.req.query("preview") === "true", i = 1;
 		if (isNaN(Number(n))) {
@@ -6674,7 +6740,7 @@ G.get("/tree.json", async (e) => {
 					id: e.contentId,
 					treeNodeId: e.treeNodeId,
 					parentId: e.parentId || null,
-					language: e.language || "en",
+					language: e.language?.trim() || null,
 					hidden: +!!s,
 					isHidden: s,
 					status: e.status || "draft",
@@ -6689,9 +6755,9 @@ G.get("/tree.json", async (e) => {
 	} catch (t) {
 		return console.error("[CMS Tree API] GET Error:", t), e.json({ error: t.message || "Failed to fetch tree" }, 500);
 	}
-}), G.post("/tree.json", async (e) => {
+}), W.post("/tree.json", async (e) => {
 	try {
-		let t = e.get("db"), n = await e.req.json(), r = n.treeId ? String(n.treeId).trim() : "main-nav", i = I(e), a = new B(e.env), o = 1;
+		let t = e.get("db"), n = await e.req.json(), r = n.treeId ? String(n.treeId).trim() : "main-nav", i = I(e), a = new V(e.env), o = 1;
 		if (isNaN(Number(r))) {
 			let e = await t.prepare("SELECT id FROM trees WHERE key = ?").get(r);
 			if (e && e.id) o = Number(e.id);
@@ -6701,7 +6767,7 @@ G.get("/tree.json", async (e) => {
 			}
 		} else o = Number(r);
 		if (n.tree && Array.isArray(n.tree)) {
-			let r = he(n.tree, null);
+			let r = _e(n.tree, null);
 			if (r.length > 0) for (let e = 0; e < r.length; e += 50) {
 				let n = r.slice(e, e + 50), i = n.map((e) => e.id), a = i.map(() => "?").join(","), s = "UPDATE tree_nodes SET \n";
 				s += "parentId = CASE id \n", n.forEach(() => {
@@ -6721,9 +6787,9 @@ G.get("/tree.json", async (e) => {
 				reorderedCount: r.length
 			});
 		}
-		let { action: s, title: c, nodeType: l, parentId: u, contentId: d, nodeData: f = {}, pageData: p = {} } = n, m = Object.keys(f).length > 0 ? { ...f } : { ...p }, h = _e(n.isHidden === void 0 ? m.isHidden === void 0 ? m.hidden : m.isHidden : n.isHidden);
+		let { action: s, title: c, nodeType: l, parentId: u, contentId: d, nodeData: f = {}, pageData: p = {} } = n, m = Object.keys(f).length > 0 ? { ...f } : { ...p }, h = ve(n.isHidden === void 0 ? m.isHidden === void 0 ? m.hidden : m.isHidden : n.isHidden);
 		delete m._isTreeDraft, delete m._draftParentId, delete m.isNew, delete m.nodeType, delete m.contentType, delete m.title, delete m.slug, delete m.hidden, delete m.is_hidden, delete m.isHidden, delete m.status;
-		let g = ge(u), _ = e.get("user")?.id || null;
+		let g = G(u), _ = e.get("user")?.id || null;
 		if (s === "create") {
 			let r = m.slug || n.slug || c, s = r ? String(r).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "") : null;
 			if (s) {
@@ -6745,23 +6811,41 @@ G.get("/tree.json", async (e) => {
 					field: "slug"
 				}, 409);
 			}
-			let u = JSON.stringify(m), d = await t.prepare("\n        INSERT INTO content_nodes (contentType, title, slug, language, isHidden, status, draftDataJson, dataJson, createdById, updatedById)\n        VALUES (?, ?, ?, ?, ?, 'draft', ?, NULL, ?, ?)\n      ").run(l || "page", c || "Untitled", s, m.language || n.language || "en", h, u, _, _), f = Number(d.lastInsertRowid);
-			await t.prepare("DELETE FROM tree_nodes WHERE treeId = ? AND contentId = ?").run(o, f);
-			let p = g === null ? "parentId IS NULL" : "parentId = ?", v = g === null ? [o] : [o, g], y = (await t.prepare(`
+			let u = m.language?.trim() || n.language?.trim() || null;
+			if (!u) {
+				let e = await t.prepare("SELECT dataJson FROM trees WHERE id = ?").get(o);
+				if (e?.dataJson) try {
+					let t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
+					t.defaultLanguage && (u = t.defaultLanguage.trim());
+				} catch {}
+			}
+			if (!u) {
+				let e = [];
+				if (n.channels && Array.isArray(n.channels) ? e = n.channels : n.channelId && n.channelId !== "all" && (e = [n.channelId]), e.length > 0) {
+					let n = Number(e[0]);
+					if (!isNaN(n)) {
+						let e = await t.prepare("SELECT defaultLanguage FROM channels WHERE id = ?").get(n);
+						e?.defaultLanguage && (u = e.defaultLanguage.trim());
+					}
+				}
+			}
+			let d = JSON.stringify(m), f = await t.prepare("\n        INSERT INTO content_nodes (contentType, title, slug, language, isHidden, status, draftDataJson, dataJson, createdById, updatedById)\n        VALUES (?, ?, ?, ?, ?, 'draft', ?, NULL, ?, ?)\n      ").run(l || "page", c || "Untitled", s, u, h, d, _, _), p = Number(f.lastInsertRowid);
+			await t.prepare("DELETE FROM tree_nodes WHERE treeId = ? AND contentId = ?").run(o, p);
+			let v = g === null ? "parentId IS NULL" : "parentId = ?", y = g === null ? [o] : [o, g], b = (await t.prepare(`
         SELECT COALESCE(MAX(sortOrder), -1) + 1 as nextSort
         FROM tree_nodes
-        WHERE treeId = ? AND ${p}
-      `).get(...v))?.nextSort ?? 0, b = await t.prepare("\n        INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder)\n        VALUES (?, ?, ?, ?)\n      ").run(o, f, g, y), x = Number(b.lastInsertRowid), S = [];
-			n.channels && Array.isArray(n.channels) ? S = n.channels : n.channelId && n.channelId !== "all" && (S = [n.channelId]);
-			let C = [...new Set(S)].filter((e) => e && e !== "all").map((e) => Number(e));
-			if (C.length > 0) {
-				let e = C.map(() => "(?, ?)").join(", "), n = C.flatMap((e) => [f, e]);
+        WHERE treeId = ? AND ${v}
+      `).get(...y))?.nextSort ?? 0, x = await t.prepare("\n        INSERT INTO tree_nodes (treeId, contentId, parentId, sortOrder)\n        VALUES (?, ?, ?, ?)\n      ").run(o, p, g, b), S = Number(x.lastInsertRowid), C = [];
+			n.channels && Array.isArray(n.channels) ? C = n.channels : n.channelId && n.channelId !== "all" && (C = [n.channelId]);
+			let w = [...new Set(C)].filter((e) => e && e !== "all").map((e) => Number(e));
+			if (w.length > 0) {
+				let e = w.map(() => "(?, ?)").join(", "), n = w.flatMap((e) => [p, e]);
 				await t.prepare(`INSERT OR IGNORE INTO node_channels (nodeId, channelId) VALUES ${e}`).run(...n);
 			}
 			return await i.clear(), a.purgeGlobalCache(e, t), e.json({
 				success: !0,
-				id: f,
-				treeNodeId: x,
+				id: p,
+				treeNodeId: S,
 				status: "draft"
 			}, 201);
 		}
@@ -6812,7 +6896,7 @@ G.get("/tree.json", async (e) => {
 			details: t.message
 		}, 500);
 	}
-}), G.get("/trees.json", async (e) => {
+}), W.get("/trees.json", async (e) => {
 	try {
 		let t = e.get("db"), n = await t.prepare("SELECT * FROM trees ORDER BY LOWER(label) ASC").all(), r = Array.isArray(n) ? n : n?.results || [], i = await t.prepare("SELECT channelId, treeId FROM channel_trees").all(), a = (Array.isArray(i) ? i : i?.results || []).reduce((e, t) => {
 			let n = Number(t.treeId), r = Number(t.channelId);
@@ -6842,7 +6926,7 @@ G.get("/tree.json", async (e) => {
 	} catch {
 		return e.json([]);
 	}
-}), G.post("/trees.json", async (e) => {
+}), W.post("/trees.json", async (e) => {
 	try {
 		let t = e.get("db"), n = await e.req.json(), r = n.id, i = r != null && r !== "" && !isNaN(Number(r)) ? Number(r) : null, a = `tree-${Date.now().toString(36)}`, o = (n.key || n.slug || a).toLowerCase().replace(/[^a-z0-9_-]/g, "-"), s = n.label?.trim() || o, c = n.treeType !== void 0 && n.treeType !== null ? n.treeType : n.type ?? "site", l = n.channelId !== void 0 && n.channelId !== null && Number(n.channelId) || null, u = +(n.isHidden === !0 || n.isHidden === 1 || n.isHidden === "true"), d = e.get("user")?.id || null, f = { ...n };
 		if (delete f.id, delete f.key, delete f.label, delete f.treeType, delete f.type, delete f.channelId, delete f.channels, delete f.isHidden, delete f.createdById, delete f.updatedById, delete f.createdAt, delete f.updatedAt, await t.prepare("SELECT id FROM trees WHERE key = ? AND id != ? LIMIT 1").get(o, i ?? -1)) return e.json({
@@ -6867,7 +6951,7 @@ G.get("/tree.json", async (e) => {
 				await t.prepare(`INSERT OR IGNORE INTO channel_trees (channelId, treeId, key) VALUES ${n}`).run(...r);
 			}
 		}
-		return await I(e).clear(), new B(e.env).purgeGlobalCache(e, t), e.json({
+		return await I(e).clear(), new V(e.env).purgeGlobalCache(e, t), e.json({
 			success: !0,
 			id: p,
 			key: o,
@@ -6881,12 +6965,12 @@ G.get("/tree.json", async (e) => {
 	} catch (t) {
 		return console.error("[API Trees] Error saving tree:", t), e.json({ error: t.message || "Failed to save tree" }, 500);
 	}
-}), G.delete("/trees.json", async (e) => {
+}), W.delete("/trees.json", async (e) => {
 	let t = e.get("db"), n = e.req.query("id");
 	if (!n) return e.json({ error: "Tree ID required" }, 400);
 	let r = Number(n);
 	try {
-		return await t.prepare("DELETE FROM trees WHERE id = ?").run(r), await t.prepare("DELETE FROM channel_trees WHERE treeId = ?").run(r), await t.prepare("DELETE FROM tree_nodes WHERE treeId = ?").run(r), await I(e).clear(), new B(e.env).purgeGlobalCache(e, t), e.json({
+		return await t.prepare("DELETE FROM trees WHERE id = ?").run(r), await t.prepare("DELETE FROM channel_trees WHERE treeId = ?").run(r), await t.prepare("DELETE FROM tree_nodes WHERE treeId = ?").run(r), await I(e).clear(), new V(e.env).purgeGlobalCache(e, t), e.json({
 			success: !0,
 			deletedTreeId: r
 		});
@@ -6894,8 +6978,8 @@ G.get("/tree.json", async (e) => {
 		return e.json({ error: "Failed to delete tree" }, 500);
 	}
 });
-var ve = new e();
-ve.get("/", async (e) => {
+var ye = new e();
+ye.get("/", async (e) => {
 	try {
 		let t = e.get("db"), n = await t.prepare("SELECT * FROM channels ORDER BY id ASC").all(), r = Array.isArray(n) ? n : n?.results || [], i = await t.prepare("SELECT channelId, treeId, key, metaJson FROM channel_trees").all(), a = ((Array.isArray(i) ? i : i?.results || []) || []).reduce((e, t) => {
 			e[t.channelId] || (e[t.channelId] = []);
@@ -6919,7 +7003,7 @@ ve.get("/", async (e) => {
 				isHidden: !!e.isHidden,
 				trees: a[e.id] || []
 			};
-		}), s = e.env?.BUNDLED_DEFINITIONS, c = ce(s)?.channelTemplate || {
+		}), s = e.env?.BUNDLED_DEFINITIONS, c = se(s), l = c?.channelTemplate || Object.values(c?.channels || {})[0] || {
 			label: "Channel Settings",
 			fields: {
 				key: {
@@ -6951,7 +7035,7 @@ ve.get("/", async (e) => {
 			}
 		};
 		return e.json({
-			schema: c,
+			schema: l,
 			channels: o
 		});
 	} catch (t) {
@@ -6961,24 +7045,26 @@ ve.get("/", async (e) => {
 			error: t.message
 		}, 500);
 	}
-}), ve.post("/", async (e) => {
+}), ye.post("/", async (e) => {
 	try {
-		let t = e.get("db"), n = await e.req.json(), r = n.id, i = r != null && r !== "" && !isNaN(Number(r)) ? Number(r) : null, { key: a, label: o, channelType: s = "website", domain: c = "localhost", baseUrl: l = "http://localhost:4321", defaultLanguage: u = "en", isHidden: d = !1, trees: f = [], createdById: p = null, updatedById: m = null, id: h, createdAt: g, updatedAt: _, ...v } = n, y = a?.trim() || "main", b = o?.trim() || "Untitled Channel", x = Array.isArray(f) ? f : [], S = JSON.stringify(v || {}), C = e.get("user")?.id || m || p || null;
-		if (await t.prepare("SELECT id FROM channels WHERE key = ? AND id != ? LIMIT 1").get(y, i ?? -1)) return e.json({
-			error: `Channel API key "${y}" is already in use.`,
+		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 E = m === !0 || m === "true" || m === 1 || h === !0 || h === "true" || h === 1, D = Array.isArray(g) ? g : [], O = JSON.stringify(S || {}), k = 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 w = i;
-		if (i) 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(y, b, s, c, l, u, +!!d, S, C, i);
+		let A = 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, +!!E, O, k, 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(y, b, s, c, l, u, +!!d, S, C, C);
-			w = 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      ").run(C, w, c, l, u, T, +!!E, O, k, k);
+			A = Number(e.lastInsertRowid);
 		}
-		await t.prepare("DELETE FROM channel_trees WHERE channelId = ?").run(w);
-		let T = x.filter((e) => e && e.treeId && e.key);
-		if (T.length > 0) {
-			let e = T.map(() => "(?, ?, ?, ?)").join(", "), n = T.flatMap((e) => [
-				w,
+		await t.prepare("DELETE FROM channel_trees WHERE channelId = ?").run(A);
+		let j = D.filter((e) => e && e.treeId && e.key);
+		if (j.length > 0) {
+			let e = j.map(() => "(?, ?, ?, ?)").join(", "), n = j.flatMap((e) => [
+				A,
 				Number(e.treeId) || e.treeId,
 				String(e.key).trim(),
 				JSON.stringify(e.meta || {})
@@ -6988,9 +7074,10 @@ ve.get("/", async (e) => {
         VALUES ${e}
       `).run(...n);
 		}
-		return await I(e).clear(), new B(e.env).purgeGlobalCache(e, t), e.json({
+		let M = I(e);
+		return await M.delete(`channel:${C}`), await M.delete(`channel:${A}`), await M.clear(), new V(e.env).purgeGlobalCache(e, t), e.json({
 			success: !0,
-			id: w
+			id: A
 		});
 	} catch (t) {
 		return console.error("[API Channels] Error saving channel:", t), e.json({
@@ -6998,12 +7085,14 @@ ve.get("/", async (e) => {
 			details: t.message
 		}, 500);
 	}
-}), ve.delete("/", async (e) => {
+}), ye.delete("/", async (e) => {
 	let t = e.get("db"), n = e.req.query("id");
 	if (!n) return e.json({ error: "Channel ID required" }, 400);
 	let r = Number(n);
 	try {
-		return await t.prepare("DELETE FROM channel_trees WHERE channelId = ?").run(r), await t.prepare("DELETE FROM node_channels WHERE channelId = ?").run(r), await t.prepare("DELETE FROM channels WHERE id = ?").run(r), await I(e).clear(), new B(e.env).purgeGlobalCache(e, t), e.json({
+		await t.prepare("DELETE FROM channel_trees WHERE channelId = ?").run(r), await t.prepare("DELETE FROM node_channels WHERE channelId = ?").run(r), await t.prepare("DELETE FROM channels WHERE id = ?").run(r);
+		let n = I(e);
+		return await n.delete(`channel:${r}`), await n.clear(), new V(e.env).purgeGlobalCache(e, t), e.json({
 			success: !0,
 			deletedSiteId: r
 		});
@@ -7019,11 +7108,11 @@ if (typeof process < "u" && process?.versions?.node) try {
 	let e = i(import.meta.url);
 	K = e("node:fs"), q = e("node:path");
 } catch {}
-function ye(e, t = "") {
+function be(e, t = "") {
 	let n = e.split(/[\\/]/).pop() || "";
 	return t && n.endsWith(t) ? n.slice(0, -t.length) : n;
 }
-function be(e) {
+function xe(e) {
 	let t = e.match(/\.[^.\\/]+$/);
 	return t ? t[0] : "";
 }
@@ -7036,7 +7125,7 @@ var J = {
 	nodeLayouts: {},
 	blockLayouts: {}
 };
-function xe(e) {
+function Se(e) {
 	return e ? typeof e == "string" ? e.trim() : Array.isArray(e) ? e.includes("*") ? "*" : e : "*" : "*";
 }
 function Y(e = {}, t = {}) {
@@ -7051,47 +7140,47 @@ function Y(e = {}, t = {}) {
 	};
 	return t.required === !0 || String(t.required).toLowerCase() === "true" || t.rules?.required === !0 || String(t.rules?.required).toLowerCase() === "true" || t.required === void 0 && (e.required === !0 || String(e.required).toLowerCase() === "true" || e.rules?.required === !0 || String(e.rules?.required).toLowerCase() === "true") ? (n.required = !0, n.rules.required = !0) : (t.required === !1 || t.rules?.required === !1) && (n.required = !1, n.rules.required = !1), n;
 }
-function Se(e) {
+function Ce(e) {
 	if (!e || typeof e != "object") return e;
-	if (Array.isArray(e)) return e.map(Se);
+	if (Array.isArray(e)) return e.map(Ce);
 	let t = {};
 	for (let [n, r] of Object.entries(e)) if (n === "<<" || n === "<<:") {
-		let e = Se(r);
+		let e = Ce(r);
 		if (typeof e == "object" && e) {
 			if (Array.isArray(e)) for (let n of e) Object.assign(t, n);
 			else Object.assign(t, e);
 		}
-	} else t[n] = Se(r);
+	} else t[n] = Ce(r);
 	return t;
 }
-function Ce(e, t) {
-	return e ? Se(n.parseDocument(e, { customTags: [{
+function we(e, t) {
+	return e ? Ce(n.parseDocument(e, { customTags: [{
 		tag: "!include",
 		resolve(e) {
-			let n = (typeof e == "string" ? e : String(e?.strValue || e?.value || "")).trim(), r = ye(n);
+			let n = (typeof e == "string" ? e : String(e?.strValue || e?.value || "")).trim(), r = be(n);
 			if (!r) return n;
 			if (t && t.fieldSets) {
 				let e = Object.keys(t.fieldSets).find((e) => e.endsWith("/" + r) || e === r);
-				if (e) return Ce(t.fieldSets[e], t);
+				if (e) return we(t.fieldSets[e], t);
 			}
 			return n;
 		}
 	}] }).toJS() || {}) : {};
 }
-function we(e, t = /* @__PURE__ */ new Set()) {
+function Te(e, t = /* @__PURE__ */ new Set()) {
 	if (!K || !q) return {};
 	let r = q.resolve(e);
 	if (t.has(r) || (t.add(r), !K.existsSync(r))) return {};
 	let i = K.readFileSync(r, "utf-8");
-	return Se(n.parseDocument(i, { customTags: [{
+	return Ce(n.parseDocument(i, { customTags: [{
 		tag: "!include",
 		resolve(e) {
 			let n = (typeof e == "string" ? e : String(e?.strValue || e?.value || "")).trim();
-			return n ? we(q.resolve(q.dirname(r), n), new Set(t)) : {};
+			return n ? Te(q.resolve(q.dirname(r), n), new Set(t)) : {};
 		}
 	}] }).toJS() || {});
 }
-function Te() {
+function Ee() {
 	if (!K || !q || typeof process > "u" || !process?.versions?.node) return null;
 	try {
 		let e = process.cwd(), t = "", n = [
@@ -7124,9 +7213,9 @@ function Te() {
 			let r = {}, i = K.readdirSync(n);
 			for (let e of i) {
 				if (!e.endsWith(".yaml") && !e.endsWith(".yml")) continue;
-				let t = q.join(n, e), i = ye(e, be(e));
+				let t = q.join(n, e), i = be(e, xe(e));
 				try {
-					r[i] = we(t);
+					r[i] = Te(t);
 				} catch (t) {
 					console.error(`❌ Error parsing ${e}:`, t.message);
 				}
@@ -7154,14 +7243,14 @@ function Te() {
 		return console.error("❌ Exception inside readLocalFsBundle:", e), null;
 	}
 }
-var Ee = null, De = null;
-function Oe(e) {
-	if (!e) Ee = null, De = null;
-	else if (Ee && De === e) return Ee;
-	let t = ke(e);
-	return Ee = t, De = e, t;
-}
+var De = null, Oe = null;
 function ke(e) {
+	if (!e) De = null, Oe = null;
+	else if (De && Oe === e) return De;
+	let t = Ae(e);
+	return De = t, Oe = e, t;
+}
+function Ae(e) {
 	if (e) {
 		let t = {
 			nodes: {
@@ -7197,12 +7286,12 @@ function ke(e) {
 			let e = (e) => {
 				let n = {};
 				for (let [r, i] of Object.entries(e || {})) {
-					let e = ye(r, be(r));
-					n[e] = Ce(i, t);
+					let e = be(r, xe(r));
+					n[e] = we(i, t);
 				}
 				return n;
 			};
-			return Ae({
+			return je({
 				rawNodes: e(t.nodes),
 				rawTrees: e(t.trees),
 				rawChannels: e(t.channels),
@@ -7212,12 +7301,12 @@ function ke(e) {
 				rawFieldSets: e(t.fieldSets)
 			});
 		}
-		return Ae(t);
+		return je(t);
 	}
-	let t = Te();
-	return t && Object.keys(t.rawNodes || {}).length > 0 ? Ae(t) : Ae(null);
+	let t = Ee();
+	return t && Object.keys(t.rawNodes || {}).length > 0 ? je(t) : je(null);
 }
-function Ae(e) {
+function je(e) {
 	if (!e) return {
 		nodes: {},
 		trees: {},
@@ -7352,8 +7441,8 @@ function Ae(e) {
 			inVault: t.inVault !== !1,
 			hasCanvas: t.hasCanvas === !0,
 			defaultLayout: t.defaultLayout,
-			allowedBlocks: xe(t.allowedBlocks),
-			disallowedBlocks: t.disallowedBlocks ? xe(t.disallowedBlocks) : void 0,
+			allowedBlocks: Se(t.allowedBlocks),
+			disallowedBlocks: t.disallowedBlocks ? Se(t.disallowedBlocks) : void 0,
 			tabs: n,
 			fields: r
 		};
@@ -7415,17 +7504,17 @@ function Ae(e) {
 			fields: n
 		};
 	});
-	let te = {};
+	let P = {};
 	Object.entries(T).forEach(([e, t]) => {
 		let n = A(t.tabs), r = k(t.fields || [], "settings", n), i = {}, a = t.regions || { content: { label: "Content" } };
 		Object.entries(a).forEach(([e, t]) => {
 			i[e] = {
 				...t,
 				label: t.label || e,
-				allowedBlocks: xe(t.allowedBlocks),
-				disallowedBlocks: t.disallowedBlocks ? xe(t.disallowedBlocks) : void 0
+				allowedBlocks: Se(t.allowedBlocks),
+				disallowedBlocks: t.disallowedBlocks ? Se(t.disallowedBlocks) : void 0
 			};
-		}), te[e] = {
+		}), P[e] = {
 			...t,
 			id: t.id || e,
 			label: t.label || e,
@@ -7438,17 +7527,17 @@ function Ae(e) {
 			tabs: n
 		};
 	});
-	let P = {};
+	let te = {};
 	Object.entries(E).forEach(([e, t]) => {
 		let n = A(t.tabs), r = k(t.fields || [], "settings", n), i = {}, a = t.regions || { main: { label: "Main Content" } };
 		Object.entries(a).forEach(([e, t]) => {
 			i[e] = {
 				...t,
 				label: t.label || e,
-				allowedBlocks: xe(t.allowedBlocks),
-				disallowedBlocks: t.disallowedBlocks ? xe(t.disallowedBlocks) : void 0
+				allowedBlocks: Se(t.allowedBlocks),
+				disallowedBlocks: t.disallowedBlocks ? Se(t.disallowedBlocks) : void 0
 			};
-		}), P[e] = {
+		}), te[e] = {
 			...t,
 			id: t.id || e,
 			label: t.label || e,
@@ -7478,7 +7567,7 @@ function Ae(e) {
 			L[e] = Y(L[e] || {}, t);
 		});
 	});
-	let R = h ? {
+	let ne = h ? {
 		...h,
 		fields: L
 	} : null;
@@ -7487,20 +7576,20 @@ function Ae(e) {
 		trees: M,
 		channels: N,
 		blocks: ee,
-		nodeLayouts: te,
-		blockLayouts: P,
+		nodeLayouts: P,
+		blockLayouts: te,
 		fieldSets: O,
 		nodeTemplate: f || null,
 		treeTemplate: p || null,
 		channelTemplate: I,
-		userTemplate: R
+		userTemplate: ne
 	};
 }
-var je = new e(), Me = (e) => {
+var Me = new e(), Ne = (e) => {
 	try {
 		let t = e.env?.BUNDLED_DEFINITIONS;
 		(!t || Object.keys(t).length === 0) && (t = f || d || u);
-		let n = Oe(t);
+		let n = ke(t);
 		return e.json(n, 200, { "Cache-Control": "no-cache, no-store, must-revalidate" });
 	} catch (t) {
 		return console.error("[CMS API] Error loading schemas:", t), e.json({
@@ -7509,8 +7598,8 @@ var je = new e(), Me = (e) => {
 		}, 500);
 	}
 };
-je.get("/", Me), je.get("/schemas.json", Me);
-var Ne = new e(), Pe = {
+Me.get("/", Ne), Me.get("/schemas.json", Ne);
+var Pe = new e(), Fe = {
 	node: "content_nodes",
 	nodes: "content_nodes",
 	content_node: "content_nodes",
@@ -7522,7 +7611,7 @@ var Ne = new e(), Pe = {
 	user: "users",
 	users: "users",
 	user_account: "user_accounts"
-}, Fe = {
+}, Ie = {
 	content_nodes: [
 		"id",
 		"title",
@@ -7579,11 +7668,11 @@ var Ne = new e(), Pe = {
 		"createdAt"
 	]
 };
-Ne.post("/validate-unique", async (e) => {
+Pe.post("/validate-unique", async (e) => {
 	try {
 		let t = e.get("db"), { entityType: n, field: r, value: i, excludeId: a } = await e.req.json();
 		if (!r || i == null || String(i).trim() === "") return e.json({ isUnique: !0 });
-		let o = Pe[n] || "content_nodes", s = r.replace(/[^a-zA-Z0-9_]/g, ""), c = (Fe[o] || Fe.content_nodes).includes(s), l = -1;
+		let o = Fe[n] || "content_nodes", s = r.replace(/[^a-zA-Z0-9_]/g, ""), c = (Ie[o] || Ie.content_nodes).includes(s), l = -1;
 		if (a != null && String(a).trim() !== "") {
 			let e = Number(a);
 			l = isNaN(e) ? String(a) : e;
@@ -7595,9 +7684,9 @@ Ne.post("/validate-unique", async (e) => {
 	} catch (t) {
 		return console.error("[API Validation] Error validating global uniqueness:", t), e.json({ error: "Failed to validate uniqueness" }, 500);
 	}
-}), Ne.post("/validate-unique-sibling", async (e) => e.json({ isUnique: !0 }));
-var Ie = new e();
-Ie.get("/", async (e) => {
+}), Pe.post("/validate-unique-sibling", async (e) => e.json({ isUnique: !0 }));
+var Le = new e();
+Le.get("/", async (e) => {
 	try {
 		let t = e.get("db"), n = await t.prepare("\n        SELECT \n          COUNT(*) as total,\n          SUM(CASE WHEN isHidden = 0 THEN 1 ELSE 0 END) as published,\n          SUM(CASE WHEN isHidden = 1 THEN 1 ELSE 0 END) as hidden\n        FROM content_nodes\n        WHERE deletedAt IS NULL OR deletedAt = ''\n      ").get(), r = Number(n?.total) || 0, i = Number(n?.published) || 0, a = Number(n?.hidden) || 0, o = await t.prepare("\n        SELECT \n          (SELECT COUNT(*) FROM channels) as totalChannels,\n          (SELECT COUNT(*) FROM trees) as totalTrees,\n          (SELECT COUNT(*) FROM users) as totalUsers\n      ").get(), s = await t.prepare("\n        SELECT contentType as type, COUNT(*) as count \n        FROM content_nodes \n        WHERE deletedAt IS NULL OR deletedAt = ''\n        GROUP BY contentType \n        ORDER BY count DESC\n      ").all(), c = Array.isArray(s) ? s : s?.results || [], l = await t.prepare("\n        SELECT id, title, slug, contentType, isHidden, status, updatedAt \n        FROM content_nodes \n        WHERE deletedAt IS NULL OR deletedAt = ''\n        ORDER BY updatedAt DESC \n        LIMIT 5\n      ").all(), u = (Array.isArray(l) ? l : l?.results || []).map((e) => ({
 			...e,
@@ -7614,7 +7703,7 @@ Ie.get("/", async (e) => {
 			isHidden: !!e.isHidden,
 			channelNames: e.channelLabels ? e.channelLabels.split(",") : [],
 			treeNames: e.treeLabels ? e.treeLabels.split(",") : []
-		})), p = e.env?.BUNDLED_DEFINITIONS, m = ce(p), h = m.nodes || m.nodeSchemas || {}, g = c.map((e) => {
+		})), p = e.env?.BUNDLED_DEFINITIONS, m = se(p), h = m.nodes || m.nodeSchemas || {}, g = c.map((e) => {
 			let t = e.type || "node", n = h[t]?.label || t.charAt(0).toUpperCase() + t.slice(1);
 			return {
 				type: t,
@@ -7658,7 +7747,7 @@ async function Q(e, t, n = []) {
 	if (typeof r.bind == "function") return await r.bind(...n).run();
 	if (typeof r.run == "function") return await r.run(...n);
 }
-function Le(e, t, n) {
+function Re(e, t, n) {
 	let r = e || (t ? `/media/${t}` : "");
 	return r && n && r.startsWith(`https://${n}/`) && !r.includes("/media/") && (r = r.replace(`https://${n}/`, `https://${n}/media/`)), r;
 }
@@ -7700,7 +7789,7 @@ X.get("/", async (e) => {
 					...JSON.parse(t.dataJson || "{}")
 				};
 			} catch {}
-			let r = Le(t.cdnUrl, t.storageKeyPrivate, e.env?.CDN_DOMAIN);
+			let r = Re(t.cdnUrl, t.storageKeyPrivate, e.env?.CDN_DOMAIN);
 			return {
 				id: t.id,
 				filename: t.filename || "Untitled Asset",
@@ -7726,7 +7815,7 @@ X.get("/", async (e) => {
 	}
 }), X.post("/upload", async (e) => {
 	try {
-		let t = l(e), { storage: n } = ie(e.env), r = await e.req.parseBody(), i = r.file, a = r.isVariant === "true" || r.isVariant === "1" || r.temporary === "true", o = r.parentAssetId || r.parentAsset, s = typeof o == "string" && o.trim().length > 0 ? o.trim() : null;
+		let t = l(e), { storage: n } = ae(e.env), r = await e.req.parseBody(), i = r.file, a = r.isVariant === "true" || r.isVariant === "1" || r.temporary === "true", o = r.parentAssetId || r.parentAsset, s = typeof o == "string" && o.trim().length > 0 ? o.trim() : null;
 		s && (await Z(t, "SELECT id FROM assets WHERE id = ?", [s])).length === 0 && (s = null);
 		let c = r.cropCoordinates, u = null, d = null;
 		if (c) {
@@ -7758,7 +7847,7 @@ X.get("/", async (e) => {
 		let D = x;
 		if (s) {
 			let n = await Z(t, "SELECT cdnUrl, storageKeyPrivate FROM assets WHERE id = ?", [s]);
-			n.length > 0 && (D = Le(n[0].cdnUrl, n[0].storageKeyPrivate, y)), new B(e.env).purgeAsset(e, t, s);
+			n.length > 0 && (D = Re(n[0].cdnUrl, n[0].storageKeyPrivate, y)), new V(e.env).purgeAsset(e, t, s);
 		}
 		return e.json({
 			id: p,
@@ -7800,7 +7889,7 @@ X.get("/", async (e) => {
 				...JSON.parse(i.dataJson || "{}")
 			};
 		} catch {}
-		let u = Le(i.cdnUrl, i.storageKeyPrivate, e.env?.CDN_DOMAIN);
+		let u = Re(i.cdnUrl, i.storageKeyPrivate, e.env?.CDN_DOMAIN);
 		return e.json({
 			id: i.id,
 			filename: i.filename,
@@ -7827,7 +7916,7 @@ X.get("/", async (e) => {
 					createdAt: t.createdAt,
 					parentAssetId: t.parentAssetId || i.id,
 					cropCoordinates: n,
-					url: Le(t.cdnUrl, t.storageKeyPrivate, e.env?.CDN_DOMAIN),
+					url: Re(t.cdnUrl, t.storageKeyPrivate, e.env?.CDN_DOMAIN),
 					originalUrl: u
 				};
 			})
@@ -7847,14 +7936,14 @@ X.get("/", async (e) => {
 			r.filename === void 0 ? a.filename : r.filename,
 			JSON.stringify(o),
 			n
-		]), new B(e.env).purgeAsset(e, t, n), e.json({ success: !0 });
+		]), new V(e.env).purgeAsset(e, t, n), e.json({ success: !0 });
 	} catch {
 		return e.json({ error: "Failed to update asset" }, 500);
 	}
 }), X.delete("/:id", async (e) => {
 	try {
 		let t = l(e), n = e.req.param("id"), r = (await Z(t, "SELECT id, filename, isSystemVariant FROM assets WHERE id = ?", [n]))[0];
-		return r ? (new B(e.env).purgeAsset(e, t, n), r.isSystemVariant ? await Q(t, "UPDATE assets SET deletedAt = CURRENT_TIMESTAMP WHERE id = ?", [n]) : await Q(t, "UPDATE assets SET deletedAt = CURRENT_TIMESTAMP WHERE id = ? OR parentAssetId = ? OR (isSystemVariant = 1 AND (filename LIKE ? OR filename LIKE ?))", [
+		return r ? (new V(e.env).purgeAsset(e, t, n), r.isSystemVariant ? await Q(t, "UPDATE assets SET deletedAt = CURRENT_TIMESTAMP WHERE id = ?", [n]) : await Q(t, "UPDATE assets SET deletedAt = CURRENT_TIMESTAMP WHERE id = ? OR parentAssetId = ? OR (isSystemVariant = 1 AND (filename LIKE ? OR filename LIKE ?))", [
 			n,
 			n,
 			`crop_%${r.filename ? r.filename.replace(/\.[^/.]+$/, "") : ""}%`,
@@ -7880,7 +7969,7 @@ X.get("/", async (e) => {
 			r,
 			`crop_%${i.filename ? i.filename.replace(/\.[^/.]+$/, "") : ""}%`,
 			`%${r}%`
-		]), new B(e.env).purgeAsset(e, t, r), e.json({
+		]), new V(e.env).purgeAsset(e, t, r), e.json({
 			success: !0,
 			id: r,
 			restored: !0
@@ -7893,9 +7982,9 @@ X.get("/", async (e) => {
 	}
 }), X.delete("/purge/:id", async (e) => {
 	try {
-		let t = l(e), { storage: n } = ie(e.env), r = e.req.param("id"), i = (await Z(t, "SELECT id, filename, storageKeyPrivate, isSystemVariant FROM assets WHERE id = ?", [r]))[0];
+		let t = l(e), { storage: n } = ae(e.env), r = e.req.param("id"), i = (await Z(t, "SELECT id, filename, storageKeyPrivate, isSystemVariant FROM assets WHERE id = ?", [r]))[0];
 		if (!i) return e.json({ error: "Asset not found" }, 404);
-		new B(e.env).purgeAsset(e, t, r);
+		new V(e.env).purgeAsset(e, t, r);
 		let a = [i];
 		i.isSystemVariant || (a = [i, ...await Z(t, "SELECT id, storageKeyPrivate FROM assets WHERE parentAssetId = ? OR (isSystemVariant = 1 AND (filename LIKE ? OR filename LIKE ?))", [
 			r,
@@ -7925,8 +8014,8 @@ X.get("/", async (e) => {
 		}, 500);
 	}
 });
-var Re = new e();
-function ze() {
+var ze = new e();
+function Be() {
 	return {
 		fullPath: /* @__PURE__ */ new Map(),
 		treeEdges: /* @__PURE__ */ new Map(),
@@ -7934,10 +8023,10 @@ function ze() {
 		assetUrls: /* @__PURE__ */ new Map()
 	};
 }
-function Be(...e) {
+function Ve(...e) {
 	return e.map((e) => String(e ?? "")).join(":");
 }
-function Ve(e, t) {
+function He(e, t) {
 	let n = Date.now();
 	if (e && String(e).trim() !== "") {
 		let t = Date.parse(e);
@@ -7949,27 +8038,27 @@ function Ve(e, t) {
 	}
 	return !0;
 }
-async function He(e, t, n) {
-	let r = t.filter((e) => e.componentId === "content-feed" || e.componentId === "article-list");
-	await Promise.all(r.map(async (t) => {
-		let r = t.data || {}, i = r.nodeType || "article", a = Number(r.limit) || 12, o = r.sortBy || "updatedAt", s = "FROM content_nodes WHERE contentType = ? AND isHidden = 0 AND (status = 'published' OR status IS NULL)", c = [i];
-		n && n !== "all" && (s += " AND id IN (SELECT nodeId FROM node_channels WHERE channelId = ?)", c.push(Number(n) || n));
-		let l = "ORDER BY updatedAt DESC";
-		o === "published_desc" || o === "createdAt" ? l = "ORDER BY createdAt DESC" : o === "title_asc" && (l = "ORDER BY LOWER(title) ASC");
-		let u = `SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${s} ${l} LIMIT ?`;
-		c.push(a);
+async function Ue(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 = "ORDER BY updatedAt DESC";
+		s === "published_desc" || s === "createdAt" ? u = "ORDER BY createdAt DESC" : s === "title_asc" && (u = "ORDER BY LOWER(title) ASC");
+		let d = `SELECT id, title, slug, language, dataJson, createdAt, updatedAt ${c} ${u} LIMIT ?`;
+		l.push(o);
 		try {
-			let n = await e.prepare(u).all(...c), r = Array.isArray(n) ? n : n?.results || [];
-			t.data.initialItems = r.map((e) => {
+			let n = await e.prepare(d).all(...l), i = Array.isArray(n) ? n : n?.results || [];
+			t.data.initialItems = i.map((e) => {
 				let t = {};
 				if (e.dataJson) try {
 					t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
 				} catch {}
-				return Ve(t.startShowingAt, t.stopShowingAt) ? {
+				return He(t.startShowingAt, t.stopShowingAt) ? {
 					id: e.id,
 					title: e.title,
 					slug: e.slug,
-					language: e.language || "en",
+					language: e.language?.trim() || r || null,
 					createdAt: e.createdAt,
 					updatedAt: e.updatedAt,
 					excerpt: t.excerpt || "",
@@ -7982,7 +8071,7 @@ async function He(e, t, n) {
 		}
 	}));
 }
-async function Ue(e, t, n, r, i = !1, a) {
+async function We(e, t, n, r, i = !1, a) {
 	if (!t) return { blocks: [] };
 	let o = await e.prepare("\n    WITH RECURSIVE ancestor_path(id, contentId, title, slug, parentId, level) AS (\n      SELECT t.id, 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.id = ? OR c.id = ?\n      UNION ALL\n      SELECT t.id, 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.id = ap.parentId\n    )\n    SELECT * FROM ancestor_path ORDER BY level ASC\n  ").all(t, t), s = Array.isArray(o) ? o : o?.results || [];
 	if (!s || s.length === 0) return { blocks: [] };
@@ -8018,10 +8107,10 @@ async function Ue(e, t, n, r, i = !1, a) {
 			try {
 				a = (typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : t.dataJson) || {};
 			} catch {}
-			let o = a.hidden === !0 || a.hidden === 1 || a.hidden === "1" || a.hidden === "true", s = Ve(a.startShowingAt, a.stopShowingAt);
+			let o = a.hidden === !0 || a.hidden === 1 || a.hidden === "1" || a.hidden === "true", s = He(a.startShowingAt, a.stopShowingAt);
 			if (!i && (o || !s)) return null;
-			let c = t.elementType || t.componentId || "text-block", l = r.blocks?.[c]?.fields || r.elements?.[c]?.fields || r.components?.[c]?.fields || {}, u = String(a.blockId || a._instanceId || a.id || t.blockId || t.id), d = We(a, l);
-			return d = await se(e, d), d = Ge(d), d.blockId = u, {
+			let c = t.elementType || t.componentId || "text-block", l = r.blocks?.[c]?.fields || r.elements?.[c]?.fields || r.components?.[c]?.fields || {}, u = String(a.blockId || a._instanceId || a.id || t.blockId || t.id), d = Ge(a, l);
+			return d = await B(e, d), d = Ke(d), d.blockId = u, {
 				region: t.region || n,
 				block: {
 					instanceId: t.id,
@@ -8041,7 +8130,7 @@ async function Ue(e, t, n, r, i = !1, a) {
 	}
 	return { blocks: [] };
 }
-function We(e, t = {}) {
+function Ge(e, t = {}) {
 	let n = {};
 	for (let [r, i] of Object.entries(e)) r.endsWith("_meta") || [
 		"disabledRegions",
@@ -8057,14 +8146,14 @@ function We(e, t = {}) {
 	].includes(r) || r.startsWith("_") || (!t[r] || t[r].public !== !1) && (n[r] = i);
 	return n;
 }
-function Ge(e) {
-	if (Array.isArray(e)) return e.map(Ge);
+function Ke(e) {
+	if (Array.isArray(e)) return e.map(Ke);
 	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, Ge({
+		} : t, a = Object.fromEntries(Object.entries(n).filter(([, t]) => t?.id !== e.id).map(([t, n]) => [t, Ke({
 			...n,
 			title: n?.title ?? e.title ?? "",
 			alt: n?.alt ?? e.alt ?? "",
@@ -8078,9 +8167,9 @@ function Ge(e) {
 			...Object.keys(a).length > 0 ? { variants: a } : {}
 		};
 	}
-	return Object.fromEntries(Object.entries(e).map(([e, t]) => [e, Ge(t)]));
+	return Object.fromEntries(Object.entries(e).map(([e, t]) => [e, Ke(t)]));
 }
-async function Ke(e, t, n) {
+async function qe(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 = (e, t) => {
@@ -8098,9 +8187,9 @@ async function Ke(e, t, n) {
 		return await Promise.all(Array.from(t.matchAll(p)).map(async (t) => {
 			let i = t[1], a = r(i, "data-node-id"), o = r(i, "data-tree-id");
 			if (!a || !o) return;
-			let s = await Je(e, a, o, n);
+			let s = await Ye(e, a, o, n);
 			if (s?.treeNodeId) {
-				let t = await Qe(e, String(s.treeNodeId), o, n);
+				let t = await $e(e, String(s.treeNodeId), o, n);
 				f.set(`${a}:${o}`, t);
 			}
 		})), t.replace(p, (e, t) => {
@@ -8120,39 +8209,39 @@ async function Ke(e, t, n) {
 			return /href\s*=\s*["'][^"']*["']/i.test(h) ? h = h.replace(/href\s*=\s*["'][^"']*["']/i, `href="${m || "/"}"`) : h += ` href="${m || "/"}"`, `<a ${h}>`;
 		});
 	}
-	if (Array.isArray(t)) return Promise.all(t.map((t) => Ke(e, t, n)));
+	if (Array.isArray(t)) return Promise.all(t.map((t) => qe(e, t, n)));
 	if (t && typeof t == "object") {
 		if (typeof t.href == "string" && (t.href.startsWith("#node:") || t.href.startsWith("#asset:"))) return {
 			...t,
-			href: await qe(e, t, n)
+			href: await Je(e, t, n)
 		};
-		let r = await Promise.all(Object.entries(t).map(async ([t, r]) => [t, await Ke(e, r, n)]));
+		let r = await Promise.all(Object.entries(t).map(async ([t, r]) => [t, await qe(e, r, n)]));
 		return Object.fromEntries(r);
 	}
 	return t;
 }
-async function qe(e, t, n) {
+async function Je(e, t, n) {
 	let r = t.href.match(/^#node:(.+)$/), i = t.href.match(/^#asset:(.+)$/);
-	if (i) return Xe(e, i[1], n);
+	if (i) return Ze(e, i[1], n);
 	if (!r) return t.href;
 	let a = r[1];
 	if (t.treeId) {
-		let r = await Je(e, a, String(t.treeId), n);
+		let r = await Ye(e, a, String(t.treeId), n);
 		if (r?.treeNodeId) {
-			let i = await Qe(e, String(r.treeNodeId), String(t.treeId), n);
+			let i = await $e(e, String(r.treeNodeId), String(t.treeId), n);
 			if (i) return i;
 		}
 	}
-	let o = await Ye(e, a, n);
+	let o = await Xe(e, a, n);
 	return o === void 0 ? "#" : `/${o}`;
 }
-async function Je(e, t, n, r) {
-	let i = Be(t, n), a = r.treeEdges.get(i);
+async function Ye(e, t, n, r) {
+	let i = Ve(t, n), a = r.treeEdges.get(i);
 	if (a) return a;
 	let o = e.prepare("SELECT id as treeNodeId FROM tree_nodes WHERE contentId = ? AND treeId = ? LIMIT 1").get(t, n);
 	return r.treeEdges.set(i, Promise.resolve(o)), o;
 }
-async function Ye(e, t, n) {
+async function Xe(e, t, n) {
 	let r = String(t), i = n.nodeSlugs.get(r);
 	if (i) return i;
 	let a = (async () => {
@@ -8161,7 +8250,7 @@ async function Ye(e, t, n) {
 	})();
 	return n.nodeSlugs.set(r, a), a;
 }
-async function Xe(e, t, n) {
+async function Ze(e, t, n) {
 	let r = String(t), i = n.assetUrls.get(r);
 	if (i) return i;
 	let a = (async () => {
@@ -8170,7 +8259,7 @@ async function Xe(e, t, n) {
 	})();
 	return n.assetUrls.set(r, a), a;
 }
-function Ze(e) {
+function Qe(e) {
 	let t = e.socialImage;
 	if (!t || typeof t != "object") return null;
 	let n = (e, t) => {
@@ -8201,9 +8290,9 @@ function Ze(e) {
 		])
 	};
 }
-async function Qe(e, t, n, r) {
+async function $e(e, t, n, r) {
 	if (!t) return "";
-	let i = Be(t, n);
+	let i = Ve(t, n);
 	if (r) {
 		let e = r.fullPath.get(i);
 		if (e) return e;
@@ -8218,7 +8307,7 @@ async function Qe(e, t, n, r) {
 	})();
 	return r && r.fullPath.set(i, a), a;
 }
-async function $e(e, t, n, r, i) {
+async function et(e, t, n, r, i) {
 	let a = {}, o = null;
 	if (t) {
 		let n = await e.prepare("\n      WITH RECURSIVE ancestor_path(id, contentId, title, slug, parentId, level) AS (\n        SELECT t.id, 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.id = ? OR c.id = ?\n        UNION ALL\n        SELECT t.id, 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.id = ap.parentId\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, t), i = Array.isArray(n) ? n : n?.results || [], s = /* @__PURE__ */ new Set([
@@ -8245,7 +8334,7 @@ async function $e(e, t, n, r, i) {
 		}
 	}
 	if (!o) {
-		let t = await e.prepare("SELECT dataJson FROM trees WHERE id = ?").get(n);
+		let t = await e.prepare("SELECT dataJson FROM trees WHERE id = ? OR key = ? LIMIT 1").get(Number(n) || -1, String(n));
 		if (t?.dataJson) try {
 			let e = typeof t.dataJson == "string" ? JSON.parse(t.dataJson) : t.dataJson;
 			e.subpageLayoutId && e.subpageLayoutId !== "inherit" && (o = e.subpageLayoutId);
@@ -8256,109 +8345,125 @@ async function $e(e, t, n, r, i) {
 		inheritedFields: a
 	};
 }
-function et(e) {
+function tt(e) {
 	let t = Number(e?.env?.CMS_NODE_CACHE_TTL);
 	return Number.isFinite(t) && t >= 60 ? Math.floor(t) : 300;
 }
-async function tt(e, t, n, r) {
+async function nt(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);
 	}
 }
-Re.get("/*", async (e) => {
+ze.get("/*", async (e) => {
 	try {
-		let t = e.get("db"), n = ze(), r = new URL(e.req.url).pathname.match(/\/node\/(.+)$/), i = (r ? r[1] : "home").replace(/^\/+|\/+$/g, ""), a = e.req.query("channelId") || e.req.query("channel") || "1", o = e.req.query("lang") || "en", s = e.req.query("preview") === "true", c = isNaN(Number(a)) ? await t.prepare("SELECT * FROM channels WHERE key = ?").get(a) : await t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(a));
+		let t = e.get("db"), n = Be(), r = new URL(e.req.url).pathname.match(/\/node\/(.+)$/), i = (r ? r[1] : "home").replace(/^\/+|\/+$/g, ""), a = e.req.query("channelId") || e.req.query("channel") || "1", o = e.req.query("lang"), s = e.req.query("preview") === "true", c = isNaN(Number(a)) ? await t.prepare("SELECT * FROM channels WHERE key = ?").get(a) : await t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(a));
 		if (!c) return e.json({ error: `Channel '${a}' not found` }, 404);
 		let l = c.status === "disabled" || c.status === "inactive" || c.isEnabled === 0 || c.isEnabled === !1;
 		if (!s && l) return e.json({ error: `Channel '${c.key || a}' is currently inactive` }, 404);
-		let u = c.id, d = c.key || a, f = I(e), p = `node:${u || d}:${o}:${i}`, m = e.req.header("x-bypass-cache") === "true";
-		if (!s && !m) {
-			let t = await f.get(p);
-			if (t) return e.header("X-Cache", "HIT"), e.json(t);
-		}
-		let h = ce(e.env?.BUNDLED_DEFINITIONS), g = /^\d+$/.test(i), _ = null, v = null, y = e.req.query("treeId"), b = i.split("/"), x = b[b.length - 1], S = "/" + i.replace(/^\/+|\/+$/g, ""), C = `
+		let u = c.id, d = c.key || a, f = I(e), p = se(e.env?.BUNDLED_DEFINITIONS), m = /^\d+$/.test(i), h = null, g = null, _ = e.req.query("treeId"), v = i.split("/"), y = v[v.length - 1], b = "/" + i.replace(/^\/+|\/+$/g, ""), x = `
       SELECT cn.*, tn.id as treeNodeId, tn.parentId, tn.treeId FROM content_nodes cn
       INNER JOIN tree_nodes tn ON cn.id = tn.contentId
       ${u === null ? "" : "INNER JOIN node_channels nc ON cn.id = nc.nodeId"}
       WHERE cn.slug = ? ${u === null ? "" : "AND nc.channelId = ?"}
-    `, w = u === null ? [x] : [x, u], T = await t.prepare(C).all(...w), E = Array.isArray(T) ? T : T?.results || [];
-		if (E.length > 0) {
-			let e = await Promise.all(E.map(async (e) => ({
+    `, S = u === null ? [y] : [y, u], C = await t.prepare(x).all(...S), w = Array.isArray(C) ? C : C?.results || [];
+		if (w.length > 0) {
+			let e = await Promise.all(w.map(async (e) => ({
 				candidate: e,
-				calculatedPath: await Qe(t, String(e.treeNodeId), String(e.treeId), n)
-			}))), r = S.replace(/^\/+|\/+$/g, "");
+				calculatedPath: await $e(t, String(e.treeNodeId), String(e.treeId), n)
+			}))), r = b.replace(/^\/+|\/+$/g, "");
 			for (let { candidate: t, calculatedPath: n } of e) {
 				let e = n.replace(/^\/+|\/+$/g, "");
 				if (e === r || r === "home" && (e === "" || e === "home")) {
-					_ = t, v = t;
+					h = t, g = t;
 					break;
 				}
 			}
 		}
-		if (!_ && b.length === 1 && (_ = u === null ? await t.prepare("SELECT * FROM content_nodes WHERE slug = ?").get(x) : await t.prepare("SELECT cn.* FROM content_nodes cn INNER JOIN node_channels nc ON cn.id = nc.nodeId WHERE cn.slug = ? AND nc.channelId = ?").get(x, u)), !_ && g && (_ = u === null ? await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(Number(i)) : await t.prepare("SELECT cn.* FROM content_nodes cn INNER JOIN node_channels nc ON cn.id = nc.nodeId WHERE cn.id = ? AND nc.channelId = ?").get(Number(i), u)), !_) return e.json({ error: `Node '${i}' not found for Channel '${a}'` }, 404);
-		if (!v) {
-			let e = y ? [_.id, y] : [_.id];
-			v = await t.prepare(`SELECT id as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${y ? "AND treeId = ?" : ""} LIMIT 1`).get(...e);
+		if (!h && v.length === 1 && (h = u === null ? await t.prepare("SELECT * FROM content_nodes WHERE slug = ?").get(y) : await t.prepare("SELECT cn.* FROM content_nodes cn INNER JOIN node_channels nc ON cn.id = nc.nodeId WHERE cn.slug = ? AND nc.channelId = ?").get(y, u)), !h && m && (h = u === null ? await t.prepare("SELECT * FROM content_nodes WHERE id = ?").get(Number(i)) : await t.prepare("SELECT cn.* FROM content_nodes cn INNER JOIN node_channels nc ON cn.id = nc.nodeId WHERE cn.id = ? AND nc.channelId = ?").get(Number(i), u)), !h) return e.json({ error: `Node '${i}' not found for Channel '${a}'` }, 404);
+		if (!g) {
+			let e = _ ? [h.id, _] : [h.id];
+			g = await t.prepare(`SELECT id as treeNodeId, treeId, parentId FROM tree_nodes WHERE contentId = ? ${_ ? "AND treeId = ?" : ""} LIMIT 1`).get(...e);
 		}
-		let D = v?.treeId || y || "main-nav", O = v?.parentId || null, k = v?.treeNodeId ? await Qe(t, String(v.treeNodeId), String(D), n) : `/${(_.slug || "").replace(/^\/+|\/+$/g, "")}`, A = {
-			id: _.id,
-			title: _.title,
-			slug: _.slug,
-			language: _.language || o || "en",
-			path: k === "" ? "/" : k,
-			nodeType: _.contentType,
-			createdAt: _.createdAt,
-			updatedAt: _.updatedAt
-		}, j = _.contentType || "node", M = h.nodes?.[j] || Object.values(h.nodes || {})[0] || {}, N = { ...M.fields || {} };
-		M.tabs && Object.values(M.tabs).forEach((e) => {
-			Object.assign(N, e.fields || {});
+		let T = g?.treeId || _ || "main-nav", E = null;
+		if (T) {
+			let e = await t.prepare("\n        SELECT dataJson \n        FROM trees \n        WHERE id = ? OR key = ? \n        LIMIT 1\n      ").get(Number(T) || -1, String(T));
+			if (e?.dataJson) try {
+				let t = typeof e.dataJson == "string" ? JSON.parse(e.dataJson) : e.dataJson;
+				t.defaultLanguage ? E = String(t.defaultLanguage).trim() : t.language && (E = String(t.language).trim());
+			} catch {}
+		}
+		let D = null;
+		if (c) {
+			if (c.defaultLanguage) D = String(c.defaultLanguage).trim();
+			else if (c.dataJson) try {
+				let e = typeof c.dataJson == "string" ? JSON.parse(c.dataJson) : c.dataJson;
+				e.defaultLanguage ? D = String(e.defaultLanguage).trim() : e.language && (D = String(e.language).trim());
+			} catch {}
+		}
+		let O = h.language?.trim() || null, k = E || D || o?.trim() || null, A = O || k || null, j = `node:${u || d}:${A || "default"}:${i}`, M = e.req.header("x-bypass-cache") === "true";
+		if (!s && !M) {
+			let t = await f.get(j);
+			if (t) return e.header("X-Cache", "HIT"), e.json(t);
+		}
+		let N = g?.parentId || null, ee = g?.treeNodeId ? await $e(t, String(g.treeNodeId), String(T), n) : `/${(h.slug || "").replace(/^\/+|\/+$/g, "")}`, P = {
+			id: h.id,
+			title: h.title,
+			slug: h.slug,
+			language: A,
+			path: ee === "" ? "/" : ee,
+			nodeType: h.contentType,
+			createdAt: h.createdAt,
+			updatedAt: h.updatedAt
+		}, te = h.contentType || "node", F = p.nodes?.[te] || Object.values(p.nodes || {})[0] || {}, L = { ...F.fields || {} };
+		F.tabs && Object.values(F.tabs).forEach((e) => {
+			Object.assign(L, e.fields || {});
 		});
-		let ee = {}, te = null, P = null, F = !1, L = {}, R = s && _.draftDataJson || _.dataJson;
-		if (R) try {
-			L = typeof R == "string" ? JSON.parse(R) : R;
+		let ne = {}, re = null, ie = null, ae = !1, R = {}, oe = s && h.draftDataJson || h.dataJson;
+		if (oe) try {
+			R = typeof oe == "string" ? JSON.parse(oe) : oe;
 		} catch {}
-		L.disabledRegions && (ee = L.disabledRegions), F = L.hidden === !0 || L.hidden === 1 || L.hidden === "1" || L.hidden === "true", te = L.startShowingAt || null, P = L.stopShowingAt || null;
-		let ne = L.layoutId, re = ne && ne !== "inherit", { resolvedLayoutId: ie, inheritedFields: ae } = await $e(t, O, D, s, N), oe = re ? ne : ie || M.defaultLayout || null;
-		for (let [e, t] of Object.entries(ae)) (L[e] === void 0 || L[e] === null || L[e] === "" || L[e] === "inherit") && t !== void 0 && (L[e] = t);
-		let z = await se(t, We(L, N));
-		z = Ge(z), z = await Ke(t, z, n);
-		let B = Ze(z);
-		delete z.socialImage, delete z.fbImage, delete z.xImage, delete z.whatsappImage, B && (z.socialImages = B), A.slug = _.slug, A.title = _.title, Object.assign(A, z), A.layoutId = oe;
-		let V = Number(_.isHidden) === 1 || F, le = !Ve(te, P), ue = _.status === "draft" || _.status === "new", de = _.dataJson && _.dataJson !== "{}" && _.dataJson !== "null";
-		if (!s && (V || le || ue && !de)) return e.json({ error: "Node is hidden, offline, or has never been published." }, 404);
-		let fe = [];
-		if (v?.treeNodeId) {
-			let e = await t.prepare("\n        SELECT t.id 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(v.treeNodeId, D), n = Array.isArray(e) ? e : e?.results || [], r = A.path === "/" ? "" : A.path;
-			fe = n.map((e) => {
+		R.disabledRegions && (ne = R.disabledRegions), ae = R.hidden === !0 || R.hidden === 1 || R.hidden === "1" || R.hidden === "true", re = R.startShowingAt || null, ie = R.stopShowingAt || null;
+		let z = R.layoutId, V = z && z !== "inherit", { resolvedLayoutId: H, inheritedFields: ce } = await et(t, N, T, s, L), le = V ? z : H || F.defaultLayout || null;
+		for (let [e, t] of Object.entries(ce)) (R[e] === void 0 || R[e] === null || R[e] === "" || R[e] === "inherit") && t !== void 0 && (R[e] = t);
+		let U = await B(t, Ge(R, L));
+		U = Ke(U), U = await qe(t, U, n), delete U.language;
+		let ue = Qe(U);
+		delete U.socialImage, delete U.fbImage, delete U.xImage, delete U.whatsappImage, ue && (U.socialImages = ue), P.slug = h.slug, P.title = h.title, Object.assign(P, U), P.layoutId = le;
+		let de = Number(h.isHidden) === 1 || ae, fe = !He(re, ie), pe = h.status === "draft" || h.status === "new", me = h.dataJson && h.dataJson !== "{}" && h.dataJson !== "null";
+		if (!s && (de || fe || pe && !me)) return e.json({ error: "Node is hidden, offline, or has never been published." }, 404);
+		let he = [];
+		if (g?.treeNodeId) {
+			let e = await t.prepare("\n        SELECT t.id 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(g.treeNodeId, T), n = Array.isArray(e) ? e : e?.results || [], r = P.path === "/" ? "" : P.path;
+			he = 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 i = Number(e.isHidden) === 1 || t.hidden === !0 || t.hidden === 1 || t.hidden === "1", a = Ve(t.startShowingAt, t.stopShowingAt), o = (e.slug || "").replace(/^\/+|\/+$/g, "");
+				let i = Number(e.isHidden) === 1 || t.hidden === !0 || t.hidden === 1 || t.hidden === "1", a = He(t.startShowingAt, t.stopShowingAt), o = (e.slug || "").replace(/^\/+|\/+$/g, "");
 				return !s && (i || !a) ? null : {
 					treeNodeId: e.treeNodeId,
 					id: e.id,
 					title: e.title,
 					slug: o,
-					language: e.language || "en",
+					language: e.language?.trim() || A || null,
 					path: `${r}/${o}`.replace(/\/+/g, "/"),
 					nodeType: e.nodeType
 				};
 			}).filter(Boolean);
 		}
-		A.children = fe;
-		let pe = +!!s, H = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = ? ORDER BY sortOrder ASC").all(_.id, pe), me = Array.isArray(H) ? H : H?.results || [], U = {}, W = {}, G = await Promise.all(me.map(async (e) => {
+		P.children = he;
+		let ge = +!!s, W = await t.prepare("SELECT * FROM content_blocks WHERE contentId = ? AND isDraft = ? ORDER BY sortOrder ASC").all(h.id, ge), _e = Array.isArray(W) ? W : W?.results || [], G = {}, ve = {}, ye = await Promise.all(_e.map(async (e) => {
 			let r = e.region || "main", i = {};
 			try {
 				i = (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", o = Ve(i.startShowingAt, i.stopShowingAt);
+			let a = i.hidden === !0 || i.hidden === 1 || i.hidden === "1" || i.hidden === "true", o = He(i.startShowingAt, i.stopShowingAt);
 			if (!s && (a || !o)) return null;
-			let c = e.elementType || e.componentId || "text-block", l = h.blocks?.[c]?.fields || h.elements?.[c]?.fields || h.components?.[c]?.fields || {}, u = String(i.blockId || i._instanceId || i.id || e.blockId || e.id), d = We(i, l);
-			return d = await se(t, d), d = Ge(d), d = await Ke(t, d, n), d.blockId = u, {
+			let c = e.elementType || e.componentId || "text-block", l = p.blocks?.[c]?.fields || p.elements?.[c]?.fields || p.components?.[c]?.fields || {}, u = String(i.blockId || i._instanceId || i.id || e.blockId || e.id), d = Ge(i, l);
+			return d = await B(t, d), d = Ke(d), d = await qe(t, d, n), d.blockId = u, {
 				region: r,
 				block: {
 					instanceId: e.id,
@@ -8368,8 +8473,8 @@ Re.get("/*", async (e) => {
 				}
 			};
 		}));
-		for (let e of G) e && (U[e.region] || (U[e.region] = [], W[e.region] = { isInherited: !1 }), U[e.region].push(e.block));
-		let he = {
+		for (let e of ye) e && (G[e.region] || (G[e.region] = [], ve[e.region] = { isInherited: !1 }), G[e.region].push(e.block));
+		let K = {
 			header: {
 				label: "Header",
 				inherit: "parent"
@@ -8378,33 +8483,33 @@ Re.get("/*", async (e) => {
 				label: "Footer",
 				inherit: "parent"
 			},
-			...(oe ? h.nodeLayouts?.[oe] || h.layouts?.[oe] : null)?.regions || { main: { label: "Content" } }
+			...(le ? p.nodeLayouts?.[le] || p.layouts?.[le] : null)?.regions || { main: { label: "Content" } }
 		};
-		for (let [e, r] of Object.entries(he)) {
-			let i = U[e] && U[e].length > 0, a = !!ee[e];
-			if (U[e] || (U[e] = [], W[e] = { isInherited: !1 }), (r?.inherit === "parent" || r?.inherit === !0 || r?.inherit === "true" || e === "header" || e === "footer") && !i && !a && O) {
-				let r = await Ue(t, O, e, h, s, n);
-				if (r.blocks.length > 0 && (U[e] = r.blocks, W[e] = {
+		for (let [e, r] of Object.entries(K)) {
+			let i = G[e] && G[e].length > 0, a = !!ne[e];
+			if (G[e] || (G[e] = [], ve[e] = { isInherited: !1 }), (r?.inherit === "parent" || r?.inherit === !0 || r?.inherit === "true" || e === "header" || e === "footer") && !i && !a && N) {
+				let r = await We(t, N, e, p, s, n);
+				if (r.blocks.length > 0 && (G[e] = r.blocks, ve[e] = {
 					isInherited: !0,
 					inheritedFromId: r.inheritedFromId,
 					inheritedFromTitle: r.inheritedFromTitle
-				}, r.subRegions)) for (let [t, n] of Object.entries(r.subRegions)) t !== e && (U[t] = n, W[t] = {
+				}, r.subRegions)) for (let [t, n] of Object.entries(r.subRegions)) t !== e && (G[t] = n, ve[t] = {
 					isInherited: !0,
 					inheritedFromId: r.inheritedFromId,
 					inheritedFromTitle: r.inheritedFromTitle
 				});
 			}
 		}
-		await Promise.all(Object.keys(U).map((e) => He(t, U[e], u)));
-		let ge = {
+		await Promise.all(Object.keys(G).map((e) => Ue(t, G[e], u, A)));
+		let q = {
 			channelId: u || d,
-			treeId: D,
-			language: A.language,
-			node: A,
-			content: U,
-			regionMeta: W
+			treeId: T,
+			language: A,
+			node: P,
+			content: G,
+			regionMeta: ve
 		};
-		return !s && !m && (e.header("X-Cache", "MISS"), await tt(f, p, ge, et(e))), e.json(ge);
+		return !s && !M && (e.header("X-Cache", "MISS"), await nt(f, j, q, tt(e))), e.json(q);
 	} catch (t) {
 		return console.error("[CMS Public API] Error fetching node by path:", t), e.json({
 			error: "Failed to fetch JSON payload",
@@ -8412,8 +8517,8 @@ Re.get("/*", async (e) => {
 		}, 500);
 	}
 });
-var nt = new e();
-function rt(e, t) {
+var rt = new e();
+function it(e, t) {
 	let n = /* @__PURE__ */ new Date();
 	if (e && String(e).trim() !== "") {
 		let t = new Date(e);
@@ -8425,93 +8530,103 @@ function rt(e, t) {
 	}
 	return !0;
 }
-async function it(e, t, n, r) {
+async function at(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);
 	}
 }
-nt.get("/:treeParam", async (e) => {
+rt.get("/:treeParam", async (e) => {
 	try {
-		let t = e.get("db"), n = e.req.param("treeParam"), r = e.req.query("channelId") || e.req.query("channel") || "default", i = e.req.query("preview") === "true";
+		let t = e.get("db"), n = e.req.param("treeParam"), r = e.req.query("channelId") || e.req.query("channel") || "default", i = e.req.query("lang"), a = e.req.query("preview") === "true", o = null;
 		if (r && r !== "default" && r !== "all") {
 			let n = isNaN(Number(r)) ? await t.prepare("SELECT * FROM channels WHERE key = ?").get(r) : await t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(r));
 			if (n) {
+				n.defaultLanguage && (o = n.defaultLanguage.trim());
 				let t = n.status === "disabled" || n.status === "inactive" || n.isEnabled === 0 || n.isEnabled === !1;
-				if (!i && t) return e.json({ error: `Channel '${n.key || r}' is currently inactive` }, 404);
+				if (!a && t) return e.json({ error: `Channel '${n.key || r}' is currently inactive` }, 404);
 			}
 		}
-		let a = I(e), o = `tree:${r}:${n}`, s = e.req.header("x-bypass-cache") === "true";
-		if (!i && !s) {
-			let t = await a.get(o);
+		let s = !isNaN(Number(n)), c = s ? await t.prepare("SELECT * FROM trees WHERE id = ?").get(Number(n)) : await t.prepare("SELECT * FROM trees WHERE key = ?").get(n);
+		if (c && Number(c.isHidden) === 1 && !a) return e.json({ error: `Tree '${n}' is hidden` }, 404);
+		let l = null;
+		if (c) {
+			if (c.defaultLanguage) l = String(c.defaultLanguage).trim();
+			else if (c.dataJson) try {
+				let e = typeof c.dataJson == "string" ? JSON.parse(c.dataJson) : c.dataJson;
+				e.defaultLanguage && (l = String(e.defaultLanguage).trim());
+			} catch {}
+		}
+		let u = l || o || i?.trim() || null, d = I(e), f = `tree:${r}:${n}:${u || "default"}`, p = e.req.header("x-bypass-cache") === "true";
+		if (!a && !p) {
+			let t = await d.get(f);
 			if (t) return e.header("X-Cache", "HIT"), e.json(t);
 		}
-		let c = !isNaN(Number(n)), l = c ? await t.prepare("SELECT * FROM trees WHERE id = ?").get(Number(n)) : await t.prepare("SELECT * FROM trees WHERE key = ?").get(n);
-		if (l && Number(l.isHidden) === 1 && !i) return e.json({ error: `Tree '${n}' is hidden` }, 404);
-		let u = l?.id || (c ? Number(n) : null), d = {};
-		if (l && l.dataJson) try {
-			let t = typeof l.dataJson == "string" ? JSON.parse(l.dataJson) : l.dataJson, r = e.env?.BUNDLED_DEFINITIONS, i = ce(r), a = (i.trees?.[l.treeType || n] || i.trees?.site || {}).fields || {};
-			for (let [e, n] of Object.entries(t)) a[e]?.public === !0 && (d[e] = n);
+		let m = c?.id || (s ? Number(n) : null), h = {};
+		if (c && c.dataJson) try {
+			let t = typeof c.dataJson == "string" ? JSON.parse(c.dataJson) : c.dataJson, r = e.env?.BUNDLED_DEFINITIONS, i = se(r), a = (i.trees?.[c.treeType || n] || i.trees?.site || {}).fields || {};
+			for (let [e, n] of Object.entries(t)) a[e]?.public === !0 && (h[e] = n);
 		} catch (e) {
 			console.warn("[CMS Public Tree API] Failed to parse tree dataJson", e);
 		}
-		let f = [];
-		if (u !== null) {
-			let e = await t.prepare("\n          SELECT \n            t.id as treeNodeId,\n            t.treeId,\n            t.contentId as id,\n            t.parentId,\n            t.sortOrder,\n            c.title,\n            c.slug,\n            c.language,\n            c.contentType as nodeType,\n            c.isHidden,\n            c.status,\n            c.dataJson,\n            c.draftDataJson\n          FROM tree_nodes t\n          INNER JOIN content_nodes c ON t.contentId = c.id\n          WHERE t.treeId = ? AND (c.deletedAt IS NULL OR c.deletedAt = '')\n          ORDER BY t.sortOrder ASC\n        ").all(u);
-			f = Array.isArray(e) ? e : e?.results || [];
+		let g = [];
+		if (m !== null) {
+			let e = await t.prepare("\n          SELECT \n            t.id as treeNodeId,\n            t.treeId,\n            t.contentId as id,\n            t.parentId,\n            t.sortOrder,\n            c.title,\n            c.slug,\n            c.language,\n            c.contentType as nodeType,\n            c.isHidden,\n            c.status,\n            c.dataJson,\n            c.draftDataJson\n          FROM tree_nodes t\n          INNER JOIN content_nodes c ON t.contentId = c.id\n          WHERE t.treeId = ? AND (c.deletedAt IS NULL OR c.deletedAt = '')\n          ORDER BY t.sortOrder ASC\n        ").all(m);
+			g = Array.isArray(e) ? e : e?.results || [];
 		}
-		if ((!f || f.length === 0) && !l) return e.json({ error: `Tree '${n}' not found` }, 404);
-		let p = /* @__PURE__ */ new Map();
-		for (let e of f) {
-			let t = !e.parentId || e.parentId === "null" || e.parentId === "" ? null : e.parentId, n = t === null ? "__ROOT__" : String(t), r = p.get(n);
-			r ? r.push(e) : p.set(n, [e]);
+		if ((!g || g.length === 0) && !c) return e.json({ error: `Tree '${n}' not found` }, 404);
+		let _ = /* @__PURE__ */ new Map();
+		for (let e of g) {
+			let t = !e.parentId || e.parentId === "null" || e.parentId === "" ? null : e.parentId, n = t === null ? "__ROOT__" : String(t), r = _.get(n);
+			r ? r.push(e) : _.set(n, [e]);
 		}
-		let m = /* @__PURE__ */ new Map();
-		for (let e of f) {
-			let t = String(e.treeNodeId), n = i && e.draftDataJson ? e.draftDataJson : e.dataJson;
+		let v = /* @__PURE__ */ new Map();
+		for (let e of g) {
+			let t = String(e.treeNodeId), n = a && e.draftDataJson ? e.draftDataJson : e.dataJson;
 			if (!n) {
-				m.set(t, {});
+				v.set(t, {});
 				continue;
 			}
 			try {
 				let e = typeof n == "string" ? JSON.parse(n) : n;
-				m.set(t, e && typeof e == "object" ? e : {});
+				v.set(t, e && typeof e == "object" ? e : {});
 			} catch {
-				m.set(t, {});
+				v.set(t, {});
 			}
 		}
-		function h(e = null, t = "") {
+		function y(e = null, t = "") {
 			let n = e == null || e === "" || e === "null" ? "__ROOT__" : String(e);
-			return (p.get(n) || []).map((e) => {
-				let n = m.get(String(e.treeNodeId)) || {}, r = {};
+			return (_.get(n) || []).map((e) => {
+				let n = v.get(String(e.treeNodeId)) || {}, 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 a = !i && (e.status === "draft" || e.status === "new"), o = Number(e.isHidden) === 1 || a || n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = rt(n.startShowingAt, n.stopShowingAt), c = (e.slug || "").replace(/^\/+|\/+$/g, ""), l = (!e.parentId || e.parentId === "null" || e.parentId === "") && (c === "home" || c === "homee") ? "/" : `${t}/${c}`.replace(/\/+/g, "/"), u = {
+				let i = !a && (e.status === "draft" || e.status === "new"), o = Number(e.isHidden) === 1 || i || n.hidden === !0 || n.hidden === 1 || n.hidden === "1" || n.hidden === "true", s = it(n.startShowingAt, n.stopShowingAt), c = (e.slug || "").replace(/^\/+|\/+$/g, ""), l = (!e.parentId || e.parentId === "null" || e.parentId === "") && (c === "home" || c === "homee") ? "/" : `${t}/${c}`.replace(/\/+/g, "/"), d = e.language && String(e.language).trim() !== "" ? e.language.trim() : u, f = {
 					id: e.id,
 					treeNodeId: e.treeNodeId,
 					parentId: e.parentId || null,
 					title: e.title,
 					slug: c,
-					language: e.language || "en",
+					language: d,
 					path: l,
 					nodeType: e.nodeType,
 					hidden: o || !s ? 1 : 0,
 					summary: r.summary || ""
 				};
-				e.nodeType === "external-link" && (r.url && (u.url = r.url), r.target && (u.target = r.target));
-				let d = l === "/" ? "" : l;
-				return u.children = h(e.treeNodeId, d), u;
-			}).filter((e) => i || !e.hidden);
+				e.nodeType === "external-link" && (r.url && (f.url = r.url), r.target && (f.target = r.target));
+				let p = l === "/" ? "" : l;
+				return f.children = y(e.treeNodeId, p), f;
+			}).filter((e) => a || !e.hidden);
 		}
-		let g = {
-			treeId: l?.id || u,
-			key: l?.key || n,
+		let b = {
+			treeId: c?.id || m,
+			key: c?.key || n,
 			channelId: r,
-			label: l?.label || n,
-			...d,
-			items: h(null)
+			language: u,
+			label: c?.label || n,
+			...h,
+			items: y(null)
 		};
-		return !i && !s && (e.header("X-Cache", "MISS"), await it(a, o, g, 300)), e.json(g);
+		return !a && !p && (e.header("X-Cache", "MISS"), await at(d, f, b, 300)), e.json(b);
 	} catch (t) {
 		return console.error("[CMS Public Tree API] Error:", t), e.json({
 			error: "Failed to fetch public tree",
@@ -8519,8 +8634,145 @@ nt.get("/:treeParam", async (e) => {
 		}, 500);
 	}
 });
-var at = new e();
-function ot(e, t) {
+var ot = new e();
+function st(e) {
+	let t = Number(e?.env?.CMS_CHANNEL_CACHE_TTL);
+	return Number.isFinite(t) && t >= 60 ? Math.floor(t) : 300;
+}
+async function ct(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 lt(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];
+		n?.fields && i(n.fields);
+	}, i = (e) => {
+		if (!(!e || typeof e != "object")) for (let [t, i] of Object.entries(e)) t === "fieldSet" && typeof i == "string" ? r(i) : i && typeof i == "object" && i.fieldSet ? r(i.fieldSet) : t !== "fieldSet" && (n[t] = i);
+	};
+	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 ut(e, t = {}) {
+	let n = {}, r = Object.keys(t).length > 0;
+	for (let [i, a] of Object.entries(e)) {
+		if (i.endsWith("_meta") || [
+			"disabledRegions",
+			"hidden",
+			"is_hidden",
+			"isHidden",
+			"status",
+			"startShowingAt",
+			"stopShowingAt",
+			"dataJson",
+			"draftDataJson"
+		].includes(i) || i.startsWith("_")) continue;
+		let e = t[i];
+		(!r || !e || e.public !== !1) && a != null && a !== "" && (n[i] = a);
+	}
+	return n;
+}
+function dt(e) {
+	if (Array.isArray(e)) return e.map(dt);
+	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, dt({
+			...n,
+			title: n?.title ?? e.title ?? "",
+			alt: n?.alt ?? e.alt ?? "",
+			description: n?.description ?? e.description ?? ""
+		})])), { metadataOverrides: o, ...s } = e;
+		return {
+			...s,
+			title: i.title ?? e.title ?? "",
+			alt: i.alt ?? e.alt ?? "",
+			description: i.description ?? e.description ?? "",
+			...Object.keys(a).length > 0 ? { variants: a } : {}
+		};
+	}
+	return Object.fromEntries(Object.entries(e).map(([e, t]) => [e, dt(t)]));
+}
+async function ft(e, t) {
+	if (typeof t == "string") {
+		if (!t.includes("#node:") && !t.includes("data-node-id") && !t.includes("#asset:") && !t.includes("data-asset-id")) return t;
+		let n = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set();
+		for (let e of t.matchAll(/(?:#node:|data-node-id\s*=\s*["'])([^"'\s>]+)/gi)) n.add(e[1]);
+		for (let e of t.matchAll(/(?:#asset:|data-asset-id\s*=\s*["'])([^"'\s>]+)/gi)) r.add(e[1]);
+		if (n.size === 0 && r.size === 0) return t;
+		let i = Array.from(n).map(() => "?").join(","), a = n.size > 0 ? await e.prepare(`SELECT id, slug FROM content_nodes WHERE id IN (${i})`).all(...n) : [], o = /* @__PURE__ */ new Map();
+		(Array.isArray(a) ? a : a?.results || []).forEach((e) => o.set(String(e.id), String(e.slug || "").replace(/^\/+|\/+$/g, "")));
+		let s = Array.from(r).map(() => "?").join(","), c = r.size > 0 ? await e.prepare(`SELECT id, cdnUrl, storageKeyPrivate FROM assets WHERE id IN (${s})`).all(...r) : [], l = /* @__PURE__ */ new Map();
+		return (Array.isArray(c) ? c : c?.results || []).forEach((e) => l.set(String(e.id), e.cdnUrl || (e.storageKeyPrivate ? `/media/${e.storageKeyPrivate}` : ""))), t.replace(/<a\s+([^>]+)>/gi, (e, t) => {
+			let n = (e, t) => {
+				let n = e.match(RegExp(`\\b${t}\\s*=\\s*(["'])(.*?)\\1`, "i"));
+				return n ? n[2] : void 0;
+			}, r = n(t, "data-node-id"), i = n(t, "data-asset-id"), a = n(t, "href") || "";
+			if (a.startsWith("mailto:")) return `<a ${t.replace(/\s+target\s*=\s*["'][^"']*["']/i, "")}>`;
+			let s = i || a.match(/^#asset:(.+)$/i)?.[1], c = r || a.match(/^#node:(.+)$/i)?.[1];
+			if (!c && !s) return e;
+			if (s && !c) {
+				let n = l.get(s);
+				if (n) {
+					let e = t;
+					return /href\s*=\s*["'][^"']*["']/i.test(e) ? e = e.replace(/href\s*=\s*["'][^"']*["']/i, `href="${n}"`) : e += ` href="${n}"`, `<a ${e}>`;
+				}
+				return e;
+			}
+			let u = o.get(c), d = u === void 0 ? "#" : `/${u}`, f = t;
+			return /href\s*=\s*["'][^"']*["']/i.test(f) ? f = f.replace(/href\s*=\s*["'][^"']*["']/i, `href="${d || "/"}"`) : f += ` href="${d || "/"}"`, `<a ${f}>`;
+		});
+	}
+	if (Array.isArray(t)) return Promise.all(t.map((t) => ft(e, t)));
+	if (t && typeof t == "object") {
+		let n = await Promise.all(Object.entries(t).map(async ([t, n]) => [t, await ft(e, n)]));
+		return Object.fromEntries(n);
+	}
+	return t;
+}
+ot.get("/:channelParam", async (e) => {
+	try {
+		let t = e.get("db"), n = e.req.param("channelParam"), r = e.req.query("preview") === "true", i = e.req.header("x-bypass-cache") === "true", a = `channel:${n}:${r ? "preview" : "live"}`, o = I(e);
+		if (!r && !i) {
+			let t = await o.get(a);
+			if (t) return e.header("X-Cache", "HIT"), e.json(t);
+		}
+		let s = isNaN(Number(n)) ? await t.prepare("SELECT * FROM channels WHERE key = ?").get(n) : await t.prepare("SELECT * FROM channels WHERE id = ?").get(Number(n));
+		if (!s) return e.json({ error: `Channel '${n}' not found` }, 404);
+		let c = s.status === "disabled" || s.status === "inactive" || s.isEnabled === 0 || s.isEnabled === !1;
+		if (!r && c) return e.json({ error: `Channel '${s.key || n}' is currently inactive` }, 404);
+		let l = e.env?.BUNDLED_DEFINITIONS, u = se(l), d = s.channelType || s.key || "website", f = lt(u.channels?.[d] || u.channels?.[s.key] || u.channels?.website || u.definitions?.["channel-base"] || {}, u), p = {}, m = r && s.draftDataJson || s.dataJson;
+		if (m) try {
+			p = typeof m == "string" ? JSON.parse(m) : m;
+		} catch (e) {
+			console.warn("[CMS Public Channel API] Failed to parse channel dataJson:", e);
+		}
+		let h = ut({
+			...p,
+			...s
+		}, f);
+		h = await B(t, h), h = dt(h), h = await ft(t, h);
+		let g = {
+			id: s.id,
+			key: s.key,
+			...h
+		};
+		return !r && !i && (e.header("X-Cache", "MISS"), await ct(o, a, g, st(e))), e.json(g);
+	} catch (t) {
+		return console.error("[CMS Public Channel API] Error:", t), e.json({
+			error: "Failed to fetch public channel",
+			...e.env?.ENVIRONMENT === "development" ? { details: t.message } : {}
+		}, 500);
+	}
+});
+var pt = new e();
+function mt(e, t) {
 	if (t === "webp") return "image/webp";
 	if (t === "avif") return "image/avif";
 	if (t === "jpeg" || t === "jpg") return "image/jpeg";
@@ -8528,7 +8780,7 @@ function ot(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(".svg") ? "image/svg+xml" : n.endsWith(".pdf") ? "application/pdf" : n.endsWith(".mp4") ? "video/mp4" : "application/octet-stream";
 }
-at.get("/*", async (e) => {
+pt.get("/*", async (e) => {
 	try {
 		let t = e.req.path.replace(/^\/media\//, "").replace(/^\//, "");
 		if (!t) return e.text("Asset key missing", 400);
@@ -8544,11 +8796,11 @@ at.get("/*", async (e) => {
 			let e = await l.match(d);
 			if (e) return e;
 		}
-		let { storage: f, optimizer: p } = ie(e.env), m = await f.get(t);
+		let { storage: f, optimizer: p } = ae(e.env), m = await f.get(t);
 		if (!m) return e.text(`Asset not found: ${t}`, 404);
 		if (!o) {
 			let n = e.body(m, 200, {
-				"Content-Type": ot(t),
+				"Content-Type": mt(t),
 				"Cache-Control": "public, max-age=31536000, immutable"
 			});
 			return l && d && e.executionCtx?.waitUntil && e.executionCtx.waitUntil(l.put(d, n.clone())), n;
@@ -8562,7 +8814,7 @@ at.get("/*", async (e) => {
 			key: t,
 			env: e.env,
 			req: e.req.raw
-		}), _ = ot(t, c), v = e.body(g, 200, {
+		}), _ = mt(t, c), v = e.body(g, 200, {
 			"Content-Type": _,
 			"Cache-Control": "public, max-age=31536000, immutable"
 		});
@@ -8571,8 +8823,8 @@ at.get("/*", async (e) => {
 		return console.error("❌ [Public Assets Error]:", t), e.text("Internal Server Error", 500);
 	}
 });
-var st = new e();
-function ct(e, t) {
+var ht = new e();
+function gt(e, t) {
 	let n = /* @__PURE__ */ new Date();
 	if (e && String(e).trim() !== "") {
 		let t = new Date(e);
@@ -8584,7 +8836,7 @@ function ct(e, t) {
 	}
 	return !0;
 }
-st.get("/", async (e) => {
+ht.get("/", async (e) => {
 	try {
 		let t = await e.get("db").prepare("\n            SELECT\n                t.id as treeNodeId,\n                t.parentId,\n                c.slug,\n                c.contentType as nodeType,\n                c.status,\n                c.dataJson\n            FROM tree_nodes t\n            INNER JOIN content_nodes c ON t.contentId = c.id\n            WHERE (c.deletedAt IS NULL OR c.deletedAt = '')\n            ORDER BY t.sortOrder ASC\n        ").all(), n = Array.isArray(t) ? t : t?.results || [], r = [], i = /* @__PURE__ */ new Map();
 		for (let e of n) {
@@ -8608,7 +8860,7 @@ st.get("/", async (e) => {
 		function o(e = null, t = "") {
 			let n = e == null || e === "" || e === "null" ? "__ROOT__" : String(e), s = i.get(n) || [];
 			for (let e of s) {
-				let n = a.get(String(e.treeNodeId)) || {}, i = e.status === "published" || e.status === "active", s = ct(n.startShowingAt, n.stopShowingAt);
+				let n = a.get(String(e.treeNodeId)) || {}, i = e.status === "published" || e.status === "active", s = gt(n.startShowingAt, n.stopShowingAt);
 				if (!i || !s) continue;
 				let c = (e.slug || "").replace(/^\/+|\/+$/g, ""), l = c === "home" || c === "homee" ? "/" : `${t}/${c}`.replace(/\/+/g, "/");
 				e.nodeType !== "external-link" && r.push(l);
@@ -8623,7 +8875,7 @@ st.get("/", async (e) => {
 		return console.error("[CMS Paths API] Error:", t), e.json({ error: "Failed to fetch paths" }, 500);
 	}
 });
-var $ = new e(), lt = !1;
+var $ = new e(), _t = !1;
 $.use("*", t()), $.use("/media/*", t({
 	origin: "*",
 	allowMethods: [
@@ -8644,13 +8896,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 = l(e);
-	if (e.set("db", i), !lt) try {
-		await _(i), lt = !0;
+	if (e.set("db", i), !_t) try {
+		await _(i), _t = !0;
 	} catch (e) {
 		console.error("❌ [CMS Server] Failed to initialize system tables on cold start:", e);
 	}
 	await t();
-}), $.route("/media", at), $.use("/media/*", y()), $.route("/api/cms/nodes", V), $.route("/api/cms/nodes.json", V), $.route("/api/cms/formcsv", V), $.route("/api/cms/formcsv.json", V), $.route("/api/cms/stats", Ie), $.route("/api/cms/stats.json", Ie), $.route("/api/cms", G), $.route("/api/cms/channels", ve), $.route("/api/cms/channels.json", ve), $.route("/api/cms/schemas", je), $.route("/api/cms/schemas.json", je), $.route("/api/cms", Ne), $.route("/api/admin/assets", X), $.route("/api/v1/node", Re), $.route("/api/v1/page", Re), $.route("/api/v1/tree", nt), $.route("/api/v1/all-paths", st), $.get("*", async (e, t) => {
+}), $.route("/media", pt), $.use("/media/*", y()), $.route("/api/cms/nodes", H), $.route("/api/cms/nodes.json", H), $.route("/api/cms/formcsv", H), $.route("/api/cms/formcsv.json", H), $.route("/api/cms/stats", Le), $.route("/api/cms/stats.json", Le), $.route("/api/cms", W), $.route("/api/cms/channels", ye), $.route("/api/cms/channels.json", ye), $.route("/api/cms/schemas", Me), $.route("/api/cms/schemas.json", Me), $.route("/api/cms", Pe), $.route("/api/admin/assets", X), $.route("/api/v1/node", ze), $.route("/api/v1/page", ze), $.route("/api/v1/tree", rt), $.route("/api/v1/channel", ot), $.route("/api/v1/all-paths", ht), $.get("*", async (e, t) => {
 	if (e.env?.ASSETS) {
 		let t = await e.env.ASSETS.fetch(e.req.raw);
 		if (t.status === 404) {
@@ -8662,4 +8914,4 @@ $.use("*", t()), $.use("/media/*", t({
 	return t();
 });
 //#endregion
-export { Oe as compileDefinitions };
+export { ke as compileDefinitions };