@marver-design/marver 0.15.0 → 0.16.1

package/dist/{plugin-DJyjmQeh.mjs → plugin-BeBGu3gH.mjs}

@@ -1,13 +1,13 @@
 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 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 { a as writeManifest, n as hash, r as scanFrames, t as affectedFrameIds } from "./manifest-BzxSMoDB.mjs";
-import { copyFileSync, existsSync, linkSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, watch, writeFileSync } from "node:fs";
+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";
 import { randomBytes } from "node:crypto";
 //#region src/server/api.ts
-const BOARD_NAME = /^[a-z0-9][a-z0-9-]*$/;
 const BODY_LIMIT = 1e6;
 const CSRF_MAX_AGE = 2592e3;
 /** Read one cookie value off the request. */
@@ -85,37 +85,18 @@ function contained(target, base) {
 }
 function apiMiddleware(root, opts = {}) {
 	const boardsDir = join(root, "design", "boards");
+	const foldersPath = join(boardsDir, FOLDERS_FILE);
 	const boardPath = (name) => {
-		if (!BOARD_NAME.test(name)) return null;
+		if (!validName(name)) return null;
+		if (checkBoardsDir(root, boardsDir)) return null;
 		mkdirSync(boardsDir, { recursive: true });
 		const p = resolve(boardsDir, `${name}.json`);
 		return contained(p, boardsDir) ? p : null;
 	};
 	const validName = (n) => typeof n === "string" && n.length >= 1 && n.length <= 64 && BOARD_NAME.test(n);
-	const underRoot = (dir) => {
-		try {
-			const rr = realpathSync(root);
-			const rd = realpathSync(dir);
-			return rd === rr || rd.startsWith(rr + sep);
-		} catch {
-			return false;
-		}
-	};
-	const notSymlink = (p) => {
-		try {
-			return !existsSync(p) || !lstatSync(p).isSymbolicLink();
-		} catch {
-			return false;
-		}
-	};
-	const nodeExists = (p) => {
-		try {
-			lstatSync(p);
-			return true;
-		} catch {
-			return false;
-		}
-	};
+	const dirError = () => checkBoardsDir(root, boardsDir);
+	const notSymlink = (p) => !nodeExists(p) || isRegularFile(p);
+	const nodeExists$1 = nodeExists;
 	try {
 		for (const f of readdirSync(boardsDir)) if (f.endsWith(".tmp")) rmSync(join(boardsDir, f), { force: true });
 	} catch {}
@@ -144,20 +125,24 @@ function apiMiddleware(root, opts = {}) {
 				return json(res, 200, { boards: {} });
 			}
 			if (path === "boards" && req.method === "GET") {
+				const de = dirError();
+				if (de) return json(res, 422, { error: de });
 				mkdirSync(boardsDir, { recursive: true });
-				return json(res, 200, readdirSync(boardsDir).filter((f) => f.endsWith(".json") && !f.endsWith(".tmp")).map((f) => {
-					const content = readFileSync(join(boardsDir, f), "utf8");
-					let order;
-					try {
-						const o = JSON.parse(content)?.order;
-						if (typeof o === "number" && Number.isFinite(o)) order = o;
-					} catch {}
-					return {
-						name: f.replace(/\.json$/, ""),
-						sha256: hash(content),
-						order
-					};
-				}));
+				return json(res, 200, listBoardFiles(boardsDir).boards.map((b) => ({
+					name: b.name,
+					sha256: b.sha256,
+					...boardFields(b.json, validName)
+				})));
+			}
+			if (path === "folders" && req.method === "GET") {
+				const de = dirError();
+				if (de) return json(res, 422, { error: de });
+				const reg = readRegistry(boardsDir);
+				if (reg.state === "malformed") return json(res, 422, { error: reg.error });
+				return json(res, 200, {
+					folders: reg.folders,
+					sha256: reg.sha256
+				});
 			}
 			if (path === "boards/rename" && req.method === "POST") {
 				if (!ownerGated(req)) return json(res, 403, { error: "forbidden" });
@@ -170,29 +155,89 @@ 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 (!underRoot(boardsDir)) return json(res, 400, { error: "boards directory escapes the project" });
+				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 });
+				}
 				const fromPath = boardPath(from), toPath = boardPath(to);
 				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(toPath)) return json(res, 409, { error: `a board named "${to}" already exists` });
+				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` });
+					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 {
-					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;
-					if (nodeExists(toPath)) return json(res, 409, { error: `a board named "${to}" already exists` });
-					renameSync(fromPath, toPath);
-					return json(res, 200, { name: to });
+					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" });
@@ -205,25 +250,105 @@ 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 order = parsed.order;
-				if (!Array.isArray(order) || order.length < 1 || order.length > 200) return json(res, 400, { error: "invalid order" });
-				if (!order.every(validName) || order.some((n) => n === "all-scenes")) return json(res, 400, { error: "invalid board name in order" });
-				if (new Set(order).size !== order.length) return json(res, 400, { error: "duplicate board in order" });
-				if (!underRoot(boardsDir)) return json(res, 400, { error: "boards directory escapes the project" });
-				for (let i = 0; i < order.length; i++) {
-					const p = boardPath(order[i]);
-					if (!p || !existsSync(p) || !notSymlink(p)) continue;
+				const { tree, base } = parsed;
+				const bad = validateWire(tree);
+				if (bad) return json(res, 400, { error: bad });
+				const b = base;
+				if (!b || typeof b !== "object" || !b.boards || typeof b.boards !== "object" || b.folders !== null && typeof b.folders !== "string") return json(res, 400, { error: "expected base hashes" });
+				{
+					const de = dirError();
+					if (de) return json(res, 400, { error: de });
+				}
+				const reg = readRegistry(boardsDir);
+				if (reg.state === "malformed") return json(res, 422, { error: reg.error });
+				if (reg.sha256 !== b.folders) return json(res, 409, {
+					error: "folders changed on disk",
+					stale: [FOLDERS_FILE]
+				});
+				const unseen = listBoardFiles(boardsDir).boards.map((x) => x.name).filter((n) => !(n in b.boards));
+				if (unseen.length) return json(res, 409, {
+					error: "boards changed on disk",
+					stale: unseen
+				});
+				const plan = [];
+				const stale = [];
+				const consider = (name, order, folder) => {
+					const p = boardPath(name);
+					if (!p || !isRegularFile(p)) {
+						stale.push(name);
+						return null;
+					}
+					const content = readFileSync(p, "utf8");
+					if (b.boards[name] !== hash(content)) {
+						stale.push(name);
+						return null;
+					}
 					let obj;
 					try {
-						obj = JSON.parse(readFileSync(p, "utf8"));
+						obj = JSON.parse(content);
 					} catch {
+						return `board "${name}" is not valid JSON - fix the file`;
+					}
+					if (!obj || typeof obj !== "object" || Array.isArray(obj)) return `board "${name}" is not a JSON object - fix the file`;
+					plan.push({
+						name,
+						path: p,
+						obj,
+						order,
+						folder
+					});
+					return null;
+				};
+				const folders = [];
+				for (const [i, it] of tree.entries()) {
+					if (typeof it === "string") {
+						const e = consider(it, i, null);
+						if (e) return json(res, 422, { error: e });
 						continue;
 					}
-					if (!obj || typeof obj !== "object") continue;
-					obj.order = i;
-					atomicWrite(p, JSON.stringify(obj, null, 2) + "\n");
+					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()) {
+						const e = consider(kid, j, it.folder);
+						if (e) return json(res, 422, { error: e });
+					}
 				}
-				return json(res, 200, { ok: true });
+				if (stale.length) return json(res, 409, {
+					error: "boards changed on disk",
+					stale
+				});
+				const sha256 = {};
+				for (const w of plan) {
+					if (w.obj.order === w.order && (w.folder ? w.obj.folder === w.folder : w.obj.folder === void 0)) continue;
+					w.obj.order = w.order;
+					if (w.folder) w.obj.folder = w.folder;
+					else delete w.obj.folder;
+					const next = JSON.stringify(w.obj, null, 2) + "\n";
+					atomicWrite(w.path, next);
+					sha256[w.name] = hash(next);
+				}
+				mkdirSync(boardsDir, { recursive: true });
+				let foldersSha = null;
+				if (folders.length) {
+					const next = JSON.stringify({
+						version: 1,
+						folders
+					}, null, 2) + "\n";
+					atomicWrite(foldersPath, next);
+					foldersSha = hash(next);
+				} else rmSync(foldersPath, { force: true });
+				return json(res, 200, {
+					ok: true,
+					sha256: {
+						boards: sha256,
+						folders: foldersSha
+					}
+				});
 			}
 			const boardMatch = /^boards\/([^/]+)$/.exec(path);
 			if (boardMatch) {
@@ -268,9 +393,12 @@ function apiMiddleware(root, opts = {}) {
 					}
 					mkdirSync(boardsDir, { recursive: true });
 					const incoming = body.board;
-					if (incoming && typeof incoming === "object" && incoming.order === void 0 && current) try {
-						const o = JSON.parse(current).order;
-						if (typeof o === "number" && Number.isFinite(o)) incoming.order = o;
+					if (incoming && typeof incoming === "object" && current) try {
+						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";
 					atomicWrite(p, next2);
@@ -294,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-BWhoz6cU.mjs");
+				const { shootFrame } = await import("./shot-z-d-zMzf.mjs");
 				const r = await shootFrame({
 					root,
 					viewports: opts.viewports ?? {},
@@ -328,8 +456,8 @@ function apiMiddleware(root, opts = {}) {
 			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-CbpzSzJu.mjs");
-				const { isLocalAssetRef } = await import("./build-DfuTQZlY.mjs");
+				const { ensurePoster, isLocalClip } = await import("./poster-CoyobbGW.mjs");
+				const { isLocalAssetRef } = await import("./build-B4yPgFNF.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 });
@@ -611,7 +739,12 @@ const VIRTUAL_CONFIG = "virtual:sh-config";
 const VIRTUAL_DATA = "virtual:sh-data";
 function marverPlugin(ctx) {
 	const { root, clientDir, config } = ctx;
-	let manifest = scanFrames(root);
+	let project = {
+		name: config.share.name || basename(root),
+		description: config.description
+	};
+	const projectInfo = () => project;
+	let manifest = scanFrames(root, projectInfo());
 	let devServer = null;
 	const bootId = String(process.hrtime.bigint());
 	let invRev = 0;
@@ -752,9 +885,16 @@ 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);
-				if (writeManifest(root, manifest)) server.ws.send("sh:manifest", manifest);
+				manifest = scanFrames(root, projectInfo());
+				const changed = writeManifest(root, manifest);
+				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));
@@ -791,14 +931,31 @@ function marverPlugin(ctx) {
 					rescanTheme();
 				}
 			});
-			server.watcher.on("change", (f) => inScope(f) && /\.(tsx|jsx)$/.test(f) && regen());
-			writeManifest(root, scanFrames(root));
+			server.watcher.on("change", (f) => inScope(f) && (/\.(tsx|jsx)$/.test(f) || f.endsWith("_brief.md")) && regen());
+			const configFile = join(root, "design", "config.ts");
+			server.watcher.on("change", (f) => {
+				if (f !== configFile) return;
+				loadConfig(root).then((c) => {
+					project = {
+						name: c.share.name || basename(root),
+						description: c.description
+					};
+					regen();
+				}).catch(() => {});
+			});
+			writeManifest(root, manifest);
 			const boardsDir = join(root, "design", "boards");
 			try {
 				mkdirSync(boardsDir, { recursive: true });
 				const timers = /* @__PURE__ */ new Map();
+				let listTimer;
 				const watcher = watch(boardsDir, (_event, file) => {
 					if (!file || !file.endsWith(".json")) return;
+					clearTimeout(listTimer);
+					listTimer = setTimeout(() => {
+						server.ws.send("sh:boards", {});
+						regen();
+					}, 150);
 					clearTimeout(timers.get(file));
 					timers.set(file, setTimeout(() => {
 						timers.delete(file);
@@ -849,7 +1006,7 @@ function marverPlugin(ctx) {
 								});
 								return;
 							}
-							const { shootFrame } = await import("./shot-BWhoz6cU.mjs");
+							const { shootFrame } = await import("./shot-z-d-zMzf.mjs");
 							write(await shootFrame({
 								root,
 								viewports: config.viewports,

package/dist/{poster-CbpzSzJu.mjs → poster-CoyobbGW.mjs}

@@ -1,4 +1,4 @@
-import { capture, findChrome } from "./shot-BWhoz6cU.mjs";
+import { capture, findChrome } from "./shot-z-d-zMzf.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";

package/dist/{shot-BWhoz6cU.mjs → shot-z-d-zMzf.mjs}

@@ -95,8 +95,8 @@ async function shootFrame(opts) {
 	};
 	const plan = planShot(frame, viewports, size);
 	if (frame.kind !== "html") try {
-		const { scanAssetRefs } = await import("./build-DfuTQZlY.mjs");
-		const { ensurePoster } = await import("./poster-CbpzSzJu.mjs");
+		const { scanAssetRefs } = await import("./build-B4yPgFNF.mjs");
+		const { ensurePoster } = await import("./poster-CoyobbGW.mjs");
 		const refs = scanAssetRefs(readFileSync(join(root, frame.file), "utf8"), frame.file);
 		for (const r of refs) if (r.endsWith(".poster.png")) await ensurePoster(join(root, "design", "assets"), r.slice(0, -11));
 	} catch {}

package/docs/publish.md

@@ -31,7 +31,10 @@ opens the same view on the published site, as long as its board and frame shippe
 
 **What ships**: the boards you list, the frames they reference, and the host `public/`
 directory in full (the `--boards` filter covers frames, not public assets). A flow you
-publish must have all its `data-goto` targets on a published board.
+publish must have all its `data-goto` targets on a published board. Sidebar folders ship
+only around published boards (a folder with nothing published never reaches the bundle),
+and `title`s and `description`s ship only for published things - the project's, the
+published boards', their folders', scenes' and frames'.
 
 ## Who can open your canvas
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marver-design/marver",
-  "version": "0.15.0",
+  "version": "0.16.1",
   "description": "The agent-native design canvas. A design/ folder, one command, a canvas of live frames built from your repo's real components - comment @marver and your own coding agent does the work. The tool ships no AI.",
   "type": "module",
   "private": false,