@marver-design/marver 0.16.0 → 0.17.0

package/dist/{plugin-BXyezwfN.mjs → plugin-D2msH1cj.mjs}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { i as ROUTE, n as NAME, r as PKG } from "./cli.mjs";
-import { a as nodeExists, c as FOLDERS_FILE, f as readDescription, i as listBoardFiles, m as hash, n as checkBoardsDir, o as readRegistry, p as validateWire, r as isRegularFile, s as BOARD_NAME, t as boardFields } from "./boards-BdG1TJwU.mjs";
+import { a as listBoardFiles, c as BOARD_NAME, g as hash, h as validateWire, i as isRegularFile, l as FOLDERS_FILE, m as readTitle, n as checkBoardsDir, o as nodeExists, p as readDescription, s as readRegistry, t as boardFields } from "./boards-BmxcT3Lc.mjs";
 import { n as localProfile, t as isConnected } from "./profile-BjAPAJSb.mjs";
-import { i as writeManifest, n as scanFrames, o as loadConfig, t as affectedFrameIds } from "./manifest-CpbsqQ_v.mjs";
+import { a as writeManifest, n as scanFrames, r as setSceneTitle, s as loadConfig, t as affectedFrameIds } from "./manifest-CaslQIAO.mjs";
 import { copyFileSync, existsSync, linkSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, watch, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -155,9 +155,13 @@ function apiMiddleware(root, opts = {}) {
 					return json(res, 400, { error: "malformed JSON" });
 				}
 				if (!parsed || typeof parsed !== "object") return json(res, 400, { error: "expected an object" });
-				const { from, to } = parsed;
+				const { from, to: toRaw, title: titleRaw, baseHash } = parsed;
+				const to = toRaw === void 0 ? from : toRaw;
 				if (!validName(from) || !validName(to)) return json(res, 400, { error: "invalid board name" });
-				if (to === "all-scenes" || from === "all-scenes" || to === from) return json(res, 400, { error: "invalid rename" });
+				if (titleRaw !== void 0 && (typeof titleRaw !== "string" || Array.from(titleRaw).length > 120)) return json(res, 400, { error: "invalid title" });
+				if (baseHash !== void 0 && typeof baseHash !== "string") return json(res, 400, { error: "invalid baseHash" });
+				if (to === "all-scenes" || from === "all-scenes") return json(res, 400, { error: "invalid rename" });
+				if (to === from && titleRaw === void 0) return json(res, 400, { error: "invalid rename" });
 				{
 					const de = dirError();
 					if (de) return json(res, 400, { error: de });
@@ -166,21 +170,74 @@ function apiMiddleware(root, opts = {}) {
 				if (!fromPath || !toPath) return json(res, 400, { error: "invalid board name" });
 				if (!existsSync(fromPath)) return json(res, 404, { error: `board "${from}" does not exist` });
 				if (!notSymlink(fromPath)) return json(res, 400, { error: "refusing to rename a symlinked board file" });
-				if (isConnected(root)) return json(res, 409, { error: "disconnect before renaming boards - comment sync is board-keyed" });
-				if (existsSync(join(root, "design", "comments", `${from}.jsonl`))) return json(res, 409, { error: "rename a board before commenting on it - this board has threads" });
-				if (nodeExists$1(toPath)) return json(res, 409, { error: `a board named "${to}" already exists` });
-				try {
-					linkSync(fromPath, toPath);
-				} catch (err) {
-					const code = err.code;
-					if (code === "EEXIST") return json(res, 409, { error: `a board named "${to}" already exists` });
-					if (code !== "EPERM" && code !== "ENOSYS" && code !== "ENOTSUP" && code !== "EOPNOTSUPP") throw err;
+				const current = readFileSync(fromPath, "utf8");
+				if (baseHash !== void 0 && baseHash !== hash(current)) return json(res, 409, {
+					error: "board changed on disk",
+					sha256: hash(current)
+				});
+				let obj = null;
+				if (titleRaw !== void 0) {
+					let parsedBoard;
+					try {
+						parsedBoard = JSON.parse(current);
+					} catch {
+						return json(res, 422, { error: `board "${from}" is not valid JSON - fix the file` });
+					}
+					if (!parsedBoard || typeof parsedBoard !== "object" || Array.isArray(parsedBoard)) return json(res, 422, { error: `board "${from}" is not a JSON object - fix the file` });
+					obj = parsedBoard;
+				}
+				let next;
+				if (obj) {
+					const title = readTitle(titleRaw);
+					if (title) obj.title = title;
+					else delete obj.title;
+					next = JSON.stringify(obj, null, 2) + "\n";
+				}
+				if (to !== from) {
+					if (isConnected(root)) return json(res, 409, { error: "disconnect before renaming boards - comment sync is board-keyed" });
+					if (existsSync(join(root, "design", "comments", `${from}.jsonl`))) return json(res, 409, { error: "rename a board before commenting on it - this board has threads" });
 					if (nodeExists$1(toPath)) return json(res, 409, { error: `a board named "${to}" already exists` });
-					renameSync(fromPath, toPath);
-					return json(res, 200, { name: to });
+					try {
+						if (next !== void 0) writeFileSync(toPath, next, { flag: "wx" });
+						else linkSync(fromPath, toPath);
+					} catch (err) {
+						const code = err.code;
+						if (code === "EEXIST") return json(res, 409, { error: `a board named "${to}" already exists` });
+						if (next !== void 0 || code !== "EPERM" && code !== "ENOSYS" && code !== "ENOTSUP" && code !== "EOPNOTSUPP") throw err;
+						if (nodeExists$1(toPath)) return json(res, 409, { error: `a board named "${to}" already exists` });
+						renameSync(fromPath, toPath);
+						return json(res, 200, { name: to });
+					}
+					rmSync(fromPath);
+					return json(res, 200, {
+						name: to,
+						...next !== void 0 ? { sha256: hash(next) } : {}
+					});
+				}
+				atomicWrite(toPath, next);
+				return json(res, 200, {
+					name: to,
+					sha256: hash(next)
+				});
+			}
+			if (path === "scenes/rename" && req.method === "POST") {
+				if (!ownerGated(req)) return json(res, 403, { error: "forbidden" });
+				const raw = await readBody(req);
+				if (raw == null) return json(res, 400, { error: "body too large or unreadable" });
+				let parsed;
+				try {
+					parsed = JSON.parse(raw);
+				} catch {
+					return json(res, 400, { error: "malformed JSON" });
 				}
-				rmSync(fromPath);
-				return json(res, 200, { name: to });
+				if (!parsed || typeof parsed !== "object") return json(res, 400, { error: "expected an object" });
+				const { scene, title } = parsed;
+				if (typeof scene !== "string" || !scene || scene.length > 128 || /[\\/]/.test(scene) || scene === "." || scene === "..") return json(res, 400, { error: "invalid scene name" });
+				if (typeof title !== "string" || Array.from(title).length > 120) return json(res, 400, { error: "invalid title" });
+				if (!scanFrames(root).scenes.some((sc) => sc.name === scene)) return json(res, 400, { error: `scene "${scene}" does not exist (no frames under design/scenes/${scene}/)` });
+				const e = setSceneTitle(root, scene, readTitle(title) ?? "");
+				if (e) return json(res, 400, { error: e });
+				return json(res, 200, { ok: true });
 			}
 			if (path === "boards/reorder" && req.method === "POST") {
 				if (!ownerGated(req)) return json(res, 403, { error: "forbidden" });
@@ -249,10 +306,11 @@ function apiMiddleware(root, opts = {}) {
 						if (e) return json(res, 422, { error: e });
 						continue;
 					}
-					const description = readDescription(it.description);
+					const title = readTitle(it.title), description = readDescription(it.description);
 					folders.push({
 						name: it.folder,
 						order: i,
+						...title ? { title } : {},
 						...description ? { description } : {}
 					});
 					for (const [j, kid] of it.boards.entries()) {
@@ -339,6 +397,7 @@ function apiMiddleware(root, opts = {}) {
 						const disk = JSON.parse(current);
 						if (incoming.order === void 0 && typeof disk.order === "number" && Number.isFinite(disk.order)) incoming.order = disk.order;
 						if (incoming.folder === void 0 && validName(disk.folder)) incoming.folder = disk.folder;
+						if (incoming.title === void 0 && readTitle(disk.title)) incoming.title = disk.title;
 						if (incoming.description === void 0 && readDescription(disk.description)) incoming.description = disk.description;
 					} catch {}
 					const next2 = JSON.stringify(body.board, null, 2) + "\n";
@@ -363,7 +422,7 @@ function apiMiddleware(root, opts = {}) {
 				};
 				const asPng = url.searchParams.get("format") === "png";
 				const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
-				const { shootFrame } = await import("./shot-CwmHO5T4.mjs");
+				const { shootFrame } = await import("./shot-DlmTO8AF.mjs");
 				const r = await shootFrame({
 					root,
 					viewports: opts.viewports ?? {},
@@ -382,6 +441,7 @@ function apiMiddleware(root, opts = {}) {
 					height: r.height,
 					scale: r.scale,
 					...r.truncated ? { truncated: true } : {},
+					...r.unsettled ? { unsettled: true } : {},
 					...r.note ? { note: r.note } : {}
 				};
 				if (!asPng) return json(res, 200, summary);
@@ -394,11 +454,46 @@ function apiMiddleware(root, opts = {}) {
 				});
 				return res.end(png);
 			}
+			if (path === "shots" && req.method === "POST") {
+				const { readDevInfo } = await import("./work-CLrmY-vQ.mjs");
+				const token = readDevInfo(root)?.token;
+				if (!ownerGated(req) && !(token && req.headers["x-mv-work"] === token)) return json(res, 403, { error: "forbidden" });
+				const raw = await readBody(req);
+				if (raw == null) return json(res, 400, { error: "body too large or unreadable" });
+				let parsed;
+				try {
+					parsed = JSON.parse(raw);
+				} catch {
+					return json(res, 400, { error: "malformed JSON" });
+				}
+				if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return json(res, 400, { error: "expected an object" });
+				const body = parsed;
+				const theme = body.theme === void 0 ? "light" : body.theme;
+				if (typeof theme !== "string" || !/^[a-z0-9-]+$/i.test(theme)) return json(res, 400, { error: "invalid theme" });
+				const scale = body.scale === void 0 ? void 0 : body.scale;
+				if (scale !== void 0 && !(Number.isInteger(scale) && scale >= 1 && scale <= 4)) return json(res, 400, { error: "invalid scale" });
+				const { resolveFrames, shootBatch } = await import("./shot-DlmTO8AF.mjs");
+				const sel = resolveFrames(root, body);
+				if (!sel.ok) return json(res, sel.status, { error: sel.error });
+				const origin = opts.origin?.() ?? `http://${req.headers.host ?? "localhost"}`;
+				try {
+					return json(res, 200, { results: await shootBatch({
+						root,
+						viewports: opts.viewports ?? {},
+						frames: sel.frames,
+						theme,
+						origin,
+						scale
+					}) });
+				} catch (err) {
+					return json(res, 503, { error: err.message });
+				}
+			}
 			if (path === "poster" && req.method === "GET") {
 				if (!ownerGated(req)) return json(res, 403, { error: "forbidden" });
 				const src = url.searchParams.get("src") ?? "";
-				const { ensurePoster, isLocalClip } = await import("./poster-DOY7pax8.mjs");
-				const { isLocalAssetRef } = await import("./build-Ct0iMoSi.mjs");
+				const { ensurePoster, isLocalClip } = await import("./poster-BEjUcQP3.mjs");
+				const { isLocalAssetRef } = await import("./build-D_g53Bp2.mjs");
 				if (!isLocalAssetRef(src) || !isLocalClip(src)) return json(res, 400, { error: "src must be a clip under design/assets/" });
 				const r = await ensurePoster(join(root, "design", "assets"), src);
 				if (!r.ok) return json(res, r.error.includes("does not exist") ? 404 : 503, { error: r.error });
@@ -827,12 +922,15 @@ function marverPlugin(ctx) {
 			server.middlewares.use(routesMiddleware(server, clientDir));
 			devServer = server;
 			let framesKey = JSON.stringify(manifest.frames);
+			let scenesKey = JSON.stringify(manifest.scenes);
 			const regen = debounce(() => {
 				manifest = scanFrames(root, projectInfo());
 				const changed = writeManifest(root, manifest);
-				const key = JSON.stringify(manifest.frames);
+				const key = JSON.stringify(manifest.frames), sKey = JSON.stringify(manifest.scenes);
 				if (changed && key !== framesKey) server.ws.send("sh:manifest", manifest);
+				else if (changed && sKey !== scenesKey) server.ws.send("sh:scenes", { scenes: manifest.scenes });
 				framesKey = key;
+				scenesKey = sKey;
 			}, 150);
 			const watched = [join(root, "design", "scenes"), join(root, "design", "components")];
 			const inScope = (file) => watched.some((w) => file.startsWith(w));
@@ -920,23 +1018,68 @@ function marverPlugin(ctx) {
 					if (!existsSync(reqPath)) return;
 					inFlight.add(file);
 					setTimeout(async () => {
+						const base = file.replace(/\.request\.json$/, "");
+						const resultPath = join(inbox, `${base}.result.json`);
+						const claimed = join(inbox, `.${base}.${process.pid}.${Date.now().toString(36)}.claimed`);
+						try {
+							renameSync(reqPath, claimed);
+						} catch {
+							inFlight.delete(file);
+							return;
+						}
 						try {
+							const write = (r) => {
+								const tmp = join(inbox, `.${base}.${process.pid}.tmp`);
+								try {
+									writeFileSync(tmp, JSON.stringify(r, null, 2));
+									renameSync(tmp, resultPath);
+								} catch {
+									try {
+										rmSync(tmp, { force: true });
+									} catch {}
+								}
+							};
 							let spec;
 							try {
-								spec = JSON.parse(readFileSync(reqPath, "utf8"));
-							} catch {
+								spec = JSON.parse(readFileSync(claimed, "utf8"));
+								if (!spec || typeof spec !== "object" || Array.isArray(spec)) throw new Error("expected an object");
+							} catch (err) {
+								write({
+									ok: false,
+									error: `malformed request - ${err.message}`
+								});
+								return;
+							}
+							const theme = spec.theme === void 0 ? "light" : spec.theme;
+							if (typeof theme !== "string" || !/^[a-z0-9-]+$/i.test(theme)) {
+								write({
+									ok: false,
+									error: "invalid theme"
+								});
+								return;
+							}
+							const scale = spec.scale === void 0 ? void 0 : spec.scale;
+							if (scale !== void 0 && !(Number.isInteger(scale) && scale >= 1 && scale <= 4)) {
+								write({
+									ok: false,
+									error: "invalid scale"
+								});
+								return;
+							}
+							const ways = [
+								"frame",
+								"frames",
+								"scene",
+								"all"
+							].filter((k) => spec[k] !== void 0);
+							if (ways.length !== 1) {
+								write({
+									ok: false,
+									error: "name the frames one way: frame (an id), frames (an array of ids), scene (a name) or all (true)"
+								});
 								return;
 							}
-							const base = file.replace(/\.request\.json$/, "");
-							const resultPath = join(inbox, `${base}.result.json`);
-							const frameId = typeof spec.frame === "string" ? spec.frame : "";
-							const theme = typeof spec.theme === "string" ? spec.theme : "light";
 							const o = origin();
-							const write = (r) => {
-								try {
-									writeFileSync(resultPath, JSON.stringify(r, null, 2));
-								} catch {}
-							};
 							if (!o) {
 								write({
 									ok: false,
@@ -944,18 +1087,55 @@ function marverPlugin(ctx) {
 								});
 								return;
 							}
-							const { shootFrame } = await import("./shot-CwmHO5T4.mjs");
-							write(await shootFrame({
-								root,
-								viewports: config.viewports,
-								frameId,
-								theme,
-								origin: o
-							}));
+							const { shootFrame, shootBatch, resolveFrames } = await import("./shot-DlmTO8AF.mjs");
+							if (ways[0] === "frame") {
+								if (typeof spec.frame !== "string") {
+									write({
+										ok: false,
+										error: "frame must be a frame id"
+									});
+									return;
+								}
+								write(await shootFrame({
+									root,
+									viewports: config.viewports,
+									frameId: spec.frame,
+									theme,
+									origin: o,
+									scale
+								}));
+								return;
+							}
+							const sel = resolveFrames(root, spec);
+							if (!sel.ok) {
+								write({
+									ok: false,
+									error: sel.error
+								});
+								return;
+							}
 							try {
-								rmSync(reqPath, { force: true });
-							} catch {}
+								write({
+									ok: true,
+									results: await shootBatch({
+										root,
+										viewports: config.viewports,
+										frames: sel.frames,
+										theme,
+										origin: o,
+										scale
+									})
+								});
+							} catch (err) {
+								write({
+									ok: false,
+									error: err.message
+								});
+							}
 						} finally {
+							try {
+								rmSync(claimed, { force: true });
+							} catch {}
 							inFlight.delete(file);
 						}
 					}, 60);

package/dist/{poster-DOY7pax8.mjs → poster-BEjUcQP3.mjs}

@@ -1,4 +1,4 @@
-import { capture, findChrome } from "./shot-CwmHO5T4.mjs";
+import { capture, t as findChrome } from "./shot-DlmTO8AF.mjs";
 import { constants, copyFileSync, existsSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, sep } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -52,15 +52,23 @@ html,body{margin:0;background:#000}#root video{display:block}
   setTimeout(function(){ if (!done && v.readyState >= 2) show() }, 4000);
 })();
 <\/script></body></html>`;
-/** Render `<clip>.poster.png` for a clip under design/assets/. Idempotent: an existing
-*  poster (authored or generated) is left alone. */
-async function ensurePoster(assetsDir, src) {
+/** Single-flight by output path: N frames of one batch referencing the same clip ask at the
+*  same moment, and each would otherwise pass the "exists" check and render the same poster. */
+const rendering = /* @__PURE__ */ new Map();
+function ensurePoster(assetsDir, src) {
+	const out = join(assetsDir, posterNameFor(src));
+	const live = rendering.get(out);
+	if (live) return live;
+	const run = ensurePosterNow(assetsDir, src, out).finally(() => rendering.delete(out));
+	rendering.set(out, run);
+	return run;
+}
+async function ensurePosterNow(assetsDir, src, out) {
 	if (!isLocalClip(src)) return {
 		ok: false,
 		error: `not a local clip: ${src}`
 	};
 	const clip = join(assetsDir, src);
-	const out = join(assetsDir, posterNameFor(src));
 	if (existsSync(out)) return {
 		ok: true,
 		path: out,

package/dist/shot-BzQ0PXKH.mjs

@@ -0,0 +1,86 @@
+import { n as NAME } from "./cli.mjs";
+import { readDevInfo } from "./work-CLrmY-vQ.mjs";
+//#region src/cli/shot.ts
+/**
+* `marver shot <scene/frame> [...]`, `--scene <name>`, `--all` - render frames headless and
+* print the PNG paths, one per line, in the order asked.
+*
+* The shell-ful agents' door into the same verify loop jam teaches: build, shoot, LOOK. One
+* frame goes through /api/shot; several, a scene or everything go through /api/shots as ONE
+* operation (one browser, several frames at a time), so shooting a scene costs about what
+* shooting a frame did. shot.ts (server) has the capture story.
+*/
+async function shotCommand(root, frames, opts) {
+	const usage = `${NAME} shot <scene/frame ...> | --scene <name> | --all  [--theme <name>] [--scale 1-4] [--json]`;
+	if ([
+		frames.length > 0,
+		!!opts.scene,
+		!!opts.all
+	].filter(Boolean).length !== 1) throw new Error(`name the frames, one way: ${usage}`);
+	const info = readDevInfo(root);
+	if (!info) throw new Error(`\`${NAME} dev\` is not running in this repo (design/.local/dev.json not found) - start it first.`);
+	const scale = opts.scale != null ? Number(opts.scale) : void 0;
+	const theme = opts.theme;
+	const single = frames.length === 1 && !opts.scene && !opts.all;
+	let res;
+	try {
+		if (single) {
+			const qs = new URLSearchParams({
+				frame: frames[0],
+				...theme ? { theme } : {},
+				...scale != null ? { scale: String(scale) } : {}
+			});
+			res = await fetch(`http://localhost:${info.port}/__mv/api/shot?${qs}`, { headers: { "x-mv-work": info.token } });
+		} else {
+			const sel = opts.all ? { all: true } : opts.scene ? { scene: opts.scene } : { frames };
+			res = await fetch(`http://localhost:${info.port}/__mv/api/shots`, {
+				method: "POST",
+				headers: {
+					"x-mv-work": info.token,
+					"content-type": "application/json"
+				},
+				body: JSON.stringify({
+					...sel,
+					...theme ? { theme } : {},
+					...scale != null ? { scale } : {}
+				})
+			});
+		}
+	} catch {
+		throw new Error(`could not reach \`${NAME} dev\` on port ${info.port} - is it still running?`);
+	}
+	const data = await res.json().catch(() => ({}));
+	if (!res.ok) throw new Error(data.error ?? `shot failed (${res.status})`);
+	const one = data;
+	const results = single ? [one.path ? {
+		frame: frames[0],
+		ok: true,
+		path: one.path,
+		width: one.width,
+		height: one.height,
+		scale: one.scale,
+		...one.truncated ? { truncated: true } : {},
+		...one.unsettled ? { unsettled: true } : {},
+		...one.note ? { note: one.note } : {}
+	} : {
+		frame: frames[0],
+		ok: false,
+		error: one.error ?? "shot failed"
+	}] : data.results ?? [];
+	if (opts.json) {
+		console.log(JSON.stringify({ results }, null, 2));
+		if (results.some((r) => !r.ok)) process.exitCode = 1;
+		return;
+	}
+	let failed = false;
+	for (const r of results) if (r.ok) {
+		console.log(r.path);
+		if (r.note) console.error(`${r.frame}: ${r.note}`);
+	} else {
+		failed = true;
+		console.error(`${r.frame}: ${r.error}`);
+	}
+	if (failed) process.exitCode = 1;
+}
+//#endregion
+export { shotCommand };