@fluid-app/fluid-cli-theme-dev 0.1.10 → 0.1.11

package/.turbo/turbo-build.log

@@ -1,18 +1,18 @@
 
-> @fluid-app/fluid-cli-theme-dev@0.1.10 build /home/runner/_work/fluid-mono/fluid-mono/packages/cli/theme-dev
+> @fluid-app/fluid-cli-theme-dev@0.1.11 build /home/runner/_work/fluid-mono/fluid-mono/packages/cli/theme-dev
 > tsdown
 
 ℹ tsdown v0.21.0 powered by rolldown v1.0.0-rc.7
 ℹ config file: /home/runner/_work/fluid-mono/fluid-mono/packages/cli/theme-dev/tsdown.config.ts 
 ℹ entry: src/index.ts
-ℹ target: node18
+ℹ target: node24
 ℹ tsconfig: tsconfig.json
 ℹ Build start
-ℹ dist/index.mjs         45.06 kB │ gzip: 12.79 kB
-ℹ dist/index.mjs.map    118.77 kB │ gzip: 26.94 kB
+ℹ dist/index.mjs         54.76 kB │ gzip: 15.09 kB
+ℹ dist/index.mjs.map    140.30 kB │ gzip: 31.59 kB
 ℹ dist/index.d.mts.map    0.11 kB │ gzip:  0.12 kB
 ℹ dist/index.d.mts        0.19 kB │ gzip:  0.16 kB
-ℹ 4 files, total: 164.13 kB
+ℹ 4 files, total: 195.36 kB
 [PLUGIN_TIMINGS] Warning: Your build spent significant time in plugin `rolldown-plugin-dts:generate`. See https://rolldown.rs/options/checks#plugintimings for more details.
+✔ Build complete in 3560ms
 
-✔ Build complete in 4607ms

package/dist/index.mjs

@@ -209,6 +209,27 @@ function requireToken() {
 	return token;
 }
 //#endregion
+//#region src/theme-config.ts
+const CONFIG_FILE = ".fluid-theme.json";
+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");
+		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 getPluginState() {
@@ -722,6 +743,10 @@ var Syncer = class {
 	remoteKeys() {
 		return [...this.checksums.keys()];
 	}
+	/** Snapshot of remote checksums (key → sha256). Available after fetchChecksums() or downloadAll(). */
+	remoteChecksums() {
+		return Object.fromEntries(this.checksums);
+	}
 	async uploadFile(file) {
 		if (file.isText) await updateThemeResource(this.api, this.themeId, { application_theme_resource: {
 			key: file.relativePath,
@@ -842,10 +867,16 @@ var Syncer = class {
 			uploaded: 0,
 			deleted: 0,
 			downloaded: 0,
+			skipped: 0,
 			errors: []
 		};
 		let done = 0;
 		for (const resource of resources) {
+			if (opts.skip?.has(resource.key)) {
+				result.skipped++;
+				opts.onProgress?.(++done, resources.length);
+				continue;
+			}
 			const file = this.themeRoot.file(resource.key);
 			if (!file.absolutePath.startsWith(this.themeRoot.root + sep)) {
 				result.errors.push(`Download ${resource.key}: path traversal detected`);
@@ -1051,6 +1082,52 @@ async function findTheme(api, identifier) {
 	process.exit(1);
 }
 //#endregion
+//#region src/workspace.ts
+const WORKSPACE_FILE = ".fluid-workspace.json";
+/**
+* Walk up from `startDir` looking for `.fluid-workspace.json`.
+* Returns the workspace info if found, or `null` if not in a workspace.
+*/
+function findWorkspace(startDir) {
+	let dir = resolve(startDir ?? process.cwd());
+	while (true) {
+		const candidate = join(dir, WORKSPACE_FILE);
+		if (existsSync(candidate)) try {
+			const raw = readFileSync(candidate, "utf-8");
+			const config = JSON.parse(raw);
+			return {
+				root: dir,
+				config
+			};
+		} catch {
+			return null;
+		}
+		const parent = dirname(dir);
+		if (parent === dir) break;
+		dir = parent;
+	}
+	return null;
+}
+/**
+* If cwd is already inside `{workspace}/local/{company}/...`, return that
+* theme root directory. Otherwise return null.
+*
+* Examples (workspace root = /code/fluid-theme-dev):
+*   cwd = /code/fluid-theme-dev/local/acme-co           → /code/fluid-theme-dev/local/acme-co
+*   cwd = /code/fluid-theme-dev/local/acme-co/templates  → /code/fluid-theme-dev/local/acme-co
+*   cwd = /code/fluid-theme-dev                          → null
+*   cwd = /code/fluid-theme-dev/local                    → null
+*/
+function resolveThemeRootFromCwd(workspace) {
+	const cwd = resolve(process.cwd());
+	const localDir = join(workspace.root, "local");
+	const rel = relative(localDir, cwd);
+	if (rel.startsWith("..") || rel === ".") return null;
+	const firstSegment = rel.split(sep)[0];
+	if (!firstSegment) return null;
+	return join(localDir, firstSegment);
+}
+//#endregion
 //#region src/commands/dev.ts
 async function ensureDevTheme(api, identifier) {
 	if (identifier) return findTheme(api, identifier);
@@ -1077,9 +1154,14 @@ async function ensureDevTheme(api, identifier) {
 function createDevCommand() {
 	return new Command("dev").description("Start the theme dev server with hot reload").option("--host <host>", "Local server host", "127.0.0.1").option("--port <port>", "Local server port", "9292").option("-t, --theme <name-or-id>", "Use an existing theme instead of dev theme").option("-f, --force", "Skip schema validation on upload").option("--live-reload <mode>", "Reload mode: full-page | off", "full-page").option("--navigate", "Open browser navigator after server starts").option("--root <path>", "Theme root directory", ".").action(async (opts) => {
 		requireToken();
-		const themeRoot = new ThemeRoot(opts.root);
+		let rootPath = opts.root;
+		if (rootPath === ".") {
+			const workspace = findWorkspace();
+			if (workspace) rootPath = resolveThemeRootFromCwd(workspace) ?? rootPath;
+		}
+		const themeRoot = new ThemeRoot(rootPath);
 		if (!themeRoot.isValid()) {
-			console.error(`'${opts.root}' does not look like a theme directory.`);
+			console.error(`'${rootPath}' does not look like a theme directory.`);
 			process.exit(1);
 		}
 		const port = Number(opts.port);
@@ -1089,12 +1171,17 @@ function createDevCommand() {
 		}
 		const reloadMode = opts.liveReload === "off" ? "off" : "full-page";
 		const api = createApiClient();
-		const company = (await api.get("/api/company/v1/companies/me")).data?.company?.subdomain;
-		if (!company) {
-			console.error("Could not determine company subdomain. Make sure your token is valid.");
-			process.exit(1);
+		const config = readThemeConfig(themeRoot.root);
+		let company;
+		if (config?.company) company = config.company;
+		else {
+			company = (await api.get("/api/company/v1/companies/me")).data?.company?.subdomain ?? "";
+			if (!company) {
+				console.error("Could not determine company subdomain. Make sure your token is valid.");
+				process.exit(1);
+			}
 		}
-		const theme = await ensureDevTheme(api, opts.theme);
+		const theme = opts.theme ? await ensureDevTheme(api, opts.theme) : config ? await ensureDevTheme(api, String(config.themeId)) : await ensureDevTheme(api);
 		const editorUrl = `https://admin.fluid.app/themes/${theme.id}/editor`;
 		let stop;
 		const cleanup = () => {
@@ -1123,15 +1210,38 @@ function createDevCommand() {
 }
 //#endregion
 //#region src/commands/push.ts
+/**
+* Detect files where the remote has changed since the last pull,
+* and we also have local changes (i.e. we'd overwrite someone else's work).
+*/
+function detectRemoteDrift(storedChecksums, remoteChecksums, themeRoot) {
+	const conflicts = [];
+	for (const [key, storedChecksum] of Object.entries(storedChecksums)) {
+		const remoteChecksum = remoteChecksums[key];
+		if (remoteChecksum === void 0) continue;
+		if (remoteChecksum === storedChecksum) continue;
+		const file = themeRoot.file(key);
+		if (!file.exists) continue;
+		if (file.checksum() === remoteChecksum) continue;
+		conflicts.push(key);
+	}
+	return conflicts;
+}
 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").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) => {
 		requireToken();
-		const themeRoot = new ThemeRoot(opts.root);
+		let rootPath = opts.root;
+		if (rootPath === ".") {
+			const workspace = findWorkspace();
+			if (workspace) rootPath = resolveThemeRootFromCwd(workspace) ?? rootPath;
+		}
+		const themeRoot = new ThemeRoot(rootPath);
 		if (!themeRoot.isValid()) {
-			console.error(`'${opts.root}' does not look like a theme directory.`);
+			console.error(`'${rootPath}' does not look like a theme directory.`);
 			process.exit(1);
 		}
 		const api = createApiClient();
+		const config = readThemeConfig(themeRoot.root);
 		let theme;
 		if (opts.unpublished) {
 			const { name } = await prompts({
@@ -1148,7 +1258,51 @@ function createPushCommand() {
 				status: "draft"
 			} })).application_theme;
 			console.log(`Created unpublished theme: ${theme.name} (#${theme.id})`);
-		} else theme = opts.theme ? await findTheme(api, opts.theme) : await selectTheme(api, "Select a theme to push to");
+		} else if (opts.theme) theme = await findTheme(api, opts.theme);
+		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;
+		} else theme = await selectTheme(api, "Select a theme to push to");
+		if (config?.checksums && !opts.force) {
+			const driftSpinner = ora("Checking for remote changes…").start();
+			const driftSyncer = new Syncer(api, theme.id, themeRoot);
+			await driftSyncer.fetchChecksums();
+			const remoteChecksums = driftSyncer.remoteChecksums();
+			const conflicts = detectRemoteDrift(config.checksums, remoteChecksums, themeRoot);
+			driftSpinner.stop();
+			if (conflicts.length > 0) {
+				console.log(chalk.yellow(`\n⚠ ${conflicts.length} file(s) changed on remote since last pull:\n`));
+				for (const key of conflicts) console.log(`  ${key}`);
+				console.log();
+				const { resolution } = await prompts({
+					type: "select",
+					name: "resolution",
+					message: "How do you want to handle this?",
+					choices: [
+						{
+							title: "Push anyway (overwrite remote changes)",
+							value: "push"
+						},
+						{
+							title: "Pull first, then push",
+							value: "pull-first"
+						},
+						{
+							title: "Abort",
+							value: "abort"
+						}
+					]
+				}, { onCancel: () => process.exit(130) });
+				if (resolution === "abort") {
+					console.log("Aborted.");
+					process.exit(0);
+				}
+				if (resolution === "pull-first") {
+					console.log(`Run ${chalk.cyan("fluid theme pull")} first, then push again.`);
+					process.exit(0);
+				}
+			}
+		}
 		const syncer = new Syncer(api, theme.id, themeRoot);
 		const spinner = ora(`Pushing to ${theme.name} (#${theme.id})…`).start();
 		const result = await syncer.uploadTheme({
@@ -1161,6 +1315,10 @@ function createPushCommand() {
 			spinner.warn(`Pushed with ${result.errors.length} error(s).`);
 			for (const e of result.errors) console.error(`  ${e}`);
 		} else spinner.succeed(`Pushed ${result.uploaded} file(s), deleted ${result.deleted} remote file(s).`);
+		if (config) writeThemeConfig(themeRoot.root, {
+			...config,
+			checksums: syncer.remoteChecksums()
+		});
 		if (opts.publish) {
 			const pubSpinner = ora("Publishing theme…").start();
 			try {
@@ -1174,24 +1332,146 @@ function createPushCommand() {
 }
 //#endregion
 //#region src/commands/pull.ts
+async function fetchCompanySubdomain(api) {
+	const subdomain = (await api.get("/api/company/v1/companies/me")).data?.company?.subdomain;
+	if (!subdomain) {
+		console.error("Could not determine company subdomain. Make sure your token is valid.");
+		process.exit(1);
+	}
+	return subdomain;
+}
+function formatRelativeTime(iso) {
+	const diff = Date.now() - new Date(iso).getTime();
+	const minutes = Math.floor(diff / 6e4);
+	if (minutes < 1) return "just now";
+	if (minutes < 60) return `${minutes}m ago`;
+	const hours = Math.floor(minutes / 60);
+	if (hours < 24) return `${hours}h ago`;
+	const days = Math.floor(hours / 24);
+	if (days === 1) return "yesterday";
+	return `${days}d ago (${new Date(iso).toLocaleDateString("en-US", {
+		month: "short",
+		day: "numeric",
+		year: "numeric"
+	})})`;
+}
+/**
+* Detect files where both local and remote have changed since the last pull.
+* Returns the set of conflicting resource keys.
+*/
+function detectConflicts(storedChecksums, remoteChecksums, themeRoot) {
+	const conflicts = [];
+	for (const [key, storedChecksum] of Object.entries(storedChecksums)) {
+		const remoteChecksum = remoteChecksums[key];
+		if (remoteChecksum === void 0) continue;
+		if (remoteChecksum === storedChecksum) continue;
+		const file = themeRoot.file(key);
+		if (!file.exists) continue;
+		const localChecksum = file.checksum();
+		if (localChecksum === storedChecksum) continue;
+		if (localChecksum === remoteChecksum) continue;
+		conflicts.push(key);
+	}
+	return conflicts;
+}
 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", ".").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").action(async (opts) => {
 		requireToken();
 		const api = createApiClient();
+		const workspace = findWorkspace();
 		const theme = opts.theme ? await findTheme(api, opts.theme) : await selectTheme(api, "Select a theme to pull");
-		const themeRoot = new ThemeRoot(opts.root);
+		const subdomain = await fetchCompanySubdomain(api);
+		let root;
+		if (opts.root) root = opts.root;
+		else if (workspace) root = resolveThemeRootFromCwd(workspace) ?? join(workspace.root, "local", subdomain);
+		else root = `.`;
+		const absoluteRoot = resolve(root);
+		const existingConfig = readThemeConfig(absoluteRoot);
+		console.log();
+		console.log(`  Theme:   ${chalk.bold(theme.name)} (#${theme.id})`);
+		console.log(`  Company: ${chalk.bold(subdomain)}`);
+		console.log(`  Target:  ${chalk.bold(absoluteRoot)}`);
+		if (existingConfig?.lastPulledAt) console.log(`  Last pulled: ${formatRelativeTime(existingConfig.lastPulledAt)}`);
+		console.log();
+		const themeRoot = new ThemeRoot(root);
+		let skipKeys;
+		if (existingConfig?.checksums) {
+			const fetchSpinner = ora("Checking for conflicts…").start();
+			const syncer = new Syncer(api, theme.id, themeRoot);
+			await syncer.fetchChecksums();
+			const remoteChecksums = syncer.remoteChecksums();
+			const conflicts = detectConflicts(existingConfig.checksums, remoteChecksums, themeRoot);
+			fetchSpinner.stop();
+			if (conflicts.length > 0) {
+				console.log(chalk.yellow(`⚠ ${conflicts.length} conflict(s) detected:\n`));
+				for (const key of conflicts) console.log(`  ${key}`);
+				console.log();
+				const { resolution } = await prompts({
+					type: "select",
+					name: "resolution",
+					message: "How do you want to handle conflicts?",
+					choices: [
+						{
+							title: "Keep local (skip conflicting files)",
+							value: "keep-local"
+						},
+						{
+							title: "Use remote (overwrite local changes)",
+							value: "use-remote"
+						},
+						{
+							title: "Abort",
+							value: "abort"
+						}
+					]
+				}, { onCancel: () => process.exit(130) });
+				if (resolution === "abort") {
+					console.log("Aborted.");
+					process.exit(0);
+				}
+				if (resolution === "keep-local") skipKeys = new Set(conflicts);
+			}
+		}
+		if (!opts.yes && !skipKeys) {
+			const { confirmed } = await prompts({
+				type: "confirm",
+				name: "confirmed",
+				message: "Pull theme to this directory?",
+				initial: true
+			}, { onCancel: () => process.exit(130) });
+			if (!confirmed) {
+				console.log("Aborted.");
+				process.exit(0);
+			}
+		}
 		const syncer = new Syncer(api, theme.id, themeRoot);
 		const spinner = ora(`Pulling ${theme.name} (#${theme.id})…`).start();
 		const result = await syncer.downloadTheme({
 			delete: !opts.nodelete,
+			skip: skipKeys,
 			onProgress: (d, total) => {
 				spinner.text = `Downloading ${d}/${total} files…`;
 			}
 		});
+		const newChecksums = syncer.remoteChecksums();
+		if (skipKeys && existingConfig?.checksums) for (const key of skipKeys) {
+			const oldChecksum = existingConfig.checksums[key];
+			if (oldChecksum) newChecksums[key] = oldChecksum;
+		}
+		writeThemeConfig(absoluteRoot, {
+			themeId: theme.id,
+			themeName: theme.name,
+			company: subdomain,
+			lastPulledAt: (/* @__PURE__ */ new Date()).toISOString(),
+			checksums: newChecksums
+		});
+		const parts = [`Downloaded ${result.downloaded} file(s)`];
+		if (result.deleted > 0) parts.push(`deleted ${result.deleted} local file(s)`);
+		if (result.skipped > 0) parts.push(`skipped ${result.skipped} conflict(s)`);
 		if (result.errors.length) {
 			spinner.warn(`Pulled with ${result.errors.length} error(s).`);
 			for (const e of result.errors) console.error(`  ${e}`);
-		} else spinner.succeed(`Downloaded ${result.downloaded} file(s), deleted ${result.deleted} local file(s).`);
+		} else spinner.succeed(`${parts.join(", ")}.`);
 	});
 }
 //#endregion