@fluid-app/fluid-cli-theme-dev 0.1.28 → 0.1.30

package/dist/index.mjs

@@ -52,6 +52,12 @@ function getRequestIdFromJsonBody(body) {
 	return getStringRequestId(record.request_id) ?? getStringRequestId(record.requestId) ?? (meta && typeof meta === "object" && !Array.isArray(meta) ? getStringRequestId(meta.request_id) ?? getStringRequestId(meta.requestId) : void 0);
 }
 /**
+* Type guard for ApiError
+*/
+function isApiError(error) {
+	return error instanceof ApiError;
+}
+/**
 * Creates a configured fetch client instance
 */
 function createFetchClient(config) {
@@ -1258,6 +1264,45 @@ 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) {
+	if (error.status !== 422) return false;
+	if (/stylesheet.*no longer accepted/i.test(error.message)) return true;
+	if (error.data && typeof error.data === "object") {
+		const resourceErrors = error.data.application_theme_resource;
+		if (resourceErrors && typeof resourceErrors.key === "string" && /stylesheet.*no longer accepted/i.test(resourceErrors.key)) return true;
+	}
+	return false;
+}
+/**
+* Extract a human-readable message from a caught error. ApiError's default
+* `toString` prefixes with `ApiError:` and the class name; this returns the
+* API's own `error_message` verbatim so the CLI surfaces messages like
+* "This stylesheet key is no longer accepted. Upload stylesheets as
+* theme-level assets." directly.
+*
+* When the error is the legacy stylesheet key rejection specifically,
+* a hint is appended pointing to the bundled migration skill — the
+* caller needs to move the per-template `styles.css` bytes to `assets/`
+* and stop pushing the deprecated column key.
+*/
+function formatError(e) {
+	if (isApiError(e)) {
+		const status = e.status ? ` [${e.status}]` : "";
+		const hint = isStylesheetKeyRejection(e) ? `\n  ↳ Run \`fluid theme skills install\` — the bundled \`${STYLESHEET_MIGRATION_SKILL}\` skill can help you migrate this to a theme-level asset.` : "";
+		return `${e.message}${status}${hint}`;
+	}
+	if (e instanceof Error) return e.message;
+	return String(e);
+}
+//#endregion
 //#region src/theme/syncer.ts
 var Syncer = class {
 	checksums = /* @__PURE__ */ new Map();
@@ -1394,7 +1439,7 @@ var Syncer = class {
 				await this.uploadFile(file);
 				result.uploaded++;
 			} catch (e) {
-				result.errors.push(`Upload ${file.relativePath}: ${e}`);
+				result.errors.push(`Upload ${file.relativePath}: ${formatError(e)}`);
 			}
 			opts.onProgress?.(++done, toUpload.length);
 		}
@@ -1405,7 +1450,7 @@ var Syncer = class {
 				await this.deleteRemoteFile(key);
 				result.deleted++;
 			} catch (e) {
-				result.errors.push(`Delete ${key}: ${e}`);
+				result.errors.push(`Delete ${key}: ${formatError(e)}`);
 			}
 		}
 		return result;
@@ -1443,17 +1488,21 @@ var Syncer = class {
 				}
 				result.downloaded++;
 			} catch (e) {
-				result.errors.push(`Download ${resource.key}: ${e}`);
+				result.errors.push(`Download ${resource.key}: ${formatError(e)}`);
 			}
 			opts.onProgress?.(++done, resources.length);
 		}
 		if (opts.delete) {
 			const remoteKeys = new Set(resources.map((r) => r.key));
-			for (const file of this.themeRoot.files()) if (!remoteKeys.has(file.relativePath)) try {
-				const { unlinkSync } = await import("node:fs");
-				unlinkSync(file.absolutePath);
-				result.deleted++;
-			} catch {}
+			for (const file of this.themeRoot.files()) {
+				if (remoteKeys.has(file.relativePath)) continue;
+				if (isStylesheetKey(file.relativePath)) continue;
+				try {
+					const { unlinkSync } = await import("node:fs");
+					unlinkSync(file.absolutePath);
+					result.deleted++;
+				} catch {}
+			}
 		}
 		return result;
 	}
@@ -2490,6 +2539,12 @@ function resolveBundledSkillsDir() {
 	}
 	throw new Error("Could not locate the bundled theme skills — this is a packaging bug.");
 }
+function skillsWouldShipWithTheme(cwd, targetRoot) {
+	if (!new ThemeRoot(cwd).isValid()) return false;
+	const rel = relative(cwd, targetRoot);
+	if (rel.startsWith("..")) return false;
+	return !rel.split(sep).some((segment) => segment.startsWith("."));
+}
 function createSkillsCommand() {
 	const skills = new Command("skills").description("Manage the bundled Fluid theme AI skills");
 	skills.command("install").description("Copy the bundled theme skills into the current directory (default: .agents/skills/)").option("-d, --dir <path>", "Directory to install into", DEFAULT_TARGET_DIR).option("-f, --force", "Overwrite existing skills without prompting").action(async (opts) => {
@@ -2499,6 +2554,7 @@ function createSkillsCommand() {
 			process.exit(1);
 		}
 		const targetRoot = resolve(process.cwd(), opts.dir);
+		if (skillsWouldShipWithTheme(process.cwd(), targetRoot)) console.log(`${chalk.yellow("⚠")} ${chalk.bold(opts.dir)} is not a hidden directory — 'fluid theme push' will upload these skills as theme files. Install into a dot-directory like ${chalk.cyan(DEFAULT_TARGET_DIR)} to keep them local.`);
 		const { installed, skipped } = await installSkills({
 			sourceDir,
 			targetRoot,