paintress 0.5.1 → 0.6.0

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { a as isDaemonRunning, c as pidPath, d as sanitizeProjectName, f as socketPath, i as attachPersistent, l as resolveProjectDir, m as encodeLine, n as runStdioServer, o as sendRequest, p as LineDecoder, r as TOOLS, s as lockPath, u as safeJoin } from "./server-vPylVJZf.js";
-import { T as loadDoc, qt as VERSION, t as renderDocument } from "./render-CzpO1cOe.js";
+import { C as isPresetType, D as presetPathFor, E as notePathFor, O as readTextIfExists, S as findNodeIn, T as listPresets, _ as LineDecoder, a as ensureDaemon, b as componentsPathFor, c as isDaemonRunning, d as lockPath, f as pidPath, g as socketPath, h as sanitizeProjectName, k as setPreset, 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 listComponents, x as ensureProjectScaffold, y as applyProjectPresets } from "./server-DZRNNWac.js";
+import { T as loadDoc, qt as VERSION, t as renderDocument } from "./render-BSf62388.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";
@@ -35,6 +35,7 @@ var Registry = class {
 		}
 		const entry = {
 			name,
+			label: name,
 			root,
 			rootReal,
 			depth: wanted,
@@ -91,7 +92,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);
@@ -100,6 +103,7 @@ var Registry = class {
 	info(entry) {
 		return {
 			name: entry.name,
+			label: entry.label,
 			root: entry.root,
 			depth: entry.depth,
 			fileCount: this.listDesigns(entry).length,
@@ -270,6 +274,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);
 			});
@@ -427,6 +434,23 @@ function findUiDist() {
 	for (const c of candidates) if (existsSync(join(c, "index.html"))) return c;
 	return null;
 }
+/**
+* 从 URL 路径段里按最长前缀解析项目。
+* 项目 key 现在是目录层级本身（`c-thun/raybend`），所以 `/c-thun/raybend`、
+* `/render/c-thun/raybend/design/editor.pen` 都能在不需要 %2F 转义的情况下命中。
+* 单段名（`paintress watch myname dir`）同样适用。
+*/
+function resolveProjectPrefix(registry, segments, maxDepth = 3) {
+	for (let n = Math.min(maxDepth, segments.length); n >= 1; n--) {
+		const key = segments.slice(0, n).map((s) => decodeURIComponent(s)).join("/");
+		const entry = registry.get(key);
+		if (entry) return {
+			entry,
+			rest: segments.slice(n)
+		};
+	}
+	return null;
+}
 function isAlive(pid) {
 	if (!Number.isInteger(pid) || pid <= 0) return false;
 	try {
@@ -457,7 +481,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 {}
@@ -512,9 +536,18 @@ async function startDaemon(opts = {}) {
 	const versions = new VersionChecker();
 	const startedAt = Date.now();
 	const idleTimeoutMs = opts.idleTimeoutMs ?? 6e4;
-	const idleCheckMs = opts.idleCheckMs ?? 15e3;
+	const emptyGraceMs = opts.emptyGraceMs ?? Math.min(idleTimeoutMs, 3e3);
+	const emptyBrowserMs = opts.emptyBrowserMs ?? 3e4;
+	const manualEmptyMs = opts.manualEmptyMs ?? 6e5;
+	/** 本次启动有没有过项目：决定「空仓 + 浏览器开着」是等接入还是收工 */
+	let everHadProjects = false;
+	const idleCheckMs = opts.idleCheckMs ?? 2e3;
 	let idleSince = null;
 	let closing = false;
+	/** 进行中的关停 Promise：close() 必须等它，不能立刻返回 */
+	let closingPromise = null;
+	/** 最近一次 HTTP 活动：用来判定「浏览器还在不在」而不单靠 SSE 关闭事件 */
+	let lastHttpAt = Date.now();
 	/**
 	* 注册表订阅者（浏览器开着的查看器窗口）。
 	* 项目列表变化时推 `projects` 事件，避免用户按 F5 才看到新项目。
@@ -522,11 +555,20 @@ async function startDaemon(opts = {}) {
 	const registryClients = /* @__PURE__ */ new Set();
 	/** 控制面长连接：shutdown 时必须主动结束，否则 server.close() 会一直等 agent attach */
 	const controlClients = /* @__PURE__ */ new Set();
+	/** agent attach 总数 / 浏览器连接总数（注册表 SSE + 设计稿 SSE） */
+	const agentCount = () => registry.all().reduce((n, p) => n + p.agents.size, 0);
+	const browserCount = () => registryClients.size + registry.all().reduce((n, p) => n + p.browsers.size, 0);
 	/** 将被关闭的长连接数：agent attach + 设计稿 SSE + 项目列表 SSE */
 	const connectionCount = () => registryClients.size + registry.all().reduce((n, p) => n + p.agents.size + p.browsers.size, 0);
+	/**
+	* 推注册表快照。事件带全量项目信息：前端不用再拉一次接口，项目增删能同一帧完成，
+	* 动画也因此不会晚一步。列表很小（每个项目只扫一次 shallow 目录），频繁推不心疼。
+	*/
 	const notifyRegistry = () => {
 		const payload = JSON.stringify({
-			projects: registry.all().length,
+			projects: registry.all().map((p) => registry.info(p)),
+			agents: agentCount(),
+			browsers: browserCount(),
 			at: Date.now()
 		});
 		for (const res of registryClients) try {
@@ -555,7 +597,7 @@ async function startDaemon(opts = {}) {
 	* - 浏览器 SSE 开着时永不退场
 	* - 人手动 watch 的项目（owner=manual）不参与自动退场
 	*/
-	const autoDetachMs = opts.autoDetachMs ?? 45e3;
+	const autoDetachMs = opts.autoDetachMs ?? 5e3;
 	const autoDetachTimers = /* @__PURE__ */ new Map();
 	function cancelAutoDetach(name) {
 		const timer = autoDetachTimers.get(name);
@@ -627,6 +669,7 @@ async function startDaemon(opts = {}) {
 								ok: true,
 								pong: true,
 								pid: process.pid,
+								port,
 								uptimeMs: Date.now() - startedAt,
 								projects: registry.all().length
 							});
@@ -641,9 +684,16 @@ async function startDaemon(opts = {}) {
 							});
 							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`);
+							}
 							reply({
 								ok: true,
 								watched: true,
@@ -676,6 +726,7 @@ async function startDaemon(opts = {}) {
 								attached: true,
 								project: req.project
 							});
+							notifyRegistry();
 							break;
 						}
 						case "detach":
@@ -747,6 +798,7 @@ async function startDaemon(opts = {}) {
 	const sockServer = createServer(handleClient);
 	const uiDist = findUiDist();
 	const httpServer = createServer$1(async (req, res) => {
+		lastHttpAt = Date.now();
 		const url = new URL(req.url ?? "/", "http://localhost");
 		const segments = url.pathname.split("/").filter((s) => s !== "");
 		const send = (code, body, type = "text/html; charset=utf-8") => {
@@ -793,7 +845,7 @@ async function startDaemon(opts = {}) {
 					});
 					return;
 				}
-				if (segments[1] === "projects" && segments.length === 3 && req.method === "DELETE") {
+				if (segments[1] === "projects" && req.method === "DELETE") {
 					if (!isTrustedWrite(req)) {
 						sendJson(403, {
 							ok: false,
@@ -920,6 +972,190 @@ 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
+						});
+						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"
+							});
+							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
+							});
+						} 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}`
@@ -963,16 +1199,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);
 				};
@@ -980,23 +1220,23 @@ async function startDaemon(opts = {}) {
 				return;
 			}
 			if (segments[0] === "render" && segments.length >= 3) {
-				const name = decodeURIComponent(segments[1] ?? "");
-				const entry = registry.get(name);
-				if (!entry) {
+				const hit = resolveProjectPrefix(registry, segments.slice(1));
+				if (hit === null || hit.rest.length === 0) {
 					send(404, "project not found", "text/plain; charset=utf-8");
 					return;
 				}
+				const { entry } = hit;
 				entry.lastAccess = Date.now();
-				const relPath = segments.slice(2).map(decodeURIComponent).join("/");
+				const relPath = hit.rest.map(decodeURIComponent).join("/");
 				const abs = safeJoin(entry.rootReal, relPath);
 				if (!abs) {
 					send(404, "file not found", "text/plain; charset=utf-8");
 					return;
 				}
 				const loaded = loadDoc(abs);
-				const rendered = renderDocument(loaded.doc, { title: relPath });
+				const rendered = renderDocument(applyProjectPresets(loaded.doc, abs).doc, { title: relPath });
 				const dir = relPath.includes("/") ? relPath.slice(0, relPath.lastIndexOf("/") + 1) : "";
-				const baseHref = `/files/${encodeURIComponent(entry.name)}/${dir.split("/").filter((s) => s !== "").map(encodeURIComponent).join("/")}${dir ? "/" : ""}`;
+				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 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>`;
@@ -1005,14 +1245,42 @@ async function startDaemon(opts = {}) {
 				send(200, html);
 				return;
 			}
-			if (segments[0] === "files" && segments.length >= 3) {
-				const name = decodeURIComponent(segments[1] ?? "");
-				const entry = registry.get(name);
+			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 relPath = segments.slice(2).map(decodeURIComponent).join("/");
+				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;
+				}
+				send(200, renderDocument({
+					...doc,
+					children: [node]
+				}, {
+					title: id,
+					transparent: true
+				}).html);
+				return;
+			}
+			if (segments[0] === "files" && segments.length >= 3) {
+				const hit = resolveProjectPrefix(registry, segments.slice(1));
+				if (hit === null) {
+					send(404, "project not found", "text/plain; charset=utf-8");
+					return;
+				}
+				const { entry } = hit;
+				const relPath = hit.rest.map(decodeURIComponent).join("/");
 				const abs = safeJoin(entry.rootReal, relPath);
 				if (!abs) {
 					send(404, "file not found", "text/plain; charset=utf-8");
@@ -1053,21 +1321,21 @@ async function startDaemon(opts = {}) {
 			if (segments.length === 0) {
 				const items = registry.all().map((p) => {
 					const info = registry.info(p);
-					return `<div class="card"><h2 style="margin:0 0 4px"><a href="/${encodeURIComponent(p.name)}">${esc(p.name)}</a></h2><div class="meta">${esc(info.root)} · ${info.fileCount} 个设计稿 · agent ${info.agentConns} · 浏览器 ${info.browserConns}</div></div>`;
+					return `<div class="card"><h2 style="margin:0 0 4px"><a href="${`/${p.name.split("/").map(encodeURIComponent).join("/")}`}">${esc(p.label)}</a></h2><div class="meta">${esc(info.root)} · ${info.fileCount} 个设计稿 · agent ${info.agentConns} · 浏览器 ${info.browserConns}</div></div>`;
 				}).join("");
 				send(200, layout("项目", `<h1>paintress</h1><div class="meta">pid ${process.pid} · 端口 ${opts.port ?? DEFAULT_PORT} · 运行 ${Math.round((Date.now() - startedAt) / 1e3)}s</div><p class="meta">前端未构建（<code>ui/dist</code> 不存在），当前为精简视图。</p>` + (items || "<p class=\"empty\">还没有注册任何项目。用 <code>paintress watch &lt;name&gt; &lt;dir&gt;</code> 注册。</p>")));
 				return;
 			}
-			const projectName = decodeURIComponent(segments[0] ?? "");
-			const entry = registry.get(projectName);
-			if (!entry) {
-				send(404, layout("未找到", `<h1>404</h1><p>未注册的项目：<code>${esc(projectName)}</code></p><p><a href="/">返回</a></p>`));
+			const hit = resolveProjectPrefix(registry, segments);
+			if (hit === null) {
+				send(404, layout("未找到", `<h1>404</h1><p>未注册的项目：<code>${esc(segments.join("/"))}</code></p><p><a href="/">返回</a></p>`));
 				return;
 			}
+			const { entry } = hit;
 			entry.lastAccess = Date.now();
-			if (segments.length === 1) {
+			if (hit.rest.length === 0) {
 				const files = registry.listDesigns(entry);
-				const list = files.map((f) => `<li><a href="/render/${encodeURIComponent(entry.name)}/${f.split("/").map(encodeURIComponent).join("/")}">${esc(f)}</a></li>`).join("");
+				const list = files.map((f) => `<li><a href="/render/${entry.name.split("/").map(encodeURIComponent).join("/")}/${f.split("/").map(encodeURIComponent).join("/")}">${esc(f)}</a></li>`).join("");
 				send(200, layout(entry.name, `<h1>${esc(entry.name)}</h1><div class="meta">${esc(entry.root)} · depth ${entry.depth}</div><h2>设计稿（${files.length}）</h2>` + (files.length ? `<ul>${list}</ul>` : "<p class=\"empty\">目录下没有 .ptr / .pen 文件</p>") + "<p><a href=\"/\">← 项目列表</a></p>"));
 				return;
 			}
@@ -1096,37 +1364,76 @@ async function startDaemon(opts = {}) {
 			resolve();
 		});
 	});
+	/**
+	* 生命周期策略：控制权在 agent 侧，人不需要管进程在不在。
+	*
+	* - 有 agent attach → 永远活着（agent 正在干活）。
+	* - 没有 agent，但浏览器开着：
+	*     · 还有项目 → 活着；项目归零 → 给前端 10s 倒计时自己走（服务端 emptyBrowserMs 兜底）。
+	* - 没有 agent 也没有浏览器：
+	*     · 还有手动 watch 的项目 → idleTimeoutMs 后关；
+	*     · 一个项目都没有 → 立刻（emptyGraceMs）关。
+	*
+	* 修的是旧逻辑的真 bug：旧代码只在「项目全部 idle」时计数，自动拉起的 daemon
+	* 又写死 `--idle 1h`，于是浏览器早就关了、进程还能挂一小时。
+	*/
 	const idleTimer = setInterval(() => {
-		if (registry.all().length === 0) idleSince = idleSince ?? Date.now();
-		else if (registry.all().every((p) => registry.isIdle(p))) idleSince = idleSince ?? Date.now();
-		else {
+		const now = Date.now();
+		const projects = registry.all().length;
+		const agents = agentCount();
+		const browsing = browserCount() > 0 && now - lastHttpAt < 3e4;
+		let threshold;
+		if (agents > 0) {
 			idleSince = null;
+			changes.prune();
 			return;
 		}
-		if (idleSince !== null && Date.now() - idleSince >= idleTimeoutMs) shutdown("idle");
+		if (browsing) {
+			if (projects > 0) {
+				idleSince = null;
+				changes.prune();
+				return;
+			}
+			threshold = everHadProjects ? emptyBrowserMs : manualEmptyMs;
+		} else threshold = projects > 0 ? idleTimeoutMs : emptyGraceMs;
+		idleSince = idleSince ?? now;
+		if (now - idleSince >= threshold) shutdown(projects > 0 ? "idle" : "无项目");
 		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.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,
@@ -1423,6 +1730,7 @@ function readConfig(path) {
 	return existsSync(path) ? readFileSync(path, "utf8") : null;
 }
 // src/cli.ts
+const NO_OPEN_FLAG = "no-open";
 const FLAG_KEYS = /* @__PURE__ */ new Set([
 	"type",
 	"name",
@@ -1444,14 +1752,17 @@ const FLAG_KEYS = /* @__PURE__ */ new Set([
 	"padding",
 	"gap",
 	"force",
-	"board"
+	"board",
+	"parent",
+	NO_OPEN_FLAG
 ]);
 const BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
 	"regex",
 	"reusable",
 	"daemon",
 	"dry-run",
-	"force"
+	"force",
+	NO_OPEN_FLAG
 ]);
 /** 纯函数：argv → 命令 + 位置参数 + 标志（可单测） */
 function parseArgv(argv) {
@@ -1556,10 +1867,11 @@ async function main(argv) {
 		if (cmd === "watch") {
 			if (!file || !a1) throw new Error("用法：paintress watch <name> <dir> [--depth 1..6]");
 			const depth = flagNum(flags, "depth");
+			const dir = resolve(a1);
 			console.log(JSON.stringify(await sendRequest({
 				kind: "watch",
 				project: file,
-				dir: a1,
+				dir,
 				...depth !== void 0 ? { depth } : {}
 			}, 8e3), null, 2));
 			return 0;
@@ -1674,50 +1986,122 @@ async function main(argv) {
 		if (cmd === "web") {
 			const port = flagNum(flags, "port");
 			const idle = flagNum(flags, "idle");
+			const noOpen = flags[NO_OPEN_FLAG] === true || process.env["PAINTRESS_NO_OPEN"] === "1";
+			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)
+				}, null, 2));
+				return 0;
+			}
 			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));
-				const child = spawn(process.execPath, args, {
-					detached: true,
-					stdio: "ignore"
+				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)
+				}, null, 2));
+				return 0;
 			}
-			const handle = await startDaemon({
-				...port !== void 0 ? { port } : {},
-				...idle !== void 0 ? { idleTimeoutMs: idle } : {},
-				updateCheck: true
-			});
+			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,
 				port: handle.port,
-				http: `http://localhost:${handle.port}`
+				http
 			}, null, 2));
+			if (!noOpen) {
+				const { openBrowser } = await import("./server-DZRNNWac.js").then((n) => n.i);
+				openBrowser(`${http}/`);
+			}
 			await new Promise((resolve) => {
 				process.once("SIGINT", () => void handle.close().then(() => resolve()));
 				process.once("SIGTERM", () => void handle.close().then(() => resolve()));
 			});
 			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 === "set") {
+				if (!a1 || !a2 || !positionals[3] || !positionals[4]) throw new Error("用法：paintress preset set <dir> <key> <color|radius> <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）`);
+			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 throw new Error(`未知 component 动作：${action}（list / insert）`);
+			console.log(JSON.stringify(out, null, 2));
+			return 0;
+		}
+		if (!file) throw new Error("缺少 <file> 参数");
 		switch (cmd) {
 			case "new": {
 				const name = flagStr(flags, "name");