@fluid-app/fluid-cli-theme-dev 0.1.63 → 0.1.64

package/dist/index.mjs

@@ -134,8 +134,10 @@ function createFetchClient(config) {
 		const queryString = new URLSearchParams();
 		Object.entries(params).forEach(([key, value]) => {
 			if (value === void 0 || value === null) return;
-			if (Array.isArray(value)) value.forEach((item) => queryString.append(`${key}[]`, String(item)));
-			else if (typeof value === "object") Object.entries(value).forEach(([subKey, subValue]) => {
+			if (Array.isArray(value)) {
+				const arrayKey = key.endsWith("[]") ? key : `${key}[]`;
+				value.forEach((item) => queryString.append(arrayKey, String(item)));
+			} else if (typeof value === "object") Object.entries(value).forEach(([subKey, subValue]) => {
 				if (subValue === void 0 || subValue === null) return;
 				if (Array.isArray(subValue)) subValue.forEach((item) => queryString.append(`${key}[${subKey}][]`, String(item)));
 				else queryString.append(`${key}[${subKey}]`, String(subValue));
@@ -611,7 +613,7 @@ async function listApplicationThemes(client, params) {
 }
 /**
 * Create an application theme
-*
+* Creates a new theme for your company. Requires a company Bearer token with permission to update themes. The theme starts in `draft` status unless you pass another `status`. Pass `cover_image_url` to set the cover image. When the company has moved theme stylesheets to theme-level assets, sending `custom_stylesheet` or `global_stylesheet` returns 422. A Git repository is provisioned for the theme in the background when Git sync is available.
 *
 * @param client - Fetch client instance
 * @param body - body
@@ -621,7 +623,7 @@ async function createApplicationTheme(client, body) {
 }
 /**
 * Get an application theme
-*
+* Returns one of your company's themes with its templates (including full Liquid content), versions, images, and Git repositories. Pass `version` to read the theme as it was at a past version. Requires a company Bearer token with permission to view themes. Themes belonging to another company return 404.
 *
 * @param client - Fetch client instance
 * @param id - id
@@ -632,7 +634,7 @@ async function getApplicationTheme(client, id, params) {
 }
 /**
 * Returns available themeables for a given type scoped to the theme's company
-*
+* Lists the company resources of one type (for example `product`, `page`, `collection`, or `enrollment_pack`) that templates in this theme can be assigned to, sorted by title. Pass `themeable` to choose the type; unsupported types return 400. Pass `search` to filter by title. Results are paginated, with page details in `meta.pagination`, 20 per page by default. Requires a company Bearer token with permission to view themes.
 *
 * @param client - Fetch client instance
 * @param id - id
@@ -654,7 +656,7 @@ async function cloneApplicationThemeForDevelopment(client, id, body) {
 }
 /**
 * Publishes the theme
-*
+* Publishes the theme so the storefront serves its latest content, then syncs it to any connected Git repository. Pass the optional `version` query parameter to publish a specific past version instead; an unknown version returns 404. Requires a company Bearer token with permission to update themes. Returns 422 when the theme's member configuration references a template or navigation item that does not exist.
 *
 * @param client - Fetch client instance
 * @param id - id
@@ -664,7 +666,7 @@ async function publishApplicationTheme(client, id) {
 }
 /**
 * Get theme assets
-*
+* Lists the files (images, stylesheets, scripts, and other assets) uploaded to one of your company's themes. Requires a company Bearer token with permission to view themes.
 *
 * @param client - Fetch client instance
 * @param id - id
@@ -695,7 +697,7 @@ async function updateThemeResource(client, application_theme_id, body) {
 }
 /**
 * Deletes a theme resource
-*
+* Deletes one theme file, identified by its `key`, as the theme CLI does when a local file is removed. Send the `base_sha` from your last pull to guard against overwriting newer server changes (409 when stale). The member site manifest `members_sites.json` cannot be deleted this way. Requires a company admin token with the `application_themes` update permission.
 *
 * @param client - Fetch client instance
 * @param application_theme_id - application_theme_id
@@ -706,7 +708,7 @@ async function deleteThemeResource(client, application_theme_id, body) {
 }
 /**
 * Creates a file resource
-*
+* Uploads a file to the company's asset library. Provide exactly one source: `content` for a text file, a multipart `file` upload, or `dam_asset_code` to link an existing digital asset; otherwise supply `url` with `filename`, `content_type`, and `content_size`. To attach the file to a theme or template, send both `relateable_type` (`ApplicationTheme` or `ApplicationThemeTemplate`) and `relateable_id`. Requires the `file_resources` update permission.
 *
 * @param client - Fetch client instance
 * @param body - body
@@ -716,7 +718,7 @@ async function createFileResource(client, body) {
 }
 /**
 * Deletes a file resource
-*
+* Deletes one of the company's uploaded files and returns its ID. Requires the `file_resources` update permission. Returns 404 when the file does not belong to the company.
 *
 * @param client - Fetch client instance
 * @param id - id
@@ -972,6 +974,23 @@ function readLegacyThemeConfig(themeRoot) {
 		return null;
 	}
 }
+/**
+* Whether a push or pull to `theme` may use this directory's own sync state
+* and rebind it to `theme`.
+*
+* Development themes are scratch copies `fluid theme dev` creates and syncs.
+* Using one here would move the project's sync baseline to the scratch copy
+* and rebind the project, so a later Publish would update the copy instead of
+* the theme the project was pulled from. Push syncs such a theme separately;
+* pull refuses. An explicit `--theme` to any other theme still rebinds.
+*/
+function mayBindTheme(existing, theme) {
+	return !existing || existing.themeId === theme.id || theme.status !== "development";
+}
+/** Why `mayBindTheme` refused, with the way forward. */
+function developmentThemeRefusal(existing, theme) {
+	return `${theme.name} (#${theme.id}) is a development theme, and this project is bound to ${existing.themeName} (#${existing.themeId}). Pulling it here would replace this project's sync state. Use \`fluid theme dev\` or \`fluid theme push -t\` to update the development theme, or pull it into a separate directory with --root.`;
+}
 /** Write `.fluid-theme.json` to a theme directory. */
 function writeThemeConfig(themeRoot, config) {
 	writeFileSync(configPath(themeRoot), JSON.stringify(config, null, 2) + "\n", "utf-8");
@@ -1031,6 +1050,21 @@ const THEME_LEVEL_RESOURCE_KEYS = new Set([
 	"variables.json",
 	"members_sites.json"
 ]);
+/**
+* Template types Fluid has retired. The resources API answers 404 for them, so
+* a theme that still carries their folders must not try to upload them: member
+* home pages are `members_page` templates on the `/` route, sign-in is hosted,
+* and account pages became member pages.
+*/
+const RETIRED_TEMPLATE_TYPES = new Set([
+	"account_page",
+	"members_dashboard",
+	"members_login"
+]);
+function isRetiredTemplateKey(relativePath) {
+	const [prefix] = normalizeThemeResourceKey(relativePath).split("/");
+	return prefix !== void 0 && RETIRED_TEMPLATE_TYPES.has(prefix);
+}
 const COMPOSITE_RESOURCE_FILE_NAMES = new Set([
 	"index.liquid",
 	"styles.css",
@@ -1051,6 +1085,7 @@ function isThemeResourceKey(relativePath) {
 	const key = normalizeThemeResourceKey(relativePath);
 	if (!hasSafeSegments(key)) return false;
 	if (THEME_LEVEL_RESOURCE_KEYS.has(key)) return true;
+	if (isRetiredTemplateKey(key)) return false;
 	const segments = key.split("/");
 	const prefix = segments[0];
 	const fileName = segments.at(-1);
@@ -1665,7 +1700,7 @@ function injectHotReload(html, mode) {
 }
 //#endregion
 //#region src/theme/dev-server/member-preview-html.ts
-function escapeHtml(value) {
+function escapeHtml$1(value) {
 	return value.replace(/[&<>"']/g, (char) => ({
 		"&": "&amp;",
 		"<": "&lt;",
@@ -1723,9 +1758,9 @@ function renderMemberHtml(render, opts) {
 			if (href) href.value = previewLink(href.value, opts);
 		}
 	}
-	const runtime = parseFragment(`<script type="module" src="${escapeHtml(opts.localOrigin)}/_members/_runtime/account-screens.js"><\/script>`);
+	const runtime = parseFragment(`<script type="module" src="${escapeHtml$1(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)}">`);
+	const base = parseFragment(`<base href="${escapeHtml$1(new URL(opts.path, opts.origin).href)}">`);
 	head.childNodes.unshift(...base.childNodes);
 	const styles = parseFragment(render.styles);
 	head.childNodes.push(...styles.childNodes);
@@ -1859,7 +1894,7 @@ var MemberPreview = class {
 				}));
 				return true;
 			}
-			if (url.pathname === "/_members" || url.pathname === "/_members/") {
+			if ((url.pathname === "/_members" || url.pathname === "/_members/") && !url.searchParams.has("members_site_id")) {
 				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) => ({
@@ -1869,7 +1904,7 @@ var MemberPreview = class {
 						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>`;
+					return `<h2>${escapeHtml$1(site.name)}</h2><ul>${destinations.map((page) => `<li><a href="${escapeHtml$1(memberPreviewUrl(page.path, { members_site_id: site.id }))}">${escapeHtml$1(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>"}`);
@@ -1878,9 +1913,9 @@ var MemberPreview = class {
 			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}/`));
+			const path = url.pathname.slice(9) || "/";
+			const screen = metadata.system_screens.find((s) => path === `/${s.key}` || path.startsWith(`/${s.key}/`));
+			const page = screen ? void 0 : site.pages.find((p) => p.path === path);
 			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`, {
@@ -1945,6 +1980,89 @@ var SSEStream = class {
 	}
 };
 //#endregion
+//#region src/theme/dev-server/template-overrides.ts
+const TEMPLATE_OVERRIDE_PARAM = "theme_template_id";
+/**
+* Maps an explicit `theme_template_id` onto the dev theme the server renders.
+*
+* Mist, `theme navigate` and bookmarked URLs carry template ids from the
+* theme the project was pulled from. Forwarded unchanged next to
+* `x-fluid-theme: <dev theme>`, the storefront renders that original
+* template and the local edits never show. Resolve such an id to the dev
+* theme's template with the same themeable type and name instead. Ids that
+* already belong to the dev theme and global and extension templates (no
+* owning theme) pass through untouched. A failed lookup also passes through,
+* with a warning, since the page may then show the original template.
+*/
+function createTemplateOverrideResolver(api, devThemeId) {
+	const cache = /* @__PURE__ */ new Map();
+	const warnLookupFailed = (requestedId, error) => {
+		const message = error instanceof Error ? error.message : String(error);
+		console.warn(`[Templates] Could not map template #${requestedId} to dev theme #${devThemeId} (${message}); rendering it unchanged, which may show the original theme's template.`);
+	};
+	/** `null` means the lookup failed: forward the id as-is, uncached. */
+	const lookup = async (requestedId) => {
+		let requested;
+		try {
+			requested = (await api.get(`/api/application_theme_templates/${encodeURIComponent(requestedId)}`)).application_theme_template;
+		} catch (error) {
+			warnLookupFailed(requestedId, error);
+			return null;
+		}
+		if (!requested) return null;
+		const { name, themeable_type: themeableType } = requested;
+		const sourceThemeId = requested.application_theme_id;
+		if (!sourceThemeId || sourceThemeId === devThemeId) return {
+			kind: "use",
+			id: requestedId
+		};
+		const params = new URLSearchParams({
+			application_theme_id: String(devThemeId),
+			themeable_type: themeableType
+		});
+		let candidates;
+		try {
+			candidates = (await api.get(`/api/application_theme_templates?${params}`)).templates ?? [];
+		} catch (error) {
+			warnLookupFailed(requestedId, error);
+			return null;
+		}
+		const matches = candidates.filter((t) => t.application_theme_id === devThemeId && t.themeable_type === themeableType && t.name === name);
+		const [counterpart] = matches;
+		if (matches.length === 1 && counterpart) return {
+			kind: "use",
+			id: String(counterpart.id)
+		};
+		return {
+			kind: "unresolved",
+			reason: matches.length === 0 ? "missing" : "ambiguous",
+			requestedId,
+			themeableType,
+			name,
+			candidateIds: matches.map((t) => t.id)
+		};
+	};
+	return {
+		async resolve(requestedId) {
+			const cached = cache.get(requestedId);
+			if (cached) return {
+				kind: "use",
+				id: cached
+			};
+			const result = await lookup(requestedId);
+			if (!result) return {
+				kind: "use",
+				id: requestedId
+			};
+			if (result.kind === "use") cache.set(requestedId, result.id);
+			return result;
+		},
+		clear() {
+			cache.clear();
+		}
+	};
+}
+//#endregion
 //#region src/theme/dev-server/proxy.ts
 const HOP_BY_HOP = new Set([
 	"connection",
@@ -1968,6 +2086,20 @@ async function proxyRequest(req, res, opts) {
 	const url = new URL(req.url ?? "/", `http://${req.headers.host}`);
 	url.searchParams.set("_fd", "0");
 	url.searchParams.set("pb", "0");
+	const requestedTemplateId = url.searchParams.get(TEMPLATE_OVERRIDE_PARAM);
+	if (requestedTemplateId && opts.templateOverrides) {
+		const override = await opts.templateOverrides.resolve(requestedTemplateId);
+		if (override.kind === "use") url.searchParams.set(TEMPLATE_OVERRIDE_PARAM, override.id);
+		else if (isPageRequest(req)) {
+			const html = injectHotReload(unresolvedTemplatePage(override, opts.themeId), opts.reloadMode);
+			res.writeHead(404, {
+				"content-type": "text/html; charset=utf-8",
+				"content-length": String(Buffer.byteLength(html))
+			});
+			res.end(html);
+			return;
+		}
+	}
 	const pending = opts.pendingFiles?.() ?? [];
 	const isGet = req.method === "GET" || req.method === "HEAD";
 	let method = req.method ?? "GET";
@@ -2022,6 +2154,26 @@ async function proxyRequest(req, res, opts) {
 		proxyReq.end();
 	});
 }
+const PAGE_FETCH_DESTS = new Set([
+	"document",
+	"iframe",
+	"frame"
+]);
+/** Browser navigations to a storefront page, as opposed to API or asset calls. */
+function isPageRequest(req) {
+	if (req.method !== "GET" && req.method !== "HEAD") return false;
+	if (((req.url ?? "/").split("?")[0] ?? "/").startsWith("/api/")) return false;
+	const dest = req.headers["sec-fetch-dest"];
+	if (typeof dest === "string") return PAGE_FETCH_DESTS.has(dest);
+	const accept = req.headers["accept"];
+	return typeof accept === "string" && accept.includes("text/html");
+}
+function unresolvedTemplatePage(override, devThemeId) {
+	return `<!doctype html><title>Template not in dev theme</title><p>${`Template #${escapeHtml(override.requestedId)} (${escapeHtml(override.themeableType)} / ${escapeHtml(override.name)})`} belongs to another theme, and ${override.reason === "missing" ? `dev theme #${devThemeId} has no template with that type and name. Sync or create it locally, or` : `dev theme #${devThemeId} has several templates with that type and name (#${override.candidateIds.join(", #")}), so the edited copy is ambiguous. Remove the duplicates, or`} remove <code>${TEMPLATE_OVERRIDE_PARAM}</code> to use the default.</p>`;
+}
+function escapeHtml(value) {
+	return value.replace(/[&<>"']/g, (c) => `&#${c.charCodeAt(0)};`);
+}
 function readBody(req) {
 	return new Promise((resolve, reject) => {
 		const chunks = [];
@@ -2346,12 +2498,13 @@ function isStylesheetKey(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. */
+* Rails remains responsible for resolving company-specific roles and handles.
+* Retired template types are never synced, so they are never dependencies. */
 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);
+	for (const entry of [...records$1(document.templates), ...records$1(document.menu_references)]) if (typeof entry.path === "string") dependencies.add(entry.path);
+	for (const site of records$1(document.sites)) {
+		for (const page of records$1(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)) {
@@ -2372,9 +2525,10 @@ function memberDependencyPaths(document, availablePaths, deletedPaths = [], chan
 			if ((suffix === "styles.css" ? changedPaths : availablePaths).has(sibling) || deletedPaths.includes(sibling)) dependencies.add(sibling);
 		}
 	}
+	for (const path of dependencies) if (isRetiredTemplateKey(path)) dependencies.delete(path);
 	return dependencies;
 }
-function records(entries) {
+function records$1(entries) {
 	return (Array.isArray(entries) ? entries : []).filter((entry) => typeof entry === "object" && entry !== null && !Array.isArray(entry));
 }
 //#endregion
@@ -2385,19 +2539,27 @@ 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 manifestContent = manifest.read();
+	const parsed = JSON.parse(manifestContent);
+	if (Array.isArray(parsed)) return individualUploads(changedFiles);
+	if (!isRecord$3(parsed)) throw new Error("members_sites.json must contain a JSON object.");
+	const { document, removed } = withoutRetiredTemplates(parsed);
+	const content = removed.length > 0 ? `${JSON.stringify(document, null, 2)}\n` : manifestContent;
 	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 memberChanged = changedFiles.some((file) => file.relativePath === "members_sites.json" || dependencies.has(file.relativePath));
+	if (!memberChanged && removed.length === 0) return changedFiles.map((file) => ({ file }));
 	const availableFiles = new Map(localFiles.map((file) => [file.relativePath, file]));
-	const memberFiles = [...dependencies].map((path) => {
+	const unavailable = [...dependencies].find((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;
+		return !file || !file.isText || themeRoot.ignore.ignore(path);
 	});
+	if (unavailable) {
+		if (!memberChanged) return changedFiles.map((file) => ({ file }));
+		throw new Error(`Member dependency must be an available text file: ${unavailable}`);
+	}
+	const memberFiles = [...dependencies].map((path) => availableFiles.get(path));
+	if (removed.length > 0) manifest.write(content);
 	const uploads = changedFiles.filter((file) => file.relativePath !== "members_sites.json" && !dependencies.has(file.relativePath)).map((file) => ({ file }));
 	uploads.push({
 		file: manifest,
@@ -2408,6 +2570,43 @@ function planThemeUploads(themeRoot, changedFiles, deletedPaths = []) {
 	});
 	return uploads;
 }
+/**
+* Drop references to retired template types. The server rejects the whole
+* document for one, which would also hold back every member site and menu it
+* carries.
+*
+* Only `templates` and `menu_references` can name one: a site page's template
+* must be a `members_page`. A menu left without any reference is dropped with
+* its reference, because the server rejects unreferenced menus too.
+*/
+function withoutRetiredTemplates(document) {
+	const removed = /* @__PURE__ */ new Set();
+	const orphanCandidates = /* @__PURE__ */ new Set();
+	const keep = (entry) => {
+		if (!isRecord$3(entry) || typeof entry.path !== "string") return true;
+		if (!isRetiredTemplateKey(entry.path)) return true;
+		removed.add(entry.path);
+		if ("menu_key" in entry) orphanCandidates.add(entry.menu_key);
+		return false;
+	};
+	const next = { ...document };
+	for (const key of ["templates", "menu_references"]) if (Array.isArray(next[key])) next[key] = next[key].filter(keep);
+	if (removed.size === 0) return {
+		document,
+		removed: []
+	};
+	if (orphanCandidates.size > 0 && Array.isArray(next.menus)) {
+		const used = new Set([...records(next.sites).map((site) => site.menu_key), ...records(next.menu_references).map((entry) => entry.menu_key)]);
+		next.menus = next.menus.filter((menu) => !isRecord$3(menu) || !orphanCandidates.has(menu.key) || used.has(menu.key));
+	}
+	return {
+		document: next,
+		removed: [...removed]
+	};
+}
+function records(entries) {
+	return Array.isArray(entries) ? entries.filter(isRecord$3) : [];
+}
 function individualUploads(files) {
 	return [...files].sort((left, right) => Number(left.relativePath === MEMBER_CONFIGURATION_KEY) - Number(right.relativePath === MEMBER_CONFIGURATION_KEY)).map((file) => ({ file }));
 }
@@ -3193,7 +3392,7 @@ var Syncer = class {
 		if (opts.remoteState) this.useDevRemoteState(opts.remoteState);
 		else await this.fetchChecksums();
 		if (!opts.skipPreflight) await this.preflightPush(opts.baseSha);
-		let baseSha = opts.baseSha ?? null;
+		let baseSha = opts.baseSha ?? (opts.guardFetchedRemote && !opts.remoteState ? this.remoteSha() : 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)) : [];
@@ -3582,6 +3781,7 @@ 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);
+	const templateOverrides = createTemplateOverrideResolver(api, theme.id);
 	let remoteStateSafe = true;
 	const invalidateRemoteState = () => {
 		if (!remoteStateSafe) return;
@@ -3767,6 +3967,7 @@ async function startDevServer(api, theme, themeRoot, opts, onReady) {
 				console.error("[Member preview] Could not refresh routes after sync. The next member request will retry.");
 			}
 		}
+		if (added.length > 0 || removed.length > 0) templateOverrides.clear();
 		if (removed.length > 0) sse.broadcast(JSON.stringify({ reload_page: true }));
 		else if (uploads.length > 0) sse.broadcast(JSON.stringify({ modified: uploads.flatMap(({ file, memberConfiguration }) => [file, ...memberConfiguration?.files ?? []].map((updatedFile) => updatedFile.relativePath)) }));
 		scheduleSync();
@@ -3787,6 +3988,7 @@ async function startDevServer(api, theme, themeRoot, opts, onReady) {
 				company: theme.company,
 				themeId: theme.id,
 				reloadMode: opts.reloadMode,
+				templateOverrides,
 				pendingFiles: () => [...pendingUpdates].map((p) => themeRoot.file(p)).filter((f) => f.isText).map((f) => ({
 					relativePath: f.relativePath,
 					read: () => f.read()
@@ -4627,6 +4829,78 @@ function createDevCommand() {
 	});
 }
 //#endregion
+//#region src/theme/development-push.ts
+/**
+* Push a project to a development theme without touching the project's own
+* sync state.
+*
+* A project directory keeps one shadow repo and one `.fluid-theme.json`, both
+* for the theme it is bound to. Opening the shadow repo for another theme
+* wipes it, so an ordinary push here would cost the bound theme its baseline:
+* the next Publish could no longer detect deletions or stale remotes. This
+* syncs the way `fluid theme dev` does instead: against the development
+* theme's own remote index and `.fluid-theme/dev-baseline.json`, which it
+* keeps current for the next dev session.
+*/
+async function pushToDevelopmentTheme(api, themeId, themeRoot, opts) {
+	const syncer = new Syncer(api, themeId, themeRoot);
+	const fingerprint = () => new ThemeAssetManifest(themeRoot.root).fingerprint();
+	const common = {
+		delete: opts.delete,
+		validate: opts.validate,
+		linkManagedAssets: { replace: true },
+		pendingBinaryAssets: true,
+		...opts.onProgress ? { onProgress: opts.onProgress } : {}
+	};
+	const saved = readDevRemoteBaseline(themeRoot.root, themeId, fingerprint());
+	let trusted = false;
+	if (saved) try {
+		syncer.useDevRemoteState(saved);
+		await syncer.preflightPush(saved.remoteSha);
+		trusted = true;
+	} catch (error) {
+		if (!(error instanceof PushConflictError)) throw error;
+	}
+	let result;
+	try {
+		result = trusted && saved ? await syncer.uploadTheme({
+			...common,
+			baseSha: syncer.remoteSha(),
+			remoteState: saved,
+			skipPreflight: true
+		}) : await syncer.uploadTheme({
+			...common,
+			guardFetchedRemote: true
+		});
+	} catch (error) {
+		if (!(error instanceof PushConflictError)) throw error;
+		removeDevRemoteBaseline(themeRoot.root);
+		return {
+			uploaded: 0,
+			deleted: 0,
+			linked: 0,
+			errors: ["The development theme changed during this push. Run the push again to compare against its current state."],
+			validationFailed: false,
+			conflict: true
+		};
+	}
+	const errors = [...result.errors];
+	if (result.validationFailed || errors.length > 0) removeDevRemoteBaseline(themeRoot.root);
+	else if (!await syncer.requestSync()) errors.push("Fluid did not accept sync finalization. Retry the push to commit it.");
+	else {
+		const state = syncer.devRemoteState(fingerprint());
+		if (state) writeDevRemoteBaseline(themeRoot.root, state);
+	}
+	return {
+		uploaded: result.uploaded,
+		deleted: result.deleted,
+		linked: result.linked,
+		errors,
+		validationFailed: result.validationFailed,
+		conflict: false
+	};
+}
+//#endregion
 //#region src/theme/merge-push.ts
 /**
 * Compute what changed locally since the last time the shadow repo
@@ -4969,7 +5243,39 @@ function createPushCommand() {
 		else if (config) {
 			console.log(`  Using theme from .fluid-theme.json: ${chalk.bold(config.themeName)} (#${config.themeId})`);
 			theme = (await getApplicationTheme(api, config.themeId)).application_theme;
+			if (theme.status === "development") console.warn(chalk.yellow(`  ${theme.name} (#${theme.id}) is a development theme: a scratch copy made by \`fluid theme dev\`, not a theme your storefront serves. This push updates only that copy. To update the real theme, run \`fluid theme pull -t <theme-id>\` here to bind the project to it, or pass --theme.`));
 		} else theme = await selectTheme(api, "Select a theme to push to");
+		if (config && !mayBindTheme(config, theme)) {
+			const own = getDevTheme(devThemeKey(config.company, themeRoot.root));
+			if (own?.id !== theme.id) {
+				console.error(`${theme.name} (#${theme.id}) is a development theme, but not this project's` + (own ? ` (that is #${own.id})` : "") + `. Pushing would overwrite it with this directory. Run \`fluid theme dev\` here to sync this project's own development theme, or \`fluid theme dev --theme ${theme.id}\` to sync this one deliberately.`);
+				process.exit(1);
+			}
+			const unresolvedDev = findUnresolvedConflicts(themeRoot.files());
+			if (unresolvedDev.length > 0) {
+				console.error(`✗ ${unresolvedDev.length} file(s) still contain unresolved conflict markers: ${unresolvedDev.join(", ")}. Resolve them before pushing.`);
+				process.exit(1);
+			}
+			if (opts.publish) {
+				console.error(`${theme.name} (#${theme.id}) is a development theme; --publish would make that scratch copy the live theme. Push without --publish, or publish ${config.themeName} (#${config.themeId}).`);
+				process.exit(1);
+			}
+			const devSpinner = ora(`Pushing to development theme ${theme.name} (#${theme.id})…`).start();
+			const result = await pushToDevelopmentTheme(api, theme.id, themeRoot, {
+				validate: !opts.force,
+				delete: !opts.nodelete && !opts.autoBaseline,
+				onProgress: (done, total) => {
+					devSpinner.text = `Pushing ${done}/${total} files to ${theme.name} (#${theme.id})…`;
+				}
+			});
+			if (result.validationFailed) devSpinner.fail(`Schema validation failed (${result.errors.length} error(s)). Use --force to skip.`);
+			else if (result.errors.length > 0) devSpinner.warn(`Pushed with ${result.errors.length} error(s).`);
+			else devSpinner.succeed(`Pushed ${result.uploaded} file(s), removed ${result.deleted}, to development theme #${theme.id}.`);
+			for (const e of result.errors) console.error(`  ${e}`);
+			console.log(`  This project stays bound to ${config.themeName} (#${config.themeId}); Publish still pushes there.`);
+			if (result.errors.length > 0) process.exitCode = 1;
+			return;
+		}
 		const shadow = await ShadowRepo.open(themeRoot.root, theme.id);
 		await migrateLegacyChecksumsIntoShadow({
 			shadow,
@@ -5546,6 +5852,14 @@ function createPullCommand() {
 			else root = `.`;
 			const absoluteRoot = resolve(root);
 			const existingConfig = readThemeConfig(absoluteRoot);
+			if (existingConfig && !mayBindTheme(existingConfig, theme)) {
+				if (opts.onlyIfClean) {
+					console.log(`Skipped: this directory is bound to ${existingConfig.themeName} (#${existingConfig.themeId}), not development theme #${theme.id}.`);
+					process.exit(3);
+				}
+				console.error(developmentThemeRefusal(existingConfig, theme));
+				process.exit(1);
+			}
 			const backgroundGuard = opts.onlyIfClean ? new BackgroundPullGuard(absoluteRoot) : void 0;
 			console.log();
 			console.log(`  Theme:   ${chalk.bold(theme.name)} (#${theme.id})`);