paintress 0.5.2 → 0.7.0

package/dist/cli.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-import { a as attachPersistent, c as lockPath, d as safeJoin, f as sanitizeProjectName, h as encodeLine, i as TOOLS, l as pidPath, m as LineDecoder, n as runStdioServer, o as isDaemonRunning, p as socketPath, s as sendRequest, u as resolveProjectDir } from "./server-ssrAxbTR.js";
-import { T as loadDoc, qt as VERSION, t as renderDocument } from "./render-CCxYNL6A.js";
+import { A as presetPathFor, C as ensureProjectScaffold, D as listPresetGroups, E as listComponents, F as setProjectRoots, M as projectFontRegistry, N as readTextIfExists, O as listPresets, P as setPreset, S as componentsPathFor, T as findProjectRoot, _ as LineDecoder, a as ensureDaemon, b as screenshotPen, c as isDaemonRunning, d as lockPath, f as pidPath, g as socketPath, h as sanitizeProjectName, j as projectFilesInfo, k as notePathFor, l as queryDaemon, m as safeJoin, n as runStdioServer, o as reuseDaemon, p as resolveProjectDir, r as TOOLS, s as attachPersistent, u as sendRequest, v as encodeLine, w as findNodeIn, x as applyProjectPresets, y as findBrowser } from "./server-DBRmwE_v.js";
+import { P as planFonts, T as loadDoc, rn as VERSION, t as renderDocument, z as isPresetType } from "./render-DWs1iQ0v.js";
 import "./index.js";
 import { chmodSync, closeSync, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import { fileURLToPath } from "node:url";
 import { dirname, extname, join, relative, resolve, sep } from "node:path";
+import { randomUUID } from "node:crypto";
 import { createServer } from "node:net";
 import { createServer as createServer$1 } from "node:http";
 import { readFile } from "node:fs/promises";
@@ -92,7 +93,9 @@ var Registry = class {
 				if (st.isDirectory()) {
 					if (skip.has(name)) continue;
 					walk(abs, relPath, depth + 1);
-				} else if (DESIGN_EXT.has(extname(name).toLowerCase())) out.push(relPath);
+				} else if (DESIGN_EXT.has(extname(name).toLowerCase())) {
+					if (!name.startsWith("__")) out.push(relPath);
+				}
 			}
 		};
 		walk(entry.rootReal, "", 0);
@@ -119,18 +122,24 @@ var Registry = class {
 var MarksStore = class {
 	byProject = /* @__PURE__ */ new Map();
 	seq = 0;
-	/** 同一项目内同一 nodeId 复用既有短号；否则分配新号 */
+	/** 短号按「文件 + nodeId」去重：节点 id 只在文件内唯一，跨文件同 id 不能复用 */
+	key(project, nodeId, file) {
+		return `${project}\u0000${file ?? ""}\u0000${nodeId}`;
+	}
+	/** 同一项目内同一文件同一 nodeId 复用既有短号；否则分配新号 */
 	add(input) {
 		let bucket = this.byProject.get(input.project);
 		if (!bucket) {
 			bucket = /* @__PURE__ */ new Map();
 			this.byProject.set(input.project, bucket);
 		}
-		const existing = bucket.get(input.nodeId);
+		const key = this.key(input.project, input.nodeId, input.file);
+		const existing = bucket.get(key);
 		if (existing) {
 			if (input.name !== void 0) existing.name = input.name;
 			if (input.type !== void 0) existing.type = input.type;
 			if (input.path !== void 0) existing.path = input.path;
+			if (input.file !== void 0) existing.file = input.file;
 			existing.at = Date.now();
 			return existing;
 		}
@@ -138,21 +147,22 @@ var MarksStore = class {
 		const mark = {
 			shortId: this.seq,
 			project: input.project,
+			...input.file !== void 0 ? { file: input.file } : {},
 			nodeId: input.nodeId,
 			name: input.name,
 			type: input.type,
 			path: input.path ?? input.nodeId,
 			at: Date.now()
 		};
-		bucket.set(input.nodeId, mark);
+		bucket.set(key, mark);
 		return mark;
 	}
 	list(project) {
 		const bucket = this.byProject.get(project);
 		return bucket ? [...bucket.values()].sort((a, b) => a.shortId - b.shortId) : [];
 	}
-	get(project, nodeId) {
-		return this.byProject.get(project)?.get(nodeId);
+	get(project, nodeId, file) {
+		return this.byProject.get(project)?.get(this.key(project, nodeId, file));
 	}
 	clear(project) {
 		const bucket = this.byProject.get(project);
@@ -161,8 +171,16 @@ var MarksStore = class {
 		this.byProject.delete(project);
 		return n;
 	}
-	remove(project, nodeId) {
-		return this.byProject.get(project)?.delete(nodeId) ?? false;
+	remove(project, nodeId, file) {
+		const bucket = this.byProject.get(project);
+		if (bucket === void 0) return false;
+		if (file !== void 0) return bucket.delete(this.key(project, nodeId, file));
+		let removed = false;
+		for (const [key, mark] of bucket) if (mark.nodeId === nodeId) {
+			bucket.delete(key);
+			removed = true;
+		}
+		return removed;
 	}
 };
 // src/web/changes.ts
@@ -272,6 +290,9 @@ var WatchManager = class {
 			watcher.on("change", () => {
 				for (const cb of created.listeners) cb(absPath);
 			});
+			watcher.on("add", () => {
+				for (const cb of created.listeners) cb(absPath);
+			});
 			watcher.on("unlink", () => {
 				for (const cb of created.listeners) cb(absPath);
 			});
@@ -418,6 +439,10 @@ const MIME = {
 function mimeOf(filePath) {
 	return MIME[extname(filePath).toLowerCase()] ?? "application/octet-stream";
 }
+/** 项目内资源 → /files URL（项目名可能带斜杠，按段编码） */
+function filesUrl(project, relPath) {
+	return `/files/${project.split("/").map(encodeURIComponent).join("/")}/${relPath.split("/").filter((seg) => seg !== "").map(encodeURIComponent).join("/")}`;
+}
 /** 定位前端产物目录：源码运行 / 构建后 / cwd 三种候选，找不到则回退精简视图 */
 function findUiDist() {
 	const here = dirname(fileURLToPath(import.meta.url));
@@ -476,7 +501,7 @@ function acquireLock() {
 		} catch {
 			holder = 0;
 		}
-		if (isAlive(holder)) throw new Error(`paintress web 已在运行（pid ${holder}）。如需重启请先 paintress web --stop`);
+		if (isAlive(holder)) throw new Error(`paintress web 已在运行（pid ${holder}）。如需重启请先 paintress stop`);
 		try {
 			unlinkSync(p);
 		} catch {}
@@ -522,10 +547,50 @@ function esc(s) {
 function isTrustedWrite(req) {
 	return req.headers["x-paintress"] === "1";
 }
+/**
+* 属性面板用的变量表：项目预设打底、文档本地同名优先。
+* themed 列表取第一个可显示的值（面板只做展示，不替人挑主题）。
+*/
+function panelVars(fileAbs) {
+	const out = {};
+	const collect = (doc) => {
+		for (const [key, def] of Object.entries(doc?.variables ?? {})) {
+			const raw = def["value"];
+			const first = Array.isArray(raw) ? raw.map((e) => e !== null && typeof e === "object" ? e["value"] : void 0).find((x) => typeof x === "string" || typeof x === "number" || typeof x === "boolean") : raw;
+			if (typeof first === "string" || typeof first === "number" || typeof first === "boolean") out[key] = String(first);
+		}
+	};
+	try {
+		const p = presetPathFor(fileAbs);
+		if (p !== null) collect(loadDoc(p).doc);
+		collect(loadDoc(fileAbs).doc);
+	} catch {}
+	return out;
+}
+var FontReportStore = class {
+	byFile = /* @__PURE__ */ new Map();
+	set(project, path, report) {
+		this.byFile.set(`${project}\u0000${path}`, {
+			...report,
+			project,
+			path,
+			at: Date.now()
+		});
+	}
+	get(project, path) {
+		return this.byFile.get(`${project}\u0000${path}`);
+	}
+	list(project) {
+		return [...this.byFile.values()].filter((r) => r.project === project);
+	}
+};
 async function startDaemon(opts = {}) {
 	const releaseLock = acquireLock();
 	const registry = new Registry();
 	const marks = new MarksStore();
+	/** daemon 自己也是 doc 层的一个调用方：注册根就是它的项目表 */
+	const syncProjectRoots = () => setProjectRoots(registry.all().map((p) => p.root));
+	const fontReports = new FontReportStore();
 	const changes = new ChangesStore();
 	const watchers = new WatchManager();
 	const versions = new VersionChecker();
@@ -539,6 +604,8 @@ async function startDaemon(opts = {}) {
 	const idleCheckMs = opts.idleCheckMs ?? 2e3;
 	let idleSince = null;
 	let closing = false;
+	/** 进行中的关停 Promise：close() 必须等它，不能立刻返回 */
+	let closingPromise = null;
 	/** 最近一次 HTTP 活动：用来判定「浏览器还在不在」而不单靠 SSE 关闭事件 */
 	let lastHttpAt = Date.now();
 	/**
@@ -662,6 +729,7 @@ async function startDaemon(opts = {}) {
 								ok: true,
 								pong: true,
 								pid: process.pid,
+								port,
 								uptimeMs: Date.now() - startedAt,
 								projects: registry.all().length
 							});
@@ -675,11 +743,24 @@ async function startDaemon(opts = {}) {
 								version: VERSION
 							});
 							break;
+						case "fonts":
+							reply({
+								ok: true,
+								reports: fontReports.list(req.project)
+							});
+							break;
 						case "watch": {
 							everHadProjects = true;
 							const entry = registry.watch(req.project, req.dir, req.depth, req.owner === "agent" ? { owner: "agent" } : {});
 							cancelAutoDetach(entry.name);
 							watchers.watchDesigns(entry.rootReal, entry.depth, scheduleRegistryNotify);
+							try {
+								const created = ensureProjectScaffold(entry.rootReal).created;
+								if (created.length > 0 && !opts.quiet) process.stderr.write(`paintress web: 项目 ${entry.name} 初始化 ${created.map((f) => relative(entry.rootReal, f)).join("、")}\n`);
+							} catch (cause) {
+								process.stderr.write(`paintress web: 项目脚手架创建失败（${cause instanceof Error ? cause.message : String(cause)}）\n`);
+							}
+							syncProjectRoots();
 							reply({
 								ok: true,
 								watched: true,
@@ -691,6 +772,7 @@ async function startDaemon(opts = {}) {
 						case "unwatch": {
 							const before = registry.get(req.project);
 							const removed = before === void 0 ? false : detachProject(before, "unwatch");
+							syncProjectRoots();
 							reply({
 								ok: true,
 								unwatched: removed
@@ -884,6 +966,61 @@ async function startDaemon(opts = {}) {
 					});
 					return;
 				}
+				if (segments[1] === "fonts" && segments.length === 2) {
+					const qProject = url.searchParams.get("project") ?? "";
+					const qFile = url.searchParams.get("path") ?? "";
+					if (req.method === "POST") {
+						const raw = await readBody();
+						let body;
+						try {
+							body = JSON.parse(raw);
+						} catch {
+							sendJson(400, {
+								ok: false,
+								error: "请求体不是合法 JSON"
+							});
+							return;
+						}
+						const project = typeof body["project"] === "string" ? body["project"] : qProject;
+						const path = typeof body["path"] === "string" ? body["path"] : qFile;
+						if (project === "" || path === "") {
+							sendJson(400, {
+								ok: false,
+								error: "缺少 project / path"
+							});
+							return;
+						}
+						if (!registry.get(project)) {
+							sendJson(404, {
+								ok: false,
+								error: `未注册的项目：${project}`
+							});
+							return;
+						}
+						const checked = Array.isArray(body["checked"]) ? body["checked"].map(String) : [];
+						const missing = Array.isArray(body["missing"]) ? body["missing"].map(String) : [];
+						fontReports.set(project, path, {
+							checked,
+							missing,
+							substituted: [],
+							source: "viewer"
+						});
+						sendJson(200, { ok: true });
+						return;
+					}
+					if (req.method !== "GET") {
+						sendJson(405, {
+							ok: false,
+							error: "不支持的方法"
+						});
+						return;
+					}
+					sendJson(200, {
+						ok: true,
+						reports: fontReports.list(qProject)
+					});
+					return;
+				}
 				if (segments[1] === "changes") {
 					const qProject = url.searchParams.get("project") ?? "";
 					const qFile = url.searchParams.get("path") ?? "";
@@ -895,6 +1032,132 @@ async function startDaemon(opts = {}) {
 					});
 					return;
 				}
+				if (segments[1] === "export" && req.method === "GET") {
+					const qProject = url.searchParams.get("project") ?? "";
+					const qFile = url.searchParams.get("path") ?? "";
+					const qBoard = url.searchParams.get("board") ?? "";
+					const qScale = Number(url.searchParams.get("scale") ?? "1");
+					if (qProject === "" || qFile === "" || qBoard === "") {
+						sendJson(400, {
+							ok: false,
+							error: "缺少 project / path / board"
+						});
+						return;
+					}
+					if (qScale !== .5 && qScale !== 1 && qScale !== 2) {
+						sendJson(400, {
+							ok: false,
+							error: "scale 只支持 0.5 / 1 / 2"
+						});
+						return;
+					}
+					const entry = registry.get(qProject);
+					if (!entry) {
+						sendJson(404, {
+							ok: false,
+							error: `未注册的项目：${qProject}`
+						});
+						return;
+					}
+					const abs = safeJoin(entry.rootReal, qFile);
+					if (!abs) {
+						sendJson(400, {
+							ok: false,
+							error: `路径不在项目内：${qFile}`
+						});
+						return;
+					}
+					if (findBrowser() === null) {
+						sendJson(501, {
+							ok: false,
+							error: "本机没有 Chromium/Chrome，无法导出 PNG（可用 PTR_BROWSER 指定）"
+						});
+						return;
+					}
+					const tmpPng = join(tmpdir(), `paintress-export-${randomUUID()}.png`);
+					try {
+						const shot = await screenshotPen(abs, tmpPng, {
+							board: qBoard,
+							scale: qScale
+						});
+						const buf = await readFile(tmpPng);
+						const raw = `${(qFile.split("/").pop() ?? qFile).replace(/\.[^.]+$/, "")}-${shot.board?.name !== void 0 && shot.board.name !== "" ? shot.board.name : shot.board?.id ?? qBoard}@${qScale}x.png`;
+						const ascii = raw.replace(/[^A-Za-z0-9._@-]+/g, "_");
+						res.writeHead(200, {
+							"content-type": "image/png",
+							"content-disposition": `attachment; filename="${ascii}"; filename*=UTF-8''${encodeURIComponent(raw)}`,
+							"cache-control": "no-store",
+							"x-paintress-scale": String(shot.scale)
+						});
+						res.end(buf);
+						return;
+					} catch (cause) {
+						sendJson(400, {
+							ok: false,
+							error: cause instanceof Error ? cause.message : String(cause)
+						});
+						return;
+					} finally {
+						try {
+							unlinkSync(tmpPng);
+						} catch {}
+					}
+				}
+				if (segments[1] === "node" && req.method === "GET") {
+					const qProject = url.searchParams.get("project") ?? "";
+					const qFile = url.searchParams.get("path") ?? "";
+					const qId = url.searchParams.get("id") ?? "";
+					if (qProject === "" || qFile === "" || qId === "") {
+						sendJson(400, {
+							ok: false,
+							error: "缺少 project / path / id"
+						});
+						return;
+					}
+					const entry = registry.get(qProject);
+					if (!entry) {
+						sendJson(404, {
+							ok: false,
+							error: `未注册的项目：${qProject}`
+						});
+						return;
+					}
+					const abs = safeJoin(entry.rootReal, qFile);
+					if (!abs) {
+						sendJson(400, {
+							ok: false,
+							error: `路径不在项目内：${qFile}`
+						});
+						return;
+					}
+					let doc;
+					try {
+						doc = loadDoc(abs).doc;
+					} catch (cause) {
+						sendJson(404, {
+							ok: false,
+							error: cause instanceof Error ? cause.message : String(cause)
+						});
+						return;
+					}
+					const node = findNodeIn(doc.children, qId);
+					if (node === null) {
+						sendJson(404, {
+							ok: false,
+							error: `节点不存在：${qId}`
+						});
+						return;
+					}
+					entry.lastAccess = Date.now();
+					const { children, ...fields } = node;
+					sendJson(200, {
+						ok: true,
+						node: fields,
+						childrenCount: Array.isArray(children) ? children.length : 0,
+						vars: panelVars(abs)
+					});
+					return;
+				}
 				if (segments[1] === "marks") {
 					const qProject = url.searchParams.get("project") ?? "";
 					if (req.method === "GET") {
@@ -937,6 +1200,7 @@ async function startDaemon(opts = {}) {
 							mark: marks.add({
 								project: projectIn,
 								nodeId,
+								...typeof body["file"] === "string" && body["file"] !== "" ? { file: body["file"] } : {},
 								...typeof body["name"] === "string" ? { name: body["name"] } : {},
 								...typeof body["type"] === "string" ? { type: body["type"] } : {},
 								...typeof body["path"] === "string" ? { path: body["path"] } : {}
@@ -946,9 +1210,10 @@ async function startDaemon(opts = {}) {
 					}
 					if (req.method === "DELETE") {
 						const nodeId = url.searchParams.get("nodeId");
+						const file = url.searchParams.get("file") ?? void 0;
 						sendJson(200, {
 							ok: true,
-							cleared: nodeId ? marks.remove(qProject, nodeId) ? 1 : 0 : marks.clear(qProject)
+							cleared: nodeId ? marks.remove(qProject, nodeId, file) ? 1 : 0 : marks.clear(qProject)
 						});
 						return;
 					}
@@ -958,6 +1223,192 @@ async function startDaemon(opts = {}) {
 					});
 					return;
 				}
+				if (segments[1] === "notes" && req.method === "GET") {
+					const name = url.searchParams.get("project") ?? "";
+					const relPath = url.searchParams.get("path") ?? "";
+					const entry = registry.get(name);
+					if (!entry) {
+						sendJson(404, {
+							ok: false,
+							error: `未注册的项目：${name}`
+						});
+						return;
+					}
+					const abs = safeJoin(entry.rootReal, relPath);
+					const noteAbs = abs === null ? null : notePathFor(abs);
+					if (abs === null || noteAbs === null) {
+						sendJson(404, {
+							ok: false,
+							error: "文件不存在"
+						});
+						return;
+					}
+					let markdown;
+					try {
+						markdown = readTextIfExists(noteAbs);
+					} catch (cause) {
+						sendJson(413, {
+							ok: false,
+							error: cause instanceof Error ? cause.message : String(cause)
+						});
+						return;
+					}
+					if (markdown === null) {
+						sendJson(200, {
+							ok: true,
+							exists: false
+						});
+						return;
+					}
+					sendJson(200, {
+						ok: true,
+						exists: true,
+						path: relative(entry.rootReal, noteAbs).split(sep).join("/"),
+						markdown
+					});
+					return;
+				}
+				if (segments[1] === "presets") {
+					const qProject = url.searchParams.get("project") ?? "";
+					if (req.method === "GET") {
+						const entry = registry.get(qProject);
+						if (!entry) {
+							sendJson(404, {
+								ok: false,
+								error: `未注册的项目：${qProject}`
+							});
+							return;
+						}
+						const { path, items } = listPresets(entry.rootReal);
+						sendJson(200, {
+							ok: true,
+							path,
+							items,
+							groups: listPresetGroups(entry.rootReal).groups
+						});
+						return;
+					}
+					if (req.method === "PUT" || req.method === "POST") {
+						if (!isTrustedWrite(req)) {
+							sendJson(403, {
+								ok: false,
+								error: "缺少 x-paintress 头"
+							});
+							return;
+						}
+						const raw = await readBody();
+						let body;
+						try {
+							body = JSON.parse(raw);
+						} catch {
+							sendJson(400, {
+								ok: false,
+								error: "请求体不是合法 JSON"
+							});
+							return;
+						}
+						const name = qProject !== "" ? qProject : typeof body["project"] === "string" ? body["project"] : "";
+						const entry = registry.get(name);
+						if (!entry) {
+							sendJson(404, {
+								ok: false,
+								error: `未注册的项目：${name}`
+							});
+							return;
+						}
+						const key = typeof body["key"] === "string" ? body["key"] : "";
+						const value = body["value"];
+						if (key === "" || typeof value !== "string" && typeof value !== "number") {
+							sendJson(400, {
+								ok: false,
+								error: "缺少 key 或 value"
+							});
+							return;
+						}
+						const existing = listPresets(entry.rootReal).items.find((p) => p.key === key);
+						const typeRaw = body["type"] ?? existing?.type;
+						if (!isPresetType(typeRaw)) {
+							sendJson(400, {
+								ok: false,
+								error: "type 必须是 color / radius / spacing / fontSize / font"
+							});
+							return;
+						}
+						const label = typeof body["name"] === "string" && body["name"] !== "" ? body["name"] : void 0;
+						try {
+							const items = setPreset(entry.rootReal, {
+								key,
+								type: typeRaw,
+								value: String(value),
+								...label !== void 0 ? { name: label } : {}
+							});
+							notifyRegistry();
+							sendJson(200, {
+								ok: true,
+								path: presetPathFor(entry.rootReal),
+								items,
+								groups: listPresetGroups(entry.rootReal).groups
+							});
+						} catch (cause) {
+							sendJson(400, {
+								ok: false,
+								error: cause instanceof Error ? cause.message : String(cause)
+							});
+						}
+						return;
+					}
+					sendJson(405, {
+						ok: false,
+						error: `不支持的方法：${req.method ?? "?"}`
+					});
+					return;
+				}
+				if (segments[1] === "components" && req.method === "GET") {
+					const name = url.searchParams.get("project") ?? "";
+					const entry = registry.get(name);
+					if (!entry) {
+						sendJson(404, {
+							ok: false,
+							error: `未注册的项目：${name}`
+						});
+						return;
+					}
+					const compPath = componentsPathFor(entry.rootReal);
+					if (compPath === null) {
+						sendJson(200, {
+							ok: true,
+							path: null,
+							items: []
+						});
+						return;
+					}
+					const doc = applyProjectPresets(loadDoc(compPath).doc, compPath).doc;
+					sendJson(200, {
+						ok: true,
+						path: compPath,
+						items: listComponents(compPath).map((c) => {
+							const node = findNodeIn(doc.children, c.id);
+							if (node === null) return c;
+							try {
+								const single = renderDocument({
+									...doc,
+									children: [node]
+								}, {
+									title: c.id,
+									transparent: true
+								});
+								return {
+									...c,
+									width: Math.round(single.canvas.width),
+									height: Math.round(single.canvas.height)
+								};
+							} catch {
+								return c;
+							}
+						})
+					});
+					return;
+				}
 				sendJson(404, {
 					ok: false,
 					error: `未知 API：${url.pathname}`
@@ -1001,16 +1452,20 @@ async function startDaemon(opts = {}) {
 				const token = Symbol("browser");
 				entry.browsers.add(token);
 				cancelAutoDetach(entry.name);
-				const release = watchers.acquire(abs, () => {
+				const notifyChange = () => {
 					res.write(`event: change\ndata: ${JSON.stringify({
 						path: relPath,
 						at: Date.now()
 					})}\n\n`);
-				});
+				};
+				const releases = [watchers.acquire(abs, notifyChange)];
+				releases.push(watchers.acquire(abs.replace(/\.(ptr|pen)$/i, ".md"), notifyChange));
+				const presetAbs = presetPathFor(entry.rootReal);
+				if (presetAbs !== null) releases.push(watchers.acquire(presetAbs, notifyChange));
 				const keepAlive = setInterval(() => res.write(": ping\n\n"), 2e4);
 				const done = () => {
 					clearInterval(keepAlive);
-					release();
+					for (const release of releases) release();
 					entry.browsers.delete(token);
 					maybeScheduleAutoDetach(entry.name);
 				};
@@ -1032,10 +1487,21 @@ async function startDaemon(opts = {}) {
 					return;
 				}
 				const loaded = loadDoc(abs);
-				const rendered = renderDocument(loaded.doc, { title: relPath });
+				const merged = applyProjectPresets(loaded.doc, abs).doc;
+				const { registry: fontRegistry } = projectFontRegistry(abs);
+				const fontPlan = planFonts(fontRegistry, (source) => source.target === void 0 ? null : filesUrl(entry.name, source.target));
+				const rendered = renderDocument(merged, {
+					title: relPath,
+					fonts: fontPlan,
+					probeFonts: url.searchParams.get("embed") === "1"
+				});
 				const dir = relPath.includes("/") ? relPath.slice(0, relPath.lastIndexOf("/") + 1) : "";
 				const baseHref = `/files/${entry.name.split("/").map(encodeURIComponent).join("/")}/${dir.split("/").filter((s) => s !== "").map(encodeURIComponent).join("/")}${dir ? "/" : ""}`;
 				let html = rendered.html.replace("<head>", `<head>\n<base href="${baseHref}">`);
+				if (url.searchParams.get("embed") === "1") {
+					const fontApi = `/api/fonts?project=${encodeURIComponent(entry.name)}&path=${encodeURIComponent(relPath)}`;
+					html = html.replace("</head>", `<script>window.PAINTRESS_FONT_URL=${JSON.stringify(fontApi)}<\/script>\n</head>`);
+				}
 				if (url.searchParams.get("embed") !== "1") {
 					const liveScript = `<script>\n(function(){\n  var es = new EventSource('/events?project=${encodeURIComponent(entry.name)}&path=${encodeURIComponent(relPath)}');\n  es.addEventListener('change', function(){ location.reload(); });\n})();\n<\/script>`;
 					html = html.replace("</body>", `${liveScript}</body>`);
@@ -1043,6 +1509,38 @@ async function startDaemon(opts = {}) {
 				send(200, html);
 				return;
 			}
+			if (segments[0] === "render-component") {
+				const project = url.searchParams.get("project") ?? "";
+				const id = url.searchParams.get("id") ?? "";
+				const entry = registry.get(project);
+				if (!entry) {
+					send(404, "project not found", "text/plain; charset=utf-8");
+					return;
+				}
+				const compPath = componentsPathFor(entry.rootReal);
+				if (compPath === null || id === "") {
+					send(404, "component not found", "text/plain; charset=utf-8");
+					return;
+				}
+				const doc = applyProjectPresets(loadDoc(compPath).doc, compPath).doc;
+				const node = findNodeIn(doc.children, id);
+				if (node === null) {
+					send(404, "component not found", "text/plain; charset=utf-8");
+					return;
+				}
+				const single = {
+					...doc,
+					children: [node]
+				};
+				const { registry: fontRegistry } = projectFontRegistry(compPath);
+				const fontPlan = planFonts(fontRegistry, (source) => source.target === void 0 ? null : filesUrl(entry.name, source.target));
+				send(200, renderDocument(single, {
+					title: id,
+					transparent: true,
+					fonts: fontPlan
+				}).html);
+				return;
+			}
 			if (segments[0] === "files" && segments.length >= 3) {
 				const hit = resolveProjectPrefix(registry, segments.slice(1));
 				if (hit === null) {
@@ -1056,10 +1554,27 @@ async function startDaemon(opts = {}) {
 					send(404, "file not found", "text/plain; charset=utf-8");
 					return;
 				}
+				const ext = extname(abs).toLowerCase();
+				const isFont = ext === ".woff" || ext === ".woff2" || ext === ".ttf" || ext === ".otf";
+				if (isFont) try {
+					if (statSync(abs).size > 33554432) {
+						sendJson(413, {
+							ok: false,
+							error: "字体文件超过 32 MB，拒绝加载"
+						});
+						return;
+					}
+				} catch {
+					sendJson(404, {
+						ok: false,
+						error: "file not found"
+					});
+					return;
+				}
 				const buf = await readFile(abs);
 				res.writeHead(200, {
 					"content-type": mimeOf(abs),
-					"cache-control": "no-cache"
+					"cache-control": isFont ? "public, max-age=31536000, immutable" : "no-cache"
 				});
 				res.end(buf);
 				return;
@@ -1171,30 +1686,39 @@ async function startDaemon(opts = {}) {
 		changes.prune();
 	}, idleCheckMs);
 	idleTimer.unref();
-	async function shutdown(reason) {
-		if (closing) return;
+	/**
+	* 关停：幂等且**可等待**。
+	* 已经在关停中时必须返回同一个 Promise —— 否则 `close()` 会立刻 resolve，
+	* 调用方以为锁已释放，紧接着 `startDaemon` 就撞上「已在运行」。
+	* （v0.6.0 的 release 测试里就是这么连环挂的：idle 关停还在飞，close() 先返回了。）
+	*/
+	function shutdown(reason) {
+		if (closingPromise !== null) return closingPromise;
 		closing = true;
-		if (!opts.quiet) process.stderr.write(`paintress web: 退出（${reason}）\n`);
-		clearInterval(idleTimer);
-		if (registryTimer !== null) clearTimeout(registryTimer);
-		for (const timer of autoDetachTimers.values()) clearTimeout(timer);
-		autoDetachTimers.clear();
-		for (const client of registryClients) try {
-			client.write(`event: shutdown\ndata: ${JSON.stringify({
-				reason,
-				at: Date.now()
-			})}\n\n`);
-			client.end();
-		} catch {}
-		registryClients.clear();
-		for (const client of controlClients) client.end();
-		controlClients.clear();
-		await watchers.closeAll();
-		await new Promise((resolve) => sockServer.close(() => resolve()));
-		const httpClosed = new Promise((resolve) => httpServer.close(() => resolve()));
-		httpServer.closeAllConnections();
-		await httpClosed;
-		releaseLock();
+		closingPromise = (async () => {
+			if (!opts.quiet) process.stderr.write(`paintress web: 退出（${reason}）\n`);
+			clearInterval(idleTimer);
+			if (registryTimer !== null) clearTimeout(registryTimer);
+			for (const timer of autoDetachTimers.values()) clearTimeout(timer);
+			autoDetachTimers.clear();
+			for (const client of registryClients) try {
+				client.write(`event: shutdown\ndata: ${JSON.stringify({
+					reason,
+					at: Date.now()
+				})}\n\n`);
+				client.end();
+			} catch {}
+			registryClients.clear();
+			for (const client of controlClients) client.end();
+			controlClients.clear();
+			await watchers.closeAll();
+			await new Promise((resolve) => sockServer.close(() => resolve()));
+			const httpClosed = new Promise((resolve) => httpServer.close(() => resolve()));
+			httpServer.closeAllConnections();
+			await httpClosed;
+			releaseLock();
+		})();
+		return closingPromise;
 	}
 	return {
 		port,
@@ -1503,6 +2027,7 @@ const FLAG_KEYS = /* @__PURE__ */ new Set([
 	"scale",
 	"port",
 	"idle",
+	"foreground",
 	"daemon",
 	"dry-run",
 	"opencode-layout",
@@ -1514,14 +2039,29 @@ const FLAG_KEYS = /* @__PURE__ */ new Set([
 	"gap",
 	"force",
 	"board",
+	"parent",
+	"apply",
+	"min-uses",
+	"key",
+	"group",
+	"prop",
+	"value",
+	"preview",
+	"note",
+	"metrics",
+	"embed-fonts",
 	NO_OPEN_FLAG
 ]);
+/** `daemon` 只是历史别名：默认行为已经是后台，留着不报错 */
 const BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
 	"regex",
 	"reusable",
+	"foreground",
 	"daemon",
 	"dry-run",
 	"force",
+	"apply",
+	"embed-fonts",
 	NO_OPEN_FLAG
 ]);
 /** 纯函数：argv → 命令 + 位置参数 + 标志（可单测） */
@@ -1570,6 +2110,14 @@ function flagNum(f, key) {
 	if (!Number.isInteger(n) || n < 0) throw new Error(`--${key} 需要非负整数，收到：${v}`);
 	return n;
 }
+/** 连续数值参数（截图倍率 0.2–2）；与整数参数分开，不能把 0.8 当成非法 */
+function flagDecimal(f, key) {
+	const v = flagStr(f, key);
+	if (v === void 0) return void 0;
+	const n = Number(v);
+	if (!Number.isFinite(n)) throw new Error(`--${key} 需要数字，收到：${v}`);
+	return n;
+}
 function parseJson(text, what) {
 	try {
 		return JSON.parse(text);
@@ -1583,6 +2131,23 @@ async function call(tool, args) {
 	return await def.run(args);
 }
 /** 入口：返回退出码（可单测） */
+/** 当前目录所在项目里两个关键文件的现状（只报告，不创建） */
+function cwdDesignSystem() {
+	try {
+		const root = findProjectRoot(process.cwd());
+		return root === null ? null : projectFilesInfo(root);
+	} catch {
+		return null;
+	}
+}
+/** CLI 进程也要用「注册根」解析项目文件：从 daemon 拉一次项目表即可 */
+async function syncProjectRoots() {
+	if (!isDaemonRunning()) return;
+	try {
+		const res = await sendRequest({ kind: "status" }, 2e3);
+		if (res.ok && "projects" in res && Array.isArray(res.projects)) setProjectRoots(res.projects.map((p) => p.root));
+	} catch {}
+}
 async function main(argv) {
 	if (argv[0] === "--version" || argv[0] === "-v" || argv[0] === "version") {
 		console.log(`paintress ${VERSION}`);
@@ -1590,10 +2155,11 @@ async function main(argv) {
 	}
 	const parsed = parseArgv(argv);
 	if (!parsed) {
-		console.error("用法：paintress <mcp|web|ping|status|watch|unwatch|attach|stop|new|info|query|get|update|insert|delete|move|batch|render|shot|validate|install|doctor|mcp-config> ...（版本：paintress --version）");
+		console.error("用法：paintress <mcp|web|ping|status|watch|unwatch|attach|stop|new|info|query|get|update|insert|delete|move|batch|render|shot|validate|audit|establish|adjust|install|doctor|mcp-config> ...（版本：paintress --version）");
 		return 2;
 	}
 	const { cmd, positionals, flags } = parsed;
+	await syncProjectRoots();
 	const [file, a1, a2] = positionals;
 	try {
 		if (cmd === "mcp") {
@@ -1605,7 +2171,7 @@ async function main(argv) {
 				console.log(JSON.stringify({
 					ok: false,
 					running: false,
-					hint: "未运行：paintress web --daemon"
+					hint: "未运行：paintress web"
 				}));
 				return 1;
 			}
@@ -1747,39 +2313,59 @@ async function main(argv) {
 			const port = flagNum(flags, "port");
 			const idle = flagNum(flags, "idle");
 			const noOpen = flags[NO_OPEN_FLAG] === true || process.env["PAINTRESS_NO_OPEN"] === "1";
-			if (flags["daemon"] === true) {
-				const { spawn } = await import("node:child_process");
-				const args = [process.argv[1] ?? "", "web"];
-				if (port !== void 0) args.push("--port", String(port));
-				if (idle !== void 0) args.push("--idle", String(idle));
-				if (noOpen) args.push("--no-open");
-				const child = spawn(process.execPath, args, {
-					detached: true,
-					stdio: "ignore"
+			const url = (p) => `http://localhost:${p}`;
+			const running = await reuseDaemon(port);
+			if (running !== null) {
+				console.log(JSON.stringify({
+					ok: true,
+					daemon: true,
+					reused: true,
+					pid: running.pid,
+					port: running.port,
+					http: url(running.port),
+					designSystem: cwdDesignSystem()
+				}, null, 2));
+				return 0;
+			}
+			if (flags["foreground"] !== true) {
+				const res = await ensureDaemon({
+					...port !== void 0 ? { port } : {},
+					...idle !== void 0 ? { idleTimeoutMs: idle } : {},
+					noOpen
 				});
-				child.unref();
-				const deadline = Date.now() + 5e3;
-				while (Date.now() < deadline) {
-					if (isDaemonRunning()) {
-						const res = await sendRequest({ kind: "ping" });
-						console.log(JSON.stringify({
-							daemon: true,
-							launcherPid: child.pid,
-							...res
-						}, null, 2));
-						return 0;
-					}
-					await new Promise((r) => setTimeout(r, 100));
-				}
-				throw new Error("后台启动超时（5s 内未出现控制面 socket）");
+				console.log(JSON.stringify({
+					ok: true,
+					daemon: true,
+					reused: !res.started,
+					pid: res.pid,
+					port: res.port,
+					http: url(res.port),
+					designSystem: cwdDesignSystem()
+				}, null, 2));
+				return 0;
 			}
-			const handle = await startDaemon({
-				...port !== void 0 ? { port } : {},
-				...idle !== void 0 ? { idleTimeoutMs: idle } : {},
-				emptyGraceMs: 6e4,
-				updateCheck: true
-			});
-			const http = `http://localhost:${handle.port}`;
+			let handle;
+			try {
+				handle = await startDaemon({
+					...port !== void 0 ? { port } : {},
+					...idle !== void 0 ? { idleTimeoutMs: idle } : {},
+					emptyGraceMs: 6e4,
+					updateCheck: true
+				});
+			} catch (cause) {
+				const again = await queryDaemon();
+				if (again === null) throw cause;
+				console.log(JSON.stringify({
+					ok: true,
+					daemon: true,
+					reused: true,
+					pid: again.pid,
+					port: again.port,
+					http: url(again.port)
+				}, null, 2));
+				return 0;
+			}
+			const http = url(handle.port);
 			console.log(JSON.stringify({
 				ok: true,
 				pid: handle.pid,
@@ -1787,7 +2373,7 @@ async function main(argv) {
 				http
 			}, null, 2));
 			if (!noOpen) {
-				const { openBrowser } = await import("./server-ssrAxbTR.js").then((n) => n.r);
+				const { openBrowser } = await import("./server-DBRmwE_v.js").then((n) => n.i);
 				openBrowser(`${http}/`);
 			}
 			await new Promise((resolve) => {
@@ -1796,8 +2382,160 @@ async function main(argv) {
 			});
 			return 0;
 		}
-		if (!file) throw new Error("缺少 <file> 参数");
 		let out;
+		if (cmd === "preset") {
+			const action = file ?? "list";
+			if (action === "list") out = await call("paintress_preset", {
+				action: "list",
+				...a1 !== void 0 ? { path: a1 } : {}
+			});
+			else if (action === "groups") {
+				const full = await call("paintress_preset", {
+					action: "list",
+					...a1 !== void 0 ? { path: a1 } : {}
+				});
+				out = {
+					ok: true,
+					path: full.path ?? null,
+					groups: full.groups ?? {}
+				};
+			} else if (action === "seed") out = await call("paintress_preset", {
+				action: "seed",
+				...a1 !== void 0 ? { path: a1 } : {},
+				...flags["apply"] === true ? { apply: true } : {}
+			});
+			else if (action === "set-group") {
+				if (!a1 || !a2 || !positionals[3] || !positionals[4]) throw new Error("用法：paintress preset set-group <dir> <组名> <target> '<props-json>'");
+				let props;
+				try {
+					props = JSON.parse(positionals[4]);
+				} catch {
+					throw new Error(`props 不是合法 JSON：${positionals[4]}`);
+				}
+				out = await call("paintress_preset", {
+					action: "set-group",
+					path: a1,
+					group: a2,
+					target: positionals[3],
+					props
+				});
+			} else if (action === "remove-group") {
+				if (!a1 || !a2) throw new Error("用法：paintress preset remove-group <dir> <组名>");
+				out = await call("paintress_preset", {
+					action: "remove-group",
+					path: a1,
+					group: a2
+				});
+			} else if (action === "set") {
+				if (!a1 || !a2 || !positionals[3] || !positionals[4]) throw new Error("用法：paintress preset set <dir> <key> <color|radius|spacing|fontSize|font> <value> [--name 名称]");
+				out = await call("paintress_preset", {
+					action: "set",
+					path: a1,
+					key: a2,
+					type: positionals[3],
+					value: positionals[4],
+					...flagStr(flags, "name") !== void 0 ? { name: flagStr(flags, "name") } : {}
+				});
+			} else if (action === "remove") {
+				if (!a1 || !a2) throw new Error("用法：paintress preset remove <dir> <key>");
+				out = await call("paintress_preset", {
+					action: "remove",
+					path: a1,
+					key: a2
+				});
+			} else throw new Error(`未知 preset 动作：${action}（list / set / remove / seed / set-group / remove-group）`);
+			console.log(JSON.stringify(out, null, 2));
+			return 0;
+		}
+		if (cmd === "component") {
+			const action = file ?? "list";
+			if (action === "list") out = await call("paintress_component", {
+				action: "list",
+				...a1 !== void 0 ? { path: a1 } : {}
+			});
+			else if (action === "insert") {
+				if (!a1 || !a2) throw new Error("用法：paintress component insert <file> <id> [--parent p] [--index n]");
+				out = await call("paintress_component", {
+					action: "insert",
+					path: a1,
+					id: a2,
+					...flagStr(flags, "parent") !== void 0 ? { parent: flagStr(flags, "parent") } : {},
+					...flagNum(flags, "index") !== void 0 ? { index: flagNum(flags, "index") } : {}
+				});
+			} else if (action === "add") {
+				if (!a1 || !a2) throw new Error("用法：paintress component add <file> <id> [--name 名称] [--parent p] [--index n]");
+				out = await call("paintress_component", {
+					action: "add",
+					path: a1,
+					id: a2,
+					...flagStr(flags, "name") !== void 0 ? { name: flagStr(flags, "name") } : {},
+					...flagStr(flags, "parent") !== void 0 ? { parent: flagStr(flags, "parent") } : {},
+					...flagNum(flags, "index") !== void 0 ? { index: flagNum(flags, "index") } : {}
+				});
+			} else throw new Error(`未知 component 动作：${action}（list / insert / add）`);
+			console.log(JSON.stringify(out, null, 2));
+			return 0;
+		}
+		if (cmd === "font") {
+			const action = file ?? "list";
+			if (action === "list") out = await call("paintress_font", {
+				action: "list",
+				...a1 !== void 0 ? { path: a1 } : {}
+			});
+			else if (action === "remove") {
+				if (!a1 || !a2) throw new Error("用法：paintress font remove <dir> <family>");
+				out = await call("paintress_font", {
+					action: "remove",
+					path: a1,
+					family: a2
+				});
+			} else if (action === "default") {
+				if (!a1 || !a2) throw new Error("用法：paintress font default <dir> <token-or-family>");
+				out = await call("paintress_font", {
+					action: "default",
+					path: a1,
+					value: a2
+				});
+			} else if (action === "add") {
+				if (!a1 || !a2 || !positionals[3]) throw new Error("用法：paintress font add <dir> <family> <web|css|file|system|bundle> [source] [--preview x] [--note n] [--metrics '{\"sizeAdjust\":\"96%\"}']");
+				const metricsRaw = flagStr(flags, "metrics");
+				let metrics;
+				if (metricsRaw !== void 0) try {
+					metrics = JSON.parse(metricsRaw);
+				} catch {
+					throw new Error(`metrics 不是合法 JSON：${metricsRaw}`);
+				}
+				const preview = flagStr(flags, "preview");
+				const note = flagStr(flags, "note");
+				out = await call("paintress_font", {
+					action: "add",
+					path: a1,
+					family: a2,
+					kind: positionals[3],
+					...positionals[4] !== void 0 ? { source: positionals[4] } : {},
+					...preview !== void 0 ? { preview } : {},
+					...note !== void 0 ? { note } : {},
+					...metrics !== void 0 ? { metrics } : {}
+				});
+			} else throw new Error(`未知 font 动作：${action}（list / add / remove / default）`);
+			console.log(JSON.stringify(out, null, 2));
+			return 0;
+		}
+		if (cmd === "project") {
+			out = await call("paintress_project", { ...file !== void 0 ? { path: file } : {} });
+			console.log(JSON.stringify(out, null, 2));
+			return 0;
+		}
+		if (cmd === "convert") {
+			out = await call("paintress_convert", {
+				path: file,
+				...a1 !== void 0 ? { out: a1 } : {},
+				...flags["force"] === true ? { overwrite: true } : {}
+			});
+			console.log(JSON.stringify(out, null, 2));
+			return 0;
+		}
+		if (!file) throw new Error("缺少 <file> 参数");
 		switch (cmd) {
 			case "new": {
 				const name = flagStr(flags, "name");
@@ -1887,9 +2625,36 @@ async function main(argv) {
 				if (!a1) throw new Error("缺少 <out.html> 参数");
 				out = await call("paintress_render", {
 					path: file,
-					out: a1
+					out: a1,
+					...flags["embed-fonts"] === true ? { embedFonts: true } : {}
+				});
+				break;
+			case "audit":
+				out = await call("paintress_audit", { path: file });
+				break;
+			case "establish":
+				out = await call("paintress_establish", {
+					path: file,
+					...flags["apply"] === true ? { apply: true } : {},
+					...flagNum(flags, "min-uses") !== void 0 ? { minUses: flagNum(flags, "min-uses") } : {}
 				});
 				break;
+			case "adjust": {
+				const key = flagStr(flags, "key");
+				const group = flagStr(flags, "group");
+				const prop = flagStr(flags, "prop");
+				const value = flagStr(flags, "value");
+				if (value === void 0) throw new Error("adjust 需要 --value");
+				out = await call("paintress_adjust", {
+					path: file,
+					value,
+					...key !== void 0 ? { key } : {},
+					...group !== void 0 ? { group } : {},
+					...prop !== void 0 ? { prop } : {},
+					...flags["apply"] === true ? { apply: true } : {}
+				});
+				break;
+			}
 			case "shot": {
 				if (!a1) throw new Error("缺少 <out.png> 参数");
 				if (flags["board"] === true) throw new Error("--board 需要画板 id 或 name");
@@ -1897,7 +2662,7 @@ async function main(argv) {
 				out = await call("paintress_screenshot", {
 					path: file,
 					out: a1,
-					...flagNum(flags, "scale") !== void 0 ? { scale: flagNum(flags, "scale") } : {},
+					...flagDecimal(flags, "scale") !== void 0 ? { scale: flagDecimal(flags, "scale") } : {},
 					...board !== void 0 ? { board } : {}
 				});
 				break;