@fluid-app/fluid-cli-theme-dev 0.1.37 → 0.1.38

package/dist/index.mjs

@@ -1156,45 +1156,6 @@ function readBody(req) {
 	});
 }
 //#endregion
-//#region src/theme/dev-server/watcher.ts
-function watchTheme(root, handler) {
-	const watcher = chokidar.watch(root.root, {
-		ignoreInitial: true,
-		ignored: (filePath) => {
-			if (filePath.includes("node_modules")) return true;
-			try {
-				const rel = relative(root.root, filePath);
-				return (rel.split(/[\\/]/).pop() ?? "").startsWith(".") || root.ignore.ignore(rel);
-			} catch {
-				return false;
-			}
-		},
-		persistent: true,
-		awaitWriteFinish: {
-			stabilityThreshold: 50,
-			pollInterval: 10
-		}
-	});
-	let pending = Promise.resolve();
-	const enqueue = (fn) => {
-		pending = pending.then(fn).catch(() => {});
-	};
-	watcher.on("change", (filePath) => {
-		const rel = relative(root.root, filePath);
-		if (root.ignore.ignore(rel)) return;
-		enqueue(() => handler([root.file(filePath)], [], []));
-	});
-	watcher.on("add", (filePath) => {
-		const rel = relative(root.root, filePath);
-		if (root.ignore.ignore(rel)) return;
-		enqueue(() => handler([], [root.file(filePath)], []));
-	});
-	watcher.on("unlink", (filePath) => {
-		enqueue(() => handler([], [], [root.file(filePath)]));
-	});
-	return () => watcher.close();
-}
-//#endregion
 //#region ../../api-clients/themes/src/namespaces/v0.ts
 /**
 * List application themes
@@ -1281,12 +1242,6 @@ async function deleteThemeResource(client, application_theme_id, body) {
 	return client.delete(`/api/application_themes/${application_theme_id}/resources`, { body });
 }
 //#endregion
-//#region src/theme/stylesheet-keys.ts
-const STYLESHEET_KEY_PATTERN = /^(styles\.css|global_styles\.css|[^/]+\/[^/]+\/styles\.css)$/;
-function isStylesheetKey(key) {
-	return STYLESHEET_KEY_PATTERN.test(key);
-}
-//#endregion
 //#region src/theme/format-error.ts
 const STYLESHEET_MIGRATION_SKILL = "template-stylesheet-to-asset-migration";
 function isStylesheetKeyRejection(error) {
@@ -1320,6 +1275,53 @@ function formatError(e) {
 	return String(e);
 }
 //#endregion
+//#region src/theme/dev-server/watcher.ts
+function watchTheme(root, handler) {
+	const watcher = chokidar.watch(root.root, {
+		ignoreInitial: true,
+		ignored: (filePath) => {
+			if (filePath.includes("node_modules")) return true;
+			try {
+				const rel = relative(root.root, filePath);
+				return (rel.split(/[\\/]/).pop() ?? "").startsWith(".") || root.ignore.ignore(rel);
+			} catch {
+				return false;
+			}
+		},
+		persistent: true,
+		awaitWriteFinish: {
+			stabilityThreshold: 50,
+			pollInterval: 10
+		}
+	});
+	let pending = Promise.resolve();
+	const enqueue = (fn) => {
+		pending = pending.then(fn).catch((e) => {
+			console.error(`  [Watcher] change handling failed: ${formatError(e)}`);
+		});
+	};
+	watcher.on("change", (filePath) => {
+		const rel = relative(root.root, filePath);
+		if (root.ignore.ignore(rel)) return;
+		enqueue(() => handler([root.file(filePath)], [], []));
+	});
+	watcher.on("add", (filePath) => {
+		const rel = relative(root.root, filePath);
+		if (root.ignore.ignore(rel)) return;
+		enqueue(() => handler([], [root.file(filePath)], []));
+	});
+	watcher.on("unlink", (filePath) => {
+		enqueue(() => handler([], [], [root.file(filePath)]));
+	});
+	return () => watcher.close();
+}
+//#endregion
+//#region src/theme/stylesheet-keys.ts
+const STYLESHEET_KEY_PATTERN = /^(styles\.css|global_styles\.css|[^/]+\/[^/]+\/styles\.css)$/;
+function isStylesheetKey(key) {
+	return STYLESHEET_KEY_PATTERN.test(key);
+}
+//#endregion
 //#region src/theme/syncer.ts
 /**
 * Server rejected the push because the CLI's `base_sha` no longer
@@ -1371,12 +1373,23 @@ var Syncer = class {
 	remoteChecksums() {
 		return Object.fromEntries(this.checksums);
 	}
+	/**
+	* Uploads one file. Resolves with the exact text content that was
+	* sent to the server (null for binary files) so callers can run
+	* diagnostics against the same bytes instead of re-reading a file
+	* that may have changed on disk while the request was in flight.
+	*/
 	async uploadFile(file, baseSha) {
-		if (file.isText) await this.putResource({
-			key: file.relativePath,
-			content: file.read()
-		}, baseSha);
-		else await this.uploadBinaryFile(file, baseSha);
+		if (file.isText) {
+			const content = file.read();
+			await this.putResource({
+				key: file.relativePath,
+				content
+			}, baseSha);
+			return content;
+		}
+		await this.uploadBinaryFile(file, baseSha);
+		return null;
 	}
 	/**
 	* Wraps the generated `updateThemeResource` client with the two
@@ -1622,6 +1635,30 @@ var Syncer = class {
 	}
 };
 //#endregion
+//#region src/theme/liquid-delimiters.ts
+/**
+* Heuristic-only check for obviously unbalanced liquid delimiters
+* (`{% %}` and `{{ }}`). This is NOT a liquid parser — it just counts
+* delimiter occurrences. It exists to give watch-mode users a signal
+* when a save is liquid-syntax-broken: the server accepts
+* syntax-broken liquid silently on upload, and the storefront
+* renderer then serves stale content for that section with no error
+* anywhere else in the pipeline.
+*
+* Known false positive: delimiters written literally inside a
+* `{% raw %}...{% endraw %}` block are still counted and can trip
+* this check even though the liquid is valid. Acceptable for a
+* warn-only heuristic — a real fix requires parsing liquid, which is
+* out of scope here (see the server-side validation note in the PR).
+*/
+function hasUnbalancedLiquidDelimiters(content) {
+	const tagOpens = content.match(/\{%/g)?.length ?? 0;
+	const tagCloses = content.match(/%\}/g)?.length ?? 0;
+	const outputOpens = content.match(/\{\{/g)?.length ?? 0;
+	const outputCloses = content.match(/\}\}/g)?.length ?? 0;
+	return tagOpens !== tagCloses || outputOpens !== outputCloses;
+}
+//#endregion
 //#region src/theme/dev-server/port-preflight.ts
 /**
 * The dev command does real work before it ever binds a port: it resolves
@@ -1663,6 +1700,9 @@ function checkPortAvailable(host, port) {
 }
 //#endregion
 //#region src/theme/dev-server/index.ts
+function timestamp() {
+	return (/* @__PURE__ */ new Date()).toLocaleTimeString("en-US", { hour12: false });
+}
 async function startDevServer(api, theme, themeRoot, opts, onReady) {
 	const sse = new SSEStream();
 	const syncer = new Syncer(api, theme.id, themeRoot);
@@ -1693,7 +1733,9 @@ async function startDevServer(api, theme, themeRoot, opts, onReady) {
 			}
 			pendingUpdates.add(file.relativePath);
 			try {
-				await syncer.uploadFile(file);
+				const uploadedContent = await syncer.uploadFile(file);
+				console.log(`  ✓ synced ${file.relativePath} (${timestamp()})`);
+				if (file.isLiquid && uploadedContent !== null && hasUnbalancedLiquidDelimiters(uploadedContent)) console.warn(`  ⚠ ${file.relativePath}: unbalanced liquid delimiters — the storefront may silently serve stale content for this section`);
 			} catch (e) {
 				console.error(`\n[Watcher] Upload failed: ${file.relativePath}: ${e}`);
 			} finally {
@@ -1702,6 +1744,7 @@ async function startDevServer(api, theme, themeRoot, opts, onReady) {
 		}
 		for (const file of removed) try {
 			await syncer.deleteRemoteFile(file.relativePath);
+			console.log(`  ✓ removed ${file.relativePath}`);
 		} catch {}
 		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) }));
@@ -2182,8 +2225,15 @@ var ShadowRepo = class ShadowRepo {
 	* `base` is null when HEAD has never seen this path; we merge
 	* against an empty base, which is what git itself does for a new
 	* file added on both sides.
+	*
+	* `favor` maps to `git merge-file`'s `--ours` / `--theirs`: instead
+	* of emitting `<<<<<<<` markers, conflicting hunks are resolved to
+	* the local (`"local"` → `--ours`, local is file1) or remote
+	* (`"remote"` → `--theirs`) side. The output then never contains
+	* markers, so the result is reported conflict-free even when
+	* merge-file's exit code still counts the auto-resolved hunks.
 	*/
-	async merge3(base, local, remote) {
+	async merge3(base, local, remote, favor) {
 		const dir = mkdtempSync(join(tmpdir(), "fluid-merge-"));
 		const localPath = join(dir, "local");
 		const basePath = join(dir, "base");
@@ -2196,6 +2246,7 @@ var ShadowRepo = class ShadowRepo {
 				const { stdout } = await this.git([
 					"merge-file",
 					"-p",
+					...favor === "local" ? ["--ours"] : favor === "remote" ? ["--theirs"] : [],
 					"-L",
 					"local",
 					"-L",
@@ -2213,7 +2264,12 @@ var ShadowRepo = class ShadowRepo {
 			} catch (err) {
 				const e = err;
 				const merged = e.stdout instanceof Buffer ? e.stdout : e.stdout != null ? Buffer.from(e.stdout) : Buffer.alloc(0);
-				if (typeof e.code === "number" && e.code >= 1 && e.code <= 127 && merged.length > 0) return {
+				const inConflictRange = typeof e.code === "number" && e.code >= 1 && e.code <= 127;
+				if (inConflictRange && favor) return {
+					merged,
+					hasConflicts: false
+				};
+				if (inConflictRange && merged.length > 0) return {
 					merged,
 					hasConflicts: true
 				};
@@ -2408,6 +2464,19 @@ function findUnresolvedConflicts(files) {
 	}
 	return flagged;
 }
+/**
+* Stable, machine-readable one-liner for non-interactive callers
+* (Mist Desktop's publish flow parses push output). Uploading marker-
+* bearing files to a live theme is never acceptable, so `--auto-
+* baseline` pushes still refuse — but they emit this line so the
+* desktop can surface WHICH files block the publish instead of a
+* dead-end wall of prose. Format:
+*
+*   FLUID_THEME_PUSH_BLOCKED code=conflict_markers files=a.liquid,b.json
+*/
+function conflictMarkerBlockLine(files) {
+	return `FLUID_THEME_PUSH_BLOCKED code=conflict_markers files=${files.join(",")}`;
+}
 const CONFLICT_START = Buffer.from("<<<<<<<");
 const CONFLICT_MID = Buffer.from("=======");
 const CONFLICT_END = Buffer.from(">>>>>>>");
@@ -2438,9 +2507,185 @@ async function commitPushedState(themeRoot, shadow, message) {
 	if (entries.length > 0) await shadow.commitState(entries, message);
 }
 //#endregion
+//#region src/theme/auto-baseline.ts
+/**
+* `fluid theme push --auto-baseline`: when a theme directory has no
+* shadow baseline (scaffold that never pulled, or a dir last synced
+* by the checksum-era CLI whose migration had nothing to seed),
+* record the server's CURRENT state as the baseline commit so the
+* normal push diff (local vs baseline) can run.
+*
+* Invariants:
+*
+* 1. **The working tree is never touched.** Baseline recording writes
+*    blobs into the bare shadow repo only; not a single byte on disk
+*    changes. Local files identical to the server simply won't diff;
+*    files that differ (or exist only locally) will push.
+*
+* 2. **Server-only files are never deleted.** Paths that exist on the
+*    server but not locally are deliberately excluded from the
+*    baseline commit. `diffAgainstShadow` reports deletions as "in
+*    HEAD but not on disk", so putting server-only paths into HEAD
+*    would mark them for remote deletion — on THIS push (or worse, a
+*    later one) — for files the user never had. Excluding them makes
+*    the diff structurally unable to delete them; the next `pull`
+*    materializes them locally and records them for real.
+*
+* Bandwidth note: a server file whose sha256 checksum matches the
+* local file's is recorded from the LOCAL bytes (identical by
+* definition), so binary assets that are already in sync are never
+* downloaded just to seed the baseline.
+*
+* No-op (`seeded: false`) when HEAD already exists.
+*/
+async function seedBaselineFromServer(input) {
+	const { shadow, themeRoot, remote, fetchBinary, message } = input;
+	const result = {
+		seeded: false,
+		recorded: [],
+		serverOnly: [],
+		errors: []
+	};
+	if (await shadow.hasHead()) return result;
+	const entries = [];
+	for (const resource of remote) {
+		const file = themeRoot.file(resource.key);
+		if (!file.absolutePath.startsWith(themeRoot.root + sep)) {
+			result.errors.push(`Baseline ${resource.key}: path traversal detected`);
+			continue;
+		}
+		if (!file.exists) {
+			result.serverOnly.push(resource.key);
+			continue;
+		}
+		let content;
+		if (resource.checksum && file.checksum() === resource.checksum) content = file.isText ? Buffer.from(file.read()) : file.readBinary();
+		else try {
+			content = await materializeRemote(resource, fetchBinary);
+		} catch (e) {
+			result.errors.push(`Baseline ${resource.key}: ${e instanceof Error ? e.message : String(e)}`);
+			continue;
+		}
+		if (content == null) continue;
+		entries.push({
+			path: resource.key,
+			sha: await shadow.writeBlob(content)
+		});
+		result.recorded.push(resource.key);
+	}
+	if (entries.length > 0) {
+		await shadow.commitState(entries, message);
+		result.seeded = true;
+	}
+	return result;
+}
+async function materializeRemote(resource, fetchBinary) {
+	if (resource.resource_type === "FileResource" && resource.url) return fetchBinary(resource.url);
+	if (resource.content == null) return null;
+	const text = typeof resource.content === "string" ? resource.content : JSON.stringify(resource.content);
+	return Buffer.from(text);
+}
+//#endregion
+//#region src/theme/legacy-migration.ts
+/**
+* On first pull after upgrading from a checksum-era CLI, the shadow
+* repo starts with no HEAD. `mergePull` would then run every diverged
+* file through a null-base merge — even files the user never touched
+* locally — producing spurious `<<<<<<<` markers for every file the
+* server updated since the last pull.
+*
+* Recover a real merge base by trusting the legacy sha256 checksums:
+* any local file whose content still matches its stored checksum is
+* "unmodified since last pull" and can be committed as HEAD. Files
+* whose local sha256 diverges from the stored checksum stay
+* unseeded — we don't have their pre-modification content, so a
+* null-base merge (marker-first UX) is the honest fallback for them.
+*
+* Idempotent: no-op when HEAD already exists, when there is no
+* legacy config, when the config is for a different theme, or when
+* the checksums map is empty. Runs before `mergePull` so its base
+* lookups see the seeded tree.
+*/
+async function migrateLegacyChecksumsIntoShadow(input) {
+	const { shadow, themeRoot, absoluteRoot, themeId } = input;
+	if (await shadow.hasHead()) return;
+	const legacy = readLegacyThemeConfig(absoluteRoot);
+	if (!legacy) return;
+	if (legacy.themeId !== themeId) return;
+	if (!legacy.checksums || Object.keys(legacy.checksums).length === 0) return;
+	const seed = [];
+	for (const file of themeRoot.files()) {
+		if (!file.exists) continue;
+		const stored = legacy.checksums[file.relativePath];
+		if (!stored) continue;
+		if (file.checksum() !== stored) continue;
+		const content = file.isText ? Buffer.from(file.read()) : file.readBinary();
+		seed.push({
+			path: file.relativePath,
+			content
+		});
+	}
+	if (seed.length === 0) return;
+	await shadow.seedFromWorkingTree(seed, `migrate from checksum-era CLI @ ${(/* @__PURE__ */ new Date()).toISOString()}`);
+}
+//#endregion
+//#region src/theme/sync-identity.ts
+/** Legacy (actor-less) wording per verb. `Push`/`Pull` are byte-
+*  compatible with what the CLI has always written. */
+const LEGACY_WORDING = {
+	Push: "push",
+	Pull: "pull",
+	"Baseline from server": "baseline from server",
+	"Snapshot before pull": "snapshot before pull"
+};
+/** Human base message per verb, used in the stamped format. */
+const BASE_MESSAGE = {
+	Push: "Push from Fluid CLI",
+	Pull: "Pull from Fluid CLI",
+	"Baseline from server": "Baseline from server",
+	"Snapshot before pull": "Snapshot before pull"
+};
+function syncCommitSubject(verb, actor, when = /* @__PURE__ */ new Date()) {
+	if (!actor) return `${LEGACY_WORDING[verb]} @ ${when.toISOString()}`;
+	const stamp = when.toISOString().slice(0, 19).replace("T", " ");
+	const idSuffix = actor.publicId ? ` (${actor.publicId})` : "";
+	return `${actor.name}: ${BASE_MESSAGE[verb]} · ${stamp}${idSuffix}`;
+}
+/** Resolve a `/api/me` body to a commit actor. Exported for tests.
+*  Name fallback ordering matches the Mist CLI: full_name (or a
+*  first+last composition) → email → `user-<id>`; null when none of
+*  those exist — the caller then uses the legacy wording. */
+function actorFromMe(raw) {
+	const user = raw.user ?? raw;
+	const composed = [user.first_name, user.last_name].filter(Boolean).join(" ").trim();
+	const name = user.full_name && user.full_name.trim() || (composed.length > 0 ? composed : null) || user.email && user.email.trim() || (typeof user.id === "number" && Number.isFinite(user.id) ? `user-${user.id}` : null);
+	if (!name) return null;
+	return {
+		name,
+		publicId: user.public_id && user.public_id.trim() || null
+	};
+}
+/**
+* Best-effort fetch of the signed-in user for commit stamping. Races
+* `/api/me` against a short timeout and NEVER rejects — a sync must
+* not block or fail because the identity lookup did. Callers kick
+* this off early and await it only at commit time.
+*/
+async function fetchSyncActor(api, timeoutMs = 5e3) {
+	try {
+		return actorFromMe(await Promise.race([api.get("/api/me"), new Promise((_, reject) => {
+			setTimeout(() => reject(/* @__PURE__ */ new Error(`timed out after ${timeoutMs}ms`)), timeoutMs).unref?.();
+		})]));
+	} catch (err) {
+		const reason = err instanceof Error ? err.message : String(err);
+		console.warn(`  (skipping user-stamp on sync commit — couldn't fetch /api/me: ${reason})`);
+		return null;
+	}
+}
+//#endregion
 //#region src/commands/push.ts
 function createPushCommand() {
-	return new Command("push").description("Push local theme files to a remote theme").option("-t, --theme <name-or-id>", "Theme name or ID to push to").option("-n, --nodelete", "Do not delete remote files missing locally").option("-f, --force", "Skip schema validation and the server-side merge check").option("-p, --publish", "Publish the theme after pushing").option("-u, --unpublished", "Create a new unpublished theme and push to it").option("--root <path>", "Theme root directory", ".").action(async (opts) => {
+	return new Command("push").description("Push local theme files to a remote theme").option("-t, --theme <name-or-id>", "Theme name or ID to push to").option("-n, --nodelete", "Do not delete remote files missing locally").option("-f, --force", "Skip schema validation and the server-side merge check").option("-p, --publish", "Publish the theme after pushing").option("-u, --unpublished", "Create a new unpublished theme and push to it").option("--auto-baseline", "When no local baseline exists, record the server's current state as the baseline and push only what differs locally (never modifies local files, never deletes server-only files)").option("--root <path>", "Theme root directory", ".").action(async (opts) => {
 		requireToken();
 		let rootPath = opts.root;
 		if (rootPath === ".") {
@@ -2476,7 +2721,16 @@ function createPushCommand() {
 			theme = (await getApplicationTheme(api, config.themeId)).application_theme;
 		} else theme = await selectTheme(api, "Select a theme to push to");
 		const shadow = await ShadowRepo.open(themeRoot.root, theme.id);
-		const unresolved = findUnresolvedConflicts(themeRoot.files().filter((f) => f.exists));
+		await migrateLegacyChecksumsIntoShadow({
+			shadow,
+			themeRoot,
+			absoluteRoot: themeRoot.root,
+			themeId: theme.id
+		});
+		const localFiles = themeRoot.files().filter((f) => f.exists);
+		let actorPromise = null;
+		const getActor = () => actorPromise ??= fetchSyncActor(api);
+		const unresolved = findUnresolvedConflicts(localFiles);
 		if (unresolved.length > 0) {
 			console.log();
 			console.log(chalk.red(`✗ ${unresolved.length} file(s) still contain unresolved conflict markers:`));
@@ -2485,29 +2739,55 @@ function createPushCommand() {
 			console.log(`  Edit each file to reconcile the ${chalk.cyan("<<<<<<<")} / ${chalk.cyan(">>>>>>>")} sections,`);
 			console.log(`  then re-run ${chalk.cyan("fluid theme push")}.`);
 			console.log();
+			if (opts.autoBaseline) console.error(conflictMarkerBlockLine(unresolved));
 			process.exit(1);
 		}
+		const syncer = new Syncer(api, theme.id, themeRoot);
+		const configMatchesTheme = config?.themeId === theme.id;
+		let baseSha = opts.force || !configMatchesTheme ? null : config?.baseSha ?? null;
+		const hasBaseline = baseSha != null || await shadow.hasHead();
+		if (!opts.force && !opts.unpublished && !hasBaseline) {
+			if (!opts.autoBaseline) {
+				console.error();
+				console.error(chalk.red(`No local baseline for theme "${theme.name}" (#${theme.id}).`));
+				console.error();
+				console.error(`  Run ${chalk.cyan(`fluid theme pull -t ${theme.id}`)} first to sync down the current server state,`);
+				console.error(`  then push — this way you see what would change before it goes live.`);
+				console.error();
+				console.error(`  Or re-run with ${chalk.cyan("--auto-baseline")} to record the server's current state`);
+				console.error(`  as the baseline and push only what differs locally (local files are never modified).`);
+				console.error();
+				console.error(`  Or, if you know what you're doing and want to overwrite the server's current`);
+				console.error(`  contents wholesale, re-run with ${chalk.cyan("--force")}.`);
+				console.error();
+				process.exit(1);
+			}
+			const baselineSpinner = ora(`No local baseline — recording current server state for ${theme.name} (#${theme.id})…`).start();
+			try {
+				const seedResult = await seedBaselineFromServer({
+					shadow,
+					themeRoot,
+					remote: await syncer.downloadAll(),
+					fetchBinary: (url) => syncer.downloadBinaryAsset(url),
+					message: syncCommitSubject("Baseline from server", await getActor())
+				});
+				baseSha = syncer.remoteSha() ?? null;
+				const parts = [`recorded ${seedResult.recorded.length} file(s)`];
+				if (seedResult.serverOnly.length > 0) parts.push(`left ${seedResult.serverOnly.length} server-only file(s) untouched`);
+				baselineSpinner.succeed(`Baseline recorded — ${parts.join(", ")}.`);
+				for (const err of seedResult.errors) console.warn(`  ${chalk.yellow("warn")} ${err}`);
+			} catch (e) {
+				baselineSpinner.fail(`Could not record a baseline from the server: ${formatError(e)}`);
+				process.exit(1);
+			}
+		}
 		const { changed, deleted } = await diffAgainstShadow(themeRoot, shadow);
 		if (changed.length === 0 && deleted.length === 0) {
 			console.log("Nothing to push — local matches the last synced state.");
+			await persistConfig();
 			return;
 		}
 		const spinner = ora(`Pushing to ${theme.name} (#${theme.id})…`).start();
-		const syncer = new Syncer(api, theme.id, themeRoot);
-		const configMatchesTheme = config?.themeId === theme.id;
-		let baseSha = opts.force || !configMatchesTheme ? null : config?.baseSha ?? null;
-		if (!opts.force && !opts.unpublished && !baseSha) {
-			console.error();
-			console.error(chalk.red(`No local baseline for theme "${theme.name}" (#${theme.id}).`));
-			console.error();
-			console.error(`  Run ${chalk.cyan(`fluid theme pull -t ${theme.id}`)} first to sync down the current server state,`);
-			console.error(`  then push — this way you see what would change before it goes live.`);
-			console.error();
-			console.error(`  Or, if you know what you're doing and want to overwrite the server's current`);
-			console.error(`  contents wholesale, re-run with ${chalk.cyan("--force")}.`);
-			console.error();
-			process.exit(1);
-		}
 		try {
 			await syncer.preflightPush(baseSha);
 			baseSha = syncer.remoteSha() ?? baseSha;
@@ -2569,13 +2849,38 @@ function createPushCommand() {
 			spinner.warn(`Pushed with ${errors.length} error(s).`);
 			for (const err of errors) console.error(`  ${err}`);
 		} else spinner.succeed(`Pushed ${uploaded} file(s)` + (deletedCount > 0 ? `, deleted ${deletedCount} remote file(s).` : "."));
-		if (errors.length === 0) await commitPushedState(themeRoot, shadow, `push @ ${(/* @__PURE__ */ new Date()).toISOString()}`);
-		if (config) writeThemeConfig(themeRoot.root, {
-			themeId: theme.id,
-			themeName: theme.name,
-			company: config.company,
-			baseSha: baseSha ?? void 0
-		});
+		if (errors.length === 0) await commitPushedState(themeRoot, shadow, syncCommitSubject("Push", await getActor()));
+		await persistConfig();
+		/**
+		* Persist `.fluid-theme.json`. When a config already exists,
+		* this is the pre-existing baseSha refresh. When it doesn't
+		* (a scaffold's first `--auto-baseline` push), bind the dir
+		* to the theme now — best-effort, since the company subdomain
+		* needs one more API call — so the next push/pull needs no
+		* interactive picker.
+		*/
+		async function persistConfig() {
+			if (config) {
+				writeThemeConfig(themeRoot.root, {
+					themeId: theme.id,
+					themeName: theme.name,
+					company: config.company,
+					baseSha: baseSha ?? void 0
+				});
+				return;
+			}
+			if (!opts.autoBaseline) return;
+			try {
+				const subdomain = (await api.get("/api/company/v1/companies/me")).data?.company?.subdomain;
+				if (!subdomain) return;
+				writeThemeConfig(themeRoot.root, {
+					themeId: theme.id,
+					themeName: theme.name,
+					company: subdomain,
+					baseSha: baseSha ?? void 0
+				});
+			} catch {}
+		}
 		if (opts.publish) {
 			const pubSpinner = ora("Publishing theme…").start();
 			try {
@@ -2617,10 +2922,19 @@ async function mergePull(input) {
 		written: 0,
 		merged: 0,
 		conflicts: [],
+		autoResolved: [],
 		deleted: 0,
 		skipped: 0,
 		errors: []
 	};
+	const pendingWrites = [];
+	const write = (file, content) => {
+		if (input.resolve) pendingWrites.push({
+			file,
+			content
+		});
+		else file.write(content);
+	};
 	const remoteContent = /* @__PURE__ */ new Map();
 	const remoteKeys = /* @__PURE__ */ new Set();
 	let done = 0;
@@ -2641,14 +2955,14 @@ async function mergePull(input) {
 			continue;
 		}
 		if (input.force) {
-			file.write(remoteBuf);
+			write(file, remoteBuf);
 			result.written++;
 			continue;
 		}
 		const localBuf = readIfExists(file.absolutePath);
 		const baseBuf = await shadow.blobAtHead(key);
 		if (localBuf == null) {
-			file.write(remoteBuf);
+			write(file, remoteBuf);
 			result.written++;
 			continue;
 		}
@@ -2657,7 +2971,7 @@ async function mergePull(input) {
 			continue;
 		}
 		if (baseBuf && localBuf.equals(baseBuf)) {
-			file.write(remoteBuf);
+			write(file, remoteBuf);
 			result.written++;
 			continue;
 		}
@@ -2666,15 +2980,29 @@ async function mergePull(input) {
 			continue;
 		}
 		if (looksBinary(localBuf) || looksBinary(remoteBuf) || (baseBuf ? looksBinary(baseBuf) : false)) {
-			file.write(remoteBuf);
-			result.conflicts.push(`${key} (binary — kept remote)`);
+			if (input.resolve === "local") {
+				result.autoResolved.push(`${key} (binary — kept local)`);
+				continue;
+			}
+			write(file, remoteBuf);
+			if (input.resolve === "remote") result.autoResolved.push(`${key} (binary — kept remote)`);
+			else result.conflicts.push(`${key} (binary — kept remote)`);
 			continue;
 		}
 		const { merged, hasConflicts } = await shadow.merge3(baseBuf, localBuf, remoteBuf);
-		file.write(merged);
+		if (hasConflicts && input.resolve) {
+			write(file, (await shadow.merge3(baseBuf, localBuf, remoteBuf, input.resolve)).merged);
+			result.autoResolved.push(key);
+			continue;
+		}
+		write(file, merged);
 		if (hasConflicts) result.conflicts.push(key);
 		else result.merged++;
 	}
+	if (input.resolve) {
+		if (result.autoResolved.length > 0) await commitPushedState(themeRoot, shadow, syncCommitSubject("Snapshot before pull", input.actor ?? null));
+		for (const { file, content } of pendingWrites) file.write(content);
+	}
 	if (doDelete && await shadow.hasHead()) for (const file of themeRoot.files()) {
 		if (remoteKeys.has(file.relativePath)) continue;
 		if (isStylesheetKey(file.relativePath)) continue;
@@ -2702,7 +3030,7 @@ async function mergePull(input) {
 			sha: await shadow.writeBlob(prevBlob)
 		});
 	}
-	if (commitEntries.length > 0) await shadow.commitState(commitEntries, `pull @ ${(/* @__PURE__ */ new Date()).toISOString()}`);
+	if (commitEntries.length > 0) await shadow.commitState(commitEntries, syncCommitSubject("Pull", input.actor ?? null));
 	return result;
 }
 async function materialize(resource, fetchBinary) {
@@ -2715,49 +3043,6 @@ function errMsg(e) {
 	return e instanceof Error ? e.message : String(e);
 }
 //#endregion
-//#region src/theme/legacy-migration.ts
-/**
-* On first pull after upgrading from a checksum-era CLI, the shadow
-* repo starts with no HEAD. `mergePull` would then run every diverged
-* file through a null-base merge — even files the user never touched
-* locally — producing spurious `<<<<<<<` markers for every file the
-* server updated since the last pull.
-*
-* Recover a real merge base by trusting the legacy sha256 checksums:
-* any local file whose content still matches its stored checksum is
-* "unmodified since last pull" and can be committed as HEAD. Files
-* whose local sha256 diverges from the stored checksum stay
-* unseeded — we don't have their pre-modification content, so a
-* null-base merge (marker-first UX) is the honest fallback for them.
-*
-* Idempotent: no-op when HEAD already exists, when there is no
-* legacy config, when the config is for a different theme, or when
-* the checksums map is empty. Runs before `mergePull` so its base
-* lookups see the seeded tree.
-*/
-async function migrateLegacyChecksumsIntoShadow(input) {
-	const { shadow, themeRoot, absoluteRoot, themeId } = input;
-	if (await shadow.hasHead()) return;
-	const legacy = readLegacyThemeConfig(absoluteRoot);
-	if (!legacy) return;
-	if (legacy.themeId !== themeId) return;
-	if (!legacy.checksums || Object.keys(legacy.checksums).length === 0) return;
-	const seed = [];
-	for (const file of themeRoot.files()) {
-		if (!file.exists) continue;
-		const stored = legacy.checksums[file.relativePath];
-		if (!stored) continue;
-		if (file.checksum() !== stored) continue;
-		const content = file.isText ? Buffer.from(file.read()) : file.readBinary();
-		seed.push({
-			path: file.relativePath,
-			content
-		});
-	}
-	if (seed.length === 0) return;
-	await shadow.seedFromWorkingTree(seed, `migrate from checksum-era CLI @ ${(/* @__PURE__ */ new Date()).toISOString()}`);
-}
-//#endregion
 //#region src/commands/pull.ts
 async function fetchCompanySubdomain(api) {
 	const subdomain = (await api.get("/api/company/v1/companies/me")).data?.company?.subdomain;
@@ -2768,8 +3053,13 @@ async function fetchCompanySubdomain(api) {
 	return subdomain;
 }
 function createPullCommand() {
-	return new Command("pull").description("Pull a remote theme to your local directory").option("-t, --theme <name-or-id>", "Theme name or ID to pull").option("-n, --nodelete", "Do not delete local files missing on remote").option("--root <path>", "Theme root directory").option("-y, --yes", "Skip confirmation prompt").option("-f, --force", "Overwrite local without merging (skip conflict markers)").action(async (opts) => {
+	return new Command("pull").description("Pull a remote theme to your local directory").option("-t, --theme <name-or-id>", "Theme name or ID to pull").option("-n, --nodelete", "Do not delete local files missing on remote").option("--root <path>", "Theme root directory").option("-y, --yes", "Skip confirmation prompt").option("-f, --force", "Overwrite local without merging (skip conflict markers)").option("--resolve <side>", "Auto-resolve merge conflicts to one side instead of writing conflict markers: 'local' keeps your files' hunks, 'remote' takes the server's (for non-interactive use)").action(async (opts) => {
 		requireToken();
+		if (opts.resolve !== void 0 && opts.resolve !== "local" && opts.resolve !== "remote") {
+			console.error(`Invalid --resolve value "${opts.resolve}" — use "local" or "remote".`);
+			process.exit(1);
+		}
+		const resolveSide = opts.resolve;
 		const api = createApiClient();
 		const workspace = findWorkspace();
 		const theme = opts.theme ? await findTheme(api, opts.theme) : await selectTheme(api, "Select a theme to pull");
@@ -2806,6 +3096,7 @@ function createPullCommand() {
 			themeId: theme.id
 		});
 		const syncer = new Syncer(api, theme.id, themeRoot);
+		const actorPromise = fetchSyncActor(api);
 		const spinner = ora(`Pulling ${theme.name} (#${theme.id})…`).start();
 		const result = await mergePull({
 			themeRoot,
@@ -2814,6 +3105,8 @@ function createPullCommand() {
 			fetchBinary: (url) => syncer.downloadBinaryAsset(url),
 			delete: !opts.nodelete,
 			force: opts.force ?? false,
+			resolve: resolveSide,
+			actor: await actorPromise,
 			onProgress: (done, total) => {
 				spinner.text = `Downloading ${done}/${total} files…`;
 			}
@@ -2821,6 +3114,7 @@ function createPullCommand() {
 		const parts = [];
 		if (result.written > 0) parts.push(`wrote ${result.written} file(s)`);
 		if (result.merged > 0) parts.push(`merged ${result.merged} file(s) cleanly`);
+		if (result.autoResolved.length > 0) parts.push(`auto-resolved ${result.autoResolved.length} conflict(s) (kept ${resolveSide})`);
 		if (result.deleted > 0) parts.push(`deleted ${result.deleted} local file(s)`);
 		if (result.skipped > 0) parts.push(`${result.skipped} already in sync`);
 		if (result.errors.length) {