weifuwu 0.91.0 → 0.93.0

package/dist/server/index.js

@@ -270,8 +270,8 @@ async function sendResponse(res, response, opts) {
   res.writeHead(response.status, response.statusText, headers);
   if (response.body) {
     const reader = response.body.getReader();
-    const closed = new Promise((resolve3) => {
-      res.once("close", () => resolve3("closed"));
+    const closed = new Promise((resolve4) => {
+      res.once("close", () => resolve4("closed"));
     });
     res.on("error", () => {
     });
@@ -291,7 +291,7 @@ async function sendResponse(res, response, opts) {
         if (done) break;
         if (!res.write(value)) {
           const drained = new Promise(
-            (resolve3) => res.once("drain", () => resolve3("drain"))
+            (resolve4) => res.once("drain", () => resolve4("drain"))
           );
           if (await Promise.race([drained, closed]) === "closed") {
             await cancelStream();
@@ -457,6 +457,101 @@ function serve(router, options) {
 // src/server/core/router.ts
 import { WebSocketServer } from "ws";
 
+// src/server/db/errors.ts
+var DbError = class extends Error {
+  kind;
+  code;
+  cause;
+  constructor(kind, message, options) {
+    super(message);
+    this.name = "DbError";
+    this.kind = kind;
+    this.code = options?.code;
+    this.cause = options?.cause;
+  }
+};
+var ProtocolError = class extends DbError {
+  constructor(feature, message) {
+    super("protocol", message ?? `${feature} is not supported by weifuwu/db`, { code: "UNSUPPORTED" });
+    this.name = "ProtocolError";
+  }
+};
+var ConnectionError = class extends DbError {
+  attempts;
+  constructor(message, attempts = 1, cause) {
+    super("connection", message, { cause });
+    this.name = "ConnectionError";
+    this.attempts = attempts;
+  }
+};
+var TimeoutError = class extends DbError {
+  operation;
+  ms;
+  constructor(operation, ms) {
+    super("timeout", `${operation} timed out after ${ms}ms`);
+    this.name = "TimeoutError";
+    this.operation = operation;
+    this.ms = ms;
+  }
+};
+var ValidationError = class extends DbError {
+  constructor(message) {
+    super("validation", message);
+    this.name = "ValidationError";
+  }
+};
+
+// src/server/response.ts
+function ok(data, init) {
+  return Response.json(data, { status: 200, ...init });
+}
+function created(data, init) {
+  return Response.json(data, { status: 201, ...init });
+}
+function noContent(init) {
+  return new Response(null, { status: 204, ...init });
+}
+function badRequest(message) {
+  return Response.json({ error: message ?? "Bad Request" }, { status: 400 });
+}
+function unauthorized(message) {
+  return Response.json({ error: message ?? "Unauthorized" }, { status: 401 });
+}
+function forbidden(message) {
+  return Response.json({ error: message ?? "Forbidden" }, { status: 403 });
+}
+function notFound(message) {
+  return Response.json({ error: message ?? "Not Found" }, { status: 404 });
+}
+function conflict(message) {
+  return Response.json({ error: message ?? "Conflict" }, { status: 409 });
+}
+function unprocessable(message) {
+  return Response.json({ error: message ?? "Unprocessable Entity" }, { status: 422 });
+}
+function tooManyRequests(message) {
+  return Response.json({ error: message ?? "Too Many Requests" }, { status: 429 });
+}
+function serverError(message) {
+  return Response.json({ error: message ?? "Internal Server Error" }, { status: 500 });
+}
+function redirect(url, status = 302) {
+  return new Response(null, { status, headers: { Location: url } });
+}
+function errorResponse(e, status) {
+  const msg = e instanceof Error ? e.message : String(e);
+  let code;
+  if (e instanceof HttpError) {
+    return Response.json({ error: msg }, { status: status ?? e.status });
+  }
+  if (e instanceof DbError) {
+    const st = status ?? (e.code === "23505" ? 409 : 400);
+    code = e.code === "23505" ? "conflict" : e.kind;
+    return Response.json({ error: msg, code }, { status: st });
+  }
+  return Response.json({ error: msg }, { status: status ?? 400 });
+}
+
 // src/server/core/ws.ts
 function safeHook(hookName, fn, onError) {
   if (!fn) return () => {
@@ -995,12 +1090,12 @@ async function runChain(mws, finalHandler, req, ctx) {
 }
 
 // src/shared/router/pipeline.ts
-function badRequest(reason) {
+function badRequest2(reason) {
   return Response.json({ error: "Bad Request", reason }, { status: 400 });
 }
 async function dispatchRouter(root, pipeline, req, ctx) {
   const target = parseRequestTarget(req);
-  if (!target.ok) return badRequest(target.reason);
+  if (!target.ok) return badRequest2(target.reason);
   const m = trieMatch(root, target.segments);
   const match = m ? { value: m.value, params: freshParams(m), wildcard: m.wildcard } : null;
   pipeline.enrichCtx?.(ctx, match, target.pathname, target.query);
@@ -1356,11 +1451,8 @@ var Router = class _Router {
   async handleError(e, req, ctx, path) {
     const err = e instanceof Error ? e : new Error(String(e));
     if (this.errorHandler) return this.errorHandler(err, req, ctx);
-    if (err instanceof HttpError) {
-      return new Response(JSON.stringify({ error: err.message }), {
-        status: err.status,
-        headers: { "Content-Type": "application/json" }
-      });
+    if (err instanceof HttpError || err instanceof DbError || err instanceof ValidationError) {
+      return errorResponse(err);
     }
     noteHandlerError(`${req.method} ${path ?? new URL(req.url).pathname}`, e);
     return Response.json({ error: "Internal Server Error" }, { status: 500 });
@@ -1394,15 +1486,15 @@ var Router = class _Router {
         } catch {
         }
       }
-      await new Promise((resolve3) => {
+      await new Promise((resolve4) => {
         let remaining = clients.length;
         const done = () => {
           if (--remaining === 0) {
             clearTimeout(timer);
-            resolve3();
+            resolve4();
           }
         };
-        const timer = setTimeout(resolve3, 500);
+        const timer = setTimeout(resolve4, 500);
         for (const c of clients) c.once("close", done);
       });
     }
@@ -1920,7 +2012,7 @@ async function MemoryEmailServer(options = {}) {
       res.end(JSON.stringify({ error: err instanceof Error ? err.message : String(err) }));
     });
   });
-  await new Promise((resolve3) => server.listen(options.port ?? 0, "127.0.0.1", resolve3));
+  await new Promise((resolve4) => server.listen(options.port ?? 0, "127.0.0.1", resolve4));
   const port = server.address().port;
   return {
     port,
@@ -1928,7 +2020,7 @@ async function MemoryEmailServer(options = {}) {
     emails,
     requests,
     closeAllConnections: () => server.closeAllConnections(),
-    close: () => new Promise((resolve3, reject) => server.close((e) => e ? reject(e) : resolve3()))
+    close: () => new Promise((resolve4, reject) => server.close((e) => e ? reject(e) : resolve4()))
   };
 }
 
@@ -2521,44 +2613,6 @@ function hashRefreshToken(token) {
   return createHash("sha256").update(token).digest("hex");
 }
 
-// src/server/response.ts
-function ok(data, init) {
-  return Response.json(data, { status: 200, ...init });
-}
-function created(data, init) {
-  return Response.json(data, { status: 201, ...init });
-}
-function noContent(init) {
-  return new Response(null, { status: 204, ...init });
-}
-function badRequest2(message) {
-  return Response.json({ error: message ?? "Bad Request" }, { status: 400 });
-}
-function unauthorized(message) {
-  return Response.json({ error: message ?? "Unauthorized" }, { status: 401 });
-}
-function forbidden(message) {
-  return Response.json({ error: message ?? "Forbidden" }, { status: 403 });
-}
-function notFound(message) {
-  return Response.json({ error: message ?? "Not Found" }, { status: 404 });
-}
-function conflict(message) {
-  return Response.json({ error: message ?? "Conflict" }, { status: 409 });
-}
-function unprocessable(message) {
-  return Response.json({ error: message ?? "Unprocessable Entity" }, { status: 422 });
-}
-function tooManyRequests(message) {
-  return Response.json({ error: message ?? "Too Many Requests" }, { status: 429 });
-}
-function serverError(message) {
-  return Response.json({ error: message ?? "Internal Server Error" }, { status: 500 });
-}
-function redirect(url, status = 302) {
-  return new Response(null, { status, headers: { Location: url } });
-}
-
 // src/server/user/index.ts
 import { randomBytes as randomBytes3 } from "node:crypto";
 var USER_TABLES = {
@@ -3116,13 +3170,13 @@ function userSystem(options) {
     });
     if (!excluded.has("login")) app.post(`${p}/login`, async (req, ctx) => {
       const body = await req.json().catch(() => ({}));
-      if (!body.email || !body.password) return badRequest2("email and password are required");
+      if (!body.email || !body.password) return badRequest("email and password are required");
       const result = await ctx.auth.login(body.email, body.password);
       return ok(result);
     });
     if (!excluded.has("logout")) app.post(`${p}/logout`, async (req, ctx) => {
       const body = await req.json().catch(() => ({}));
-      if (!body.refreshToken) return badRequest2("refreshToken is required");
+      if (!body.refreshToken) return badRequest("refreshToken is required");
       await ctx.auth.logout(body.refreshToken);
       return noContent();
     });
@@ -3224,13 +3278,13 @@ function userSystem(options) {
       });
       app.post(`${p}/apps/:appSlug/auth/login`, async (req, ctx) => {
         const body = await req.json().catch(() => ({}));
-        if (!body.email || !body.password) return badRequest2("email and password are required");
+        if (!body.email || !body.password) return badRequest("email and password are required");
         const result = await ctx.auth.loginApp(ctx.params.appSlug, body.email, body.password);
         return ok(result);
       });
       app.patch(`${p}/apps/:appSlug/auth/registration`, async (req, ctx) => {
         const body = await req.json().catch(() => ({}));
-        if (typeof body.open !== "boolean") return badRequest2("open is required (boolean)");
+        if (typeof body.open !== "boolean") return badRequest("open is required (boolean)");
         const appId = await findAppIdBySlug(ctx.params.appSlug);
         if (!appId) throw new HttpError("Application not found", 404);
         await ctx.auth.setOpenRegistration(appId, body.open);
@@ -3239,7 +3293,7 @@ function userSystem(options) {
       app.post(`${p}/apps/:appSlug/auth/verify`, async (req, ctx) => {
         const appId = req.headers.get("x-wf-app-id");
         const appKey = req.headers.get("x-wf-app-key");
-        if (!appId || !appKey) return badRequest2("X-Wf-App-Id / X-Wf-App-Key required");
+        if (!appId || !appKey) return badRequest("X-Wf-App-Id / X-Wf-App-Key required");
         const rows = await A.select("id", "slug", "name").where({ id: { eq: appId }, app_key: { eq: appKey } }).run();
         if (!rows.length) throw new HttpError("Invalid app credentials", 403);
         const a = rows[0];
@@ -3390,50 +3444,6 @@ function appAuth(options) {
   return mw;
 }
 
-// src/server/db/errors.ts
-var DbError = class extends Error {
-  kind;
-  code;
-  cause;
-  constructor(kind, message, options) {
-    super(message);
-    this.name = "DbError";
-    this.kind = kind;
-    this.code = options?.code;
-    this.cause = options?.cause;
-  }
-};
-var ProtocolError = class extends DbError {
-  constructor(feature, message) {
-    super("protocol", message ?? `${feature} is not supported by weifuwu/db`, { code: "UNSUPPORTED" });
-    this.name = "ProtocolError";
-  }
-};
-var ConnectionError = class extends DbError {
-  attempts;
-  constructor(message, attempts = 1, cause) {
-    super("connection", message, { cause });
-    this.name = "ConnectionError";
-    this.attempts = attempts;
-  }
-};
-var TimeoutError = class extends DbError {
-  operation;
-  ms;
-  constructor(operation, ms) {
-    super("timeout", `${operation} timed out after ${ms}ms`);
-    this.name = "TimeoutError";
-    this.operation = operation;
-    this.ms = ms;
-  }
-};
-var ValidationError = class extends DbError {
-  constructor(message) {
-    super("validation", message);
-    this.name = "ValidationError";
-  }
-};
-
 // src/server/db/body.ts
 function shapeOf(s) {
   const sh = s.__shape;
@@ -3510,11 +3520,6 @@ function listQuery(url, shapeDef, opts = {}) {
   const offset = Math.max(0, parseInt(search.get("offset") ?? "0", 10) || 0);
   return { filter: filter2, sort, limit, offset };
 }
-function errorResponse(e, status) {
-  const msg = e instanceof Error ? e.message : String(e);
-  const st = status ?? (e instanceof DbError ? e.code === "23505" ? 409 : 400 : 400);
-  return Response.json({ error: msg }, { status: st });
-}
 
 // src/server/db/schema.ts
 function innerOf(t) {
@@ -5332,7 +5337,7 @@ function messager(options) {
   function sendTo(userId, event) {
     broadcast(`user:${userId}`, event);
   }
-  function join(room, ws2) {
+  function join2(room, ws2) {
     let members = rooms.get(room);
     if (!members) {
       members = /* @__PURE__ */ new Set();
@@ -5390,7 +5395,7 @@ function messager(options) {
                 return;
               }
             }
-            join(msg.room, ws2);
+            join2(msg.room, ws2);
             ws2.send(JSON.stringify({ type: "subscribed", room: msg.room }));
           } else if (msg.type === "unsubscribe" && msg.room) {
             leave(msg.room, ws2);
@@ -5423,7 +5428,7 @@ function messager(options) {
     handler,
     broadcast,
     sendTo,
-    join,
+    join: join2,
     leave,
     close,
     createConversation,
@@ -5462,7 +5467,7 @@ function messager(options) {
         const conv = await createConversation(ctx.user.id, { type: "group", memberIds: body.memberIds });
         return created(conv);
       }
-      return badRequest2("conversation input invalid");
+      return badRequest("conversation input invalid");
     });
     app.get(`${p}/conversations`, async (_req, ctx) => {
       if (!ctx.user) throw new HttpError("Unauthorized", 401);
@@ -5482,7 +5487,7 @@ function messager(options) {
       const convId = ctx.params.id;
       await requireMember(convId, ctx);
       const body = await req.json().catch(() => ({}));
-      if (!body.content?.trim()) return badRequest2("content is required");
+      if (!body.content?.trim()) return badRequest("content is required");
       const message = await sendMessage(convId, {
         senderType: "user",
         senderId: ctx.user.id,
@@ -5503,15 +5508,15 @@ function messager(options) {
       if (!ctx.user) throw new HttpError("Unauthorized", 401);
       const messageId = ctx.params.id;
       const body = await req.json().catch(() => ({}));
-      if (!body.content?.trim()) return badRequest2("content is required");
+      if (!body.content?.trim()) return badRequest("content is required");
       const rows = await orm.query.from(`${MESSAGES} m`).join(`${MEMBERS} mem`, { "mem.conversation_id": { col: "m.conversation_id" } }).where({ "m.id": { eq: messageId }, "mem.user_id": { eq: String(ctx.user.id) } }).select("m.conversation_id", "m.sender_type", "m.sender_id").run();
-      if (!rows.length) return badRequest2("message not found");
+      if (!rows.length) return badRequest("message not found");
       const row = rows[0];
       if (row.sender_type === "user" && row.sender_id !== ctx.user.id) {
         throw new HttpError("Forbidden: not your message", 403);
       }
       const edited = await editMessage(messageId, body.content);
-      if (!edited) return badRequest2("message not found");
+      if (!edited) return badRequest("message not found");
       broadcast(`conv:${edited.conversation_id}`, { type: "message_edited", message: edited });
       return ok(edited);
     });
@@ -5519,7 +5524,7 @@ function messager(options) {
       if (!ctx.user) throw new HttpError("Unauthorized", 401);
       const messageId = ctx.params.id;
       const rows = await orm.query.from(`${MESSAGES} m`).join(`${MEMBERS} mem`, { "mem.conversation_id": { col: "m.conversation_id" } }).where({ "m.id": { eq: messageId }, "mem.user_id": { eq: String(ctx.user.id) } }).select("m.conversation_id", "m.sender_type", "m.sender_id").run();
-      if (!rows.length) return badRequest2("message not found");
+      if (!rows.length) return badRequest("message not found");
       const row = rows[0];
       if (row.sender_type === "user" && row.sender_id !== ctx.user.id) {
         throw new HttpError("Forbidden: not your message", 403);
@@ -8230,6 +8235,7 @@ function createScheduler(orm, execute, opts = {}) {
     start: () => {
       if (timer) return;
       timer = setInterval(() => void tick(), intervalMs);
+      timer.unref?.();
       void tick();
     },
     stop: () => {
@@ -9481,23 +9487,23 @@ function createAiClient(opts) {
   }
   const approvals = /* @__PURE__ */ new Map();
   function approve(response) {
-    const resolve3 = approvals.get(response.id);
-    if (!resolve3) return false;
+    const resolve4 = approvals.get(response.id);
+    if (!resolve4) return false;
     approvals.delete(response.id);
-    resolve3(response);
+    resolve4(response);
     return true;
   }
   async function waitApproval(req, emit, timeoutMs = DEFAULT_APPROVAL_TIMEOUT, signal) {
     const expiresAt = Date.now() + timeoutMs;
     emit("wf:approval_request", { ...req, expiresAt });
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       let settled = false;
       const finish = (resp) => {
         if (settled) return;
         settled = true;
         clearTimeout(timer);
         signal?.removeEventListener("abort", onAbort);
-        resolve3(resp);
+        resolve4(resp);
       };
       const timer = setTimeout(() => {
         if (approvals.has(req.id)) approvals.delete(req.id);
@@ -9969,23 +9975,23 @@ function createApprovalHub(timeoutMs = DEFAULT_APPROVAL_TIMEOUT2) {
   const approvals = /* @__PURE__ */ new Map();
   return {
     approve(response) {
-      const resolve3 = approvals.get(response.id);
-      if (!resolve3) return false;
+      const resolve4 = approvals.get(response.id);
+      if (!resolve4) return false;
       approvals.delete(response.id);
-      resolve3(response);
+      resolve4(response);
       return true;
     },
     async waitApproval(req, emit, timeout = timeoutMs, signal) {
       const expiresAt = Date.now() + timeout;
       emit("wf:approval_request", { ...req, expiresAt });
-      return new Promise((resolve3) => {
+      return new Promise((resolve4) => {
         let settled = false;
         const finish = (resp) => {
           if (settled) return;
           settled = true;
           clearTimeout(timer);
           signal?.removeEventListener("abort", onAbort);
-          resolve3(resp);
+          resolve4(resp);
         };
         const timer = setTimeout(() => {
           if (approvals.has(req.id)) approvals.delete(req.id);
@@ -10199,7 +10205,7 @@ async function MemoryAiServer(options = {}) {
       }
     });
   });
-  await new Promise((resolve3) => server.listen(options.port ?? 0, "127.0.0.1", resolve3));
+  await new Promise((resolve4) => server.listen(options.port ?? 0, "127.0.0.1", resolve4));
   const addr = server.address();
   const port = typeof addr === "object" && addr ? addr.port : 0;
   return {
@@ -10207,7 +10213,7 @@ async function MemoryAiServer(options = {}) {
     url: `http://127.0.0.1:${port}`,
     requests,
     closeAllConnections: () => server.closeAllConnections(),
-    close: () => new Promise((resolve3) => server.close(() => resolve3()))
+    close: () => new Promise((resolve4) => server.close(() => resolve4()))
   };
 }
 async function readJson(req) {
@@ -10298,11 +10304,98 @@ async function handle(ai, method, url, req, res, preBody) {
 
 // src/server/ui/index.ts
 import { build } from "esbuild";
-import { readFile, stat as stat2 } from "node:fs/promises";
+import { readFile as readFile2, stat as stat2 } from "node:fs/promises";
 import { createHash as createHash2 } from "node:crypto";
-import { resolve as resolve2 } from "node:path";
+import { resolve as resolve3, dirname, basename } from "node:path";
 import { fileURLToPath } from "node:url";
 
+// src/client/layout/bundle.ts
+import { readFile, readdir } from "node:fs/promises";
+import { join, resolve as resolve2 } from "node:path";
+var LAYER_ORDER = ["tokens", "base", "layout", "components", "utilities"];
+var LAYER_OF = {
+  _tokens: "tokens",
+  _dark: "tokens",
+  _presets: "tokens",
+  _props: "tokens",
+  _base: "base",
+  _stack: "layout",
+  _row: "layout",
+  _split: "layout",
+  _center: "layout",
+  _justify: "layout",
+  _fill: "layout",
+  _grid: "layout",
+  _cluster: "layout",
+  _cover: "layout",
+  _position: "layout",
+  _sticky: "layout",
+  _overflow: "layout",
+  "_safe-area": "layout",
+  _layer: "layout",
+  "_align-self": "layout",
+  _nowrap: "layout",
+  _shrink: "layout",
+  _container: "layout",
+  "_app-shell": "layout",
+  _surface: "utilities",
+  _spacing: "utilities",
+  _border: "utilities",
+  _text: "utilities",
+  _hidden: "utilities",
+  _block: "utilities",
+  _flex: "utilities",
+  // display 工具族（基类 :where() 零优先级 + @media 变体正常优先级——变体恒胜基类，零 !important）
+  _popup: "layout"
+  // 框架内部浮层基类（popup-manager 消费——非用户词汇）
+};
+var TOKENS_LAYER = "tokens";
+var stripImports = (css) => css.replace(/@import\s+['"][^'"]+['"]\s*;?\s*\n?/g, "");
+async function layoutEntryFiles(layoutDir) {
+  const entry = await readFile(join(layoutDir, "weifuwu-layout.css"), "utf-8");
+  const files = [];
+  for (const line of entry.split("\n")) {
+    const m = line.match(/@import\s+['"]([^'"]+)['"]/);
+    if (m) files.push(m[1].replace(/^\.\//, ""));
+  }
+  if (!files.length) throw new Error(`layout \u5165\u53E3\u65E0 @import\uFF08${layoutDir}/weifuwu-layout.css\uFF09\u2014\u2014\u88C5\u914D\u5355\u6E90\u5931\u6548`);
+  return files;
+}
+async function isLayoutSourceDir(dir) {
+  try {
+    const entries = await readdir(dir);
+    return entries.includes("weifuwu-layout.css") && entries.some((f2) => /^_[a-z-]+\.css$/.test(f2));
+  } catch {
+    return false;
+  }
+}
+async function bundleLayout(layoutDir) {
+  const dir = resolve2(layoutDir);
+  const files = await layoutEntryFiles(dir);
+  const inputs = [join(dir, "weifuwu-layout.css")];
+  const chunks = [];
+  for (const f2 of files) {
+    const abs = join(dir, f2);
+    inputs.push(abs);
+    const content = stripImports(await readFile(abs, "utf-8")).trim();
+    const name = f2.replace(/\.css$/, "");
+    const layer = LAYER_OF[name];
+    if (!layer) {
+      throw new Error(`layout \u6587\u4EF6\u672A\u767B\u8BB0 @layer \u6620\u5C04: ${f2}\uFF08\u5728 src/client/layout/bundle.ts LAYER_OF \u4E2D\u767B\u8BB0\uFF09`);
+    }
+    chunks.push(layer === TOKENS_LAYER ? content : `@layer ${layer} {
+${content}
+}`);
+  }
+  const css = `/* weifuwu/layout \u2014 CSS \u5E03\u5C40\u539F\u8BED + \u8BBE\u8BA1 Token\uFF08\u88C5\u914D\u5355\u6E90\uFF1Asrc/client/layout/bundle.ts\uFF09 */
+
+@layer ${LAYER_ORDER.join(", ")};
+
+${chunks.join("\n\n")}
+`;
+  return { css, inputs };
+}
+
 // src/server/ui/html-safe.ts
 var HtmlSafe = class {
   value;
@@ -12886,11 +12979,11 @@ function openPopup(env, opts) {
       const registry = applier.registry;
       if (!registry) return;
       const ctx = env.getSharedContext() ?? {};
-      const cmds = await new Promise((resolve3, reject) => {
+      const cmds = await new Promise((resolve4, reject) => {
         const out = [];
         const req = () => env.requestRender?.();
         const obs = prev ? diffV2(prev, content, ctx, state2.segments, registry, req) : renderV2(content, ctx, registry, state2.segments, req);
-        obs.subscribe({ next: (c) => out.push(c), error: reject, complete: () => resolve3(out) });
+        obs.subscribe({ next: (c) => out.push(c), error: reject, complete: () => resolve4(out) });
       });
       for (const value of cmds) {
         if (state2.disposed || v !== state2.version) return;
@@ -14166,9 +14259,9 @@ function concatWith(tail) {
 
 // src/client/vdom/core/v2/integrate.ts
 function collectCommands(obs) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     const out = [];
-    obs.subscribe({ next: (c) => out.push(c), error: reject, complete: () => resolve3(out) });
+    obs.subscribe({ next: (c) => out.push(c), error: reject, complete: () => resolve4(out) });
   });
 }
 async function v2ToHtml(root, ctx, registry) {
@@ -14205,6 +14298,35 @@ function unsafe(s) {
   return new HtmlSafe(s);
 }
 var MAX_CACHE_ENTRIES = 32;
+async function statAll(paths) {
+  const out = {};
+  for (const p of paths) {
+    try {
+      const st = await stat2(p);
+      out[p] = { mtimeMs: st.mtimeMs, size: st.size };
+    } catch {
+      out[p] = { mtimeMs: -1, size: -1 };
+    }
+  }
+  return out;
+}
+async function importClosure(absPath, seen = /* @__PURE__ */ new Set()) {
+  if (seen.has(absPath)) return [];
+  seen.add(absPath);
+  let css;
+  try {
+    css = await readFile2(absPath, "utf-8");
+  } catch {
+    return [];
+  }
+  const dir = dirname(absPath);
+  const out = [];
+  for (const m of css.matchAll(/@import\s+['"](\.[^'"]+\.css)['"]/g)) {
+    const dep = resolve3(dir, m[1]);
+    out.push(dep, ...await importClosure(dep, seen));
+  }
+  return out;
+}
 var postcssAvailable;
 async function checkPostcss() {
   if (postcssAvailable !== void 0) return postcssAvailable;
@@ -14219,12 +14341,12 @@ async function checkPostcss() {
 }
 function resolveEntry(entryPath) {
   if (entryPath.startsWith(".") || entryPath.startsWith("/")) {
-    return resolve2(entryPath);
+    return resolve3(entryPath);
   }
   try {
     return fileURLToPath(import.meta.resolve(entryPath));
   } catch {
-    return resolve2(entryPath);
+    return resolve3(entryPath);
   }
 }
 function ui(options = {}) {
@@ -14330,7 +14452,7 @@ function ui(options = {}) {
           });
           const inputs = {};
           for (const key of Object.keys(result.metafile?.inputs ?? {})) {
-            const abs = resolve2(key);
+            const abs = resolve3(key);
             try {
               const st = await stat2(abs);
               inputs[abs] = { mtimeMs: st.mtimeMs, size: st.size };
@@ -14345,14 +14467,13 @@ function ui(options = {}) {
       async css(entryPath) {
         const absPath = resolveEntry(entryPath);
         const { code, etag } = await compile2("css", absPath, async () => {
-          let code2 = await readFile(absPath, "utf-8");
-          const inputs = {};
-          try {
-            const st = await stat2(absPath);
-            inputs[absPath] = { mtimeMs: st.mtimeMs, size: st.size };
-          } catch {
-            inputs[absPath] = { mtimeMs: -1, size: -1 };
+          const dir = dirname(absPath);
+          if (basename(absPath) === "weifuwu-layout.css" && await isLayoutSourceDir(dir)) {
+            const bundle = await bundleLayout(dir);
+            return { code: bundle.css, inputs: await statAll(bundle.inputs) };
           }
+          let code2 = await readFile2(absPath, "utf-8");
+          const inputs = await statAll([absPath, ...await importClosure(absPath)]);
           if (await checkPostcss()) {
             try {
               const postcss = await import("postcss");
@@ -14695,7 +14816,7 @@ var PgConnection = class _PgConnection {
   /** 池空闲回收用：最近一次查询完成时间戳（pool release 时更新） */
   lastUsed = 0;
   connect() {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       this.status = "connecting";
       const sock = net.connect(this.opts.port, this.opts.host);
       this.socket = sock;
@@ -14727,7 +14848,7 @@ var PgConnection = class _PgConnection {
       this.onReady = () => {
         clearTimeout(timeout);
         this.status = "ready";
-        resolve3();
+        resolve4();
       };
       this.onAuthFail = (err) => {
         clearTimeout(timeout);
@@ -15024,7 +15145,7 @@ var PgConnection = class _PgConnection {
   }
   /** 查询：无参数走简单协议（Q），有参数走扩展查询（Parse/Bind/Execute/Sync） */
   query(sql, params) {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       if (this.status !== "ready" || !this.socket) {
         reject(new ConnectionError("postgres: not connected"));
         return;
@@ -15037,7 +15158,7 @@ var PgConnection = class _PgConnection {
         this.currentQuery = {
           columns: [],
           rows: [],
-          resolve: resolve3,
+          resolve: resolve4,
           reject
         };
         if (process.env.PGDBG2) console.error("[cquery]", JSON.stringify(sql.slice(0, 120)));
@@ -15047,12 +15168,12 @@ var PgConnection = class _PgConnection {
         let stmtEntry = this.getPrepared(sig);
         const encoded = encodeParams(params);
         if (!stmtEntry) {
-          this.issueExtendedQuery(sql, encoded, resolve3, reject);
+          this.issueExtendedQuery(sql, encoded, resolve4, reject);
         } else {
           this.currentQuery = {
             columns: [...stmtEntry.columns],
             rows: [],
-            resolve: resolve3,
+            resolve: resolve4,
             reject,
             sql,
             params: encoded,
@@ -15071,12 +15192,12 @@ var PgConnection = class _PgConnection {
    * 扩展查询首次准备：Parse + Describe + Flush（无 Sync——错误时由调用方发 Sync 复位）。
    * retry 路径复用：新语句名强制服务器按当前 schema 重新解析（DDL 失效恢复）。
    */
-  issueExtendedQuery(sql, params, resolve3, reject, retried) {
+  issueExtendedQuery(sql, params, resolve4, reject, retried) {
     const name = `wf_s${++this.stmtSeq}`;
     this.currentQuery = {
       columns: [],
       rows: [],
-      resolve: resolve3,
+      resolve: resolve4,
       reject,
       sql,
       params,
@@ -15100,7 +15221,7 @@ var PgConnection = class _PgConnection {
   /** 等待连接空闲（事务/多语句流程用） */
   waitIdle() {
     if (!this.currentQuery) return Promise.resolve();
-    return new Promise((resolve3) => this.waiters.push(resolve3));
+    return new Promise((resolve4) => this.waiters.push(resolve4));
   }
   /** 终止连接 */
   async close() {
@@ -15321,9 +15442,9 @@ var PgPool = class _PgPool {
       );
     }
     const timeoutMs = this.opts.acquireTimeoutMs ?? 3e4;
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const waiter = {
-        resolve: resolve3,
+        resolve: resolve4,
         reject
       };
       if (timeoutMs > 0) {
@@ -16773,9 +16894,9 @@ var RedisConnection = class {
   connect() {
     if (this.connectPromise) return this.connectPromise;
     this.closed = false;
-    this.connectPromise = new Promise((resolve3, reject) => {
+    this.connectPromise = new Promise((resolve4, reject) => {
       this.openSocket();
-      this.onceReady = () => resolve3();
+      this.onceReady = () => resolve4();
       this.onceFailed = (err) => reject(err);
     }).finally(() => {
       this.connectPromise = null;
@@ -16883,15 +17004,15 @@ var RedisConnection = class {
     if (this.offlineQueue.length >= this.opts.maxOfflineQueue) {
       return Promise.reject(new ConnectionError(`redis: offline queue full (${this.opts.maxOfflineQueue})`));
     }
-    return new Promise((resolve3, reject) => {
-      this.offlineQueue.push({ name, args, resolve: resolve3, reject, asBuffer: opts?.asBuffer });
+    return new Promise((resolve4, reject) => {
+      this.offlineQueue.push({ name, args, resolve: resolve4, reject, asBuffer: opts?.asBuffer });
     });
   }
   sendNow(name, args, asBuffer) {
     const start = performance.now();
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const p = {
-        resolve: resolve3,
+        resolve: resolve4,
         reject,
         asBuffer,
         blocking: BLOCKING_COMMANDS.has(name.toUpperCase())
@@ -16961,7 +17082,7 @@ var RedisConnection = class {
     if (this.status !== "ready" || !this.socket) {
       return Promise.reject(new ConnectionError("redis: not connected"));
     }
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const results = [];
       const batchPending = [];
       let settled = false;
@@ -16970,7 +17091,7 @@ var RedisConnection = class {
         if (results.length === count) {
           settled = true;
           if (batchTimer) clearTimeout(batchTimer);
-          resolve3(results);
+          resolve4(results);
         }
       };
       for (let i = 0; i < count; i++) {
@@ -17361,9 +17482,9 @@ var RedisPool = class _RedisPool {
       });
       this.replenish();
     }
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const waiter = () => {
-        if (this.clients.length > 0 && this.clients[0].connected) resolve3(this.clients[0]);
+        if (this.clients.length > 0 && this.clients[0].connected) resolve4(this.clients[0]);
         else reject(new ConnectionError("redis: pool exhausted after reconnect wait"));
       };
       this.replenishWaiters.push(waiter);
@@ -18494,13 +18615,13 @@ var MemoryRedisServer = class {
   }
   async start() {
     if (this.server) return;
-    await new Promise((resolve3) => {
+    await new Promise((resolve4) => {
       this.server = net3.createServer((sock) => this.handleSocket(sock));
       this.server.listen(this.opts.port, "127.0.0.1", () => {
         const addr = this.server.address();
         this.port = addr.port;
         this.url = `redis://127.0.0.1:${addr.port}`;
-        resolve3();
+        resolve4();
       });
     });
   }
@@ -18512,9 +18633,9 @@ var MemoryRedisServer = class {
       ctx.sock.destroy();
     }
     this.conns.clear();
-    await new Promise((resolve3) => {
-      if (!this.server) return resolve3();
-      this.server.close(() => resolve3());
+    await new Promise((resolve4) => {
+      if (!this.server) return resolve4();
+      this.server.close(() => resolve4());
       this.server = null;
     });
   }
@@ -18600,14 +18721,14 @@ var MemoryRedisServer = class {
         const v = await this.engine.command("LPOP", k);
         if (v !== null && v !== void 0) return encodeReply([k, v]);
       }
-      return await new Promise((resolve3) => {
-        const waiter = { keys, resolve: resolve3, timer: null, owner: ctx.id };
+      return await new Promise((resolve4) => {
+        const waiter = { keys, resolve: resolve4, timer: null, owner: ctx.id };
         this.blpopWaiters.push(waiter);
         if (timeout > 0) {
           waiter.timer = setTimeout(() => {
             const i = this.blpopWaiters.indexOf(waiter);
             if (i >= 0) this.blpopWaiters.splice(i, 1);
-            resolve3(encodeReply(null));
+            resolve4(encodeReply(null));
           }, timeout * 1e3);
         }
       });
@@ -18729,7 +18850,7 @@ export {
   WEIFUWU_WORKFLOW_SCHEMA,
   and,
   appAuth,
-  badRequest2 as badRequest,
+  badRequest,
   between,
   bodyOf,
   buildQuery,