@fluid-app/fluid-cli-theme-dev 0.1.59 → 0.1.60

package/dist/index.mjs

@@ -1,18 +1,20 @@
 import { Command } from "commander";
+import prompts from "prompts";
 import { getAuthToken, gitSyncActorFromMe, gitSyncCommitSubject, readConfig, resolveGitSyncActor, summarizeChanges, updateConfig } from "@fluid-app/fluid-cli";
+import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { cpSync, existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { createHash, randomBytes } from "node:crypto";
 import http from "node:http";
+import { fileURLToPath } from "node:url";
+import { parse, parseFragment, serialize } from "parse5";
 import https from "node:https";
 import chokidar from "chokidar";
 import net from "node:net";
 import { execFileSync, spawn } from "node:child_process";
 import { tmpdir } from "node:os";
 import chalk from "chalk";
-import prompts from "prompts";
 import ora from "ora";
-import { fileURLToPath } from "node:url";
 //#region ../../platform/api-client-core/src/api-error-shape.ts
 /**
 * Narrows a parsed JSON error payload to the envelope contract. Arrays and
@@ -292,10 +294,34 @@ async function backgroundToken(tokenOverride) {
 	return tokenOverride ?? getAuthToken() ?? null;
 }
 function createApiClient(tokenOverride) {
-	return createFetchClient({
+	const client = createFetchClient({
 		baseUrl: getApiBase(),
 		getAuthToken: () => process.env["FLUID_BACKGROUND_SYNC"] === "1" ? backgroundToken(tokenOverride) : tokenOverride ?? getAuthToken() ?? null
 	});
+	const request = async (endpoint, options = {}) => {
+		for (let attempt = 0;; attempt++) {
+			options.signal?.throwIfAborted();
+			try {
+				return await client.request(endpoint, options);
+			} catch (error) {
+				if ((options.method ?? "GET") !== "GET" || !(error instanceof ApiError) || ![
+					502,
+					503,
+					504
+				].includes(error.status) || attempt >= 2 || options.signal?.aborted) throw error;
+				await setTimeout$1(500 * 2 ** attempt, void 0, { signal: options.signal });
+			}
+		}
+	};
+	return {
+		...client,
+		request,
+		get: (endpoint, params, options) => request(endpoint, {
+			...options,
+			method: "GET",
+			params
+		})
+	};
 }
 function requireToken() {
 	const token = getAuthToken();
@@ -306,54 +332,6 @@ function requireToken() {
 	return token;
 }
 //#endregion
-//#region src/theme-config.ts
-const CONFIG_FILE = ".fluid-theme.json";
-/**
-* `company` must be the bare subdomain slug — the dev server builds
-* `<company>.fluid.app` from it, so a full domain here produces an
-* unreachable `<slug>.fluid.app.fluid.app` host. Some external tooling
-* writes the full domain (or a URL); accept those and reduce them to
-* the subdomain.
-*/
-function normalizeCompany(company) {
-	return company.replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/[/?#].*$/, "").replace(/\.fluid\.app$/i, "");
-}
-function configPath(themeRoot) {
-	return join(themeRoot, CONFIG_FILE);
-}
-/** Read `.fluid-theme.json` from a theme directory, or null if it doesn't exist. */
-function readThemeConfig(themeRoot) {
-	const path = configPath(themeRoot);
-	if (!existsSync(path)) return null;
-	try {
-		const raw = readFileSync(path, "utf-8");
-		const config = JSON.parse(raw);
-		if (typeof config.company === "string") config.company = normalizeCompany(config.company);
-		return config;
-	} catch {
-		return null;
-	}
-}
-/**
-* Read a legacy config (pre-shadow-repo). Used only by the migration
-* path on first new-CLI pull to seed shadow HEAD from files whose
-* local content still matches their stored sha256 checksum.
-*/
-function readLegacyThemeConfig(themeRoot) {
-	const path = configPath(themeRoot);
-	if (!existsSync(path)) return null;
-	try {
-		const raw = readFileSync(path, "utf-8");
-		return JSON.parse(raw);
-	} catch {
-		return null;
-	}
-}
-/** Write `.fluid-theme.json` to a theme directory. */
-function writeThemeConfig(themeRoot, config) {
-	writeFileSync(configPath(themeRoot), JSON.stringify(config, null, 2) + "\n", "utf-8");
-}
-//#endregion
 //#region src/plugin-state.ts
 const PLUGIN_KEY = "theme-dev";
 function getState() {
@@ -473,13 +451,530 @@ function setLastDevThemeId(id) {
 	});
 }
 /**
-* The dev theme to target by default in `navigate` — the most recently started
-* dev server. Falls back to the legacy global id for users who haven't yet run
-* the per-project `theme dev`.
+* The dev theme to target by default in `navigate` — the most recently started
+* dev server. Falls back to the legacy global id for users who haven't yet run
+* the per-project `theme dev`.
+*/
+function getLastDevThemeId() {
+	const state = getState();
+	return state.lastDevThemeId ?? state.devThemeId;
+}
+//#endregion
+//#region src/theme/dev-server/member-preview-contract.ts
+var MemberPreviewError = class extends Error {
+	constructor(message, status = 502) {
+		super(message);
+		this.status = status;
+	}
+};
+function isRecord$5(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isId(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
+}
+/** The metadata API still exposes storefront-era /accounts paths. Account hosts omit it. */
+function accountPath(path) {
+	return path === "/accounts" ? "/" : path.startsWith("/accounts/") ? path.slice(9) : path;
+}
+function isProductionPath(value) {
+	if (typeof value !== "string" || !value.startsWith("/") || value.startsWith("//") || value.includes("\\")) return false;
+	return new URL(value, "http://preview.invalid").pathname === value && !value.startsWith("/_members");
+}
+function parseMemberMetadata(value) {
+	if (!isRecord$5(value) || !Array.isArray(value.members_sites) || !Array.isArray(value.system_screens)) throw new MemberPreviewError("This server does not provide compatible member preview metadata.");
+	const sites = value.members_sites.map((site) => {
+		if (!isRecord$5(site) || !isId(site.id) || typeof site.name !== "string" || !Array.isArray(site.pages)) throw new MemberPreviewError("Invalid member site metadata.");
+		const pages = site.pages.map((page) => {
+			if (!isRecord$5(page) || !isId(page.id) || typeof page.title !== "string" || !isProductionPath(page.path) || typeof page.published !== "boolean") throw new MemberPreviewError("Invalid member page metadata.");
+			return {
+				id: page.id,
+				title: page.title,
+				path: accountPath(page.path),
+				published: page.published
+			};
+		});
+		if (new Set(pages.map((p) => p.path)).size !== pages.length) throw new MemberPreviewError("Ambiguous member page paths.");
+		return {
+			id: site.id,
+			name: site.name,
+			pages
+		};
+	});
+	if (new Set(sites.map((s) => s.id)).size !== sites.length) throw new MemberPreviewError("Duplicate member site identifiers.");
+	return {
+		members_sites: sites,
+		system_screens: value.system_screens.map((screen) => {
+			if (!isRecord$5(screen) || typeof screen.key !== "string" || !/^[a-z][a-z0-9_-]*$/.test(screen.key)) throw new MemberPreviewError("Invalid system screen metadata.");
+			return { key: screen.key };
+		})
+	};
+}
+function parseSelection(params) {
+	const site = numericParam(params, "members_site_id");
+	if (!site) throw new MemberPreviewError("Select a member site at /_members first.", 400);
+	const memberType = params.get("member_type_id");
+	if (params.getAll("member_type_id").length > 1 || memberType !== null && !/^[\w-]{1,100}$/.test(memberType)) throw new MemberPreviewError("Invalid member type selection.", 400);
+	return {
+		members_site_id: site,
+		country_id: numericParam(params, "country_id"),
+		language_id: numericParam(params, "language_id"),
+		...memberType ? { member_type_id: memberType } : {}
+	};
+}
+function numericParam(params, key) {
+	const value = params.get(key);
+	if (value === null) return void 0;
+	if (params.getAll(key).length !== 1 || !/^[1-9]\d*$/.test(value) || !isId(Number(value))) throw new MemberPreviewError(`Invalid ${key}.`, 400);
+	return Number(value);
+}
+function memberPreviewUrl(path, selection) {
+	const url = new URL(path, "http://preview.invalid");
+	if (url.origin !== "http://preview.invalid") throw new MemberPreviewError("Expected a local member path.", 400);
+	if (url.pathname !== "/_members" && !url.pathname.startsWith("/_members/")) url.pathname = `/_members${url.pathname}`;
+	for (const key of [
+		"members_site_id",
+		"country_id",
+		"language_id",
+		"member_type_id"
+	]) {
+		const value = selection[key];
+		if (value === void 0) url.searchParams.delete(key);
+		else url.searchParams.set(key, String(value));
+	}
+	return url.pathname + url.search + url.hash;
+}
+function parseMemberRender(value, themeId, selection, pageId, screenKey = null) {
+	const preview = isRecord$5(value) ? value.preview : void 0;
+	if (!isRecord$5(preview) || preview.contract_version !== 1 || preview.mode !== "sample" || preview.theme_id !== themeId || preview.members_site_id !== selection.members_site_id || preview.members_page_id !== pageId || preview.system_screen_key !== screenKey || typeof preview.html_content !== "string" || !(preview.page_stylesheet === null || typeof preview.page_stylesheet === "string") || !(preview.template_stylesheet === null || typeof preview.template_stylesheet === "string")) throw new MemberPreviewError("Incompatible member preview response. Update the server and CLI together.");
+	return {
+		html: preview.html_content,
+		styles: preview.page_stylesheet ?? "",
+		templateStyles: preview.template_stylesheet ?? ""
+	};
+}
+//#endregion
+//#region src/theme/navigation-members.ts
+/** Read the running server's acknowledged route map, without sending credentials. */
+async function readPreviewMetadata(address, themeId) {
+	let value;
+	try {
+		const response = await fetch(`${address}/_members/_metadata`, {
+			redirect: "error",
+			signal: AbortSignal.timeout(1e4)
+		});
+		if (!response.ok) throw new Error("Member metadata unavailable");
+		value = await response.json();
+	} catch {
+		console.warn("Member preview is unavailable. Start an updated theme dev server to list member pages.");
+		return;
+	}
+	if (!isRecord$5(value) || value.mode !== "sample") throw new Error("The running server does not provide compatible preview metadata.");
+	if (value.theme_id !== themeId) throw new Error(`The running server is not serving theme #${themeId}. Use its theme ID or restart theme dev.`);
+	if (!Array.isArray(value.supported_system_screens) || !value.supported_system_screens.every((key) => typeof key === "string")) throw new Error("The running server does not provide preview capabilities.");
+	return {
+		...parseMemberMetadata(value),
+		supported_system_screens: value.supported_system_screens
+	};
+}
+function memberChoices(metadata) {
+	if (!metadata) return [];
+	return metadata.members_sites.flatMap((site) => {
+		const prefix = `Member · ${site.name} (#${site.id}) · `;
+		const selection = { members_site_id: site.id };
+		return [...site.pages.map((page) => ({
+			title: `${prefix}${page.title}${page.published ? "" : " (draft)"} — ${page.path}`,
+			value: memberPreviewUrl(page.path, selection)
+		})), ...metadata.system_screens.filter((screen) => metadata.supported_system_screens.includes(screen.key)).map((screen) => {
+			return {
+				title: `${prefix}${screen.key}`,
+				value: memberPreviewUrl(`/${screen.key}`, selection)
+			};
+		})];
+	});
+}
+/** A watcher update may remove a page while the prompt is open. */
+async function validateMemberDestination(address, themeId, path) {
+	if (!memberChoices(await readPreviewMetadata(address, themeId)).some((choice) => choice.value === path)) throw new Error("This member page is no longer available. Run the navigator again to refresh the choices.");
+}
+//#endregion
+//#region ../../api-clients/themes/src/namespaces/v0.ts
+/**
+* List application themes
+* Get all application themes with optional filters
+*
+* @param client - Fetch client instance
+* @param [params] - params
+*/
+async function listApplicationThemes(client, params) {
+	return client.get(`/api/application_themes`, params);
+}
+/**
+* Create an application theme
+*
+*
+* @param client - Fetch client instance
+* @param body - body
+*/
+async function createApplicationTheme(client, body) {
+	return client.post(`/api/application_themes`, body);
+}
+/**
+* Get an application theme
+*
+*
+* @param client - Fetch client instance
+* @param id - id
+* @param [params] - params
+*/
+async function getApplicationTheme(client, id, params) {
+	return client.get(`/api/application_themes/${id}`, params);
+}
+/**
+* Returns available themeables for a given type scoped to the theme's company
+*
+*
+* @param client - Fetch client instance
+* @param id - id
+* @param [params] - params
+*/
+async function getApplicationThemeAvailableThemeables(client, id, params) {
+	return client.get(`/api/application_themes/${id}/available_themeables`, params);
+}
+/**
+* Create a development reference clone of an application theme
+* Creates an isolated development theme while preserving existing DAM and ImageKit references without transferring asset bytes.
+*
+* @param client - Fetch client instance
+* @param id - id
+* @param body - body
+*/
+async function cloneApplicationThemeForDevelopment(client, id, body) {
+	return client.post(`/api/application_themes/${id}/clone_for_development`, body);
+}
+/**
+* Publishes the theme
+*
+*
+* @param client - Fetch client instance
+* @param id - id
+*/
+async function publishApplicationTheme(client, id) {
+	return client.post(`/api/application_themes/${id}/publish`);
+}
+/**
+* Get theme assets
+*
+*
+* @param client - Fetch client instance
+* @param id - id
+*/
+async function getThemeAssets(client, id) {
+	return client.get(`/api/application_themes/${id}/theme_assets`);
+}
+/**
+* Lists all theme resources
+* Lists resources for a theme owned by the current company, including the canonical members_sites.json snapshot. Themes without member sites receive an explicit empty version 2 document. Companyless root themes are not accessible through this endpoint. The content field remains JSON-encoded text.
+*
+* @param client - Fetch client instance
+* @param application_theme_id - application_theme_id
+*/
+async function listThemeResources(client, application_theme_id) {
+	return client.get(`/api/application_themes/${application_theme_id}/resources`);
+}
+/**
+* Updates a theme resource
+* Submit member template dependencies together with members_sites.json using member_files so navigation is captured before any file changes. The files and member graph apply atomically; a rejected dependency rolls back the bundle. Existing single-resource writes remain supported. Missing manifests preserve existing configuration; deleting the file is refused.
+*
+* @param client - Fetch client instance
+* @param application_theme_id - application_theme_id
+* @param body - body
+*/
+async function updateThemeResource(client, application_theme_id, body) {
+	return client.put(`/api/application_themes/${application_theme_id}/resources`, body);
+}
+/**
+* Deletes a theme resource
+*
+*
+* @param client - Fetch client instance
+* @param application_theme_id - application_theme_id
+* @param body - body
+*/
+async function deleteThemeResource(client, application_theme_id, body) {
+	return client.delete(`/api/application_themes/${application_theme_id}/resources`, { body });
+}
+/**
+* Creates a file resource
+*
+*
+* @param client - Fetch client instance
+* @param body - body
+*/
+async function createFileResource(client, body) {
+	return client.post(`/api/file_resources`, body);
+}
+/**
+* Deletes a file resource
+*
+*
+* @param client - Fetch client instance
+* @param id - id
+*/
+async function destroyFileResource(client, id) {
+	return client.delete(`/api/file_resources/${id}`);
+}
+//#endregion
+//#region src/commands/navigate.ts
+function localSuggest(input, choices) {
+	if (!input) return choices;
+	const lower = input.toLowerCase();
+	return choices.filter((c) => c.title.toLowerCase().includes(lower));
+}
+const THEMEABLE_TYPE_MAP = {
+	"/home": "home_page",
+	"/home/shop": "shop_page",
+	"/home/join": "join_page",
+	"/cart": "cart_page",
+	"/home/blog": "post_page",
+	"/home/categories": "category_page",
+	"/home/collections": "collection_page"
+};
+const STATIC_ROUTES = [
+	{
+		label: "Home",
+		path: "/home"
+	},
+	{
+		label: "Shop",
+		path: "/home/shop"
+	},
+	{
+		label: "Join / Sign Up",
+		path: "/home/join"
+	},
+	{
+		label: "Cart",
+		path: "/cart"
+	},
+	{
+		label: "Blog",
+		path: "/home/blog"
+	},
+	{
+		label: "Categories (all)",
+		path: "/home/categories"
+	},
+	{
+		label: "Collections (all)",
+		path: "/home/collections"
+	}
+];
+const RESOURCE_ROUTES = [
+	{
+		label: "Category",
+		type: "category",
+		template: "/home/categories/%s",
+		fallback: "/home/categories"
+	},
+	{
+		label: "Collection",
+		type: "collection",
+		template: "/home/collections/%s",
+		fallback: "/home/collections"
+	},
+	{
+		label: "Product",
+		type: "product",
+		template: "/home/products/%s",
+		fallback: "/home/shop"
+	},
+	{
+		label: "Library",
+		type: "library",
+		template: "/home/libraries/%s",
+		fallback: "/home/libraries"
+	},
+	{
+		label: "Post",
+		type: "post",
+		template: "/home/posts/%s",
+		fallback: "/home/blog"
+	},
+	{
+		label: "Media",
+		type: "medium",
+		template: "/home/media/%s",
+		fallback: "/home/media"
+	},
+	{
+		label: "Enrollment Pack",
+		type: "enrollment_pack",
+		template: "/home/enrollments/%s",
+		fallback: "/home/join"
+	},
+	{
+		label: "Page",
+		type: "page",
+		template: "/home/pages/%s",
+		fallback: "/home/pages"
+	}
+];
+async function fetchTemplatesForType(api, themeId, themeableType) {
+	const params = new URLSearchParams({
+		application_theme_id: String(themeId),
+		themeable_type: themeableType,
+		published: "true"
+	});
+	return (await api.get(`/api/application_theme_templates?${params}`)).templates ?? [];
+}
+async function selectTemplate(api, themeId, themeableType, onCancel) {
+	const templates = await fetchTemplatesForType(api, themeId, themeableType);
+	if (templates.length <= 1) return null;
+	const { templateId } = await prompts({
+		type: "autocomplete",
+		name: "templateId",
+		message: "Select a template",
+		choices: templates.map((t) => ({
+			title: `${t.name}${t.default ? " (default)" : ""}`,
+			value: t.id
+		})),
+		suggest: (input, choices) => Promise.resolve(localSuggest(input, choices))
+	}, { onCancel });
+	return templateId ?? null;
+}
+function createNavigateCommand() {
+	return new Command("navigate").description("Interactively navigate to a route in the dev server browser").option("--host <host>", "Dev server host", "127.0.0.1").option("--port <port>", "Dev server port", "9292").option("-t, --theme <id>", "Theme ID (defaults to active dev theme)").action(async (opts) => {
+		requireToken();
+		const themeId = opts.theme ? Number(opts.theme) : getLastDevThemeId();
+		if (!themeId) {
+			console.error("No active dev theme. Run `fluid theme dev` first, or pass --theme <id>.");
+			process.exit(1);
+		}
+		const address = `http://${opts.host}:${opts.port}`;
+		await navigateTheme(createApiClient(), themeId, address);
+	});
+}
+/** Shared by theme navigate and theme dev --navigate. */
+async function navigateTheme(api, themeId, address) {
+	const choices = [...STATIC_ROUTES.map((r) => ({
+		title: r.label,
+		value: r.path
+	})), ...RESOURCE_ROUTES.map((r) => ({
+		title: `${r.label} (select specific)`,
+		value: {
+			resourceType: r.type,
+			template: r.template,
+			fallback: r.fallback,
+			label: r.label
+		}
+	}))];
+	let cancelled = false;
+	const onCancel = () => {
+		cancelled = true;
+		return false;
+	};
+	const metadata = await readPreviewMetadata(address, themeId);
+	choices.push(...memberChoices(metadata));
+	const unavailable = metadata?.system_screens.filter((screen) => !metadata.supported_system_screens.includes(screen.key));
+	if (unavailable?.length) console.log(`System-screen preview unavailable: ${unavailable.map((screen) => screen.key).join(", ")}.`);
+	const { dest } = await prompts({
+		type: "autocomplete",
+		name: "dest",
+		message: "Select a route",
+		choices,
+		suggest: (input, choices) => Promise.resolve(localSuggest(input, choices))
+	}, { onCancel });
+	if (!dest) return;
+	let path;
+	let themeableType;
+	if (typeof dest === "string") {
+		if (dest.startsWith("/_members/")) await validateMemberDestination(address, themeId, dest);
+		path = dest;
+		themeableType = THEMEABLE_TYPE_MAP[dest];
+	} else {
+		themeableType = dest.resourceType;
+		const resources = (await getApplicationThemeAvailableThemeables(api, themeId, {
+			themeable: dest.resourceType,
+			per_page: 50
+		})).available_themeables ?? [];
+		if (!resources.length) {
+			console.log(`No ${dest.label} resources found, using listing page.`);
+			path = dest.fallback;
+		} else {
+			const resourceChoices = resources.map((r) => ({
+				title: r.title ?? r.slug ?? "Untitled",
+				value: r.slug
+			}));
+			const { slug } = await prompts({
+				type: "autocomplete",
+				name: "slug",
+				message: `Select a ${dest.label.toLowerCase()}`,
+				choices: resourceChoices,
+				suggest: (input, choices) => Promise.resolve(localSuggest(input, choices))
+			}, { onCancel });
+			if (cancelled || !slug) return;
+			path = dest.template.replace("%s", encodeURIComponent(slug));
+		}
+	}
+	let templateParam = "";
+	if (themeableType) {
+		const templateId = await selectTemplate(api, themeId, themeableType, onCancel);
+		if (templateId) templateParam = `?theme_template_id=${templateId}`;
+	}
+	if (cancelled) return;
+	const url = `${address}${path}${templateParam}`;
+	console.log(`\nNavigating to: ${url}\n`);
+	const open = (await import("open")).default;
+	await open(url);
+}
+//#endregion
+//#region src/theme-config.ts
+const CONFIG_FILE = ".fluid-theme.json";
+/**
+* `company` must be the bare subdomain slug — the dev server builds
+* `<company>.fluid.app` from it, so a full domain here produces an
+* unreachable `<slug>.fluid.app.fluid.app` host. Some external tooling
+* writes the full domain (or a URL); accept those and reduce them to
+* the subdomain.
+*/
+function normalizeCompany(company) {
+	return company.replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/[/?#].*$/, "").replace(/\.fluid\.app$/i, "");
+}
+function configPath(themeRoot) {
+	return join(themeRoot, CONFIG_FILE);
+}
+/** Read `.fluid-theme.json` from a theme directory, or null if it doesn't exist. */
+function readThemeConfig(themeRoot) {
+	const path = configPath(themeRoot);
+	if (!existsSync(path)) return null;
+	try {
+		const raw = readFileSync(path, "utf-8");
+		const config = JSON.parse(raw);
+		if (typeof config.company === "string") config.company = normalizeCompany(config.company);
+		return config;
+	} catch {
+		return null;
+	}
+}
+/**
+* Read a legacy config (pre-shadow-repo). Used only by the migration
+* path on first new-CLI pull to seed shadow HEAD from files whose
+* local content still matches their stored sha256 checksum.
 */
-function getLastDevThemeId() {
-	const state = getState();
-	return state.lastDevThemeId ?? state.devThemeId;
+function readLegacyThemeConfig(themeRoot) {
+	const path = configPath(themeRoot);
+	if (!existsSync(path)) return null;
+	try {
+		const raw = readFileSync(path, "utf-8");
+		return JSON.parse(raw);
+	} catch {
+		return null;
+	}
+}
+/** Write `.fluid-theme.json` to a theme directory. */
+function writeThemeConfig(themeRoot, config) {
+	writeFileSync(configPath(themeRoot), JSON.stringify(config, null, 2) + "\n", "utf-8");
 }
 //#endregion
 //#region src/theme/mime-type.ts
@@ -533,7 +1028,8 @@ function mimeTypeFor(ext) {
 const THEME_LEVEL_RESOURCE_KEYS = new Set([
 	"global_styles.css",
 	"styles.css",
-	"variables.json"
+	"variables.json",
+	"members_sites.json"
 ]);
 const COMPOSITE_RESOURCE_FILE_NAMES = new Set([
 	"index.liquid",
@@ -1072,37 +1568,39 @@ var ThemeRoot = class {
 	}
 };
 //#endregion
-//#region src/theme/dev-server/sse.ts
-var SSEStream = class {
-	responses = /* @__PURE__ */ new Set();
-	add(res) {
-		res.writeHead(200, {
-			"Content-Type": "text/event-stream",
-			"Cache-Control": "no-cache",
-			Connection: "keep-alive",
-			"Access-Control-Allow-Origin": "*"
-		});
-		res.write(":\n\n");
-		this.responses.add(res);
-		res.on("close", () => this.responses.delete(res));
+//#region src/theme/dev-server/member-screen-assets.ts
+/** The runtime is shipped with this CLI, not taken from a mutable theme/CDN URL. */
+function findMemberScreenAssets() {
+	let directory = dirname(fileURLToPath(import.meta.url));
+	while (true) {
+		for (const candidate of [join(directory, "dist-cli-preview"), join(directory, "dist", "dist-cli-preview")]) if (existsSync(join(candidate, "capabilities.json"))) return candidate;
+		const parent = dirname(directory);
+		if (parent === directory) return void 0;
+		directory = parent;
+	}
+}
+var MemberScreenAssets = class {
+	screens;
+	constructor(directory = findMemberScreenAssets()) {
+		this.directory = directory;
+		this.screens = [];
+		if (!directory) return;
+		try {
+			const value = JSON.parse(readFileSync(join(directory, "capabilities.json"), "utf8"));
+			if (typeof value !== "object" || value === null || !("version" in value) || value.version !== 1 || !("screens" in value) || !Array.isArray(value.screens)) return;
+			if (!value.screens.every((screen) => typeof screen === "string" && /^[a-z][a-z-]*$/.test(screen))) return;
+			if (!existsSync(join(directory, "account-screens.js"))) return;
+			this.screens = value.screens;
+		} catch {}
 	}
-	broadcast(data) {
-		const payload = `data: ${data}\n\n`;
-		for (const res of this.responses) try {
-			res.write(payload);
+	read(path) {
+		if (!this.directory || !/^(?:account-screens\.js|chunks\/[a-zA-Z0-9_.-]+\.js)$/.test(path)) return void 0;
+		try {
+			return readFileSync(join(this.directory, path));
 		} catch {
-			this.responses.delete(res);
+			return;
 		}
 	}
-	close() {
-		for (const res of this.responses) try {
-			res.end();
-		} catch {}
-		this.responses.clear();
-	}
-	get size() {
-		return this.responses.size;
-	}
 };
 //#endregion
 //#region src/theme/dev-server/hot-reload.ts
@@ -1166,6 +1664,287 @@ function injectHotReload(html, mode) {
 	return html + script;
 }
 //#endregion
+//#region src/theme/dev-server/member-preview-html.ts
+function escapeHtml(value) {
+	return value.replace(/[&<>"']/g, (char) => ({
+		"&": "&amp;",
+		"<": "&lt;",
+		">": "&gt;",
+		"\"": "&quot;",
+		"'": "&#39;"
+	})[char] ?? char);
+}
+/** Use the configured Rails environment, never a browser-supplied upstream. */
+function memberOrigin(apiBase, company) {
+	const url = new URL(apiBase);
+	if (!/^[a-z0-9-]+$/i.test(company)) throw new Error("Invalid company subdomain.");
+	if (url.hostname.startsWith("api.")) url.hostname = `${company}.account.${url.hostname.slice(4)}`;
+	return url.origin;
+}
+function renderMemberHtml(render, opts) {
+	const document = parse(render.html);
+	const elements = [];
+	function visit(parent) {
+		for (const child of parent.childNodes) if ("tagName" in child) {
+			elements.push(child);
+			visit(child);
+		}
+	}
+	visit(document);
+	const head = elements.find((el) => el.tagName === "head");
+	for (const el of elements) {
+		if (el.tagName === "base" && el.parentNode) el.parentNode.childNodes.splice(el.parentNode.childNodes.indexOf(el), 1);
+		if (el.tagName === "script") {
+			const src = el.attrs.find((attr) => attr.name === "src")?.value ?? "";
+			if (/\/(?:account-screens(?:\/|\.)|member-storefront-sdk\/)/.test(src) && el.parentNode) el.parentNode.childNodes.splice(el.parentNode.childNodes.indexOf(el), 1);
+		}
+		if (el.tagName === "fluid-account-screen" || el.tagName === "fluid-messaging") {
+			el.attrs = el.attrs.filter((attr) => attr.name !== "preview" && attr.name !== "path");
+			el.attrs.push({
+				name: "preview",
+				value: "true"
+			});
+			if (opts.screenKey) el.attrs.push({
+				name: "path",
+				value: new URL(opts.path, opts.origin).pathname.slice(1)
+			});
+		}
+		if (el.tagName === "form") {
+			el.attrs = el.attrs.filter((attr) => attr.name !== "action");
+			el.attrs.push({
+				name: "action",
+				value: `${opts.localOrigin}/_members/_actions`
+			});
+		}
+		const formAction = el.attrs.find((attr) => attr.name === "formaction");
+		if (formAction) formAction.value = `${opts.localOrigin}/_members/_actions`;
+		if (el.tagName === "a" || el.tagName === "area") {
+			const href = el.attrs.find((a) => a.name === "href");
+			if (href) href.value = previewLink(href.value, opts);
+		}
+	}
+	const runtime = parseFragment(`<script type="module" src="${escapeHtml(opts.localOrigin)}/_members/_runtime/account-screens.js"><\/script>`);
+	head.childNodes.unshift(...runtime.childNodes);
+	const base = parseFragment(`<base href="${escapeHtml(new URL(opts.path, opts.origin).href)}">`);
+	head.childNodes.unshift(...base.childNodes);
+	const styles = parseFragment(render.styles);
+	head.childNodes.push(...styles.childNodes);
+	const style = parseFragment("<style></style>").childNodes[0];
+	if (style && "childNodes" in style) {
+		style.childNodes.push({
+			nodeName: "#text",
+			value: render.templateStyles,
+			parentNode: style
+		});
+		head.childNodes.push(style);
+	}
+	const guard = parseFragment(`<script>document.addEventListener("submit",function(event){event.preventDefault();},true);<\/script>`);
+	head.childNodes.unshift(...guard.childNodes);
+	const navigation = parseFragment(`<script>
+    document.addEventListener("fluid-account-navigate",function(event){
+      event.preventDefault(); event.stopImmediatePropagation();
+      var slug=event.detail && event.detail.slug;
+      if(typeof slug!=="string" || !/^[a-z][a-z0-9_-]*(?:[/?#]|$)/.test(slug) || slug.includes("\\\\")) return;
+      var next=new URL("/_members/"+slug,window.location.origin);
+      if(next.origin!==window.location.origin || !next.pathname.startsWith("/_members/")) return;
+      var context=${JSON.stringify(opts.selection).replace(/</g, "\\u003c")};
+      ["members_site_id","country_id","language_id","member_type_id"].forEach(function(key){
+        if(context[key]===undefined) next.searchParams.delete(key); else next.searchParams.set(key,context[key]);
+      });
+      window.location.assign(next.href);
+    },true);
+  <\/script>`);
+	head.childNodes.unshift(...navigation.childNodes);
+	return injectHotReload(serialize(document), opts.reloadMode);
+}
+function previewLink(href, opts) {
+	if (href.startsWith("#")) return opts.localOrigin + memberPreviewUrl(opts.path, opts.selection) + href;
+	let target;
+	try {
+		target = new URL(href, new URL(opts.path, opts.origin));
+	} catch {
+		return href;
+	}
+	if (!["http:", "https:"].includes(target.protocol)) return href;
+	const absolute = /^[a-z][a-z\d+.-]*:/i.test(href) || href.startsWith("//");
+	const accountLink = absolute && target.origin === opts.origin;
+	if (absolute && !accountLink && target.origin !== opts.localOrigin) return href;
+	target.pathname = accountPath(target.pathname);
+	const isMember = accountLink || /^\/(auth(?:\/|$)|login$|logout$)/.test(target.pathname) || target.pathname.startsWith("/_members/") || opts.metadata.members_sites.some((site) => site.pages.some((p) => p.path === target.pathname)) || opts.metadata.system_screens.some((screen) => target.pathname === `/${screen.key}` || target.pathname.startsWith(`/${screen.key}/`));
+	const path = target.pathname + target.search + target.hash;
+	return opts.localOrigin + (isMember ? memberPreviewUrl(path, opts.selection) : path);
+}
+//#endregion
+//#region src/theme/dev-server/member-preview.ts
+/** Deny DNS rebinding and cross-origin access before using Node's CLI credential. */
+function isLocalPreviewRequest(req, host) {
+	const port = req.socket.localPort;
+	const hosts = new Set([
+		host,
+		"localhost",
+		"127.0.0.1",
+		"[::1]"
+	]);
+	if ((host === "0.0.0.0" || host === "::") && req.socket.localAddress) {
+		const address = req.socket.localAddress.replace(/^::ffff:/, "");
+		hosts.add(address.includes(":") ? `[${address}]` : address);
+	}
+	let url;
+	try {
+		url = new URL(`http://${req.headers.host}`);
+	} catch {
+		return false;
+	}
+	if (!hosts.has(url.hostname) || Number(url.port || 80) !== port || url.username || url.password || url.pathname !== "/") return false;
+	if (req.headers.origin && req.headers.origin !== url.origin) return false;
+	return req.headers["sec-fetch-site"] !== "cross-site";
+}
+var MemberPreview = class {
+	metadata;
+	loading;
+	origin;
+	constructor(api, theme, reloadMode, screenAssets = new MemberScreenAssets()) {
+		this.api = api;
+		this.theme = theme;
+		this.reloadMode = reloadMode;
+		this.screenAssets = screenAssets;
+		this.origin = memberOrigin(getApiBase(), theme.company);
+	}
+	/** Only call after every upload in a watcher batch has been acknowledged. */
+	async refreshAfterSync() {
+		if (!this.metadata && !this.loading) return;
+		if (this.loading) await this.loading;
+		this.metadata = void 0;
+		this.metadata = await this.loadMetadata();
+	}
+	async loadMetadata() {
+		return parseMemberMetadata(await this.api.get("/api/company/members_sites", { application_theme_id: this.theme.id }));
+	}
+	async getMetadata() {
+		if (this.metadata) return this.metadata;
+		this.loading ??= this.loadMetadata();
+		try {
+			this.metadata = await this.loading;
+			return this.metadata;
+		} finally {
+			this.loading = void 0;
+		}
+	}
+	async handle(req, res) {
+		const url = new URL(req.url ?? "/", `http://${req.headers.host}`);
+		if (url.pathname !== "/_members" && !url.pathname.startsWith("/_members/")) return false;
+		res.setHeader("Cache-Control", "private, no-store");
+		res.setHeader("Referrer-Policy", "no-referrer");
+		res.setHeader("X-Content-Type-Options", "nosniff");
+		try {
+			if (req.method !== "GET" && req.method !== "HEAD") {
+				res.setHeader("Allow", "GET, HEAD");
+				throw new MemberPreviewError("Member preview is read-only.", 405);
+			}
+			if (url.pathname.startsWith("/_members/_runtime/")) {
+				const asset = this.screenAssets.read(url.pathname.slice(19));
+				if (!asset) throw new MemberPreviewError("Preview runtime asset unavailable. Rebuild or update the CLI.", 404);
+				res.setHeader("Content-Type", "text/javascript; charset=utf-8");
+				res.end(req.method === "HEAD" ? void 0 : asset);
+				return true;
+			}
+			const metadata = await this.getMetadata();
+			if (url.pathname === "/_members/_metadata") {
+				res.setHeader("Content-Type", "application/json");
+				res.end(req.method === "HEAD" ? void 0 : JSON.stringify({
+					theme_id: this.theme.id,
+					mode: "sample",
+					...metadata,
+					supported_system_screens: metadata.system_screens.filter((screen) => this.screenAssets.screens.includes(screen.key)).map((screen) => screen.key)
+				}));
+				return true;
+			}
+			if (url.pathname === "/_members" || url.pathname === "/_members/") {
+				const screens = metadata.system_screens.filter((screen) => this.screenAssets.screens.includes(screen.key));
+				const links = metadata.members_sites.map((site) => {
+					const destinations = [...site.pages.map((page) => ({
+						path: page.path,
+						title: page.title + (page.published ? "" : " (draft)")
+					})), ...screens.map((screen) => ({
+						path: `/${screen.key}`,
+						title: screen.key + " (sample)"
+					}))];
+					return `<h2>${escapeHtml(site.name)}</h2><ul>${destinations.map((page) => `<li><a href="${escapeHtml(memberPreviewUrl(page.path, { members_site_id: site.id }))}">${escapeHtml(page.title)}</a></li>`).join("")}</ul>`;
+				}).join("");
+				res.setHeader("Content-Type", "text/html; charset=utf-8");
+				res.end(req.method === "HEAD" ? void 0 : `<!doctype html><meta charset="utf-8"><title>Member preview</title><h1>Member preview</h1><p>Sample data. Select a page to preview its site's layout.</p>${links || "<p>No member pages in this theme.</p>"}`);
+				return true;
+			}
+			const selection = parseSelection(url.searchParams);
+			const site = metadata.members_sites.find((s) => s.id === selection.members_site_id);
+			if (!site) throw new MemberPreviewError("This site no longer belongs to the preview theme. Select a page at /_members.", 404);
+			const path = url.pathname.slice(9);
+			const page = site.pages.find((p) => p.path === path);
+			const screen = page ? void 0 : metadata.system_screens.find((s) => path === `/${s.key}` || path.startsWith(`/${s.key}/`));
+			if (!page && !screen) throw new MemberPreviewError("This member page is unavailable in the selected site. Select a page at /_members.", 404);
+			if (screen && !this.screenAssets.screens.includes(screen.key)) throw new MemberPreviewError("This system screen has no packaged sample preview. Rebuild or update the CLI.", 501);
+			const html = renderMemberHtml(parseMemberRender(await this.api.post(`/api/v202604/themes/${this.theme.id}/member-preview`, {
+				...selection,
+				...page ? { members_page_id: page.id } : { system_screen_key: screen.key }
+			}), this.theme.id, selection, page?.id ?? null, screen?.key ?? null), {
+				origin: this.origin,
+				localOrigin: url.origin,
+				path: path + url.search,
+				selection,
+				metadata,
+				reloadMode: this.reloadMode,
+				screenKey: screen?.key
+			});
+			res.setHeader("Content-Type", "text/html; charset=utf-8");
+			res.end(req.method === "HEAD" ? void 0 : html);
+		} catch (error) {
+			const status = error instanceof MemberPreviewError ? error.status : isRecord$5(error) && typeof error.status === "number" && [
+				401,
+				403,
+				404,
+				422
+			].includes(error.status) ? error.status : 502;
+			const message = error instanceof MemberPreviewError ? error.message : status === 401 || status === 403 ? "Member preview authorization failed. Check your CLI login and theme permissions." : "Member preview could not be rendered. Check the selected page and server preview support.";
+			res.writeHead(status, { "Content-Type": "text/plain; charset=utf-8" });
+			res.end(req.method === "HEAD" ? void 0 : message);
+		}
+		return true;
+	}
+};
+//#endregion
+//#region src/theme/dev-server/sse.ts
+var SSEStream = class {
+	responses = /* @__PURE__ */ new Set();
+	add(res) {
+		res.writeHead(200, {
+			"Content-Type": "text/event-stream",
+			"Cache-Control": "no-cache",
+			Connection: "keep-alive",
+			"Access-Control-Allow-Origin": "*"
+		});
+		res.write(":\n\n");
+		this.responses.add(res);
+		res.on("close", () => this.responses.delete(res));
+	}
+	broadcast(data) {
+		const payload = `data: ${data}\n\n`;
+		for (const res of this.responses) try {
+			res.write(payload);
+		} catch {
+			this.responses.delete(res);
+		}
+	}
+	close() {
+		for (const res of this.responses) try {
+			res.end();
+		} catch {}
+		this.responses.clear();
+	}
+	get size() {
+		return this.responses.size;
+	}
+};
+//#endregion
 //#region src/theme/dev-server/proxy.ts
 const HOP_BY_HOP = new Set([
 	"connection",
@@ -1240,143 +2019,16 @@ async function proxyRequest(req, res, opts) {
 			reject(err);
 		});
 		if (body) proxyReq.write(body);
-		proxyReq.end();
-	});
-}
-function readBody(req) {
-	return new Promise((resolve, reject) => {
-		const chunks = [];
-		req.on("data", (chunk) => chunks.push(chunk));
-		req.on("end", () => resolve(Buffer.concat(chunks)));
-		req.on("error", reject);
-	});
-}
-//#endregion
-//#region ../../api-clients/themes/src/namespaces/v0.ts
-/**
-* List application themes
-* Get all application themes with optional filters
-*
-* @param client - Fetch client instance
-* @param [params] - params
-*/
-async function listApplicationThemes(client, params) {
-	return client.get(`/api/application_themes`, params);
-}
-/**
-* Create an application theme
-*
-*
-* @param client - Fetch client instance
-* @param body - body
-*/
-async function createApplicationTheme(client, body) {
-	return client.post(`/api/application_themes`, body);
-}
-/**
-* Get an application theme
-*
-*
-* @param client - Fetch client instance
-* @param id - id
-* @param [params] - params
-*/
-async function getApplicationTheme(client, id, params) {
-	return client.get(`/api/application_themes/${id}`, params);
-}
-/**
-* Returns available themeables for a given type scoped to the theme's company
-*
-*
-* @param client - Fetch client instance
-* @param id - id
-* @param [params] - params
-*/
-async function getApplicationThemeAvailableThemeables(client, id, params) {
-	return client.get(`/api/application_themes/${id}/available_themeables`, params);
-}
-/**
-* Create a development reference clone of an application theme
-* Creates an isolated development theme while preserving existing DAM and ImageKit references without transferring asset bytes.
-*
-* @param client - Fetch client instance
-* @param id - id
-* @param body - body
-*/
-async function cloneApplicationThemeForDevelopment(client, id, body) {
-	return client.post(`/api/application_themes/${id}/clone_for_development`, body);
-}
-/**
-* Publishes the theme
-*
-*
-* @param client - Fetch client instance
-* @param id - id
-*/
-async function publishApplicationTheme(client, id) {
-	return client.post(`/api/application_themes/${id}/publish`);
-}
-/**
-* Get theme assets
-*
-*
-* @param client - Fetch client instance
-* @param id - id
-*/
-async function getThemeAssets(client, id) {
-	return client.get(`/api/application_themes/${id}/theme_assets`);
-}
-/**
-* Lists all theme resources
-*
-*
-* @param client - Fetch client instance
-* @param application_theme_id - application_theme_id
-*/
-async function listThemeResources(client, application_theme_id) {
-	return client.get(`/api/application_themes/${application_theme_id}/resources`);
-}
-/**
-* Updates a theme resource
-*
-*
-* @param client - Fetch client instance
-* @param application_theme_id - application_theme_id
-* @param body - body
-*/
-async function updateThemeResource(client, application_theme_id, body) {
-	return client.put(`/api/application_themes/${application_theme_id}/resources`, body);
-}
-/**
-* Deletes a theme resource
-*
-*
-* @param client - Fetch client instance
-* @param application_theme_id - application_theme_id
-* @param body - body
-*/
-async function deleteThemeResource(client, application_theme_id, body) {
-	return client.delete(`/api/application_themes/${application_theme_id}/resources`, { body });
-}
-/**
-* Creates a file resource
-*
-*
-* @param client - Fetch client instance
-* @param body - body
-*/
-async function createFileResource(client, body) {
-	return client.post(`/api/file_resources`, body);
+		proxyReq.end();
+	});
 }
-/**
-* Deletes a file resource
-*
-*
-* @param client - Fetch client instance
-* @param id - id
-*/
-async function destroyFileResource(client, id) {
-	return client.delete(`/api/file_resources/${id}`);
+function readBody(req) {
+	return new Promise((resolve, reject) => {
+		const chunks = [];
+		req.on("data", (chunk) => chunks.push(chunk));
+		req.on("end", () => resolve(Buffer.concat(chunks)));
+		req.on("error", reject);
+	});
 }
 //#endregion
 //#region src/theme/format-error.ts
@@ -1638,9 +2290,9 @@ function readDocument(path) {
 	}
 }
 function parseDocument$1(value) {
-	if (!isRecord$2(value) || value["version"] !== MANIFEST_VERSION) throw new Error(`expected version ${MANIFEST_VERSION}`);
+	if (!isRecord$4(value) || value["version"] !== MANIFEST_VERSION) throw new Error(`expected version ${MANIFEST_VERSION}`);
 	const rawAssets = value["assets"];
-	if (!isRecord$2(rawAssets)) throw new Error("expected an assets object");
+	if (!isRecord$4(rawAssets)) throw new Error("expected an assets object");
 	const assets = {};
 	for (const [key, rawLink] of Object.entries(rawAssets)) {
 		if (!isThemeAssetKey(key) || !isThemeAssetLink(rawLink)) throw new Error(`invalid asset entry for ${key}`);
@@ -1675,14 +2327,14 @@ function copyLink(link) {
 	};
 }
 function isThemeAssetLink(value) {
-	return isRecord$2(value) && typeof value["sourceThemeId"] === "number" && Number.isInteger(value["sourceThemeId"]) && value["sourceThemeId"] > 0 && (value["checksum"] === void 0 || typeof value["checksum"] === "string" && value["checksum"].length > 0) && (value["url"] === void 0 || typeof value["url"] === "string" && value["url"].length > 0) && (value["contentType"] === void 0 || typeof value["contentType"] === "string" && value["contentType"].length > 0) && (value["contentSize"] === void 0 || typeof value["contentSize"] === "number" && Number.isInteger(value["contentSize"]) && value["contentSize"] > 0) && (value["previewImageUrl"] === void 0 || typeof value["previewImageUrl"] === "string" && value["previewImageUrl"].length > 0) && (value["altText"] === void 0 || typeof value["altText"] === "string") && (value["handle"] === void 0 || typeof value["handle"] === "string" && value["handle"].length > 0) && (value["pending"] === void 0 || typeof value["pending"] === "boolean") && (value["damAssetCode"] === void 0 || typeof value["damAssetCode"] === "string" && value["damAssetCode"].length > 0);
+	return isRecord$4(value) && typeof value["sourceThemeId"] === "number" && Number.isInteger(value["sourceThemeId"]) && value["sourceThemeId"] > 0 && (value["checksum"] === void 0 || typeof value["checksum"] === "string" && value["checksum"].length > 0) && (value["url"] === void 0 || typeof value["url"] === "string" && value["url"].length > 0) && (value["contentType"] === void 0 || typeof value["contentType"] === "string" && value["contentType"].length > 0) && (value["contentSize"] === void 0 || typeof value["contentSize"] === "number" && Number.isInteger(value["contentSize"]) && value["contentSize"] > 0) && (value["previewImageUrl"] === void 0 || typeof value["previewImageUrl"] === "string" && value["previewImageUrl"].length > 0) && (value["altText"] === void 0 || typeof value["altText"] === "string") && (value["handle"] === void 0 || typeof value["handle"] === "string" && value["handle"].length > 0) && (value["pending"] === void 0 || typeof value["pending"] === "boolean") && (value["damAssetCode"] === void 0 || typeof value["damAssetCode"] === "string" && value["damAssetCode"].length > 0);
 }
 function isThemeAssetKey(key) {
 	if (key.includes("\\") || key.includes("\0")) return false;
 	const segments = key.split("/");
 	return segments[0] === "assets" && segments.length === 2 && segments[1] !== void 0 && segments[1].length > 0 && segments[1] !== "." && segments[1] !== "..";
 }
-function isRecord$2(value) {
+function isRecord$4(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -1692,6 +2344,81 @@ function isStylesheetKey(key) {
 	return STYLESHEET_KEY_PATTERN.test(key);
 }
 //#endregion
+//#region src/theme/member-dependencies.ts
+/** The same file graph is used for uploads and incoming omission protection.
+* Rails remains responsible for resolving company-specific roles and handles. */
+function memberDependencyPaths(document, availablePaths, deletedPaths = [], changedPaths = availablePaths) {
+	const dependencies = /* @__PURE__ */ new Set();
+	for (const entry of [...records(document.templates), ...records(document.menu_references)]) if (typeof entry.path === "string") dependencies.add(entry.path);
+	for (const site of records(document.sites)) {
+		for (const page of records(site.pages)) if (typeof page.template_path === "string") dependencies.add(page.template_path);
+		const layout = site.layout_name;
+		if (layout === "none") continue;
+		if (typeof layout === "string" && layout && !["member", "theme"].includes(layout)) {
+			dependencies.add(`layouts/${layout}.liquid`);
+			continue;
+		}
+		const fallback = [
+			layout,
+			"member",
+			"theme"
+		].filter((name) => typeof name === "string" && name.length > 0).map((name) => `layouts/${name}.liquid`).find((path) => availablePaths.has(path) || deletedPaths.includes(path));
+		if (fallback) dependencies.add(fallback);
+	}
+	for (const path of dependencies) {
+		if (!path.endsWith("/index.liquid")) continue;
+		for (const suffix of ["variables.json", "styles.css"]) {
+			const sibling = path.replace(/index\.liquid$/, suffix);
+			if ((suffix === "styles.css" ? changedPaths : availablePaths).has(sibling) || deletedPaths.includes(sibling)) dependencies.add(sibling);
+		}
+	}
+	return dependencies;
+}
+function records(entries) {
+	return (Array.isArray(entries) ? entries : []).filter((entry) => typeof entry === "object" && entry !== null && !Array.isArray(entry));
+}
+//#endregion
+//#region src/theme/member-configuration.ts
+const MEMBER_CONFIGURATION_KEY = "members_sites.json";
+/** Apply member selectors and their document together, before losing old references. */
+function planThemeUploads(themeRoot, changedFiles, deletedPaths = []) {
+	const localFiles = themeRoot.files();
+	const manifest = localFiles.find((file) => file.relativePath === MEMBER_CONFIGURATION_KEY);
+	if (!manifest || themeRoot.ignore.ignore("members_sites.json")) return individualUploads(changedFiles);
+	const content = manifest.read();
+	const document = JSON.parse(content);
+	if (Array.isArray(document)) return individualUploads(changedFiles);
+	if (!isRecord$3(document)) throw new Error("members_sites.json must contain a JSON object.");
+	const dependencies = memberDependencyPaths(document, new Set(localFiles.map((file) => file.relativePath)), deletedPaths, new Set(changedFiles.map((file) => file.relativePath)));
+	for (const path of deletedPaths) if (dependencies.has(path)) throw new Error(`Member dependency is still declared and cannot be deleted: ${path}`);
+	if (!changedFiles.some((file) => file.relativePath === "members_sites.json" || dependencies.has(file.relativePath))) return changedFiles.map((file) => ({ file }));
+	const availableFiles = new Map(localFiles.map((file) => [file.relativePath, file]));
+	const memberFiles = [...dependencies].map((path) => {
+		const file = availableFiles.get(path);
+		if (!file || !file.isText || themeRoot.ignore.ignore(path)) throw new Error(`Member dependency must be an available text file: ${path}`);
+		return file;
+	});
+	const uploads = changedFiles.filter((file) => file.relativePath !== "members_sites.json" && !dependencies.has(file.relativePath)).map((file) => ({ file }));
+	uploads.push({
+		file: manifest,
+		memberConfiguration: {
+			content,
+			files: memberFiles
+		}
+	});
+	return uploads;
+}
+function individualUploads(files) {
+	return [...files].sort((left, right) => Number(left.relativePath === MEMBER_CONFIGURATION_KEY) - Number(right.relativePath === MEMBER_CONFIGURATION_KEY)).map((file) => ({ file }));
+}
+function isRecord$3(entry) {
+	return typeof entry === "object" && entry !== null && !Array.isArray(entry);
+}
+/** Removing an older file is not an instruction to erase a member site. */
+function assertMemberConfigurationRetained(deletedPaths) {
+	if (deletedPaths.includes("members_sites.json")) throw new Error("Keep members_sites.json. To remove member configuration, upload an explicit empty versioned document instead of deleting or renaming the file.");
+}
+//#endregion
 //#region src/theme/syncer.ts
 const ASSET_REFERENCE_CONCURRENCY = 6;
 /**
@@ -1712,6 +2439,7 @@ var PushConflictError = class extends Error {
 };
 var Syncer = class {
 	checksumIndex = /* @__PURE__ */ new Map();
+	memberAcknowledgments = /* @__PURE__ */ new Map();
 	rawRemoteResources = /* @__PURE__ */ new Map();
 	remoteResourceGroups = /* @__PURE__ */ new Map();
 	remoteResourceIndex = /* @__PURE__ */ new Map();
@@ -1894,7 +2622,7 @@ var Syncer = class {
 	}
 	async fetchThemeAssetMetadata(sourceThemeId) {
 		const body = await getThemeAssets(this.api, sourceThemeId);
-		if (!isRecord$1(body) || !Array.isArray(body["file_resources"])) throw new Error("Theme assets response did not include file_resources");
+		if (!isRecord$2(body) || !Array.isArray(body["file_resources"])) throw new Error("Theme assets response did not include file_resources");
 		const assets = /* @__PURE__ */ new Map();
 		for (const value of body["file_resources"]) {
 			const asset = parseThemeAssetMetadata(value);
@@ -2063,6 +2791,33 @@ var Syncer = class {
 		if (isThemeAssetKey(file.relativePath)) this.externalizeBinaryFile(file, resource, opts.pendingAsset);
 		return null;
 	}
+	/** Canonical member bytes accepted by the server during this transfer. */
+	acknowledgedMemberContents() {
+		return this.memberAcknowledgments;
+	}
+	/** Upload one member document and its changed dependencies as one transaction. */
+	async uploadMemberConfiguration(upload, baseSha) {
+		if (!upload.memberConfiguration) throw new Error("A member configuration upload is required.");
+		const { content, files } = upload.memberConfiguration;
+		const capturedFiles = files.map((file) => ({
+			file,
+			content: file.read()
+		}));
+		const resource = await this.putResource({
+			key: MEMBER_CONFIGURATION_KEY,
+			content,
+			member_files: capturedFiles.map(({ file, content: capturedContent }) => ({
+				key: file.relativePath,
+				content: capturedContent
+			}))
+		}, baseSha, capturedFiles.map(({ file }) => file.relativePath));
+		this.setRemoteResource(resource);
+		if (resource.key && resource.content != null) this.memberAcknowledgments.set(resource.key, typeof resource.content === "string" ? resource.content : JSON.stringify(resource.content));
+		return [{
+			file: upload.file,
+			content
+		}, ...capturedFiles];
+	}
 	/**
 	* Wraps the generated `updateThemeResource` client with the two
 	* merge-aware Phase 003 additions: sending `base_sha` on the request
@@ -2085,12 +2840,21 @@ var Syncer = class {
 	* "server rejected because of stale base" from generic upload
 	* failures.
 	*/
-	async putResource(resource, baseSha) {
+	async putResource(resource, baseSha, expectedMemberKeys) {
 		const body = { application_theme_resource: resource };
 		if (baseSha) body["base_sha"] = baseSha;
 		try {
 			const response = await updateThemeResource(this.api, this.themeId, body);
+			if (expectedMemberKeys) {
+				const acknowledged = new Map((response.member_resources ?? []).map((entry) => [entry.key, entry]));
+				const manifest = response.application_theme_resource;
+				if (manifest?.key !== "members_sites.json" || manifest.content == null || !manifest.checksum || expectedMemberKeys.some((key) => acknowledged.get(key)?.content == null || !acknowledged.get(key)?.checksum)) throw new Error("Fluid did not acknowledge every bundled member file. Update the server before retrying this push.");
+			}
 			if (response.content_version_sha) this.lastKnownRemoteSha = response.content_version_sha;
+			for (const memberResource of response.member_resources ?? []) {
+				this.setRemoteResource(memberResource);
+				if (memberResource.key && memberResource.content != null) this.memberAcknowledgments.set(memberResource.key, typeof memberResource.content === "string" ? memberResource.content : JSON.stringify(memberResource.content));
+			}
 			return response.application_theme_resource ?? {
 				key: typeof resource["key"] === "string" ? resource["key"] : "",
 				checksum: null
@@ -2125,10 +2889,9 @@ var Syncer = class {
 	* close together or splits one push across several commits. The client
 	* knows; this says so.
 	*
-	* Best-effort in that it never throws: the files are already on the server
-	* by the time this runs, and Fluid sweeps anything left unsynced, so a
-	* failure delays the commit rather than losing it and must not fail the
-	* push.
+	* Returns false rather than throwing when the request fails. Callers must
+	* retain their previous baseline until finalization succeeds; the server
+	* can reject an incomplete member graph even after individual files land.
 	*
 	* Returns whether Fluid took the request, because a caller tracking edit
 	* boundaries needs to know. A failed ask leaves the previous edit
@@ -2141,7 +2904,7 @@ var Syncer = class {
 			if (response.content_version_sha) this.lastKnownRemoteSha = response.content_version_sha;
 			return true;
 		} catch (e) {
-			console.warn(`  ⚠ couldn't ask Fluid to commit this push (${formatError(e)}). It will be picked up automatically.`);
+			console.warn(`  ⚠ couldn't ask Fluid to commit this push (${formatError(e)}). Retry the push to finalize it.`);
 			return false;
 		}
 	}
@@ -2247,6 +3010,7 @@ var Syncer = class {
 		}[category] ?? "files"}/${assetCode}`;
 	}
 	async deleteRemoteFile(relativePath, baseSha) {
+		assertMemberConfigurationRetained([relativePath]);
 		this.assetManifest.reload();
 		if (this.assetManifest.has(relativePath)) return;
 		const body = { application_theme_resource: { key: relativePath } };
@@ -2430,6 +3194,10 @@ var Syncer = class {
 		else await this.fetchChecksums();
 		if (!opts.skipPreflight) await this.preflightPush(opts.baseSha);
 		let baseSha = opts.baseSha ?? null;
+		const localPaths = new Set(localFiles.map((file) => file.relativePath));
+		if (opts.delete) for (const key of this.assetManifest.keys()) localPaths.add(key);
+		const toDelete = opts.delete ? this.remoteKeys().filter((key) => key !== "members_sites.json" && this.canDeleteRemoteResource(key) && !localPaths.has(key) && !this.themeRoot.ignore.ignore(key)) : [];
+		const plannedUploads = planThemeUploads(this.themeRoot, localFiles.filter((f) => f.exists && this.hasChanged(f)), toDelete);
 		if (opts.linkManagedAssets) {
 			result.linked = await this.linkManagedAssets(opts.linkManagedAssets);
 			baseSha = this.lastKnownRemoteSha ?? baseSha;
@@ -2437,31 +3205,34 @@ var Syncer = class {
 			this.assetManifest.reload();
 			this.ensureManagedAssetsAreResolved();
 		}
-		const toUpload = localFiles.filter((f) => f.exists && this.hasChanged(f));
+		const toUpload = plannedUploads.filter(({ file, memberConfiguration }) => memberConfiguration || file.exists && this.hasChanged(file));
+		const uploadCount = toUpload.reduce((count, upload) => count + 1 + (upload.memberConfiguration?.files.length ?? 0), 0);
 		let done = 0;
-		for (const file of toUpload) {
+		for (const upload of toUpload) {
+			const { file } = upload;
+			if (file.relativePath === "members_sites.json" && result.errors.length > 0) {
+				result.errors.push("Skipped members_sites.json because a dependency upload failed.");
+				break;
+			}
 			try {
-				await this.uploadFile(file, baseSha, { pendingAsset: opts.pendingBinaryAssets });
+				if (upload.memberConfiguration) await this.uploadMemberConfiguration(upload, baseSha);
+				else await this.uploadFile(file, baseSha, { pendingAsset: opts.pendingBinaryAssets });
 				baseSha = this.lastKnownRemoteSha;
-				result.uploaded++;
+				result.uploaded += 1 + (upload.memberConfiguration?.files.length ?? 0);
 			} catch (e) {
 				if (e instanceof PushConflictError) throw e;
 				result.errors.push(`Upload ${file.relativePath}: ${formatError(e)}`);
 			}
-			opts.onProgress?.(++done, toUpload.length);
+			done += 1 + (upload.memberConfiguration?.files.length ?? 0);
+			opts.onProgress?.(done, uploadCount);
 		}
-		if (opts.delete) {
-			const localPaths = new Set(localFiles.map((f) => f.relativePath));
-			for (const key of this.assetManifest.keys()) localPaths.add(key);
-			const toDelete = this.remoteKeys().filter((key) => this.canDeleteRemoteResource(key) && !localPaths.has(key) && !this.themeRoot.ignore.ignore(key));
-			for (const key of toDelete) try {
-				await this.deleteRemoteFile(key, baseSha);
-				baseSha = this.lastKnownRemoteSha;
-				result.deleted++;
-			} catch (e) {
-				if (e instanceof PushConflictError) throw e;
-				result.errors.push(`Delete ${key}: ${formatError(e)}`);
-			}
+		if (opts.delete && result.errors.length === 0) for (const key of toDelete) try {
+			await this.deleteRemoteFile(key, baseSha);
+			baseSha = this.lastKnownRemoteSha;
+			result.deleted++;
+		} catch (e) {
+			if (e instanceof PushConflictError) throw e;
+			result.errors.push(`Delete ${key}: ${formatError(e)}`);
 		}
 		return result;
 	}
@@ -2586,7 +3357,7 @@ function uploadedAssetMetadata(file, resource) {
 	};
 }
 function parseThemeAssetMetadata(value) {
-	if (!isRecord$1(value)) return void 0;
+	if (!isRecord$2(value)) return void 0;
 	const filename = nonEmptyString(value["filename"]);
 	const url = nonEmptyString(value["url"]);
 	const contentType = nonEmptyString(value["content_type"]);
@@ -2608,7 +3379,7 @@ function parseThemeAssetMetadata(value) {
 	};
 }
 function createdFileResourceId(value) {
-	if (!isRecord$1(value) || !isRecord$1(value["file_resource"])) return;
+	if (!isRecord$2(value) || !isRecord$2(value["file_resource"])) return;
 	return positiveInteger(value["file_resource"]["id"]);
 }
 function positiveInteger(value) {
@@ -2623,7 +3394,7 @@ function nonEmptyString(value) {
 function optionalString(value) {
 	return typeof value === "string" ? value : void 0;
 }
-function isRecord$1(value) {
+function isRecord$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -2809,6 +3580,7 @@ function timestamp() {
 }
 async function startDevServer(api, theme, themeRoot, opts, onReady) {
 	const sse = new SSEStream();
+	const memberPreview = new MemberPreview(api, theme, opts.reloadMode);
 	const syncer = new Syncer(api, theme.id, themeRoot);
 	let remoteStateSafe = true;
 	const invalidateRemoteState = () => {
@@ -2919,30 +3691,40 @@ async function startDevServer(api, theme, themeRoot, opts, onReady) {
 			await syncInFlight;
 		}
 		if (remoteWritesBlocked) return;
+		let uploads;
 		try {
 			assertNoCaseCollisions(themeRoot.files().map((file) => file.relativePath));
+			assertMemberConfigurationRetained(removed.filter((file) => !themeRoot.ignore.ignore(file.relativePath)).map((file) => file.relativePath));
+			uploads = planThemeUploads(themeRoot, [...modified, ...added], removed.filter((file) => !themeRoot.ignore.ignore(file.relativePath)).map((file) => file.relativePath));
 		} catch (error) {
 			console.error(`\n[Watcher] Sync blocked: ${String(error)}`);
 			return;
 		}
-		const changed = [...modified, ...added];
 		let wroteRemote = false;
-		for (const file of changed) {
-			if (opts.validate && file.isLiquid) {
-				const diagnostics = file.validateSchema();
-				for (const d of diagnostics) {
-					const prefix = d.severity === "error" ? "Schema error" : "Schema warning";
-					console.warn(`\n[${prefix}] ${file.relativePath}: ${d.message}`);
+		const memberTransfer = uploads.some((upload) => upload.memberConfiguration || upload.file.relativePath === "members_sites.json");
+		for (const upload of uploads) {
+			const { file } = upload;
+			const uploadFiles = [file, ...upload.memberConfiguration?.files ?? []];
+			if (opts.validate) for (const candidate of uploadFiles) {
+				if (!candidate.isLiquid) continue;
+				for (const diagnostic of candidate.validateSchema()) {
+					const prefix = diagnostic.severity === "error" ? "Schema error" : "Schema warning";
+					console.warn(`\n[${prefix}] ${candidate.relativePath}: ${diagnostic.message}`);
 				}
 			}
-			pendingUpdates.add(file.relativePath);
+			for (const pendingFile of uploadFiles) pendingUpdates.add(pendingFile.relativePath);
 			try {
-				const uploadedContent = await syncer.uploadFile(file, syncer.remoteSha(), { pendingAsset: true });
+				const uploadedFiles = upload.memberConfiguration ? await syncer.uploadMemberConfiguration(upload, syncer.remoteSha()) : [{
+					file,
+					content: await syncer.uploadFile(file, syncer.remoteSha(), { pendingAsset: true })
+				}];
 				wroteRemote = true;
-				console.log(`  ✓ synced ${file.relativePath} (${timestamp()})`);
-				if (isStylesheetKey(file.relativePath)) console.warn(`  ⚠ ${file.relativePath}: the storefront inlines this CSS from a published asset, so it serves the previous bytes until the stylesheet asset sync finishes`);
-				if (file.isLiquid && uploadedContent !== null && hasUnbalancedLiquidDelimiters(uploadedContent)) console.warn(`  ⚠ ${file.relativePath}: unbalanced liquid delimiters — the storefront may silently serve stale content for this section`);
-				if (file.isLiquid && uploadedContent !== null) for (const diagnostic of findLiquidBlockTagDiagnostics(uploadedContent)) console.warn(`  ⚠ ${file.relativePath}: ${diagnostic.message}`);
+				for (const { file: uploadedFile, content: uploadedContent } of uploadedFiles) {
+					console.log(`  ✓ synced ${uploadedFile.relativePath} (${timestamp()})`);
+					if (isStylesheetKey(uploadedFile.relativePath)) console.warn(`  ⚠ ${uploadedFile.relativePath}: the storefront inlines this CSS from a published asset, so it serves the previous bytes until the stylesheet asset sync finishes`);
+					if (uploadedFile.isLiquid && uploadedContent !== null && hasUnbalancedLiquidDelimiters(uploadedContent)) console.warn(`  ⚠ ${uploadedFile.relativePath}: unbalanced liquid delimiters — the storefront may silently serve stale content for this section`);
+					if (uploadedFile.isLiquid && uploadedContent !== null) for (const diagnostic of findLiquidBlockTagDiagnostics(uploadedContent)) console.warn(`  ⚠ ${uploadedFile.relativePath}: ${diagnostic.message}`);
+				}
 			} catch (e) {
 				if (e instanceof PushConflictError) {
 					blockRemoteWrites(e);
@@ -2950,8 +3732,11 @@ async function startDevServer(api, theme, themeRoot, opts, onReady) {
 				}
 				invalidateRemoteState();
 				console.error(`\n[Watcher] Upload failed: ${file.relativePath}: ${e}`);
+				remoteWritesBlocked = wroteRemote || memberTransfer;
+				if (remoteWritesBlocked) console.error("[Watcher] Restart theme dev to retry the incomplete transfer.");
+				return;
 			} finally {
-				pendingUpdates.delete(file.relativePath);
+				for (const pendingFile of uploadFiles) pendingUpdates.delete(pendingFile.relativePath);
 			}
 		}
 		if (remoteWritesBlocked) return;
@@ -2967,15 +3752,32 @@ async function startDevServer(api, theme, themeRoot, opts, onReady) {
 					break;
 				}
 				invalidateRemoteState();
+				remoteWritesBlocked = wroteRemote || memberTransfer;
+				console.error(`[Watcher] Delete failed: ${file.relativePath}: ${error}`);
+				if (remoteWritesBlocked) console.error("[Watcher] Restart theme dev to retry the incomplete transfer.");
+				return;
 			}
 		}
 		if (remoteWritesBlocked) return;
-		if (wroteRemote) recordRemoteState();
+		if (wroteRemote) {
+			recordRemoteState();
+			try {
+				await memberPreview.refreshAfterSync();
+			} catch {
+				console.error("[Member preview] Could not refresh routes after sync. The next member request will retry.");
+			}
+		}
 		if (removed.length > 0) sse.broadcast(JSON.stringify({ reload_page: true }));
-		else if (changed.length > 0) sse.broadcast(JSON.stringify({ modified: changed.map((f) => f.relativePath) }));
+		else if (uploads.length > 0) sse.broadcast(JSON.stringify({ modified: uploads.flatMap(({ file, memberConfiguration }) => [file, ...memberConfiguration?.files ?? []].map((updatedFile) => updatedFile.relativePath)) }));
 		scheduleSync();
 	});
 	const server = http.createServer(async (req, res) => {
+		if (!isLocalPreviewRequest(req, opts.host)) {
+			res.writeHead(403, { "Content-Type": "text/plain" });
+			res.end("Local preview requests only.");
+			return;
+		}
+		if (await memberPreview.handle(req, res)) return;
 		if (req.url === "/hot-reload") {
 			sse.add(res);
 			return;
@@ -3092,7 +3894,7 @@ async function devRemoteStateFromSourceShadow(themeRoot, shadow, themeId, remote
 	}
 }
 function parseDocument(document) {
-	if (!isRecord(document) || document["version"] !== BASELINE_VERSION) throw new Error(`expected version ${BASELINE_VERSION}`);
+	if (!isRecord$1(document) || document["version"] !== BASELINE_VERSION) throw new Error(`expected version ${BASELINE_VERSION}`);
 	const themeId = document["themeId"];
 	const remoteSha = document["remoteSha"];
 	const assetManifestSha = document["assetManifestSha"];
@@ -3111,7 +3913,7 @@ function parseDocument(document) {
 	};
 }
 function parseResource(resource) {
-	if (!isRecord(resource)) throw new Error("invalid resource");
+	if (!isRecord$1(resource)) throw new Error("invalid resource");
 	const key = resource["key"];
 	const checksum = resource["checksum"];
 	const contentPresent = resource["contentPresent"];
@@ -3133,7 +3935,7 @@ function parseResource(resource) {
 		url
 	};
 }
-function isRecord(candidate) {
+function isRecord$1(candidate) {
 	return typeof candidate === "object" && candidate !== null;
 }
 function isNonEmptyString(candidate) {
@@ -3817,7 +4619,9 @@ function createDevCommand() {
 			console.log(`\n  Dev server: ${address}`);
 			console.log(`  Web editor: ${editorUrl}`);
 			console.log("\n  Watching for file changes…\n");
-			if (opts.navigate) import("open").then((m) => m.default(`${address}/home`));
+			if (opts.navigate) navigateTheme(api, theme.id, address).catch((error) => {
+				console.error(error instanceof Error ? error.message : "Could not open the preview navigator.");
+			});
 		});
 		await new Promise(() => {});
 	});
@@ -3911,17 +4715,25 @@ function containsConflictMarker(buf) {
 	return buf.includes(CONFLICT_START) && buf.includes(CONFLICT_MID) && buf.includes(CONFLICT_END);
 }
 /**
-* Commit the current working-tree state to shadow HEAD after a
-* successful push. Ensures the next pull's merge base is the state
-* we know the server just accepted.
+* Commit the pushed state to shadow HEAD. Server-acknowledged contents
+* override local bytes for normalized member files, including files edited
+* or deleted locally during upload. Local files remain untouched so those
+* later changes still differ from the next pull's merge base.
 */
-async function commitPushedState(themeRoot, shadow, message) {
+async function commitPushedState(themeRoot, shadow, message, acknowledgedContents) {
 	const entries = [];
 	const assetManifest = new ThemeAssetManifest(themeRoot.root);
-	const localKeys = /* @__PURE__ */ new Set();
+	const recordedKeys = /* @__PURE__ */ new Set();
+	for (const [path, content] of new Map(acknowledgedContents)) {
+		entries.push({
+			path,
+			sha: await shadow.writeBlob(content)
+		});
+		recordedKeys.add(path);
+	}
 	for (const file of themeRoot.files()) {
-		if (!file.exists) continue;
-		localKeys.add(file.relativePath);
+		if (!file.exists || recordedKeys.has(file.relativePath)) continue;
+		recordedKeys.add(file.relativePath);
 		const buf = file.isText ? Buffer.from(file.read()) : file.readBinary();
 		entries.push({
 			path: file.relativePath,
@@ -3930,7 +4742,7 @@ async function commitPushedState(themeRoot, shadow, message) {
 	}
 	let managedAssetSentinelSha;
 	for (const key of assetManifest.keys()) {
-		if (localKeys.has(key)) continue;
+		if (recordedKeys.has(key)) continue;
 		managedAssetSentinelSha ??= await shadow.writeBlob(MANAGED_ASSET_SHADOW_SENTINEL);
 		entries.push({
 			path: key,
@@ -4220,6 +5032,7 @@ function createPushCommand() {
 			}
 		}
 		const { changed, deleted } = await diffAgainstShadow(themeRoot, shadow);
+		if (!opts.nodelete) assertMemberConfigurationRetained(deleted);
 		const managedAssetCount = new ThemeAssetManifest(themeRoot.root).keys().length;
 		if (changed.length === 0 && deleted.length === 0 && managedAssetCount === 0) {
 			console.log("Nothing to push — local matches the last synced state.");
@@ -4250,6 +5063,7 @@ function createPushCommand() {
 			}
 			throw e;
 		}
+		const uploads = planThemeUploads(themeRoot, changed, opts.nodelete ? [] : deleted);
 		let linked = 0;
 		try {
 			linked = await syncer.linkManagedAssets({ replace: true });
@@ -4273,12 +5087,18 @@ function createPushCommand() {
 		let deletedCount = 0;
 		const errors = [];
 		let progress = 0;
-		const total = changed.length + (opts.nodelete ? 0 : deleted.length);
-		for (const file of changed) {
+		const total = uploads.reduce((count, upload) => count + 1 + (upload.memberConfiguration?.files.length ?? 0), 0) + (opts.nodelete ? 0 : deleted.length);
+		for (const upload of uploads) {
+			const { file } = upload;
+			if (file.relativePath === "members_sites.json" && errors.length > 0) {
+				errors.push("Skipped members_sites.json because a dependency upload failed.");
+				break;
+			}
 			try {
-				await syncer.uploadFile(file, baseSha);
+				if (upload.memberConfiguration) await syncer.uploadMemberConfiguration(upload, baseSha);
+				else await syncer.uploadFile(file, baseSha);
 				baseSha = syncer.remoteSha() ?? baseSha;
-				uploaded++;
+				uploaded += 1 + (upload.memberConfiguration?.files.length ?? 0);
 			} catch (e) {
 				if (e instanceof PushConflictError) {
 					spinner.stop();
@@ -4287,9 +5107,10 @@ function createPushCommand() {
 				}
 				errors.push(`Upload ${file.relativePath}: ${formatError(e)}`);
 			}
-			spinner.text = `Pushing ${++progress}/${total} files…`;
+			progress += 1 + (upload.memberConfiguration?.files.length ?? 0);
+			spinner.text = `Pushing ${progress}/${total} files…`;
 		}
-		if (!opts.nodelete) for (const key of deleted) {
+		if (!opts.nodelete && errors.length === 0) for (const key of deleted) {
 			try {
 				await syncer.deleteRemoteFile(key, baseSha);
 				baseSha = syncer.remoteSha() ?? baseSha;
@@ -4309,7 +5130,9 @@ function createPushCommand() {
 		} catch (error) {
 			errors.push(`Save asset provenance: ${formatError(error)}`);
 		}
-		if (uploaded > 0 || deletedCount > 0 || linked > 0) await syncer.requestSync();
+		if (errors.length === 0 && (uploaded > 0 || deletedCount > 0 || linked > 0)) {
+			if (!await syncer.requestSync()) errors.push("Fluid did not accept sync finalization. Retry the push before publishing.");
+		}
 		if (errors.length) {
 			spinner.warn(`Pushed with ${errors.length} error(s).`);
 			for (const err of errors) console.error(`  ${err}`);
@@ -4323,7 +5146,14 @@ function createPushCommand() {
 				status: "deleted",
 				path: key
 			}))];
-			await commitPushedState(themeRoot, shadow, syncCommitSubject("Push", await getActor(), /* @__PURE__ */ new Date(), pushedChanges));
+			try {
+				await commitPushedState(themeRoot, shadow, syncCommitSubject("Push", await getActor(), /* @__PURE__ */ new Date(), pushedChanges), syncer.acknowledgedMemberContents());
+			} catch (error) {
+				console.error(`Theme content was uploaded to the server, but the local restore point and sync baseline could not be saved: ${error instanceof Error ? error.message : String(error)}. Do not repeat the push with --force. Review the remote theme and run a normal pull to recover the baseline.`);
+				if (opts.publish) console.error("Publishing was not attempted.");
+				process.exitCode = 1;
+				return;
+			}
 		}
 		await persistConfig();
 		/**
@@ -4358,7 +5188,7 @@ function createPushCommand() {
 				});
 			} catch {}
 		}
-		if (opts.publish) {
+		if (opts.publish && errors.length === 0) {
 			const pubSpinner = ora("Publishing theme…").start();
 			try {
 				await publishApplicationTheme(api, theme.id);
@@ -4410,6 +5240,50 @@ async function canPullThemeInBackground(root, themeId) {
 	}
 }
 //#endregion
+//#region src/theme/member-transfer.ts
+/** Missing/ignored is not empty. Return paths to retain without acknowledging
+* their local bytes as remotely accepted. Used before pull writes or pruning. */
+function planOmittedMemberFiles(input) {
+	if (input.incomingPaths.has("members_sites.json") && !input.ignored("members_sites.json")) return /* @__PURE__ */ new Set();
+	const protectedPaths = /* @__PURE__ */ new Set();
+	for (const content of input.previousDocuments) {
+		if (content === null) continue;
+		protectedPaths.add(MEMBER_CONFIGURATION_KEY);
+		if (content.byteLength > 2 * 1024 * 1024) throw new Error("Cannot preserve member files: members_sites.json exceeds 2 MB.");
+		const document = JSON.parse(content.toString("utf8"));
+		if (!isRecord(document) || document.version !== 2) throw new Error("Cannot preserve member files: members_sites.json must be a version 2 document.");
+		for (const field of [
+			"sites",
+			"menus",
+			"menu_references"
+		]) if (!Array.isArray(document[field])) throw new Error(`Cannot preserve member files: members_sites.json ${field} must be an array.`);
+		assertDependencyShape(document);
+		if (document.sites.length > 0) {
+			for (const path of input.availablePaths) if (/^(sections|blocks|components|snippets|navbar|footer)\//.test(path)) protectedPaths.add(path);
+		}
+		for (const path of memberDependencyPaths(document, input.availablePaths)) {
+			if (!isThemeResourceKey(path) || path.includes("\\") || [...path].some((character) => character.charCodeAt(0) < 32) || path === "config/members_sites.json") throw new Error(`Cannot preserve member files: invalid dependency path ${path}.`);
+			protectedPaths.add(path);
+		}
+	}
+	return new Set([...protectedPaths].filter((path) => !input.incomingPaths.has(path) || input.ignored(path)));
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/** Reject incomplete dependency declarations rather than silently pruning files. */
+function assertDependencyShape(document) {
+	const entries = (value) => {
+		if (!Array.isArray(value) || !value.every(isRecord)) throw new Error("Cannot preserve member files: malformed dependency declaration.");
+		return value;
+	};
+	for (const entry of [...entries(document.templates ?? []), ...entries(document.menu_references)]) if (typeof entry.path !== "string" || !entry.path) throw new Error("Cannot preserve member files: dependency path is missing.");
+	for (const site of entries(document.sites)) {
+		if (site.layout_name !== null && typeof site.layout_name !== "string") throw new Error("Cannot preserve member files: invalid layout name.");
+		for (const page of entries(site.pages)) if (page.template_path !== null && typeof page.template_path !== "string") throw new Error("Cannot preserve member files: invalid page template path.");
+	}
+}
+//#endregion
 //#region src/theme/merge-pull.ts
 /** `write(..., RESOLVES_CONFLICT)`: this write is the chosen side of a conflict. */
 const RESOLVES_CONFLICT = true;
@@ -4499,6 +5373,21 @@ async function mergePull(input) {
 		onProgress?.(++done, remote.length);
 	}
 	input.backgroundGuard?.assertUnchanged();
+	let retainedMemberPaths;
+	try {
+		if (remoteKeys.has("members_sites.json") && !themeRoot.ignore.ignore("members_sites.json") && !remoteContent.has("members_sites.json")) throw new Error("members_sites.json was listed but could not be downloaded; previous member state retained.");
+		retainedMemberPaths = planOmittedMemberFiles({
+			previousDocuments: [readIfExists(themeRoot.file(MEMBER_CONFIGURATION_KEY).absolutePath), await shadow.blobAtHead(MEMBER_CONFIGURATION_KEY)],
+			availablePaths: new Set([...themeRoot.files().map((file) => file.relativePath), ...await shadow.headPaths()]),
+			incomingPaths: remoteKeys,
+			ignored: (path) => themeRoot.ignore.ignore(path)
+		});
+	} catch (error) {
+		result.errors.push(errMsg(error));
+		result.baselinePreserved = true;
+		return result;
+	}
+	for (const path of retainedMemberPaths) remoteContent.delete(path);
 	for (const [key, remoteBuf] of remoteContent) {
 		const file = themeRoot.file(key);
 		if (!file.absolutePath.startsWith(themeRoot.root + sep)) {
@@ -4559,7 +5448,7 @@ async function mergePull(input) {
 		for (const { key, file, content, record } of pendingWrites) if (tryWrite(key, file, content)) record();
 	}
 	if (doDelete && await shadow.hasHead()) for (const file of themeRoot.files()) {
-		if (remoteKeys.has(file.relativePath)) continue;
+		if (remoteKeys.has(file.relativePath) || retainedMemberPaths.has(file.relativePath)) continue;
 		if (isStylesheetKey(file.relativePath)) continue;
 		const baseBuf = await shadow.blobAtHead(file.relativePath);
 		if (!baseBuf) continue;
@@ -4574,37 +5463,43 @@ async function mergePull(input) {
 			if (error instanceof BackgroundPullChangedError) throw error;
 		}
 	}
-	const commitEntries = [];
-	for (const [key, buf] of remoteContent) {
-		if (unwrittenKeys.has(key)) continue;
-		commitEntries.push({
-			path: key,
-			sha: await shadow.writeBlob(buf)
-		});
-	}
-	for (const key of remoteKeys) {
-		if (input.skipRemoteKeys?.has(key)) continue;
-		if (remoteContent.has(key) && !unwrittenKeys.has(key)) continue;
-		const prevBlob = await shadow.blobAtHead(key);
-		if (prevBlob == null) continue;
-		commitEntries.push({
-			path: key,
-			sha: await shadow.writeBlob(prevBlob)
-		});
-	}
-	const assetManifest = new ThemeAssetManifest(themeRoot.root);
-	let managedAssetSentinelSha;
-	for (const key of input.skipRemoteKeys ?? []) {
-		if (!remoteKeys.has(key) || !assetManifest.has(key)) continue;
-		managedAssetSentinelSha ??= await shadow.writeBlob(MANAGED_ASSET_SHADOW_SENTINEL);
-		commitEntries.push({
-			path: key,
-			sha: managedAssetSentinelSha
-		});
-	}
-	if (commitEntries.length > 0 || remoteKeys.size === 0 && await shadow.hasHead()) {
-		input.backgroundGuard?.assertUnchanged();
-		await shadow.commitState(commitEntries, syncCommitSubject("Pull", input.actor ?? null));
+	try {
+		const commitEntries = [];
+		for (const [key, buf] of remoteContent) {
+			if (unwrittenKeys.has(key)) continue;
+			commitEntries.push({
+				path: key,
+				sha: await shadow.writeBlob(buf)
+			});
+		}
+		for (const key of new Set([...remoteKeys, ...retainedMemberPaths])) {
+			if (input.skipRemoteKeys?.has(key) && !retainedMemberPaths.has(key)) continue;
+			if (remoteContent.has(key) && !unwrittenKeys.has(key)) continue;
+			const prevBlob = await shadow.blobAtHead(key);
+			if (prevBlob == null) continue;
+			commitEntries.push({
+				path: key,
+				sha: await shadow.writeBlob(prevBlob)
+			});
+		}
+		const assetManifest = new ThemeAssetManifest(themeRoot.root);
+		let managedAssetSentinelSha;
+		for (const key of input.skipRemoteKeys ?? []) {
+			if (!remoteKeys.has(key) || !assetManifest.has(key)) continue;
+			managedAssetSentinelSha ??= await shadow.writeBlob(MANAGED_ASSET_SHADOW_SENTINEL);
+			commitEntries.push({
+				path: key,
+				sha: managedAssetSentinelSha
+			});
+		}
+		if (commitEntries.length > 0 || remoteKeys.size === 0 && await shadow.hasHead()) {
+			input.backgroundGuard?.assertUnchanged();
+			await shadow.commitState(commitEntries, syncCommitSubject("Pull", input.actor ?? null));
+		}
+	} catch (error) {
+		if (error instanceof BackgroundPullChangedError) throw error;
+		result.baselinePreserved = true;
+		result.errors.push(`Downloaded changes have already been applied locally, but the local restore point and sync baseline could not be saved: ${error instanceof Error ? error.message : String(error)}. Review the files and retry a normal pull before pushing; do not use --force to bypass the missing baseline.`);
 	}
 	return result;
 }
@@ -4726,7 +5621,8 @@ function createPullCommand() {
 				spinner.warn(`Pulled with ${result.errors.length} error(s): ${parts.join(", ")}.`);
 				for (const e of result.errors) console.error(`  ${e}`);
 				process.exitCode = 1;
-			} else if (result.conflicts.length > 0) {
+			}
+			if (result.conflicts.length > 0) {
 				spinner.warn(`${result.conflicts.length} conflict(s) — resolve markers before pushing: ${parts.join(", ")}.`);
 				console.log();
 				for (const c of result.conflicts) console.log(`  ${chalk.yellow("CONFLICT")} ${c}`);
@@ -4734,7 +5630,8 @@ function createPullCommand() {
 				console.log(`  Edit each file above to reconcile the ${chalk.cyan("<<<<<<<")} / ${chalk.cyan(">>>>>>>")} markers,`);
 				console.log(`  then run ${chalk.cyan("fluid theme push")} once your resolution is in place.`);
 				console.log();
-			} else spinner.succeed(parts.join(", ") || "Already up to date.");
+			} else if (result.errors.length === 0) spinner.succeed(parts.join(", ") || "Already up to date.");
+			if (result.baselinePreserved) return;
 			const remoteSha = syncer.remoteSha();
 			backgroundGuard?.assertUnchanged();
 			const updateConfig = () => writeThemeConfig(absoluteRoot, {
@@ -4881,196 +5778,6 @@ function createInitCommand() {
 	});
 }
 //#endregion
-//#region src/commands/navigate.ts
-function localSuggest(input, choices) {
-	if (!input) return choices;
-	const lower = input.toLowerCase();
-	return choices.filter((c) => c.title.toLowerCase().includes(lower));
-}
-const THEMEABLE_TYPE_MAP = {
-	"/home": "home_page",
-	"/home/shop": "shop_page",
-	"/home/join": "join_page",
-	"/cart": "cart_page",
-	"/home/blog": "post_page",
-	"/home/categories": "category_page",
-	"/home/collections": "collection_page"
-};
-const STATIC_ROUTES = [
-	{
-		label: "Home",
-		path: "/home"
-	},
-	{
-		label: "Shop",
-		path: "/home/shop"
-	},
-	{
-		label: "Join / Sign Up",
-		path: "/home/join"
-	},
-	{
-		label: "Cart",
-		path: "/cart"
-	},
-	{
-		label: "Blog",
-		path: "/home/blog"
-	},
-	{
-		label: "Categories (all)",
-		path: "/home/categories"
-	},
-	{
-		label: "Collections (all)",
-		path: "/home/collections"
-	}
-];
-const RESOURCE_ROUTES = [
-	{
-		label: "Category",
-		type: "category",
-		template: "/home/categories/%s",
-		fallback: "/home/categories"
-	},
-	{
-		label: "Collection",
-		type: "collection",
-		template: "/home/collections/%s",
-		fallback: "/home/collections"
-	},
-	{
-		label: "Product",
-		type: "product",
-		template: "/home/products/%s",
-		fallback: "/home/shop"
-	},
-	{
-		label: "Library",
-		type: "library",
-		template: "/home/libraries/%s",
-		fallback: "/home/libraries"
-	},
-	{
-		label: "Post",
-		type: "post",
-		template: "/home/posts/%s",
-		fallback: "/home/blog"
-	},
-	{
-		label: "Media",
-		type: "medium",
-		template: "/home/media/%s",
-		fallback: "/home/media"
-	},
-	{
-		label: "Enrollment Pack",
-		type: "enrollment_pack",
-		template: "/home/enrollments/%s",
-		fallback: "/home/join"
-	},
-	{
-		label: "Page",
-		type: "page",
-		template: "/home/pages/%s",
-		fallback: "/home/pages"
-	}
-];
-async function fetchTemplatesForType(api, themeId, themeableType) {
-	const params = new URLSearchParams({
-		application_theme_id: String(themeId),
-		themeable_type: themeableType,
-		published: "true"
-	});
-	return (await api.get(`/api/application_theme_templates?${params}`)).templates ?? [];
-}
-async function selectTemplate(api, themeId, themeableType, onCancel) {
-	const templates = await fetchTemplatesForType(api, themeId, themeableType);
-	if (templates.length <= 1) return null;
-	const { templateId } = await prompts({
-		type: "autocomplete",
-		name: "templateId",
-		message: "Select a template",
-		choices: templates.map((t) => ({
-			title: `${t.name}${t.default ? " (default)" : ""}`,
-			value: t.id
-		})),
-		suggest: (input, choices) => Promise.resolve(localSuggest(input, choices))
-	}, { onCancel });
-	return templateId ?? null;
-}
-function createNavigateCommand() {
-	return new Command("navigate").description("Interactively navigate to a route in the dev server browser").option("--host <host>", "Dev server host", "127.0.0.1").option("--port <port>", "Dev server port", "9292").option("-t, --theme <id>", "Theme ID (defaults to active dev theme)").action(async (opts) => {
-		requireToken();
-		const themeId = opts.theme ? Number(opts.theme) : getLastDevThemeId();
-		if (!themeId) {
-			console.error("No active dev theme. Run `fluid theme dev` first, or pass --theme <id>.");
-			process.exit(1);
-		}
-		const address = `http://${opts.host}:${opts.port}`;
-		const choices = [...STATIC_ROUTES.map((r) => ({
-			title: r.label,
-			value: r.path
-		})), ...RESOURCE_ROUTES.map((r) => ({
-			title: `${r.label} (select specific)`,
-			value: {
-				resourceType: r.type,
-				template: r.template,
-				fallback: r.fallback,
-				label: r.label
-			}
-		}))];
-		const onCancel = () => process.exit(130);
-		const { dest } = await prompts({
-			type: "autocomplete",
-			name: "dest",
-			message: "Select a route",
-			choices,
-			suggest: (input, choices) => Promise.resolve(localSuggest(input, choices))
-		}, { onCancel });
-		if (!dest) return;
-		const api = createApiClient();
-		let path;
-		let themeableType;
-		if (typeof dest === "string") {
-			path = dest;
-			themeableType = THEMEABLE_TYPE_MAP[dest];
-		} else {
-			themeableType = dest.resourceType;
-			const resources = (await getApplicationThemeAvailableThemeables(api, themeId, {
-				themeable: dest.resourceType,
-				per_page: 50
-			})).available_themeables ?? [];
-			if (!resources.length) {
-				console.log(`No ${dest.label} resources found, using listing page.`);
-				path = dest.fallback;
-			} else {
-				const resourceChoices = resources.map((r) => ({
-					title: r.title ?? r.slug ?? "Untitled",
-					value: r.slug
-				}));
-				const { slug } = await prompts({
-					type: "autocomplete",
-					name: "slug",
-					message: `Select a ${dest.label.toLowerCase()}`,
-					choices: resourceChoices,
-					suggest: (input, choices) => Promise.resolve(localSuggest(input, choices))
-				}, { onCancel });
-				path = dest.template.replace("%s", slug);
-			}
-		}
-		let templateParam = "";
-		if (themeableType) {
-			const templateId = await selectTemplate(api, themeId, themeableType, onCancel);
-			if (templateId) templateParam = `?theme_template_id=${templateId}`;
-		}
-		const url = `${address}${path}${templateParam}`;
-		console.log(`\nNavigating to: ${url}\n`);
-		const open = (await import("open")).default;
-		await open(url);
-	});
-}
-//#endregion
 //#region src/skills/install.ts
 function listSkillNames(skillsDir) {
 	if (!existsSync(skillsDir)) return [];