@marver-design/marver 0.20.0 → 0.21.0

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 Notable changes to `@marver-design/marver`. Format follows [Keep a Changelog](https://keepachangelog.com); versions follow semver.
 
+## 0.21.0 - 2026-10-05
+
+### Added
+
+- **Folders in folders.** A folder can now hold folders, one level down, so the sidebar has two
+  levels: a board sits at the root, in a folder, or in a sub-folder. Every folder move works at
+  both levels, from the sidebar and from the files: **New folder inside** on a top-level folder's
+  menu, **Move to top level** for a sub-folder, boards dragged into a sub-folder or between its
+  boards, a folder without sub-folders dragged into a top-level folder. Deleting a folder moves
+  what it held up one level, into its place - never a board lost. **Move to new folder** now
+  makes the folder at the board's own level: a sub-folder when the board sits in a folder.
+- The files carry it with one new field: a sub-folder's entry in `design/boards/_folders.json`
+  names its `"parent"`. A board's `folder` stays the one folder it sits in directly. `npx marver
+  boards` prints the nested tree, the manifest lists each folder's `parent`, and a published
+  canvas keeps the nesting of its published boards (a folder with nothing published at any depth
+  stays out of the bundle). `instructions/boards.md` teaches agents the moves.
+
+### Upgrading
+
+- **The registry says `"version": 2` while any folder nests, and 1 when none does.** Marver 0.20
+  and earlier refuse a version-2 registry with an error instead of rewriting it flat, so a
+  teammate on an older version sees a clear message - upgrade the whole team before nesting.
+  A canvas tab opened before the upgrade is refused the same way once folders nest: reload it.
+- Run `npx marver init` to take the new folders guidance (unedited instruction files update in
+  place; edited ones are staged in `design/.local/latest/`).
+
 ## 0.20.0 - 2026-10-01
 
 ### Changed

package/dist/{bake-tAb0D6Rc.mjs → bake-BID6mo-N.mjs}

@@ -1,4 +1,4 @@
-import { AREA, SURFACE, pool, shotConcurrency, withBrowser } from "./shot-iw3SEcpn.mjs";
+import { AREA, SURFACE, pool, shotConcurrency, withBrowser } from "./shot-DswS4iRK.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, utimesSync, writeFileSync } from "node:fs";
 import { join, sep } from "node:path";
 import { createHash } from "node:crypto";

package/dist/{boards-BmxcT3Lc.mjs → boards-BwiDAmPf.mjs}

@@ -9,9 +9,11 @@ const hash = (s) => createHash("sha256").update(s).digest("hex");
 /**
 * Board folders - the pure tree shared by the sidebar, the dev API, the build and the
 * tests. Files are the truth: a board says which folder it sits in (`folder` on the
-* board file, ranked among its siblings by `order`), and `design/boards/_folders.json`
-* says which folders exist and where they rank at the root. One level only: folders
-* hold boards, never folders. `all-scenes` never enters the tree - callers pin it last.
+* board file - one slug, the folder it sits in directly), ranked among its siblings by
+* `order`, and `design/boards/_folders.json` says which folders exist, where they rank, and
+* which folder holds which (`parent`). Two levels: a folder holds boards and folders, a
+* folder inside a folder (a sub-folder) holds boards only. `all-scenes` never enters the
+* tree - callers pin it last.
 */
 /** The on-disk name grammar shared by boards and folders (a board name is a filename). */
 const BOARD_NAME = /^[a-z0-9][a-z0-9-]*$/;
@@ -36,12 +38,13 @@ const folderExtras = (it) => ({
 	...it.description ? { description: it.description } : {}
 });
 /** The registry file's shape. Returns the rows, or a string naming what is wrong - a
-*  malformed registry is an ERROR the human must fix (silently reading it as empty would
-*  let the next drag overwrite their folders), while a missing file is simply no folders. */
+*  malformed registry is an ERROR the human must fix (silently reading it as empty, or
+*  flattening a broken nesting, would let the next drag overwrite their folders), while a
+*  missing file is simply no folders. */
 function parseFolders(raw) {
 	if (!raw || typeof raw !== "object" || Array.isArray(raw)) return "expected an object";
 	const { version, folders } = raw;
-	if (version !== void 0 && version !== 1) return `unsupported version ${String(version)}`;
+	if (version !== void 0 && version !== 1 && version !== 2) return `unsupported version ${String(version)}`;
 	if (!Array.isArray(folders)) return "expected a \"folders\" array";
 	const out = [];
 	const seen = /* @__PURE__ */ new Set();
@@ -51,30 +54,45 @@ function parseFolders(raw) {
 		if (seen.has(name)) return `folder "${name}" is listed twice`;
 		seen.add(name);
 		const o = f.order;
+		const p = f.parent;
+		if (p !== void 0 && !isBoardName(p)) return `folder "${name}" has an invalid parent - a folder name`;
 		const t = readTitle(f.title);
 		const d = readDescription(f.description);
 		out.push({
 			name,
 			...typeof o === "number" && Number.isFinite(o) ? { order: o } : {},
+			...p !== void 0 ? { parent: p } : {},
 			...t ? { title: t } : {},
 			...d ? { description: d } : {}
 		});
 	}
+	const byName = new Map(out.map((f) => [f.name, f]));
+	for (const f of out) {
+		if (f.parent === void 0) continue;
+		if (version !== 2) return `folder "${f.name}" names a parent - nested folders need "version": 2`;
+		if (f.parent === f.name) return `folder "${f.name}" cannot be its own parent`;
+		const p = byName.get(f.parent);
+		if (!p) return `folder "${f.name}" names an unknown parent "${f.parent}"`;
+		if (p.parent !== void 0) return `folder "${f.name}" would sit three levels deep - folders nest one level only`;
+	}
 	return out;
 }
-/** Sidebar order from the files. Root: boards with no folder + every folder (registered
-*  or implied by a board), ranked by `order` then kind (board before folder) then name.
-*  Inside a folder: its boards by `order` then name. Unranked sorts after ranked. A folder's
-*  title and description ride on its item (they live in the registry a tree write rewrites);
-*  a board's title stays with its row - it lives in the board's own file. */
+/** Sidebar order from the files. At every level the boards and folders there share one
+*  sequence, ranked by `order`, then kind (board before folder), then name; unranked sorts
+*  after ranked. The root holds root boards and top-level folders (registered without a
+*  parent, or implied by a board that names an unregistered folder); a top-level folder holds
+*  its boards and its sub-folders; a sub-folder holds its boards. A folder's title and
+*  description ride on its item (they live in the registry a tree write rewrites); a board's
+*  title stays with its row - it lives in the board's own file. */
 function buildTree(boards, folders) {
-	const folderOrder = /* @__PURE__ */ new Map();
-	const folderMeta = /* @__PURE__ */ new Map();
-	for (const f of folders) if (isBoardName(f.name) && !folderOrder.has(f.name)) {
-		folderOrder.set(f.name, f.order);
-		folderMeta.set(f.name, folderExtras(f));
-	}
+	const reg = /* @__PURE__ */ new Map();
+	for (const f of folders) if (isBoardName(f.name) && !reg.has(f.name)) reg.set(f.name, f);
+	const parentOf = (n) => {
+		const p = reg.get(n)?.parent;
+		return p !== void 0 && p !== n && reg.has(p) && reg.get(p).parent === void 0 ? p : void 0;
+	};
 	const members = /* @__PURE__ */ new Map();
+	const implied = [];
 	const rootBoards = [];
 	for (const b of boards) {
 		if (!isBoardName(b.name) || b.name === "all-scenes") continue;
@@ -83,37 +101,43 @@ function buildTree(boards, folders) {
 			rootBoards.push(b);
 			continue;
 		}
-		if (!folderOrder.has(folder)) folderOrder.set(folder, void 0);
+		if (!reg.has(folder) && !implied.includes(folder)) implied.push(folder);
 		const list = members.get(folder) ?? [];
 		list.push(b);
 		members.set(folder, list);
 	}
-	const byRank = (a, b) => rank(a.order) - rank(b.order) || a.name.localeCompare(b.name);
-	const root = [...rootBoards.map((b) => ({
+	const sorted = (xs) => xs.sort((a, b) => rank(a.order) - rank(b.order) || (a.item.kind === b.item.kind ? 0 : a.item.kind === "board" ? -1 : 1) || a.item.name.localeCompare(b.item.name)).map((r) => r.item);
+	const boardsHere = (name) => (name === null ? rootBoards : members.get(name) ?? []).map((b) => ({
 		item: {
 			kind: "board",
 			name: b.name
 		},
 		order: b.order
-	})), ...[...folderOrder].map(([name, order]) => ({
+	}));
+	const folder = (name, kids) => ({
 		item: {
 			kind: "folder",
 			name,
-			boards: (members.get(name) ?? []).sort(byRank).map((b) => b.name),
-			...folderMeta.get(name) ?? {}
+			items: sorted(kids),
+			...folderExtras(reg.get(name) ?? {})
 		},
-		order
-	}))];
-	root.sort((a, b) => rank(a.order) - rank(b.order) || (a.item.kind === b.item.kind ? 0 : a.item.kind === "board" ? -1 : 1) || a.item.name.localeCompare(b.item.name));
-	return root.map((r) => r.item);
+		order: reg.get(name)?.order
+	});
+	const subsOf = (top) => [...reg.keys()].filter((n) => parentOf(n) === top);
+	const tops = [...[...reg.keys()].filter((n) => !parentOf(n)), ...implied];
+	return sorted([...boardsHere(null), ...tops.map((t) => folder(t, [...boardsHere(t), ...subsOf(t).map((s) => folder(s, boardsHere(s)))]))]);
 }
-/** Every board in reading order - the order the switchers and the landing pick use. */
+/** Every board in reading order, depth-first - the order the switchers and the landing pick use. */
 function flatten(tree) {
 	const out = [];
-	for (const it of tree) if (it.kind === "board") out.push(it.name);
-	else out.push(...it.boards);
+	const walk = (items) => {
+		for (const it of items) if (it.kind === "board") out.push(it.name);
+		else walk(it.items);
+	};
+	walk(tree);
 	return out;
 }
+const wireKids = (w) => w.items ?? w.boards ?? [];
 function validateWire(wire) {
 	if (!Array.isArray(wire)) return "invalid tree";
 	const boards = /* @__PURE__ */ new Set(), folders = /* @__PURE__ */ new Set();
@@ -123,28 +147,51 @@ function validateWire(wire) {
 		boards.add(n);
 		return null;
 	};
-	for (const w of wire) {
-		if (typeof w === "string") {
-			const e = board(w);
+	const walk = (list, depth) => {
+		for (const w of list) {
+			if (typeof w === "string") {
+				const e = board(w);
+				if (e) return e;
+				continue;
+			}
+			if (!w || typeof w !== "object" || Array.isArray(w)) return "invalid tree item";
+			if (depth >= 2) return "folders nest one level only";
+			const { folder, items, boards: legacy, title, description } = w;
+			if (!isBoardName(folder)) return "invalid folder name in tree";
+			if (title !== void 0 && (typeof title !== "string" || Array.from(title).length > 120)) return "invalid folder title";
+			if (description !== void 0 && (typeof description !== "string" || description.length > 300)) return "invalid folder description";
+			if (folders.has(folder)) return `folder "${folder}" appears twice`;
+			folders.add(folder);
+			const kids = items ?? legacy;
+			if (!Array.isArray(kids)) return "invalid folder in tree";
+			if (items === void 0 && kids.some((k) => typeof k !== "string")) return "invalid folder in tree";
+			const e = walk(kids, depth + 1);
 			if (e) return e;
-			continue;
 		}
-		if (!w || typeof w !== "object" || Array.isArray(w)) return "invalid tree item";
-		const { folder, boards: kids, title, description } = w;
-		if (!isBoardName(folder)) return "invalid folder name in tree";
-		if (title !== void 0 && (typeof title !== "string" || Array.from(title).length > 120)) return "invalid folder title";
-		if (description !== void 0 && (typeof description !== "string" || description.length > 300)) return "invalid folder description";
-		if (folders.has(folder)) return `folder "${folder}" appears twice`;
-		folders.add(folder);
-		if (!Array.isArray(kids)) return "invalid folder in tree";
-		for (const k of kids) {
-			const e = board(k);
-			if (e) return e;
-		}
-	}
+		return null;
+	};
+	const e = walk(wire, 0);
+	if (e) return e;
 	if (boards.size > 200 || folders.size > 50) return "tree too large";
 	return null;
 }
+/** Every folder with the folder it sits in (null = the root), top-level folders first in
+*  reading order, each followed by its sub-folders. */
+function folderEntries(t) {
+	const out = [];
+	for (const it of t) {
+		if (it.kind !== "folder") continue;
+		out.push({
+			folder: it,
+			parent: null
+		});
+		for (const k of it.items) if (k.kind === "folder") out.push({
+			folder: k,
+			parent: it.name
+		});
+	}
+	return out;
+}
 //#endregion
 //#region src/server/boards.ts
 /**
@@ -287,4 +334,4 @@ function readRegistry(boardsDir) {
 	};
 }
 //#endregion
-export { listBoardFiles as a, BOARD_NAME as c, flatten as d, isBoardName as f, hash as g, validateWire as h, isRegularFile as i, FOLDERS_FILE as l, readTitle as m, checkBoardsDir as n, nodeExists as o, readDescription as p, checkRealDirs as r, readRegistry as s, boardFields as t, buildTree as u };
+export { wireKids as _, listBoardFiles as a, BOARD_NAME as c, flatten as d, folderEntries as f, validateWire as g, readTitle as h, isRegularFile as i, FOLDERS_FILE as l, readDescription as m, checkBoardsDir as n, nodeExists as o, isBoardName as p, checkRealDirs as r, readRegistry as s, boardFields as t, buildTree as u, hash as v };

package/dist/{boards-PuVzw5Wp.mjs → boards-DnLewfj8.mjs}

@@ -1,10 +1,10 @@
-import { a as listBoardFiles, d as flatten, f as isBoardName, n as checkBoardsDir, s as readRegistry, t as boardFields, u as buildTree } from "./boards-BmxcT3Lc.mjs";
+import { a as listBoardFiles, d as flatten, n as checkBoardsDir, p as isBoardName, s as readRegistry, t as boardFields, u as buildTree } from "./boards-BwiDAmPf.mjs";
 import { join } from "node:path";
 //#region src/cli/boards.ts
 /**
 * `marver boards` - the sidebar as the agent sees it: every folder and board in reading
-* order, from the files (no dev server needed). One call answers "what folders exist, what
-* is in them, what ranks where" before the agent writes `folder` on a board or edits
+* order - sub-folders indented under their parent - from the files (no dev server needed). One
+* call answers "what folders exist, what is in them, what ranks where" before the agent writes `folder` on a board or edits
 * `design/boards/_folders.json`. `--json` gives the tree shape the shell uses.
 */
 function boardsCommand(root, opts) {
@@ -43,15 +43,24 @@ function boardsCommand(root, opts) {
 		const r = rows.find((x) => x.name === n);
 		return `${n}${title(r?.title)}${order(n)}${desc(r?.description)}`;
 	};
-	for (const it of tree) {
-		if (it.kind === "board") {
-			console.log(boardLine(it.name));
-			continue;
+	const count = (f) => {
+		const boards = f.items.filter((k) => k.kind === "board").length, subs = f.items.length - boards;
+		return `${boards} board${boards === 1 ? "" : "s"}${subs ? `, ${subs} folder${subs === 1 ? "" : "s"}` : ""}`;
+	};
+	const print = (items, pad, parent) => {
+		for (const it of items) {
+			if (it.kind === "board") {
+				console.log(`${pad}${boardLine(it.name)}`);
+				continue;
+			}
+			const where = parent ? `sub-folder of ${parent}` : "folder";
+			const implied = reg.folders.some((f) => f.name === it.name) ? "" : ", implied by its boards - not in _folders.json";
+			console.log(`${pad}${it.name}/${title(it.title)}  (${where}, ${count(it)}${implied})${desc(it.description)}`);
+			print(it.items, `${pad}  `, it.name);
+			if (!it.items.length) console.log(`${pad}  (empty)`);
 		}
-		console.log(`${it.name}/${title(it.title)}  (folder, ${it.boards.length} board${it.boards.length === 1 ? "" : "s"}${reg.folders.some((f) => f.name === it.name) ? "" : ", implied by its boards - not in _folders.json"})${desc(it.description)}`);
-		for (const b of it.boards) console.log(`  ${boardLine(b)}`);
-		if (!it.boards.length) console.log("  (empty)");
-	}
+	};
+	print(tree, "", null);
 	if (hasAll) console.log("all-scenes  (auto, always last)");
 	const landing = flatten(tree)[0];
 	if (landing) console.log(`\nlanding board: ${landing}`);

package/dist/{build-DwpNPl6Z.mjs → build-C7MqQ7hq.mjs}

@@ -1,7 +1,7 @@
 import { a as ROUTE, r as NAME } from "./cli.mjs";
-import { a as listBoardFiles, d as flatten, f as isBoardName, n as checkBoardsDir, s as readRegistry, t as boardFields, u as buildTree } from "./boards-BmxcT3Lc.mjs";
-import { c as loadConfig, r as scanFrames, u as detectHost } from "./manifest-B01PSyDc.mjs";
-import { n as tailwind3Css, r as tailwind4Plugin, t as marverPlugin } from "./plugin-y4Ch7o_A.mjs";
+import { a as listBoardFiles, d as flatten, n as checkBoardsDir, p as isBoardName, s as readRegistry, t as boardFields, u as buildTree } from "./boards-BwiDAmPf.mjs";
+import { c as loadConfig, r as scanFrames, u as detectHost } from "./manifest-mMfUhPtL.mjs";
+import { n as tailwind3Css, r as tailwind4Plugin, t as marverPlugin } from "./plugin-omHLCn91.mjs";
 import { cpSync, existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, sep } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -339,15 +339,24 @@ function readBoards(root) {
 	return out;
 }
 /** Switcher order = the sidebar's reading order: the folder tree over the PUBLISHED boards only
-*  (a folder left with no published board drops out - its name never reaches the bundle),
+*  (a folder left with no published board at any depth drops out - its name never reaches the bundle),
 *  flattened depth-first; all-scenes always LAST (it is the expensive everything-board, never
 *  the landing). `names[0]` is where `/` opens. Folder names of published boards are structure,
 *  like board names: they ship. */
 function publishedTree(published, allBoards, folders) {
-	const tree = buildTree(published.filter((n) => n !== "all-scenes").map((n) => ({
+	const built = buildTree(published.filter((n) => n !== "all-scenes").map((n) => ({
 		name: n,
 		...boardFields(allBoards[n], isBoardName)
-	})), folders).filter((it) => it.kind === "board" || it.boards.length > 0);
+	})), folders);
+	const prune = (items) => items.flatMap((it) => {
+		if (it.kind === "board") return [it];
+		const kids = prune(it.items);
+		return kids.length ? [{
+			...it,
+			items: kids
+		}] : [];
+	});
+	const tree = prune(built);
 	return {
 		tree,
 		names: [...flatten(tree), ...published.includes("all-scenes") ? ["all-scenes"] : []]
@@ -361,6 +370,7 @@ function publishedManifest(manifest, pubFrames, publishedNames, strip) {
 	const pubBoardSet = new Set(publishedNames);
 	const pubBoards = (manifest.boards ?? []).filter((b) => pubBoardSet.has(b.name));
 	const pubFolderSet = new Set(pubBoards.map((b) => b.folder).filter(Boolean));
+	for (const f of manifest.folders ?? []) if (f.parent && pubFolderSet.has(f.name)) pubFolderSet.add(f.parent);
 	const pubFolders = (manifest.folders ?? []).filter((f) => pubFolderSet.has(f.name));
 	return {
 		...manifest.project ? { project: manifest.project } : {},
@@ -683,7 +693,7 @@ async function buildSite(root, boardsFlag, allBoardsFlag, embedSeeds, textures =
 	const realAssets = existsSync(assetsDir) ? realpathSync(assetsDir) : null;
 	for (const r of refs) {
 		if (!isLocalAssetRef(r) || !r.endsWith(".poster.png") || existsSync(join(assetsDir, r))) continue;
-		const { ensurePoster } = await import("./poster-FCv_nXyP.mjs");
+		const { ensurePoster } = await import("./poster-BvxiAzy1.mjs");
 		const g = await ensurePoster(assetsDir, r.slice(0, -11));
 		if (!g.ok) throw new Error(`design/assets/${r}: ${g.error}`);
 		console.log(`  poster: rendered design/assets/${r} (${g.width}×${g.height})`);
@@ -750,7 +760,7 @@ async function buildSite(root, boardsFlag, allBoardsFlag, embedSeeds, textures =
 	}));
 	let textureLine = "  textures: skipped (--no-textures)";
 	if (textures && bakeGen) {
-		const { bakePublished } = await import("./publish-bakes-XH6Bac58.mjs");
+		const { bakePublished } = await import("./publish-bakes-BqzAAa3w.mjs");
 		const pubFrameFile = new Map(pubFrames.map((f) => [f.id, f]));
 		const r = await bakePublished({
 			root,

package/dist/cli.mjs

@@ -78,14 +78,14 @@ const resolve$1 = (dir) => {
 };
 const cli = cac(NAME);
 cli.command("init", "Scaffold design/ in this repo").option("--mode <mode>", "studio | embedded", { default: "studio" }).option("--no-demo", "Skip the demo scene (the demo ships unless this flag is passed)").option("--root <dir>", "Host repo root", { default: "." }).action(async (opts) => {
-	const { init } = await import("./init-DKxuRxBr.mjs");
+	const { init } = await import("./init-C34BY3R4.mjs");
 	init(resolve$1(opts.root), {
 		mode: opts.mode === "embedded" ? "embedded" : "studio",
 		demo: opts.demo !== false
 	});
 });
 for (const [name, desc] of [["dev", "Start the local canvas (everything on: hot reload, comments, Live Jam)"], ["canvas", "Start the local canvas - same as dev"]]) cli.command(name, desc).option("--root <dir>", "Host repo root", { default: "." }).option("--port <port>", "Port (default 5199)").action(async (opts) => {
-	const { dev } = await import("./dev-BjdDP69b.mjs");
+	const { dev } = await import("./dev-BNZF4Mup.mjs");
 	let port;
 	if (opts.port !== void 0) {
 		const n = Number(opts.port);
@@ -95,7 +95,7 @@ for (const [name, desc] of [["dev", "Start the local canvas (everything on: hot
 	await dev(resolve$1(opts.root), port);
 });
 cli.command("build", "Static export → design/.dist (what ships comes from design/publish.json - publishing is default-closed)").option("--boards <names>", "Publish only these boards (comma-separated); overrides the publish policy").option("--all-boards", "Publish every board - the loud override for the default-closed policy").option("--embed-seeds", "Copy comment history INTO the web root (identifying - every event carries its author's email)").option("--no-textures", "Skip compiling the glass textures the published frames rest under (needs Chrome; a CI without one skips on its own)").option("--root <dir>", "Host repo root", { default: "." }).action(async (opts) => {
-	const { buildSite } = await import("./build-DwpNPl6Z.mjs");
+	const { buildSite } = await import("./build-C7MqQ7hq.mjs");
 	try {
 		const boards = opts.boards === void 0 ? void 0 : typeof opts.boards === "string" ? opts.boards : "";
 		await buildSite(resolve$1(opts.root), boards, opts.allBoards === true, opts.embedSeeds === true, opts.textures !== false && !process.env.MARVER_NO_TEXTURES);
@@ -141,7 +141,7 @@ cli.command("work <action> [...frames]", "Working state on the canvas: start <sc
 	}
 });
 cli.command("boards", "The sidebar as files: every folder and board in reading order, the landing board, the registry").option("--root <dir>", "Host repo root", { default: "." }).option("--json", "The tree as JSON ({ tree, landing, registry })").action(async (opts) => {
-	const { boardsCommand } = await import("./boards-PuVzw5Wp.mjs");
+	const { boardsCommand } = await import("./boards-DnLewfj8.mjs");
 	try {
 		boardsCommand(resolve$1(opts.root), opts);
 	} catch (err) {

package/dist/{daemon-DbHvLQUL.mjs → daemon-CRZFpl6K.mjs}

@@ -1,7 +1,7 @@
 import { n as replay } from "./events-B3LBn74P.mjs";
 import { i as readLog, r as listBoards, t as appendEvents } from "./comments-DZyobpxG.mjs";
 import { n as localProfile } from "./profile-BjAPAJSb.mjs";
-import { a as toFrameId } from "./manifest-B01PSyDc.mjs";
+import { a as toFrameId } from "./manifest-mMfUhPtL.mjs";
 import { workActivity } from "./work-CLrmY-vQ.mjs";
 import { r as deviceId, t as has } from "./ledger-Bu0BjqIe.mjs";
 import { closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, watch, writeFileSync, writeSync } from "node:fs";

package/dist/{dev-BjdDP69b.mjs → dev-BNZF4Mup.mjs}

@@ -1,6 +1,6 @@
 import { i as PKG, r as NAME } from "./cli.mjs";
-import { c as loadConfig, u as detectHost } from "./manifest-B01PSyDc.mjs";
-import { n as tailwind3Css, r as tailwind4Plugin, t as marverPlugin } from "./plugin-y4Ch7o_A.mjs";
+import { c as loadConfig, u as detectHost } from "./manifest-mMfUhPtL.mjs";
+import { n as tailwind3Css, r as tailwind4Plugin, t as marverPlugin } from "./plugin-omHLCn91.mjs";
 import { readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -452,12 +452,12 @@ async function dev(root, portFlag) {
 	console.log(`\n  ${NAME} · ${projectName} → http://localhost:${port}/\n`);
 	setTimeout(async () => {
 		try {
-			await (await import("./shot-iw3SEcpn.mjs")).sweepGhosts((m) => console.log(`  ${m}`));
+			await (await import("./shot-DswS4iRK.mjs")).sweepGhosts((m) => console.log(`  ${m}`));
 		} catch {}
 	}, 0);
 	try {
 		const { staleManagedInstructions } = await import("./managed-HwHVNI3h.mjs");
-		const { installedVersion } = await import("./plugin-y4Ch7o_A.mjs").then((n) => n.i);
+		const { installedVersion } = await import("./plugin-omHLCn91.mjs").then((n) => n.i);
 		const stale = staleManagedInstructions(root);
 		if (stale.length) {
 			const shown = stale.slice(0, 4).join(", ") + (stale.length > 4 ? `, +${stale.length - 4} more` : "");
@@ -495,7 +495,7 @@ async function dev(root, portFlag) {
 		});
 	}
 	if (config.jam) {
-		const { startJam } = await import("./daemon-DbHvLQUL.mjs");
+		const { startJam } = await import("./daemon-CRZFpl6K.mjs");
 		const jam = startJam(root, config.jam, (m) => console.log(m), (board) => server.ws.send("sh:jam-comment", { board }));
 		if (jam) {
 			const close = server.close.bind(server);

package/dist/{init-DKxuRxBr.mjs → init-C34BY3R4.mjs}

@@ -1,5 +1,5 @@
 import { r as NAME } from "./cli.mjs";
-import { d as readJson, l as detectAgent, o as writeManifest, r as scanFrames, s as DEFAULTS, u as detectHost } from "./manifest-B01PSyDc.mjs";
+import { d as readJson, l as detectAgent, o as writeManifest, r as scanFrames, s as DEFAULTS, u as detectHost } from "./manifest-mMfUhPtL.mjs";
 import { MANAGED_PREFIX, enumerateInstructionTemplates, hashBody, managedFile, pkgDir } from "./managed-HwHVNI3h.mjs";
 import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative } from "node:path";

package/dist/{manifest-B01PSyDc.mjs → manifest-mMfUhPtL.mjs}

@@ -1,5 +1,5 @@
 import { i as PKG, n as CONTENT_WIDTH } from "./cli.mjs";
-import { a as listBoardFiles, d as flatten, f as isBoardName, g as hash, m as readTitle, n as checkBoardsDir, p as readDescription, r as checkRealDirs, s as readRegistry, t as boardFields, u as buildTree } from "./boards-BmxcT3Lc.mjs";
+import { a as listBoardFiles, d as flatten, f as folderEntries, h as readTitle, m as readDescription, n as checkBoardsDir, p as isBoardName, r as checkRealDirs, s as readRegistry, t as boardFields, u as buildTree, v as hash } from "./boards-BwiDAmPf.mjs";
 import { accessSync, constants, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { delimiter, isAbsolute, join, relative, sep } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -615,8 +615,9 @@ function setSceneTitle(root, scene, title) {
 	}
 	return null;
 }
-/** The sidebar as files say it is, for the manifest: folders in root order, boards in
-*  reading order with their folder and description. A boards dir we may not read (symlink)
+/** The sidebar as files say it is, for the manifest: folders in reading order (a sub-folder
+*  after its parent, with `parent`), boards in reading order with the folder they sit in
+*  directly and their description. A boards dir we may not read (symlink)
 *  or a malformed registry yields nothing here - the API and the build say why; the
 *  orientation file must never fail to write. */
 function scanBoards(root) {
@@ -629,10 +630,12 @@ function scanBoards(root) {
 		...boardFields(b.json, isBoardName)
 	}));
 	const tree = buildTree(rows, reg.folders);
+	const entries = folderEntries(tree);
 	const folderOf = /* @__PURE__ */ new Map();
-	for (const it of tree) if (it.kind === "folder") for (const b of it.boards) folderOf.set(b, it.name);
-	const folders = tree.filter((it) => it.kind === "folder").map((it) => ({
+	for (const { folder } of entries) for (const k of folder.items) if (k.kind === "board") folderOf.set(k.name, folder.name);
+	const folders = entries.map(({ folder: it, parent }) => ({
 		name: it.name,
+		...parent ? { parent } : {},
 		...it.title ? { title: it.title } : {},
 		...it.description ? { description: it.description } : {}
 	}));

package/dist/{plugin-y4Ch7o_A.mjs → plugin-omHLCn91.mjs}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { a as ROUTE, i as PKG, r as NAME } 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 { _ as wireKids, a as listBoardFiles, c as BOARD_NAME, g as validateWire, h as readTitle, i as isRegularFile, l as FOLDERS_FILE, m as readDescription, n as checkBoardsDir, o as nodeExists, s as readRegistry, t as boardFields, v as hash } from "./boards-BwiDAmPf.mjs";
 import { n as localProfile, t as isConnected } from "./profile-BjAPAJSb.mjs";
-import { c as loadConfig, i as setSceneTitle, n as isNoteFile, o as writeManifest, r as scanFrames, t as affectedFrameIds } from "./manifest-B01PSyDc.mjs";
+import { c as loadConfig, i as setSceneTitle, n as isNoteFile, o as writeManifest, r as scanFrames, t as affectedFrameIds } from "./manifest-mMfUhPtL.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";
@@ -261,6 +261,7 @@ function apiMiddleware(root, opts = {}) {
 				}
 				const reg = readRegistry(boardsDir);
 				if (reg.state === "malformed") return json(res, 422, { error: reg.error });
+				if (reg.state === "ok" && reg.folders.some((f) => f.parent) && parsed.protocol !== 2) return json(res, 422, { error: "this tab predates folders in folders - reload the canvas, then try again" });
 				if (reg.sha256 !== b.folders) return json(res, 409, {
 					error: "folders changed on disk",
 					stale: [FOLDERS_FILE]
@@ -300,23 +301,29 @@ function apiMiddleware(root, opts = {}) {
 					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;
-					}
-					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 });
+				const walk = (list, parent) => {
+					for (const [i, it] of list.entries()) {
+						if (typeof it === "string") {
+							const e = consider(it, i, parent);
+							if (e) return e;
+							continue;
+						}
+						const title = readTitle(it.title), description = readDescription(it.description);
+						folders.push({
+							name: it.folder,
+							order: i,
+							...parent ? { parent } : {},
+							...title ? { title } : {},
+							...description ? { description } : {}
+						});
+						const e = walk(wireKids(it), it.folder);
+						if (e) return e;
 					}
+					return null;
+				};
+				{
+					const e = walk(tree, null);
+					if (e) return json(res, 422, { error: e });
 				}
 				if (stale.length) return json(res, 409, {
 					error: "boards changed on disk",
@@ -335,8 +342,9 @@ function apiMiddleware(root, opts = {}) {
 				mkdirSync(boardsDir, { recursive: true });
 				let foldersSha = null;
 				if (folders.length) {
+					const version = folders.some((f) => f.parent) ? 2 : 1;
 					const next = JSON.stringify({
-						version: 1,
+						version,
 						folders
 					}, null, 2) + "\n";
 					atomicWrite(foldersPath, next);
@@ -422,7 +430,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-iw3SEcpn.mjs");
+				const { shootFrame } = await import("./shot-DswS4iRK.mjs");
 				const r = await shootFrame({
 					root,
 					viewports: opts.viewports ?? {},
@@ -472,7 +480,7 @@ function apiMiddleware(root, opts = {}) {
 				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-iw3SEcpn.mjs");
+				const { resolveFrames, shootBatch } = await import("./shot-DswS4iRK.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"}`;
@@ -500,7 +508,7 @@ function apiMiddleware(root, opts = {}) {
 					return json(res, 400, { error: "malformed JSON" });
 				}
 				if (!body || typeof body !== "object" || !Array.isArray(body.asks) || !body.asks.length || body.asks.length > 200) return json(res, 400, { error: "asks must list 1-200 frames" });
-				const { bakeBatch, ASK_MAX } = await import("./bake-tAb0D6Rc.mjs");
+				const { bakeBatch, ASK_MAX } = await import("./bake-BID6mo-N.mjs");
 				let manifest = {};
 				try {
 					manifest = JSON.parse(readFileSync(join(root, "design", "manifest.json"), "utf8"));
@@ -544,8 +552,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-FCv_nXyP.mjs");
-				const { isLocalAssetRef } = await import("./build-DwpNPl6Z.mjs");
+				const { ensurePoster, isLocalClip } = await import("./poster-BvxiAzy1.mjs");
+				const { isLocalAssetRef } = await import("./build-C7MqQ7hq.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 });
@@ -1027,7 +1035,7 @@ function marverPlugin(ctx) {
 			};
 			const prune = () => setTimeout(async () => {
 				try {
-					(await import("./bake-tAb0D6Rc.mjs")).pruneBakes(root, bakeGen);
+					(await import("./bake-BID6mo-N.mjs")).pruneBakes(root, bakeGen);
 				} catch {}
 			}, 500);
 			prune();
@@ -1166,7 +1174,7 @@ function marverPlugin(ctx) {
 								});
 								return;
 							}
-							const { shootFrame, shootBatch, resolveFrames } = await import("./shot-iw3SEcpn.mjs");
+							const { shootFrame, shootBatch, resolveFrames } = await import("./shot-DswS4iRK.mjs");
 							if (ways[0] === "frame") {
 								if (typeof spec.frame !== "string") {
 									write({