tina4-nodejs 3.13.95 → 3.13.96

package/packages/orm/dist/index.js

@@ -8,64 +8,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/types.ts
-var FetchResult;
-var init_types = __esm({
-  "src/types.ts"() {
-    "use strict";
-    FetchResult = class {
-      records;
-      count;
-      sql;
-      constructor(records, sql = "") {
-        this.records = records;
-        this.count = records.length;
-        this.sql = sql;
-      }
-      /** Paginate the in-memory result set. */
-      toPaginate(page = 1, perPage = 20) {
-        const total = this.count;
-        const totalPages = Math.max(1, Math.ceil(total / perPage));
-        const offset = (page - 1) * perPage;
-        const data = this.records.slice(offset, offset + perPage);
-        return {
-          data,
-          page,
-          perPage,
-          total,
-          totalPages,
-          hasNext: page < totalPages,
-          hasPrev: page > 1
-        };
-      }
-      /** Return the first record or null. */
-      first() {
-        return this.records[0] ?? null;
-      }
-      /** Return the last record or null. */
-      last() {
-        return this.records[this.records.length - 1] ?? null;
-      }
-      /** Check if result is empty. */
-      isEmpty() {
-        return this.records.length === 0;
-      }
-      /** Convert to plain array. */
-      toArray() {
-        return [...this.records];
-      }
-      /** Convert to JSON string. */
-      toJSON() {
-        return JSON.stringify(this.records);
-      }
-      /** Iterate over records. */
-      [Symbol.iterator]() {
-        return this.records[Symbol.iterator]();
-      }
-    };
-  }
-});
-
 // src/databaseResult.ts
 var DatabaseResult;
 var init_databaseResult = __esm({
@@ -129,75 +71,52 @@ var init_databaseResult = __esm({
       toArray() {
         return this.records;
       }
-      /** Pagination envelope — accepts either (page, perPage) or (offset, limit) style.
+      /**
+       * Describe the page this result IS — the canonical pagination envelope.
        *
-       * When called with two arguments both >= 0 and the first >= the second
-       * (i.e. offset-style), pass `{ offset, limit }` as the first argument.
-       * The simplest way is to always use the default (page, perPage) form and
-       * let the autoCRUD layer supply offset/limit from the query string.
+       * Takes NO arguments and derives every field from the query that produced this
+       * result (ADR-0043). Passing ANY argument RAISES: a DatabaseResult holds no
+       * connection, so an argument could only re-slice the rows already in memory and
+       * then report total_pages for pages it can never reach. To read page N, FETCH
+       * page N (limit + offset) and call this with no arguments.
        *
-       * Returns a superset of keys for backwards-compatibility across all clients.
-       */
-      /**
-       * Describe the page this result actually IS. Takes no arguments.
+       * The envelope is EXACTLY seven snake_case keys, identical across all four
+       * frameworks: `records, total, page, per_page, total_pages, limit, offset`.
        *
-       * MEASURED 2026-08-05 on a real 250-row table read with limit=20 offset=40
-       * (page 3 of 13): this reported page 1 of 2 and returned 10 of the 20 rows.
-       * It ignored the query entirely - defaulting page to 1 and perPage to 10 -
-       * then re-sliced the rows it was handed, which were already just that page.
-       * So a caller who paginated correctly at the SQL level had the answer
-       * silently re-paginated underneath them, with a page number that was simply
-       * wrong.
+       *   per_page    = the query's limit
+       *   page        = floor(offset / limit) + 1
+       *   total       = the TRUE total for the filter — Database.fetch (and
+       *                 QueryBuilder.get) run a COUNT probe whenever a limit was
+       *                 applied — NEVER the number of rows returned
+       *   total_pages = ceil(total / per_page)
+       *   records     = the rows the query returned, VERBATIM (never re-sliced)
+       *   limit       = the SQL limit actually applied
+       *   offset      = the SQL offset actually applied
        *
-       * WITH page/perPage it slices this result in memory, the behaviour GitHub
-       * issue #106 asked for. Valid ONLY when the result holds the WHOLE set
-       * (records.length >= count). A PARTIAL result cannot be sliced by page number
-       * without lying: MEASURED on 100,000 rows read under the default cap of 100,
-       * pages 1-5 of 20 were right and every page from 6 onward came back EMPTY
-       * while totalPages reported 5,000.
+       * The JSON payload is snake_case even though the method name is camelCase — a
+       * JSON key is data, not a language surface (ADR-0043). The old duplicate and
+       * camelCase keys (`data`, `count`, `perPage`, `totalPages`, `has_next`,
+       * `has_prev`) are removed: Node emitted 13 keys, the worst offender of the four.
        *
-       * `total` is `count`, and `count` is now the TRUE total for the filter in
-       * all four frameworks - Database.fetch runs a COUNT probe whenever it applied
-       * a limit. It used to be ROWS RETURNED here and in Ruby while Python and PHP
-       * probed, so one query answered 20 in two frameworks and 250 in the other
-       * two.
+       * @throws {TypeError} if called with any argument.
        */
-      toPaginate(page, perPage) {
-        if ((page !== void 0 || perPage !== void 0) && this.records.length < this.count) {
+      toPaginate() {
+        if (arguments.length > 0) {
           throw new TypeError(
-            `toPaginate(page, perPage) slices the rows this result holds, but this result holds only ${this.records.length} of ${this.count} rows - it is a PARTIAL result, so any page past the rows it holds comes back empty while totalPages claims it exists. MEASURED on 100,000 rows read under the default cap of 100: pages 1-5 of 20 were right and pages 6 onward returned NOTHING. Fetch the page you want instead: fetch(sql, params, perPage, (page - 1) * perPage), then call toPaginate() with no arguments.`
+            "toPaginate() takes no arguments and derives the page from the query that ran (ADR-0043). A DatabaseResult holds no connection, so an argument could only re-slice the rows already in memory and report total_pages for pages it can never reach. To read a page, FETCH it: db.fetch(sql, params, perPage, (page - 1) * perPage), then call toPaginate() with no arguments."
           );
         }
-        let resolvedPerPage;
-        let resolvedPage;
-        let offset;
-        let rows;
-        if (page === void 0 && perPage === void 0) {
-          resolvedPerPage = this.limit > 0 ? this.limit : this.records.length;
-          resolvedPage = resolvedPerPage > 0 ? Math.floor(this.offset / resolvedPerPage) + 1 : 1;
-          offset = this.offset;
-          rows = this.records;
-        } else {
-          resolvedPage = page ?? 1;
-          resolvedPerPage = perPage ?? (this.limit > 0 ? this.limit : 10);
-          offset = (resolvedPage - 1) * resolvedPerPage;
-          rows = this.records.slice(offset, offset + resolvedPerPage);
-        }
-        const totalPages = resolvedPerPage > 0 ? Math.max(1, Math.ceil(this.count / resolvedPerPage)) : 1;
+        const perPage = this.limit > 0 ? this.limit : this.records.length;
+        const page = perPage > 0 ? Math.floor(this.offset / perPage) + 1 : 1;
+        const totalPages = perPage > 0 ? Math.max(1, Math.ceil(this.count / perPage)) : 1;
         return {
-          records: rows,
-          data: rows,
-          count: this.count,
+          records: this.records,
           total: this.count,
-          limit: resolvedPerPage,
-          offset,
-          page: resolvedPage,
-          per_page: resolvedPerPage,
-          perPage: resolvedPerPage,
-          totalPages,
+          page,
+          per_page: perPage,
           total_pages: totalPages,
-          has_next: resolvedPage < totalPages,
-          has_prev: resolvedPage > 1
+          limit: perPage,
+          offset: this.offset
         };
       }
       /** Iterable — for (const row of result) */
@@ -3336,7 +3255,7 @@ ${s}\r
       connect() {
         if (this.connected) return Promise.resolve();
         if (this.connecting) return this.connecting;
-        this.connecting = new Promise((resolve21, reject) => {
+        this.connecting = new Promise((resolve20, reject) => {
           const sock = net.createConnection({ host: this.host, port: this.port });
           sock.setNoDelay(true);
           const onError = (err) => {
@@ -3373,7 +3292,7 @@ ${s}\r
               sock.on("error", (e) => {
                 this.brokenError = e;
               });
-              resolve21();
+              resolve20();
             } catch (e) {
               onError(e);
             }
@@ -3436,12 +3355,12 @@ ${s}\r
       }
       /** Send one command and await its reply (assumes socket is up). */
       raw(args) {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           if (!this.sock || this.sock.destroyed) {
             reject(this.brokenError ?? new Error("redis socket not connected"));
             return;
           }
-          this.waiters.push({ resolve: resolve21, reject });
+          this.waiters.push({ resolve: resolve20, reject });
           this.sock.write(_RespClient.encode(args));
         });
       }
@@ -3783,7 +3702,7 @@ ${s}\r
       connect() {
         if (this.connected) return Promise.resolve();
         if (this.connecting) return this.connecting;
-        this.connecting = new Promise((resolve21, reject) => {
+        this.connecting = new Promise((resolve20, reject) => {
           const sock = net.createConnection({ host: this.host, port: this.port });
           sock.setNoDelay(true);
           sock.once("error", (err) => {
@@ -3804,7 +3723,7 @@ ${s}\r
                 p.resolve(this.buffer.toString("utf-8"));
               }
             });
-            resolve21();
+            resolve20();
           });
         });
         return this.connecting;
@@ -3837,13 +3756,13 @@ ${s}\r
       async send(payload, terminator) {
         await this.connect();
         if (!this.sock || this.sock.destroyed) return "";
-        return new Promise((resolve21) => {
+        return new Promise((resolve20) => {
           this.buffer = Buffer.alloc(0);
-          this.pending = { terminator, resolve: resolve21 };
+          this.pending = { terminator, resolve: resolve20 };
           const timer = setTimeout(() => {
-            if (this.pending && this.pending.resolve === resolve21) {
+            if (this.pending && this.pending.resolve === resolve20) {
               this.pending = null;
-              resolve21(this.buffer.toString("utf-8"));
+              resolve20(this.buffer.toString("utf-8"));
             }
           }, 4e3);
           if (timer.unref) timer.unref();
@@ -5369,16 +5288,27 @@ async function parseBody(req2) {
   }
   const contentType = req2.headers["content-type"] ?? "";
   const chunks = [];
-  await new Promise((resolve21, reject) => {
-    req2.on("data", (chunk) => chunks.push(chunk));
-    req2.on("end", resolve21);
+  await new Promise((resolve20, reject) => {
+    let received = 0;
+    let refused = false;
+    req2.on("data", (chunk) => {
+      if (refused) return;
+      received += chunk.length;
+      if (received > TINA4_MAX_UPLOAD_SIZE) {
+        refused = true;
+        chunks.length = 0;
+        reject(new PayloadTooLargeError(received, TINA4_MAX_UPLOAD_SIZE));
+        return;
+      }
+      chunks.push(chunk);
+    });
+    req2.on("end", () => {
+      if (!refused) resolve20();
+    });
     req2.on("error", reject);
   });
   const raw = Buffer.concat(chunks);
   if (raw.length === 0) return;
-  if (raw.length > TINA4_MAX_UPLOAD_SIZE) {
-    throw new PayloadTooLargeError(raw.length, TINA4_MAX_UPLOAD_SIZE);
-  }
   if (contentType.includes("multipart/form-data")) {
     const boundary = extractBoundary(contentType);
     if (boundary) {
@@ -13201,14 +13131,14 @@ data: ${channel.buffer.shift()}
 `;
               continue;
             }
-            const gotMessage = await new Promise((resolve21) => {
+            const gotMessage = await new Promise((resolve20) => {
               const timer = setTimeout(() => {
                 channel.wake = null;
-                resolve21(false);
+                resolve20(false);
               }, keepaliveMs);
               channel.wake = () => {
                 clearTimeout(timer);
-                resolve21(true);
+                resolve20(true);
               };
             });
             if (!gotMessage) yield `: keep-alive
@@ -15723,7 +15653,7 @@ var init_websocket = __esm({
        * Start the WebSocket server.
        */
       async start() {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           this.server = createServer((req2, res) => {
             res.writeHead(426, { "Content-Type": "text/plain" });
             res.end("Upgrade Required");
@@ -15733,7 +15663,7 @@ var init_websocket = __esm({
           });
           this.server.listen(this.port, () => {
             this.startIdleReaper();
-            resolve21();
+            resolve20();
           });
           this.server.on("error", (err) => {
             this.emit("error", err);
@@ -16297,7 +16227,7 @@ var init_websocket = __esm({
           client.trackerId = this.onAdd(socket.remoteAddress ?? "unknown", "/__dev_reload");
         }
         this.clients.add(client);
-        const cleanup2 = () => {
+        const cleanup = () => {
           if (!this.clients.has(client)) return;
           this.clients.delete(client);
           if (client.trackerId && this.onRemove) this.onRemove(client.trackerId);
@@ -16320,13 +16250,13 @@ var init_websocket = __esm({
                 socket.end();
               } catch {
               }
-              cleanup2();
+              cleanup();
               return;
             }
           }
         });
-        socket.on("close", cleanup2);
-        socket.on("error", cleanup2);
+        socket.on("close", cleanup);
+        socket.on("error", cleanup);
         return true;
       }
       /**
@@ -17844,7 +17774,7 @@ var init_queue = __esm({
             const jobs = this.popBatch(resolvedBatchSize);
             if (jobs.length === 0) {
               if (resolvedPollInterval <= 0) break;
-              await new Promise((resolve21) => setTimeout(resolve21, resolvedPollInterval));
+              await new Promise((resolve20) => setTimeout(resolve20, resolvedPollInterval));
               continue;
             }
             yield jobs;
@@ -17854,7 +17784,7 @@ var init_queue = __esm({
             const raw = this.pop();
             if (raw === null) {
               if (resolvedPollInterval <= 0) break;
-              await new Promise((resolve21) => setTimeout(resolve21, resolvedPollInterval));
+              await new Promise((resolve20) => setTimeout(resolve20, resolvedPollInterval));
               continue;
             }
             yield createJob(raw, this);
@@ -22374,23 +22304,23 @@ var init_devAdmin = __esm({
       });
     };
     handleDevAdminJs = async (_req, res) => {
-      const { readFileSync: readFileSync27, existsSync: existsSync27 } = await import("node:fs");
-      const { dirname: dirname14, join: join30, resolve: resolve21 } = await import("node:path");
+      const { readFileSync: readFileSync26, existsSync: existsSync26 } = await import("node:fs");
+      const { dirname: dirname13, join: join29, resolve: resolve20 } = await import("node:path");
       const { fileURLToPath: fileURLToPath7 } = await import("node:url");
-      const dir = dirname14(fileURLToPath7(import.meta.url));
+      const dir = dirname13(fileURLToPath7(import.meta.url));
       const candidates = [
-        join30(dir, "..", "public", "js", "tina4-dev-admin.min.js"),
+        join29(dir, "..", "public", "js", "tina4-dev-admin.min.js"),
         // src/../public/js/
-        join30(dir, "..", "..", "public", "js", "tina4-dev-admin.min.js"),
+        join29(dir, "..", "..", "public", "js", "tina4-dev-admin.min.js"),
         // deeper nesting
-        resolve21(process.cwd(), "node_modules", "tina4-nodejs", "packages", "core", "public", "js", "tina4-dev-admin.min.js"),
-        resolve21(process.cwd(), "public", "js", "tina4-dev-admin.min.js")
+        resolve20(process.cwd(), "node_modules", "tina4-nodejs", "packages", "core", "public", "js", "tina4-dev-admin.min.js"),
+        resolve20(process.cwd(), "public", "js", "tina4-dev-admin.min.js")
         // project public/
       ];
       for (const jsPath of candidates) {
-        if (existsSync27(jsPath)) {
+        if (existsSync26(jsPath)) {
           try {
-            const content = readFileSync27(jsPath, "utf-8");
+            const content = readFileSync26(jsPath, "utf-8");
             res.raw.writeHead(200, { "Content-Type": "application/javascript; charset=utf-8", "Cache-Control": "no-cache" });
             res.raw.end(content);
             return;
@@ -22851,8 +22781,12 @@ function sanitizeSecurity(reqs, schemes) {
 function generate(routes, models = []) {
   const info = {
     title: process.env.TINA4_SWAGGER_TITLE ?? "Tina4 API",
-    version: process.env.TINA4_SWAGGER_VERSION ?? "0.0.1",
-    description: process.env.TINA4_SWAGGER_DESCRIPTION ?? "Auto-generated API documentation"
+    // The app's version, defaulting to 1.0.0 — NOT the framework's (Node shipped
+    // 0.0.1). description defaults to the empty string, not a canned sentence.
+    // Both are the settled cross-framework defaults (parity with the Python
+    // master); TINA4_SWAGGER_VERSION / _DESCRIPTION still override.
+    version: process.env.TINA4_SWAGGER_VERSION ?? "1.0.0",
+    description: process.env.TINA4_SWAGGER_DESCRIPTION ?? ""
   };
   const contactEmail = (process.env.TINA4_SWAGGER_CONTACT_EMAIL ?? "").trim();
   const contactName = (process.env.TINA4_SWAGGER_CONTACT_TEAM ?? "").trim();
@@ -22885,9 +22819,11 @@ function generate(routes, models = []) {
   const includePrefixes = csv(process.env.TINA4_SWAGGER_INCLUDE);
   const excludePrefixes = csv(process.env.TINA4_SWAGGER_EXCLUDE);
   const refSchemas = /* @__PURE__ */ new Set();
+  const tableToSchema = /* @__PURE__ */ new Map();
   for (const model of models) {
-    const schema = modelToSchema(model);
-    spec.components.schemas[model.tableName] = schema;
+    const schemaKey = schemaNameForModel(model);
+    tableToSchema.set(model.tableName, schemaKey);
+    spec.components.schemas[schemaKey] = modelToSchema(model);
   }
   const usedTags = [];
   const seenIds = /* @__PURE__ */ new Set();
@@ -22914,11 +22850,11 @@ function generate(routes, models = []) {
     if (route.meta?.deprecated) operation.deprecated = true;
     const pathParams = extractPathParams(route.pattern);
     if (pathParams.length > 0) {
-      operation.parameters = pathParams.map((name) => ({
+      operation.parameters = pathParams.map(({ name, schema }) => ({
         name,
         in: "path",
         required: true,
-        schema: { type: "string" }
+        schema
       }));
     }
     if (method === "get" && !route.pattern.includes("[id]") && !route.pattern.includes("[...")) {
@@ -22944,19 +22880,20 @@ function generate(routes, models = []) {
       };
     } else if (method === "post" || method === "put") {
       const modelName = inferModelFromPath(route.pattern);
-      if (modelName && models.some((m) => m.tableName === modelName)) {
-        const media = {
-          schema: { $ref: `#/components/schemas/${modelName}` }
-        };
+      const schemaKey = modelName ? tableToSchema.get(modelName) : void 0;
+      if (schemaKey) {
+        const sref = `#/components/schemas/${schemaKey}`;
+        const media = { schema: { $ref: sref } };
         if (route.meta?.example !== void 0) media.example = route.meta.example;
         operation.requestBody = {
           required: true,
           content: { "application/json": media }
         };
-        operation.responses = {
-          ...method === "post" ? { "201": { description: "Created", content: { "application/json": { schema: { $ref: `#/components/schemas/${modelName}` } } } } } : { "200": { description: "Updated", content: { "application/json": { schema: { $ref: `#/components/schemas/${modelName}` } } } } },
-          "422": { description: "Validation failed" }
-        };
+        if (route.meta?.responses === void 0) {
+          operation.responses = {
+            "200": { description: "Successful response", content: { "application/json": { schema: { $ref: sref } } } }
+          };
+        }
       } else if (route.meta?.example !== void 0) {
         operation.requestBody = {
           content: { "application/json": { schema: inferSchema(route.meta.example), example: route.meta.example } }
@@ -23043,6 +22980,21 @@ function resolveServers() {
   const dev = (process.env.SWAGGER_DEV_URL ?? "").trim();
   return dev.length > 0 ? [{ url: dev }] : [{ url: "/" }];
 }
+function schemaNameForModel(model) {
+  const explicit = model.className?.trim();
+  if (explicit) return explicit;
+  return deriveClassName(model.tableName);
+}
+function deriveClassName(tableName) {
+  return singularize(tableName).split(/[_\s-]+/).filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("") || tableName;
+}
+function singularize(word) {
+  if (/ies$/i.test(word) && word.length > 3) return word.slice(0, -3) + "y";
+  if (/(ses|xes|zes|ches|shes)$/i.test(word)) return word.slice(0, -2);
+  if (/ss$/i.test(word)) return word;
+  if (/s$/i.test(word) && word.length > 1) return word.slice(0, -1);
+  return word;
+}
 function modelToSchema(model) {
   const properties = {};
   const required = [];
@@ -23116,15 +23068,35 @@ function inferSchema(value) {
   if (typeof value === "number") return { type: Number.isInteger(value) ? "integer" : "number" };
   return { type: "string" };
 }
+function segmentParam(segment) {
+  if (segment.startsWith("{") && segment.endsWith("}")) {
+    const inner = segment.slice(1, -1);
+    if (inner.startsWith("...")) return { name: inner.slice(3), type: "string" };
+    const colon = inner.indexOf(":");
+    if (colon >= 0) return { name: inner.slice(0, colon), type: inner.slice(colon + 1) };
+    return { name: inner, type: "string" };
+  }
+  if (segment.startsWith("[") && segment.endsWith("]")) {
+    const inner = segment.slice(1, -1);
+    return { name: inner.startsWith("...") ? inner.slice(3) : inner, type: "string" };
+  }
+  if (segment.startsWith(":") && segment.length > 1) {
+    return { name: segment.slice(1), type: "string" };
+  }
+  return null;
+}
 function patternToOpenAPI(pattern) {
-  return pattern.replace(/\[\.\.\.(\w+)\]/g, "{$1}").replace(/\[(\w+)\]/g, "{$1}");
+  return pattern.split("/").map((segment) => {
+    const p = segmentParam(segment);
+    return p ? `{${p.name}}` : segment;
+  }).join("/");
 }
 function extractPathParams(pattern) {
   const params = [];
-  const regex = /\[(?:\.\.\.)?(\w+)\]/g;
-  let match;
-  while ((match = regex.exec(pattern)) !== null) {
-    params.push(match[1]);
+  for (const segment of pattern.split("/")) {
+    const p = segmentParam(segment);
+    if (!p) continue;
+    params.push({ name: p.name, schema: { ...PARAM_TYPE_SCHEMA[p.type] ?? { type: "string" } } });
   }
   return params;
 }
@@ -23146,8 +23118,12 @@ function inferModelFromPath(pattern) {
   if (rest.length === 1 && /^[[{]\.{0,3}\w+[\]}]$/.test(rest[0])) return candidate;
   return null;
 }
+function operationIdBase(method, openApiPath) {
+  const clean = openApiPath.replace(/^\/+|\/+$/g, "").replace(/\//g, "_").replace(/\.\.\./g, "").replace(/[{}]/g, "").replace(/\*/g, "wildcard");
+  return clean ? `${method}_${clean}` : method;
+}
 function uniqueOperationId(method, openApiPath, seen) {
-  const base = (method + openApiPath.replace(/[/{}]/g, "_")).replace(/_+/g, "_").replace(/_$/, "");
+  const base = operationIdBase(method, openApiPath);
   let oid = base;
   let n = 2;
   while (seen.has(oid)) {
@@ -23157,13 +23133,25 @@ function uniqueOperationId(method, openApiPath, seen) {
   seen.add(oid);
   return oid;
 }
-var WRITE_METHODS, registeredSchemes, registeredSchemas;
+var WRITE_METHODS, registeredSchemes, registeredSchemas, PARAM_TYPE_SCHEMA;
 var init_generator = __esm({
   "../swagger/src/generator.ts"() {
     "use strict";
     WRITE_METHODS = /* @__PURE__ */ new Set(["post", "put", "patch", "delete"]);
     registeredSchemes = {};
     registeredSchemas = {};
+    PARAM_TYPE_SCHEMA = {
+      int: { type: "integer" },
+      integer: { type: "integer" },
+      float: { type: "number" },
+      number: { type: "number" },
+      uuid: { type: "string", format: "uuid" },
+      slug: { type: "string", pattern: "^[a-z0-9]+(?:-[a-z0-9]+)*$" },
+      alpha: { type: "string", pattern: "^[A-Za-z]+$" },
+      alnum: { type: "string", pattern: "^[A-Za-z0-9]+$" },
+      path: { type: "string" },
+      string: { type: "string" }
+    };
   }
 });
 
@@ -23483,10 +23471,29 @@ function openBrowser(url) {
   }, 2e3);
 }
 function resolvePortAndHost(config) {
-  const port = config?.port ?? (process.env.PORT ? parseInt(process.env.PORT, 10) : void 0) ?? 7148;
+  const tina4Port = process.env.TINA4_PORT;
+  const legacyPort = process.env.PORT;
+  let port;
+  if (config?.port !== void 0) {
+    port = config.port;
+  } else if (tina4Port && /^\d+$/.test(tina4Port)) {
+    port = parseInt(tina4Port, 10);
+  } else if (legacyPort && /^\d+$/.test(legacyPort)) {
+    port = parseInt(legacyPort, 10);
+    warnDeprecatedPort(port);
+  } else {
+    port = 7148;
+  }
   const host = config?.host ?? process.env.TINA4_HOST ?? process.env.HOST ?? "0.0.0.0";
   return { port, host };
 }
+function warnDeprecatedPort(port) {
+  if (portDeprecationWarned) return;
+  portDeprecationWarned = true;
+  Log.warning(
+    `PORT is deprecated and will be removed in 3.14 - use TINA4_PORT instead (binding port ${port} from PORT)`
+  );
+}
 function isBannerSuppressed() {
   return isTruthy(process.env.TINA4_SUPPRESS);
 }
@@ -23758,6 +23765,29 @@ function deployGallery(name) {
 </body>
 </html>`;
 }
+function startLoopWatchdog() {
+  const raw = (process.env.TINA4_LOOP_LAG_WARN_MS ?? "").trim();
+  const threshold = /^\d+$/.test(raw) ? parseInt(raw, 10) : 250;
+  if (threshold <= 0) {
+    return { stop: () => {
+    } };
+  }
+  let last = Date.now();
+  let warned = 0;
+  const timer = setInterval(() => {
+    const now = Date.now();
+    const lag = now - last - LOOP_WATCHDOG_TICK_MS;
+    last = now;
+    if (lag < threshold) return;
+    warned++;
+    if (warned > 5 && warned % 20 !== 0) return;
+    Log.warning(
+      `Event loop blocked for ${lag}ms. Node serves every request on one loop, so a handler doing CPU-bound work or synchronous I/O stalls all the others for that long. Move the work to Tina4's queue, or await it. Set TINA4_LOOP_LAG_WARN_MS to change the ${threshold}ms threshold, or 0 to silence.`
+    );
+  }, LOOP_WATCHDOG_TICK_MS);
+  timer.unref();
+  return { stop: () => clearInterval(timer) };
+}
 async function start(config) {
   const isManaged = process.argv.includes("--managed");
   if (!isManaged && process.env.TINA4_OVERRIDE_CLIENT !== "true") {
@@ -24007,7 +24037,9 @@ async function startServer(config) {
   const resolved = resolvePortAndHost(config);
   const host = resolved.host;
   let port = resolved.port;
-  port = findAvailablePort(port);
+  if (!cluster.isWorker) {
+    port = findAvailablePort(port);
+  }
   const isProduction = (process.env.TINA4_PRODUCTION ?? "").toLowerCase() === "true";
   if (cluster.isPrimary && isProduction) {
     const numCPUs = os2.cpus().length;
@@ -24223,7 +24255,20 @@ ${reset2}
       await sessionAutoStart(rawReq, rawRes, req2);
       await middleware.run(req2, res);
       if (res.raw.writableEnded) return;
-      await req2.parseBody();
+      try {
+        await req2.parseBody();
+      } catch (err) {
+        const status2 = err?.statusCode;
+        if (typeof status2 === "number" && status2 >= 400 && status2 < 500) {
+          if (!rawRes.writableEnded) {
+            rawRes.statusCode = status2;
+            rawRes.setHeader("content-type", "application/json");
+            rawRes.end(JSON.stringify({ error: err.message }));
+          }
+          return;
+        }
+        throw err;
+      }
       const pathname = req2.path;
       const reqStartTime = DevAdmin.isEnabled() ? Date.now() : 0;
       const matchedPattern = { value: "" };
@@ -24422,8 +24467,10 @@ ${reset2}
       };
       process.on("SIGTERM", onSigterm);
       process.on("SIGINT", onSigint);
+      const loopWatchdog = startLoopWatchdog();
       resolvePromise({
         close: () => {
+          loopWatchdog.stop();
           process.off("SIGTERM", onSigterm);
           process.off("SIGINT", onSigint);
           stopAllBackgroundTasks();
@@ -24438,7 +24485,7 @@ ${reset2}
     });
   });
 }
-var __filename, __dirname, BUILTIN_ERROR_TEMPLATES_DIR, BUILTIN_PUBLIC_DIR, swaggerAssetsEnabled, DEFAULT_SHUTDOWN_TIMEOUT_SECONDS, TINA4_VERSION2, frondCache, _LEGACY_ENV_VARS, TEMPLATE_PAGES_DIR, HTTP_REASON_PHRASES, templateCache, _dispatchFn, _serverHandle, FALLBACK_STAGES;
+var __filename, __dirname, BUILTIN_ERROR_TEMPLATES_DIR, BUILTIN_PUBLIC_DIR, swaggerAssetsEnabled, DEFAULT_SHUTDOWN_TIMEOUT_SECONDS, TINA4_VERSION2, frondCache, _LEGACY_ENV_VARS, portDeprecationWarned, TEMPLATE_PAGES_DIR, HTTP_REASON_PHRASES, templateCache, _dispatchFn, _serverHandle, LOOP_WATCHDOG_TICK_MS, FALLBACK_STAGES;
 var init_server = __esm({
   "../core/src/server.ts"() {
     "use strict";
@@ -24491,6 +24538,7 @@ var init_server = __esm({
       SWAGGER_VERSION: "TINA4_SWAGGER_VERSION",
       ORM_PLURAL_TABLE_NAMES: "TINA4_ORM_PLURAL_TABLE_NAMES"
     };
+    portDeprecationWarned = false;
     TEMPLATE_PAGES_DIR = "pages";
     HTTP_REASON_PHRASES = {
       100: "Continue",
@@ -24527,6 +24575,7 @@ var init_server = __esm({
     templateCache = null;
     _dispatchFn = null;
     _serverHandle = null;
+    LOOP_WATCHDOG_TICK_MS = 100;
     FALLBACK_STAGES = [
       serveTemplateFallback,
       serveLandingPage,
@@ -25082,433 +25131,6 @@ var init_fakeData = __esm({
   }
 });
 
-// ../core/src/scss.ts
-import { readFileSync as readFileSync21, writeFileSync as writeFileSync14, existsSync as existsSync23, mkdirSync as mkdirSync14, readdirSync as readdirSync16 } from "node:fs";
-import { join as join23, resolve as resolve16, dirname as dirname10 } from "node:path";
-function compileString(scss, importPaths, variables) {
-  const imported = /* @__PURE__ */ new Set();
-  scss = resolveImports(scss, importPaths, imported);
-  scss = scss.replace(/(?<![:"'])\/\/[^\n]*/g, "");
-  scss = extractVariables(scss, variables);
-  const mixins = {};
-  scss = extractMixins(scss, mixins);
-  scss = resolveIncludes(scss, mixins);
-  scss = resolveInterpolation(scss, variables);
-  scss = substituteVariables(scss, variables);
-  scss = evalMath(scss);
-  scss = resolveColorFunctions(scss);
-  const css = flattenNesting(scss);
-  return cleanup(css);
-}
-function resolveImports(content, paths, imported) {
-  return content.replace(/@import\s+["']?([^"';\n]+)["']?\s*;/g, (_match, name) => {
-    name = name.trim();
-    const candidates = [];
-    for (const base of paths) {
-      candidates.push(
-        join23(base, `${name}.scss`),
-        join23(base, `_${name}.scss`),
-        join23(base, name)
-      );
-    }
-    for (const candidate of candidates) {
-      if (existsSync23(candidate) && !imported.has(candidate)) {
-        imported.add(candidate);
-        const fileContent = readFileSync21(candidate, "utf-8");
-        return resolveImports(fileContent, [dirname10(candidate), ...paths], imported);
-      }
-    }
-    return `/* IMPORT NOT FOUND: ${name} */`;
-  });
-}
-function stripVariableFlags(value) {
-  let declaresDefault = false;
-  for (; ; ) {
-    const match = VARIABLE_FLAG.exec(value);
-    if (match === null) return [value.trim(), declaresDefault];
-    if (match[1] === "default") declaresDefault = true;
-    value = value.slice(0, match.index);
-  }
-}
-function extractVariables(scss, variables) {
-  return scss.replace(/\$([a-zA-Z_][\w-]*)\s*:\s*([^;]+);/g, (_m, name, value) => {
-    const [stripped, declaresDefault] = stripVariableFlags(value.trim());
-    if (declaresDefault && (variables[name] ?? "null") !== "null") {
-      return "";
-    }
-    let resolved = stripped;
-    for (const [vName, vVal] of Object.entries(variables)) {
-      resolved = resolved.replaceAll(`$${vName}`, vVal);
-    }
-    variables[name] = resolved;
-    return "";
-  });
-}
-function substituteVariables(scss, variables) {
-  const sorted = Object.keys(variables).sort((a, b) => b.length - a.length);
-  for (const name of sorted) {
-    scss = scss.replaceAll(`$${name}`, variables[name]);
-  }
-  return scss;
-}
-function resolveInterpolation(scss, variables) {
-  const sorted = Object.keys(variables).sort((a, b) => b.length - a.length);
-  return scss.replace(/#\{([^{}]*)\}/g, (_m, inner) => {
-    let resolved = inner.trim();
-    for (const name of sorted) {
-      resolved = resolved.replaceAll(`$${name}`, variables[name]);
-    }
-    return resolved;
-  });
-}
-function extractMixins(scss, mixins) {
-  const pattern = /@mixin\s+([\w-]+)\s*(?:\(([^)]*)\))?\s*\{/g;
-  let match;
-  const locations = [];
-  while ((match = pattern.exec(scss)) !== null) {
-    const name = match[1];
-    const paramsStr = match[2] ?? "";
-    const params = paramsStr.split(",").map((p) => p.trim().replace(/^\$/, "")).filter(Boolean);
-    const bodyStart = match.index + match[0].length;
-    const body = findBlock(scss, bodyStart);
-    if (body !== null) {
-      mixins[name] = { params, body };
-      locations.push({
-        start: match.index,
-        end: bodyStart + body.length + 1,
-        name
-      });
-    }
-  }
-  let result = scss;
-  for (const loc of locations.reverse()) {
-    result = result.slice(0, loc.start) + result.slice(loc.end);
-  }
-  return result;
-}
-function resolveIncludes(scss, mixins) {
-  return scss.replace(
-    /@include\s+([\w-]+)\s*(?:\(([^)]*)\))?\s*;/g,
-    (_m, name, argsStr) => {
-      if (!(name in mixins)) {
-        return `/* MIXIN NOT FOUND: ${name} */`;
-      }
-      const mixin = mixins[name];
-      const args = argsStr ? argsStr.split(",").map((a) => a.trim()).filter(Boolean) : [];
-      let body = mixin.body;
-      for (let i = 0; i < mixin.params.length; i++) {
-        const paramName = mixin.params[i].split(":")[0].trim();
-        const defaultVal = mixin.params[i].includes(":") ? mixin.params[i].split(":").slice(1).join(":").trim() : "";
-        const value = i < args.length ? args[i] : defaultVal;
-        body = body.replaceAll(`$${paramName}`, value);
-      }
-      return body;
-    }
-  );
-}
-function evalMath(scss) {
-  const placeholders = [];
-  const masked = scss.replace(/calc\([^()]*\)/g, (m) => {
-    placeholders.push(m);
-    return `\0CALC${placeholders.length - 1}\0`;
-  });
-  const folded = masked.replace(
-    /([\d.]+)([a-z%]*)\s*([+\-*/])\s*([\d.]+)([a-z%]*)/g,
-    (full, n1, u1, op, n2, u2) => {
-      const num1 = parseFloat(n1);
-      const num2 = parseFloat(n2);
-      if (Number.isNaN(num1) || Number.isNaN(num2)) return full;
-      const unit1 = u1 || "";
-      const unit2 = u2 || "";
-      let unit;
-      if (unit1 === unit2) {
-        unit = unit1;
-      } else if ((op === "*" || op === "/") && unit1 === "") {
-        unit = unit2;
-      } else if ((op === "*" || op === "/") && unit2 === "") {
-        unit = unit1;
-      } else {
-        return full;
-      }
-      let result;
-      switch (op) {
-        case "+":
-          result = num1 + num2;
-          break;
-        case "-":
-          result = num1 - num2;
-          break;
-        case "*":
-          result = num1 * num2;
-          break;
-        case "/":
-          if (num2 === 0) return full;
-          result = num1 / num2;
-          break;
-        default:
-          return full;
-      }
-      if (result === Math.floor(result)) {
-        return `${Math.floor(result)}${unit}`;
-      }
-      return `${result.toFixed(2)}${unit}`;
-    }
-  );
-  return folded.replace(/\x00CALC(\d+)\x00/g, (_m, idx) => {
-    return placeholders[parseInt(idx, 10)];
-  });
-}
-function resolveColorFunctions(scss) {
-  scss = scss.replace(
-    /lighten\(\s*([^,]+)\s*,\s*([^)]+)\s*\)/g,
-    (_m, color, amt) => adjustLightness(color.trim(), parseFloat(amt.trim().replace(/%$/, "")) / 100)
-  );
-  scss = scss.replace(
-    /darken\(\s*([^,]+)\s*,\s*([^)]+)\s*\)/g,
-    (_m, color, amt) => adjustLightness(color.trim(), -(parseFloat(amt.trim().replace(/%$/, "")) / 100))
-  );
-  scss = scss.replace(/rgba\(\s*(#[0-9a-fA-F]{3,8})\s*,\s*([\d.]+)\s*\)/g, (whole, hex, alpha) => {
-    const rgb = hexToRgb(hex);
-    return rgb === null ? whole : `rgba(${rgb[0]}, ${rgb[1]}, ${rgb[2]}, ${alpha.trim()})`;
-  });
-  scss = scss.replace(/rgb\(\s*(#[0-9a-fA-F]{3,8})\s*\)/g, (whole, hex) => {
-    const rgb = hexToRgb(hex);
-    return rgb === null ? whole : `rgb(${rgb[0]}, ${rgb[1]}, ${rgb[2]})`;
-  });
-  scss = scss.replace(
-    /mix\(\s*(#[0-9a-fA-F]{3,8})\s*,\s*(#[0-9a-fA-F]{3,8})\s*(?:,\s*([\d.]+%?)\s*)?\)/g,
-    (whole, h1, h2, weight) => {
-      const c1 = hexToRgb(h1);
-      const c2 = hexToRgb(h2);
-      if (c1 === null || c2 === null) return whole;
-      const w = weight ? parseFloat(weight.replace(/%$/, "")) / 100 : 0.5;
-      const mixed = [0, 1, 2].map((i) => Math.round(c1[i] * w + c2[i] * (1 - w)));
-      return `#${mixed.map((v) => v.toString(16).padStart(2, "0")).join("")}`;
-    }
-  );
-  return scss;
-}
-function hexToRgb(color) {
-  let c = color.trim().replace(/^#/, "");
-  if (c.length === 3) {
-    c = c.split("").map((ch) => ch + ch).join("");
-  }
-  if (!/^[0-9a-fA-F]{6}$/.test(c)) return null;
-  return [parseInt(c.slice(0, 2), 16), parseInt(c.slice(2, 4), 16), parseInt(c.slice(4, 6), 16)];
-}
-function adjustLightness(color, amount) {
-  const rgb = hexToRgb(color);
-  if (rgb === null) return color;
-  let [r, g, b] = rgb.map((v) => v / 255);
-  const max = Math.max(r, g, b);
-  const min = Math.min(r, g, b);
-  let l = (max + min) / 2;
-  const d = max - min;
-  let h = 0;
-  let s = 0;
-  if (d !== 0) {
-    s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-    if (max === r) h = (g - b) / d + (g < b ? 6 : 0);
-    else if (max === g) h = (b - r) / d + 2;
-    else h = (r - g) / d + 4;
-    h /= 6;
-  }
-  l = Math.max(0, Math.min(1, l + amount));
-  if (s === 0) {
-    r = g = b = l;
-  } else {
-    const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-    const p = 2 * l - q;
-    r = hueToRgb(p, q, h + 1 / 3);
-    g = hueToRgb(p, q, h);
-    b = hueToRgb(p, q, h - 1 / 3);
-  }
-  const hex = (v) => Math.trunc(v * 255).toString(16).padStart(2, "0");
-  return `#${hex(r)}${hex(g)}${hex(b)}`;
-}
-function hueToRgb(p, q, t) {
-  if (t < 0) t += 1;
-  if (t > 1) t -= 1;
-  if (t < 1 / 6) return p + (q - p) * 6 * t;
-  if (t < 1 / 2) return q;
-  if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
-  return p;
-}
-function flattenNesting(scss) {
-  const output = [];
-  flattenBlock(scss, [], output);
-  return output.join("\n");
-}
-function flattenBlock(content, parentSelectors, output) {
-  let pos = 0;
-  const properties = [];
-  while (pos < content.length) {
-    while (pos < content.length && /[\s]/.test(content[pos])) {
-      pos++;
-    }
-    if (pos >= content.length) break;
-    if (content[pos] === "/" && content[pos + 1] === "*") {
-      const end = content.indexOf("*/", pos + 2);
-      if (end === -1) break;
-      output.push(content.slice(pos, end + 2));
-      pos = end + 2;
-      continue;
-    }
-    if (content.slice(pos, pos + 6) === "@media") {
-      const brace = content.indexOf("{", pos);
-      if (brace === -1) break;
-      const mediaQuery = content.slice(pos, brace).trim();
-      const body = findBlock(content, brace + 1);
-      if (body === null) break;
-      pos = brace + 1 + body.length + 1;
-      const innerOutput = [];
-      flattenBlock(body, parentSelectors, innerOutput);
-      if (innerOutput.length > 0) {
-        output.push(`${mediaQuery} {`);
-        for (const line of innerOutput) {
-          output.push(`  ${line}`);
-        }
-        output.push("}");
-      }
-      continue;
-    }
-    const bracePos = content.indexOf("{", pos);
-    const semiPos = content.indexOf(";", pos);
-    if (semiPos !== -1 && (bracePos === -1 || semiPos < bracePos)) {
-      const prop = content.slice(pos, semiPos).trim();
-      if (prop && !prop.startsWith("@")) {
-        properties.push(prop);
-      }
-      pos = semiPos + 1;
-      continue;
-    }
-    if (bracePos !== -1) {
-      const selectorText = content.slice(pos, bracePos).trim();
-      const body = findBlock(content, bracePos + 1);
-      if (body === null) break;
-      pos = bracePos + 1 + body.length + 1;
-      if (!selectorText) continue;
-      const selectors = selectorText.split(",").map((s) => s.trim());
-      const newSelectors = [];
-      for (const sel of selectors) {
-        if (parentSelectors.length > 0) {
-          for (const parent of parentSelectors) {
-            if (sel.includes("&")) {
-              newSelectors.push(sel.replace(/&/g, parent));
-            } else {
-              newSelectors.push(`${parent} ${sel}`);
-            }
-          }
-        } else {
-          newSelectors.push(sel);
-        }
-      }
-      flattenBlock(body, newSelectors, output);
-      continue;
-    }
-    const remaining = content.slice(pos).trim();
-    if (remaining) {
-      properties.push(remaining);
-    }
-    break;
-  }
-  if (properties.length > 0 && parentSelectors.length > 0) {
-    const selectorStr = parentSelectors.join(", ");
-    output.push(`${selectorStr} {`);
-    for (const prop of properties) {
-      output.push(`  ${prop};`);
-    }
-    output.push("}");
-  }
-}
-function findBlock(content, start2) {
-  let depth = 1;
-  let pos = start2;
-  while (pos < content.length && depth > 0) {
-    if (content[pos] === "{") depth++;
-    else if (content[pos] === "}") depth--;
-    if (depth > 0) pos++;
-  }
-  return depth === 0 ? content.slice(start2, pos) : null;
-}
-function cleanup(css) {
-  css = css.replace(/[^{}]+\{\s*\}/g, "");
-  css = css.replace(/\n{3,}/g, "\n\n");
-  css = css.split("\n").map((line) => line.trimEnd()).join("\n");
-  return css.trim() + "\n";
-}
-var ScssCompiler, VARIABLE_FLAG;
-var init_scss = __esm({
-  "../core/src/scss.ts"() {
-    "use strict";
-    ScssCompiler = class {
-      _importPaths;
-      _variables;
-      constructor(config) {
-        this._importPaths = config?.importPaths ? [...config.importPaths] : [];
-        this._variables = config?.variables ? { ...config.variables } : {};
-      }
-      /** Compile an SCSS string to CSS. */
-      compile(source) {
-        return compileString(source, this._importPaths, { ...this._variables });
-      }
-      /** Compile an SCSS file to CSS. */
-      compileFile(filePath) {
-        const absPath = resolve16(filePath);
-        const content = readFileSync21(absPath, "utf-8");
-        const paths = [dirname10(absPath), ...this._importPaths];
-        return compileString(content, paths, { ...this._variables });
-      }
-      /** Add a directory to the import resolution path. */
-      addImportPath(path8) {
-        this._importPaths.push(resolve16(path8));
-      }
-      /** Set or override an SCSS variable. */
-      setVariable(name, value) {
-        const key = name.startsWith("$") ? name.slice(1) : name;
-        this._variables[key] = value;
-      }
-      /** Compile all .scss files in a directory into a single CSS output file. */
-      compileScss(scssDir = "src/scss", output = "src/public/css/default.css", minify = false) {
-        const absDir = resolve16(scssDir);
-        if (!existsSync23(absDir)) return "";
-        const files = readdirSync16(absDir).filter((f) => f.endsWith(".scss") && !f.startsWith("_")).sort().map((f) => join23(absDir, f));
-        if (files.length === 0) return "";
-        const paths = [absDir, ...this._importPaths];
-        const imported = /* @__PURE__ */ new Set();
-        let merged = "";
-        for (const file of files) {
-          const content = readFileSync21(file, "utf-8");
-          imported.add(file);
-          merged += resolveImports(content, paths, imported) + "\n";
-        }
-        let css = compileString(merged, paths, { ...this._variables });
-        if (minify) {
-          css = css.replace(/\/\*.*?\*\//gs, "");
-          css = css.replace(/\s+/g, " ");
-          css = css.replace(/\s*([{}:;,])\s*/g, "$1");
-          css = css.replace(/;}/g, "}");
-          css = css.trim();
-        }
-        const absOutput = resolve16(output);
-        const outDir = dirname10(absOutput);
-        if (!existsSync23(outDir)) mkdirSync14(outDir, { recursive: true });
-        let existing = null;
-        try {
-          existing = existsSync23(absOutput) ? readFileSync21(absOutput, "utf-8") : null;
-        } catch {
-          existing = null;
-        }
-        if (existing !== css) {
-          writeFileSync14(absOutput, css, "utf-8");
-        }
-        return css;
-      }
-    };
-    VARIABLE_FLAG = /\s*!(default|global)\s*$/;
-  }
-});
-
 // ../core/src/mqttMessage.ts
 var MqttMessage;
 var init_mqttMessage = __esm({
@@ -25582,7 +25204,7 @@ var init_mqttMessage = __esm({
 import net2 from "node:net";
 import tls from "node:tls";
 import { randomBytes as randomBytes5 } from "node:crypto";
-import { existsSync as existsSync24, readFileSync as readFileSync22 } from "node:fs";
+import { existsSync as existsSync23, readFileSync as readFileSync21 } from "node:fs";
 var MqttError, MqttTimeoutError, CONNECT, CONNACK, PUBLISH, PUBACK, SUBSCRIBE, SUBACK, PINGREQ, PINGRESP, DISCONNECT, PROTOCOL_LEVEL, DEFAULT_PORT, DEFAULT_TLS_PORT, DEFAULT_URL, DEFAULT_KEEPALIVE, SUBSCRIPTION_REFUSED, MAX_REMAINING_LENGTH, QOS2_REFUSED_MESSAGE, CONNACK_RETURN_CODES, Mqtt;
 var init_mqtt = __esm({
   "../core/src/mqtt.ts"() {
@@ -25785,7 +25407,7 @@ var init_mqtt = __esm({
        */
       async connect() {
         this.closeSocket();
-        if (this.secure && this.tlsVerify && this.caFile && !existsSync24(this.caFile)) {
+        if (this.secure && this.tlsVerify && this.caFile && !existsSync23(this.caFile)) {
           throw new MqttError(
             `MQTT CA file not found: ${this.caFile} -- TINA4_MQTT_CA_FILE (or caFile) must point at the broker's CA certificate in PEM form`
           );
@@ -26022,7 +25644,7 @@ var init_mqtt = __esm({
        * a later client.
        */
       openSocket() {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           let settled = false;
           const settle = (fn) => {
             if (settled) return;
@@ -26047,10 +25669,10 @@ var init_mqtt = __esm({
               servername: this.host,
               rejectUnauthorized: this.tlsVerify
             };
-            if (this.tlsVerify && this.caFile) opts.ca = readFileSync22(this.caFile);
-            sock = tls.connect(opts, () => settle(() => resolve21(sock)));
+            if (this.tlsVerify && this.caFile) opts.ca = readFileSync21(this.caFile);
+            sock = tls.connect(opts, () => settle(() => resolve20(sock)));
           } else {
-            sock = net2.createConnection({ host: this.host, port: this.port }, () => settle(() => resolve21(sock)));
+            sock = net2.createConnection({ host: this.host, port: this.port }, () => settle(() => resolve20(sock)));
           }
           sock.once("error", (err) => {
             settle(() => {
@@ -26089,13 +25711,13 @@ var init_mqtt = __esm({
       writePacket(header, body) {
         if (this.socket === null) return Promise.reject(new MqttError("not connected to an MQTT broker"));
         const packet = Buffer.concat([Buffer.from([header]), _Mqtt.encodeRemainingLength(body.length), body]);
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           this.socket.write(packet, (err) => {
             if (err) {
               reject(new MqttError(`MQTT write failed: ${err.message}`));
             } else {
               this.lastWriteAt = Date.now();
-              resolve21();
+              resolve20();
             }
           });
         });
@@ -26128,7 +25750,7 @@ var init_mqtt = __esm({
         if (this.readBuffer.length >= need) return Promise.resolve(this.take(need));
         if (this.socket === null) return Promise.reject(this.socketError ?? new MqttError("not connected to an MQTT broker"));
         if (this.socketError !== null) return Promise.reject(this.socketError);
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           let timer = null;
           if (deadline !== null) {
             const remaining = deadline - Date.now();
@@ -26143,7 +25765,7 @@ var init_mqtt = __esm({
               }
             }, remaining);
           }
-          this.waiter = { need, resolve: resolve21, reject, timer };
+          this.waiter = { need, resolve: resolve20, reject, timer };
           this.serviceWaiter();
         });
       }
@@ -26267,8 +25889,8 @@ var init_mqtt = __esm({
 });
 
 // ../core/src/service.ts
-import { readdirSync as readdirSync17, statSync as statSync16, watchFile, unwatchFile } from "node:fs";
-import { join as join24, extname as extname7 } from "node:path";
+import { readdirSync as readdirSync16, statSync as statSync16, watchFile, unwatchFile } from "node:fs";
+import { join as join23, extname as extname7 } from "node:path";
 import { pathToFileURL } from "node:url";
 function matchCronField(field, value) {
   if (field === "*") return true;
@@ -26434,14 +26056,14 @@ var init_service = __esm({
         const discovered = [];
         let entries;
         try {
-          entries = readdirSync17(dir);
+          entries = readdirSync16(dir);
         } catch {
           return discovered;
         }
         for (const entry of entries) {
           const ext = extname7(entry);
           if (ext !== ".ts" && ext !== ".js") continue;
-          const fullPath = join24(dir, entry);
+          const fullPath = join23(dir, entry);
           const stat = statSync16(fullPath);
           if (!stat.isFile()) continue;
           try {
@@ -26550,14 +26172,14 @@ var init_service = __esm({
         const dir = serviceDir ?? process.env.TINA4_SERVICE_DIR ?? "src/services";
         let entries;
         try {
-          entries = readdirSync17(dir);
+          entries = readdirSync16(dir);
         } catch {
           return;
         }
         for (const entry of entries) {
           const ext = extname7(entry);
           if (ext !== ".ts" && ext !== ".js") continue;
-          const fullPath = join24(dir, entry);
+          const fullPath = join23(dir, entry);
           if (watchedFiles.has(fullPath)) continue;
           watchedFiles.add(fullPath);
           watchFile(fullPath, { interval: 1e3 }, async () => {
@@ -26601,7 +26223,7 @@ import https from "node:https";
 import { URL as URL2 } from "node:url";
 import { randomBytes as randomBytes6 } from "node:crypto";
 import { promises as fsp, createWriteStream } from "node:fs";
-import { basename as basename5 } from "node:path";
+import { basename as basename4 } from "node:path";
 import { pipeline } from "node:stream/promises";
 function sameOrigin(urlA, urlB) {
   try {
@@ -26891,7 +26513,7 @@ var init_api = __esm({
               error: err instanceof Error ? err.message : String(err)
             };
           }
-          uploadName = filename || basename5(filePath);
+          uploadName = filename || basename4(filePath);
         } else {
           return { http_code: null, body: null, headers: {}, error: "upload requires filePath or fileBytes" };
         }
@@ -27106,12 +26728,12 @@ var init_api = __esm({
        * authenticate to.
        */
       performRequest(method, url, headers, data, redirectsLeft) {
-        return new Promise((resolve21) => {
+        return new Promise((resolve20) => {
           let parsed;
           try {
             parsed = new URL2(url);
           } catch (err) {
-            resolve21({ kind: "error", error: err instanceof Error ? err.message : String(err) });
+            resolve20({ kind: "error", error: err instanceof Error ? err.message : String(err) });
             return;
           }
           const isHttps = parsed.protocol === "https:";
@@ -27136,7 +26758,7 @@ var init_api = __esm({
               try {
                 nextUrl = new URL2(location, url).toString();
               } catch {
-                resolve21({ kind: "response", res });
+                resolve20({ kind: "response", res });
                 return;
               }
               const crossOrigin = !sameOrigin(url, nextUrl);
@@ -27154,17 +26776,17 @@ var init_api = __esm({
                   deleteHeaderCaseInsensitive(nextHeaders, name);
                 }
               }
-              this.performRequest(nextMethod, nextUrl, nextHeaders, nextData, redirectsLeft - 1).then(resolve21);
+              this.performRequest(nextMethod, nextUrl, nextHeaders, nextData, redirectsLeft - 1).then(resolve20);
               return;
             }
-            resolve21({ kind: "response", res });
+            resolve20({ kind: "response", res });
           });
           req2.on("timeout", () => {
             req2.destroy();
-            resolve21({ kind: "error", error: `Request timed out after ${this.timeout}s` });
+            resolve20({ kind: "error", error: `Request timed out after ${this.timeout}s` });
           });
           req2.on("error", (err) => {
-            resolve21({ kind: "error", error: err.message });
+            resolve20({ kind: "error", error: err.message });
           });
           if (data) {
             req2.write(data);
@@ -27174,7 +26796,7 @@ var init_api = __esm({
       }
       /** Buffer a response body, parse JSON if possible, and store cookies. */
       readResponse(res) {
-        return new Promise((resolve21) => {
+        return new Promise((resolve20) => {
           const chunks = [];
           res.on("data", (chunk) => {
             chunks.push(chunk);
@@ -27189,7 +26811,7 @@ var init_api = __esm({
             } catch {
               parsed = raw;
             }
-            resolve21({
+            resolve20({
               http_code: res.statusCode ?? null,
               body: parsed,
               headers: respHeaders,
@@ -27197,7 +26819,7 @@ var init_api = __esm({
             });
           });
           res.on("error", (err) => {
-            resolve21({ http_code: null, body: null, headers: {}, error: err.message });
+            resolve20({ http_code: null, body: null, headers: {}, error: err.message });
           });
         });
       }
@@ -27250,14 +26872,14 @@ var init_api = __esm({
 // ../core/src/messenger.ts
 import net3 from "node:net";
 import tls2 from "node:tls";
-import { readFileSync as readFileSync23 } from "node:fs";
-import { basename as basename6 } from "node:path";
+import { readFileSync as readFileSync22 } from "node:fs";
+import { basename as basename5 } from "node:path";
 import { randomUUID as randomUUID7 } from "node:crypto";
 function tlsRejectUnauthorized() {
   return !isTruthy(process.env.TINA4_MAIL_TLS_INSECURE);
 }
 function readResponse(socket) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve20, reject) => {
     let buffer = "";
     const onData = (chunk) => {
       buffer += chunk.toString("utf-8");
@@ -27269,7 +26891,7 @@ function readResponse(socket) {
         if (line.length >= 4 && line[3] === " ") {
           socket.removeListener("data", onData);
           socket.removeListener("error", onError);
-          resolve21({ code, text: buffer.trim() });
+          resolve20({ code, text: buffer.trim() });
           return;
         }
       }
@@ -27283,10 +26905,10 @@ function readResponse(socket) {
   });
 }
 function sendCommand(socket, command) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve20, reject) => {
     socket.write(command + "\r\n", "utf-8", (err) => {
       if (err) return reject(err);
-      readResponse(socket).then(resolve21, reject);
+      readResponse(socket).then(resolve20, reject);
     });
   });
 }
@@ -27342,8 +26964,8 @@ function buildMimeMessage(options) {
       lines.push(options.body);
     }
     for (const filePath of options.attachments) {
-      const fileName = basename6(filePath);
-      const fileData = readFileSync23(filePath);
+      const fileName = basename5(filePath);
+      const fileData = readFileSync22(filePath);
       const base64Data = fileData.toString("base64");
       lines.push("");
       lines.push(`--${boundary}`);
@@ -27386,7 +27008,7 @@ function imapQuote(s) {
   return '"' + s.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '"';
 }
 function imapReadLine(socket) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve20, reject) => {
     let buffer = "";
     const onData = (chunk) => {
       buffer += chunk.toString("utf-8");
@@ -27394,7 +27016,7 @@ function imapReadLine(socket) {
       if (nlIndex !== -1) {
         socket.removeListener("data", onData);
         socket.removeListener("error", onError);
-        resolve21(buffer);
+        resolve20(buffer);
       }
     };
     const onError = (err) => {
@@ -27406,7 +27028,7 @@ function imapReadLine(socket) {
   });
 }
 function imapCommand(socket, command) {
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve20, reject) => {
     imapTagCounter++;
     const tag = `T${imapTagCounter}`;
     const fullCommand = `${tag} ${command}\r
@@ -27417,7 +27039,7 @@ function imapCommand(socket, command) {
       if (buffer.includes(`${tag} OK`)) {
         socket.removeListener("data", onData);
         socket.removeListener("error", onError);
-        resolve21(buffer);
+        resolve20(buffer);
         return;
       }
       if (buffer.includes(`${tag} NO`) || buffer.includes(`${tag} BAD`)) {
@@ -27446,91 +27068,149 @@ function parseSearchResponse(response) {
   if (!match) return [];
   return match[1].trim().split(/\s+/).filter((s) => /^\d+$/.test(s));
 }
-function parseHeaderResponse(uid, response) {
-  const headers = {};
-  const headerBlock = response.match(/\r\n([\s\S]*?)\r\n\)/);
-  if (headerBlock) {
-    const lines = headerBlock[1].split(/\r\n/);
-    let currentKey = "";
-    for (const line of lines) {
-      if (/^\s/.test(line) && currentKey) {
-        headers[currentKey] += " " + line.trim();
-      } else {
-        const colonIdx = line.indexOf(":");
-        if (colonIdx > 0) {
-          currentKey = line.substring(0, colonIdx).trim().toLowerCase();
-          headers[currentKey] = line.substring(colonIdx + 1).trim();
-        }
-      }
-    }
-  }
-  const seen = /\\Seen/i.test(response);
-  return {
-    uid,
-    subject: headers["subject"] ?? "",
-    from: headers["from"] ?? "",
-    to: headers["to"] ?? "",
-    date: headers["date"] ?? "",
-    snippet: "",
-    seen
-  };
+function extractRawMessage(response) {
+  const m = response.match(/\{(\d+)\}\r\n/);
+  if (!m) return response;
+  const start2 = (m.index ?? 0) + m[0].length;
+  return response.slice(start2, start2 + parseInt(m[1], 10));
 }
-function parseFullMessage(uid, response) {
-  const bodyMatch = response.match(/\{(\d+)\}\r\n([\s\S]*)/);
-  const rawMessage = bodyMatch ? bodyMatch[2] : response;
-  const headerEnd = rawMessage.indexOf("\r\n\r\n");
-  const headerSection = headerEnd > 0 ? rawMessage.substring(0, headerEnd) : rawMessage;
-  const bodySection = headerEnd > 0 ? rawMessage.substring(headerEnd + 4) : "";
+function parseMimeHeaders(section) {
   const headers = {};
-  const headerLines = headerSection.split(/\r\n/);
   let currentKey = "";
-  for (const line of headerLines) {
+  for (const line of section.split(/\r\n/)) {
     if (/^\s/.test(line) && currentKey) {
       headers[currentKey] += " " + line.trim();
     } else {
-      const colonIdx = line.indexOf(":");
-      if (colonIdx > 0) {
-        currentKey = line.substring(0, colonIdx).trim().toLowerCase();
-        headers[currentKey] = line.substring(colonIdx + 1).trim();
+      const idx = line.indexOf(":");
+      if (idx > 0) {
+        currentKey = line.substring(0, idx).trim().toLowerCase();
+        headers[currentKey] = line.substring(idx + 1).trim();
+      }
+    }
+  }
+  return headers;
+}
+function decodeTransfer(body, encoding) {
+  const enc = encoding.toLowerCase().trim();
+  if (enc === "base64") {
+    try {
+      return Buffer.from(body.replace(/\s+/g, ""), "base64").toString("utf-8");
+    } catch {
+      return body;
+    }
+  }
+  if (enc === "quoted-printable") {
+    return body.replace(/=\r?\n/g, "").replace(/=([0-9A-Fa-f]{2})/g, (_m, h) => String.fromCharCode(parseInt(h, 16)));
+  }
+  return body;
+}
+function decodeAttachmentBytes(body, encoding) {
+  const enc = encoding.toLowerCase().trim();
+  if (enc === "base64") {
+    return Buffer.from(body.replace(/\s+/g, ""), "base64");
+  }
+  const trimmed = body.replace(/\r\n$/, "");
+  if (enc === "quoted-printable") {
+    const collapsed = trimmed.replace(/=\r?\n/g, "");
+    const bytes = [];
+    for (let i = 0; i < collapsed.length; i++) {
+      const hex = collapsed.substring(i + 1, i + 3);
+      if (collapsed[i] === "=" && /^[0-9A-Fa-f]{2}$/.test(hex)) {
+        bytes.push(parseInt(hex, 16));
+        i += 2;
+      } else {
+        bytes.push(collapsed.charCodeAt(i) & 255);
       }
     }
+    return Buffer.from(bytes);
   }
+  return Buffer.from(trimmed, "utf-8");
+}
+function attachmentFilename(disposition, contentType) {
+  const d = disposition.match(/filename="?([^";\r\n]+)"?/i);
+  if (d) return d[1].trim();
+  const c = contentType.match(/name="?([^";\r\n]+)"?/i);
+  if (c) return c[1].trim();
+  return "attachment";
+}
+function makeSnippet(bodyText, bodyHtml) {
+  return (bodyText || bodyHtml || "").replace(/<[^>]+>/g, " ").replace(/\s+/g, " ").trim().slice(0, 200);
+}
+function toIsoDate(raw) {
+  if (!raw) return "";
+  const d = new Date(raw);
+  return Number.isNaN(d.getTime()) ? raw : d.toISOString();
+}
+function parseMessage(response) {
+  const raw = extractRawMessage(response);
+  const headerEnd = raw.indexOf("\r\n\r\n");
+  const headerSection = headerEnd >= 0 ? raw.substring(0, headerEnd) : raw;
+  const bodySection = headerEnd >= 0 ? raw.substring(headerEnd + 4) : "";
+  const headers = parseMimeHeaders(headerSection);
   const contentType = headers["content-type"] ?? "text/plain";
   let bodyText = "";
   let bodyHtml = "";
+  const attachments = [];
   if (contentType.includes("multipart")) {
     const boundaryMatch = contentType.match(/boundary="?([^";\s]+)"?/);
     if (boundaryMatch) {
-      const boundary = boundaryMatch[1];
-      const parts = bodySection.split("--" + boundary);
-      for (const part of parts) {
-        if (part.trim() === "" || part.trim() === "--") continue;
-        const partHeaderEnd = part.indexOf("\r\n\r\n");
-        const partHeaders = partHeaderEnd > 0 ? part.substring(0, partHeaderEnd).toLowerCase() : "";
-        const partBody = partHeaderEnd > 0 ? part.substring(partHeaderEnd + 4).trim() : "";
-        if (partHeaders.includes("text/html")) {
-          bodyHtml = partBody;
-        } else if (partHeaders.includes("text/plain")) {
-          bodyText = partBody;
+      const boundary = "--" + boundaryMatch[1];
+      for (const part of bodySection.split(boundary)) {
+        const trimmed = part.trim();
+        if (trimmed === "" || trimmed === "--") continue;
+        const pEnd = part.indexOf("\r\n\r\n");
+        if (pEnd < 0) continue;
+        const pHeaders = parseMimeHeaders(part.substring(0, pEnd));
+        const pBody = part.substring(pEnd + 4);
+        const cte = pHeaders["content-transfer-encoding"] ?? "";
+        const pType = pHeaders["content-type"] ?? "text/plain";
+        const disposition = pHeaders["content-disposition"] ?? "";
+        if (/attachment/i.test(disposition)) {
+          const content = decodeAttachmentBytes(pBody, cte);
+          attachments.push({
+            filename: attachmentFilename(disposition, pType),
+            contentType: pType.split(";")[0].trim(),
+            size: content.length,
+            content
+          });
+        } else if (pType.includes("text/html")) {
+          bodyHtml = decodeTransfer(pBody, cte).trim();
+        } else if (pType.includes("text/plain")) {
+          bodyText = decodeTransfer(pBody, cte).trim();
         }
       }
     }
   } else if (contentType.includes("text/html")) {
-    bodyHtml = bodySection;
+    bodyHtml = decodeTransfer(bodySection, headers["content-transfer-encoding"] ?? "").trim();
   } else {
-    bodyText = bodySection;
+    bodyText = decodeTransfer(bodySection, headers["content-transfer-encoding"] ?? "").trim();
   }
-  bodyText = bodyText.replace(/\)\r\n[A-Z]\d+ OK.*$/s, "").trim();
-  bodyHtml = bodyHtml.replace(/\)\r\n[A-Z]\d+ OK.*$/s, "").trim();
+  return { headers, bodyText, bodyHtml, attachments };
+}
+function parseSummary(uid, response) {
+  const { headers, bodyText, bodyHtml } = parseMessage(response);
+  return {
+    uid,
+    subject: headers["subject"] ?? "",
+    from: headers["from"] ?? "",
+    to: headers["to"] ?? "",
+    date: toIsoDate(headers["date"] ?? ""),
+    snippet: makeSnippet(bodyText, bodyHtml),
+    seen: /\\Seen/i.test(response)
+  };
+}
+function parseFullMessage(uid, response) {
+  const { headers, bodyText, bodyHtml, attachments } = parseMessage(response);
   return {
     uid,
     subject: headers["subject"] ?? "",
     from: headers["from"] ?? "",
     to: headers["to"] ?? "",
     cc: headers["cc"] ?? "",
-    date: headers["date"] ?? "",
+    date: toIsoDate(headers["date"] ?? ""),
     bodyText,
     bodyHtml,
+    attachments,
     headers
   };
 }
@@ -27646,89 +27326,89 @@ var init_messenger = __esm({
         }
         const messageId = `${randomUUID7()}@${this.host}`;
         if (allRecipients.length === 0) {
-          return { success: false, message: "No recipients specified" };
+          return { success: false, message: "No recipients specified", id: null };
         }
         if (!this.fromAddress) {
-          return { success: false, message: "No from address configured" };
+          return { success: false, message: "No from address configured", id: null };
         }
         try {
           let socket;
           if (this.port === 465) {
             socket = tls2.connect({ host: this.host, port: this.port, rejectUnauthorized: tlsRejectUnauthorized() });
-            await new Promise((resolve21, reject) => {
-              socket.once("secureConnect", resolve21);
+            await new Promise((resolve20, reject) => {
+              socket.once("secureConnect", resolve20);
               socket.once("error", reject);
             });
           } else {
             socket = net3.createConnection({ host: this.host, port: this.port });
-            await new Promise((resolve21, reject) => {
-              socket.once("connect", resolve21);
+            await new Promise((resolve20, reject) => {
+              socket.once("connect", resolve20);
               socket.once("error", reject);
             });
           }
           const greeting = await readResponse(socket);
           if (greeting.code !== 220) {
             socket.destroy();
-            return { success: false, message: `SMTP greeting failed: ${greeting.text}` };
+            return { success: false, message: `SMTP greeting failed: ${greeting.text}`, id: null };
           }
           const ehlo = await sendCommand(socket, `EHLO ${this.host}`);
           if (ehlo.code !== 250) {
             socket.destroy();
-            return { success: false, message: `EHLO failed: ${ehlo.text}` };
+            return { success: false, message: `EHLO failed: ${ehlo.text}`, id: null };
           }
           if (this.useTls && this.port !== 465 && ehlo.text.includes("STARTTLS")) {
             const starttls = await sendCommand(socket, "STARTTLS");
             if (starttls.code !== 220) {
               socket.destroy();
-              return { success: false, message: `STARTTLS failed: ${starttls.text}` };
+              return { success: false, message: `STARTTLS failed: ${starttls.text}`, id: null };
             }
             const plainSocket = socket;
             socket = tls2.connect(
               { socket: plainSocket, host: this.host, rejectUnauthorized: tlsRejectUnauthorized() }
             );
-            await new Promise((resolve21, reject) => {
-              socket.once("secureConnect", resolve21);
+            await new Promise((resolve20, reject) => {
+              socket.once("secureConnect", resolve20);
               socket.once("error", reject);
             });
             const ehlo2 = await sendCommand(socket, `EHLO ${this.host}`);
             if (ehlo2.code !== 250) {
               socket.destroy();
-              return { success: false, message: `EHLO after STARTTLS failed: ${ehlo2.text}` };
+              return { success: false, message: `EHLO after STARTTLS failed: ${ehlo2.text}`, id: null };
             }
           }
           if (this.username && this.password) {
             const auth = await sendCommand(socket, "AUTH LOGIN");
             if (auth.code !== 334) {
               socket.destroy();
-              return { success: false, message: `AUTH LOGIN failed: ${auth.text}` };
+              return { success: false, message: `AUTH LOGIN failed: ${auth.text}`, id: null };
             }
             const userResp = await sendCommand(socket, Buffer.from(this.username).toString("base64"));
             if (userResp.code !== 334) {
               socket.destroy();
-              return { success: false, message: `AUTH username failed: ${userResp.text}` };
+              return { success: false, message: `AUTH username failed: ${userResp.text}`, id: null };
             }
             const passResp = await sendCommand(socket, Buffer.from(this.password).toString("base64"));
             if (passResp.code !== 235) {
               socket.destroy();
-              return { success: false, message: `AUTH password failed: ${passResp.text}` };
+              return { success: false, message: `AUTH password failed: ${passResp.text}`, id: null };
             }
           }
           const mailFrom = await sendCommand(socket, `MAIL FROM:<${this.fromAddress}>`);
           if (mailFrom.code !== 250) {
             socket.destroy();
-            return { success: false, message: `MAIL FROM failed: ${mailFrom.text}` };
+            return { success: false, message: `MAIL FROM failed: ${mailFrom.text}`, id: null };
           }
           for (const recipient of allRecipients) {
             const rcpt = await sendCommand(socket, `RCPT TO:<${recipient}>`);
             if (rcpt.code !== 250 && rcpt.code !== 251) {
               socket.destroy();
-              return { success: false, message: `RCPT TO <${recipient}> failed: ${rcpt.text}` };
+              return { success: false, message: `RCPT TO <${recipient}> failed: ${rcpt.text}`, id: null };
             }
           }
           const dataCmd = await sendCommand(socket, "DATA");
           if (dataCmd.code !== 354) {
             socket.destroy();
-            return { success: false, message: `DATA failed: ${dataCmd.text}` };
+            return { success: false, message: `DATA failed: ${dataCmd.text}`, id: null };
           }
           const mimeMessage = buildMimeMessage({
             from: this.fromAddress,
@@ -27747,15 +27427,30 @@ var init_messenger = __esm({
           const endData = await sendCommand(socket, mimeMessage + "\r\n.");
           if (endData.code !== 250) {
             socket.destroy();
-            return { success: false, message: `Message delivery failed: ${endData.text}` };
+            return { success: false, message: `Message delivery failed: ${endData.text}`, id: null };
           }
           await sendCommand(socket, "QUIT");
           socket.destroy();
           return { success: true, message: "Email sent successfully", id: messageId };
         } catch (err) {
           const errMsg = err instanceof Error ? err.message : String(err);
-          return { success: false, message: `SMTP error: ${errMsg}` };
+          return { success: false, message: `SMTP error: ${errMsg}`, id: null };
+        }
+      }
+      /**
+       * Render a Frond template STRING and send it as an HTML email (G7, parity with
+       * Python's send_template). Extra send() options (cc, bcc, replyTo, attachments,
+       * headers) pass through. If the Frond package cannot be loaded the raw template
+       * is sent verbatim (matches Python's ImportError fallback) rather than failing.
+       */
+      async sendTemplate(to, subject, template, data = {}, cc, bcc, replyTo, attachments, headers) {
+        let body = template;
+        try {
+          const { Frond: Frond2 } = await Promise.resolve().then(() => (init_engine(), engine_exports));
+          body = new Frond2().renderString(template, data);
+        } catch {
         }
+        return this.send(to, subject, body, true, void 0, cc, bcc, replyTo, attachments, headers);
       }
       /**
        * Test the SMTP connection without sending an email.
@@ -27765,14 +27460,14 @@ var init_messenger = __esm({
           let socket;
           if (this.port === 465) {
             socket = tls2.connect({ host: this.host, port: this.port, rejectUnauthorized: tlsRejectUnauthorized() });
-            await new Promise((resolve21, reject) => {
-              socket.once("secureConnect", resolve21);
+            await new Promise((resolve20, reject) => {
+              socket.once("secureConnect", resolve20);
               socket.once("error", reject);
             });
           } else {
             socket = net3.createConnection({ host: this.host, port: this.port });
-            await new Promise((resolve21, reject) => {
-              socket.once("connect", resolve21);
+            await new Promise((resolve20, reject) => {
+              socket.once("connect", resolve20);
               socket.once("error", reject);
             });
           }
@@ -27807,14 +27502,14 @@ var init_messenger = __esm({
         const useTls = this.imapEncryption === "tls" || this.imapEncryption === "ssl" || this.imapEncryption === "" && this.imapPort === 993;
         if (useTls) {
           socket = tls2.connect({ host: this.imapHost, port: this.imapPort, rejectUnauthorized: tlsRejectUnauthorized() });
-          await new Promise((resolve21, reject) => {
-            socket.once("secureConnect", resolve21);
+          await new Promise((resolve20, reject) => {
+            socket.once("secureConnect", resolve20);
             socket.once("error", reject);
           });
         } else {
           socket = net3.createConnection({ host: this.imapHost, port: this.imapPort });
-          await new Promise((resolve21, reject) => {
-            socket.once("connect", resolve21);
+          await new Promise((resolve20, reject) => {
+            socket.once("connect", resolve20);
             socket.once("error", reject);
           });
         }
@@ -27851,7 +27546,7 @@ var init_messenger = __esm({
         }
         try {
           await imapCommand(socket, `SELECT ${imapQuote(folder)}`);
-          const searchResp = await imapCommand(socket, "SEARCH ALL");
+          const searchResp = await imapCommand(socket, "UID SEARCH ALL");
           const uids = parseSearchResponse(searchResp);
           if (uids.length === 0) return [];
           uids.reverse();
@@ -27859,8 +27554,8 @@ var init_messenger = __esm({
           if (selected.length === 0) return [];
           const messages = [];
           for (const uid of selected) {
-            const fetchResp = await imapCommand(socket, `FETCH ${uid} (FLAGS BODY.PEEK[HEADER.FIELDS (FROM TO SUBJECT DATE)])`);
-            messages.push(parseHeaderResponse(uid, fetchResp));
+            const fetchResp = await imapCommand(socket, `UID FETCH ${uid} (FLAGS BODY.PEEK[])`);
+            messages.push(parseSummary(uid, fetchResp));
           }
           return messages;
         } catch (err) {
@@ -27870,7 +27565,7 @@ var init_messenger = __esm({
         }
       }
       /**
-       * Read a single message by sequence number or UID.
+       * Read a single message by its IMAP UID.
        */
       async read(uid, folder = "INBOX") {
         let socket;
@@ -27881,11 +27576,11 @@ var init_messenger = __esm({
         }
         try {
           await imapCommand(socket, `SELECT ${imapQuote(folder)}`);
-          const fetchResp = await imapCommand(socket, `FETCH ${uid} (FLAGS BODY[])`);
+          const fetchResp = await imapCommand(socket, `UID FETCH ${uid} (FLAGS BODY[])`);
           if (!/\{\d+\}/.test(fetchResp)) {
             return null;
           }
-          await imapCommand(socket, `STORE ${uid} +FLAGS (\\Seen)`);
+          await imapCommand(socket, `UID STORE ${uid} +FLAGS (\\Seen)`);
           return parseFullMessage(uid, fetchResp);
         } catch (err) {
           throw imapFail("read", err);
@@ -27912,14 +27607,14 @@ var init_messenger = __esm({
         }
         try {
           await imapCommand(socket, `SELECT ${imapQuote(folder)}`);
-          const searchResp = await imapCommand(socket, `SEARCH ${query}`);
+          const searchResp = await imapCommand(socket, `UID SEARCH ${query}`);
           const uids = parseSearchResponse(searchResp);
           if (uids.length === 0) return [];
           uids.reverse();
           const messages = [];
           for (const uid of uids.slice(0, limit)) {
-            const fetchResp = await imapCommand(socket, `FETCH ${uid} (FLAGS BODY.PEEK[HEADER.FIELDS (FROM TO SUBJECT DATE)])`);
-            messages.push(parseHeaderResponse(uid, fetchResp));
+            const fetchResp = await imapCommand(socket, `UID FETCH ${uid} (FLAGS BODY.PEEK[])`);
+            messages.push(parseSummary(uid, fetchResp));
           }
           return messages;
         } catch (err) {
@@ -27929,26 +27624,46 @@ var init_messenger = __esm({
         }
       }
       /**
-       * Delete a message by UID.
+       * Delete a message by UID (mark \Deleted, then EXPUNGE).
+       *
+       * `delete` is the one cross-framework name (python/php/ruby/node all spell it
+       * `delete`). `deleteMessage` remains as a DEPRECATED alias for one release.
        */
-      async deleteMessage(uid, folder = "INBOX") {
+      async delete(uid, folder = "INBOX") {
         const socket = await this.imapConnect();
         try {
           await imapCommand(socket, `SELECT ${imapQuote(folder)}`);
-          await imapCommand(socket, `STORE ${uid} +FLAGS (\\Deleted)`);
+          await imapCommand(socket, `UID STORE ${uid} +FLAGS (\\Deleted)`);
           await imapCommand(socket, "EXPUNGE");
         } finally {
           await this.imapDisconnect(socket);
         }
       }
+      /** @deprecated Use {@link delete} — kept as an alias for one release (G7). */
+      async deleteMessage(uid, folder = "INBOX") {
+        return this.delete(uid, folder);
+      }
       /**
-       * Mark a message as read.
+       * Mark a message as read (+FLAGS \Seen).
        */
       async markRead(uid, folder = "INBOX") {
         const socket = await this.imapConnect();
         try {
           await imapCommand(socket, `SELECT ${imapQuote(folder)}`);
-          await imapCommand(socket, `STORE ${uid} +FLAGS (\\Seen)`);
+          await imapCommand(socket, `UID STORE ${uid} +FLAGS (\\Seen)`);
+        } finally {
+          await this.imapDisconnect(socket);
+        }
+      }
+      /**
+       * Mark a message as unread (-FLAGS \Seen) — the inverse of markRead (G7,
+       * parity with Python's mark_unread).
+       */
+      async markUnread(uid, folder = "INBOX") {
+        const socket = await this.imapConnect();
+        try {
+          await imapCommand(socket, `SELECT ${imapQuote(folder)}`);
+          await imapCommand(socket, `UID STORE ${uid} -FLAGS (\\Seen)`);
         } finally {
           await this.imapDisconnect(socket);
         }
@@ -27965,7 +27680,7 @@ var init_messenger = __esm({
         }
         try {
           await imapCommand(socket, `SELECT ${imapQuote(folder)}`);
-          const searchResp = await imapCommand(socket, "SEARCH UNSEEN");
+          const searchResp = await imapCommand(socket, "UID SEARCH UNSEEN");
           return parseSearchResponse(searchResp).length;
         } catch (err) {
           throw imapFail("unread", err);
@@ -28704,17 +28419,17 @@ var init_htmlElement = __esm({
 });
 
 // ../core/src/ai.ts
-import { existsSync as existsSync25, mkdirSync as mkdirSync15, writeFileSync as writeFileSync15, readFileSync as readFileSync24 } from "node:fs";
+import { existsSync as existsSync24, mkdirSync as mkdirSync14, writeFileSync as writeFileSync14, readFileSync as readFileSync23 } from "node:fs";
 import { homedir } from "node:os";
-import { join as join25, resolve as resolve17, relative as relative10, dirname as dirname11 } from "node:path";
+import { join as join24, resolve as resolve16, relative as relative10, dirname as dirname10 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 import { execSync, execFileSync as execFileSync3 } from "node:child_process";
 import { createInterface } from "node:readline";
 function readVersion() {
   try {
-    const thisDir = dirname11(fileURLToPath6(import.meta.url));
-    const rootPkg = resolve17(thisDir, "..", "..", "..", "package.json");
-    const pkg = JSON.parse(readFileSync24(rootPkg, "utf-8"));
+    const thisDir = dirname10(fileURLToPath6(import.meta.url));
+    const rootPkg = resolve16(thisDir, "..", "..", "..", "package.json");
+    const pkg = JSON.parse(readFileSync23(rootPkg, "utf-8"));
     return pkg.version ?? "0.0.0";
   } catch {
     return "0.0.0";
@@ -28763,8 +28478,8 @@ function downloadSkillsSync(jobs) {
 function installSkills(root = ".", targets) {
   const ref = skillsRef();
   const dests = targets ?? [
-    join25(resolve17(root), ".claude", "skills"),
-    join25(homedir(), ".claude", "skills")
+    join24(resolve16(root), ".claude", "skills"),
+    join24(homedir(), ".claude", "skills")
   ];
   const jobs = [];
   const index = /* @__PURE__ */ new Map();
@@ -28782,9 +28497,9 @@ function installSkills(root = ".", targets) {
     const base = `https://raw.githubusercontent.com/tina4stack/${spec.repo}/${ref}/.claude/skills/${skill}`;
     skillMdUrl[skill] = `${base}/SKILL.md`;
     for (const dest of dests) {
-      add(`${base}/SKILL.md`, join25(dest, skill, "SKILL.md"));
+      add(`${base}/SKILL.md`, join24(dest, skill, "SKILL.md"));
       for (const r of spec.references) {
-        add(`${base}/references/${r}`, join25(dest, skill, "references", r));
+        add(`${base}/references/${r}`, join24(dest, skill, "references", r));
       }
     }
   }
@@ -28796,10 +28511,10 @@ function installSkills(root = ".", targets) {
   return installed;
 }
 function isInstalled(root, tool) {
-  return existsSync25(join25(resolve17(root), tool.contextFile));
+  return existsSync24(join24(resolve16(root), tool.contextFile));
 }
 function showMenu(root = ".") {
-  const r = resolve17(root);
+  const r = resolve16(root);
   console.log("\n  Tina4 AI Context Installer\n");
   for (let i = 0; i < AI_TOOLS.length; i++) {
     const tool = AI_TOOLS[i];
@@ -28817,16 +28532,16 @@ function showMenu(root = ".") {
   const tina4AiMarker = tina4AiInstalled ? `  ${GREEN2}[installed]${RESET2}` : "";
   console.log(`  8. Install tina4-ai tools  (requires Python)${tina4AiMarker}`);
   console.log();
-  return new Promise((resolve21) => {
+  return new Promise((resolve20) => {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     rl.question("  Select (comma-separated, or 'all'): ", (answer) => {
       rl.close();
-      resolve21(answer.trim());
+      resolve20(answer.trim());
     });
   });
 }
 function installSelected(root, selection) {
-  const rootPath = resolve17(root);
+  const rootPath = resolve16(root);
   const created = [];
   let indices;
   let doInstallTina4Ai = false;
@@ -28919,33 +28634,33 @@ function looksLikeOldFrameworkInstall(existing) {
 function writeOrMerge(contextPath, contextFile, frameworkGuide) {
   const block = skillBlock(contextFile);
   const [start2, end] = markersFor(contextFile);
-  if (!existsSync25(contextPath)) {
-    writeFileSync15(contextPath, frameworkGuide.replace(/\s+$/, "") + "\n\n" + block + "\n", "utf-8");
+  if (!existsSync24(contextPath)) {
+    writeFileSync14(contextPath, frameworkGuide.replace(/\s+$/, "") + "\n\n" + block + "\n", "utf-8");
     return "Installed";
   }
-  const existing = readFileSync24(contextPath, "utf-8");
+  const existing = readFileSync23(contextPath, "utf-8");
   if (hasMarkers(existing, start2, end)) {
-    writeFileSync15(contextPath, replaceMarkerBlock(existing, block, start2, end), "utf-8");
+    writeFileSync14(contextPath, replaceMarkerBlock(existing, block, start2, end), "utf-8");
     return "Refreshed skill block in";
   }
   if (looksLikeOldFrameworkInstall(existing)) {
     const head = existing.replace(/^\s+/, "");
     const preamble = existing.slice(0, existing.length - head.length);
     const newContent = (preamble.trim() ? preamble.replace(/\s+$/, "") + "\n\n" : "") + frameworkGuide.replace(/\s+$/, "") + "\n\n" + block + "\n";
-    writeFileSync15(contextPath, newContent, "utf-8");
+    writeFileSync14(contextPath, newContent, "utf-8");
     return "Migrated (replaced old framework dump in)";
   }
-  writeFileSync15(contextPath, existing.replace(/\s+$/, "") + "\n\n" + block + "\n", "utf-8");
+  writeFileSync14(contextPath, existing.replace(/\s+$/, "") + "\n\n" + block + "\n", "utf-8");
   return "Appended skill block to";
 }
 function installForTool(root, tool, context) {
   const created = [];
-  const contextPath = join25(root, tool.contextFile);
+  const contextPath = join24(root, tool.contextFile);
   if (tool.configDir) {
-    mkdirSync15(join25(root, tool.configDir), { recursive: true });
+    mkdirSync14(join24(root, tool.configDir), { recursive: true });
   }
-  const parentDir = dirname11(contextPath);
-  mkdirSync15(parentDir, { recursive: true });
+  const parentDir = dirname10(contextPath);
+  mkdirSync14(parentDir, { recursive: true });
   const action = writeOrMerge(contextPath, tool.contextFile, context);
   const rel = relative10(root, contextPath);
   created.push(rel);
@@ -28980,7 +28695,7 @@ function installTina4Ai() {
 function installClaudeSkills(root) {
   const created = [];
   for (const skill of installSkills(root)) {
-    created.push(join25(".claude", "skills", skill));
+    created.push(join24(".claude", "skills", skill));
     console.log(`  ${GREEN2}\u2713${RESET2} Installed .claude/skills/${skill}  (project + global)`);
   }
   return created;
@@ -29321,11 +29036,11 @@ import { tests, assertEqual, runAll } from "tina4-nodejs";
 }
 function generateClaudeCodeContext() {
   try {
-    const thisDir = dirname11(fileURLToPath6(import.meta.url));
-    const repoRoot = resolve17(thisDir, "..", "..", "..");
-    const claudeMdPath = join25(repoRoot, "CLAUDE.md");
-    if (existsSync25(claudeMdPath)) {
-      return readFileSync24(claudeMdPath, "utf-8");
+    const thisDir = dirname10(fileURLToPath6(import.meta.url));
+    const repoRoot = resolve16(thisDir, "..", "..", "..");
+    const claudeMdPath = join24(repoRoot, "CLAUDE.md");
+    if (existsSync24(claudeMdPath)) {
+      return readFileSync23(claudeMdPath, "utf-8");
     }
   } catch {
   }
@@ -31317,7 +31032,6 @@ __export(src_exports2, {
   RouteRef: () => RouteRef,
   Router: () => Router,
   SafeString: () => SafeString2,
-  ScssCompiler: () => ScssCompiler,
   SecurityHeadersMiddleware: () => SecurityHeadersMiddleware,
   ServiceRunner: () => ServiceRunner,
   Session: () => Session,
@@ -31514,7 +31228,6 @@ var init_src2 = __esm({
     init_session();
     init_i18n();
     init_fakeData();
-    init_scss();
     init_queue();
     init_job();
     init_mqtt();
@@ -32073,8 +31786,8 @@ __export(sqlite_exports, {
   SQLiteAdapter: () => SQLiteAdapter
 });
 import { DatabaseSync as DatabaseSync3 } from "node:sqlite";
-import { mkdirSync as mkdirSync16 } from "node:fs";
-import { dirname as dirname12, isAbsolute as isAbsolute4, join as join26, resolve as resolve18 } from "node:path";
+import { mkdirSync as mkdirSync15 } from "node:fs";
+import { dirname as dirname11, isAbsolute as isAbsolute4, join as join25, resolve as resolve17 } from "node:path";
 function isIdentifier(str) {
   return /^[A-Za-z_][A-Za-z0-9_]*$/.test(str);
 }
@@ -32107,13 +31820,13 @@ function resolveSqlitePath(dbPath) {
   if (dbPath === ":memory:") return dbPath;
   let path8 = dbPath;
   if (!isAbsolute4(path8)) {
-    path8 = join26(process.cwd(), path8);
-    mkdirSync16(dirname12(path8), { recursive: true });
+    path8 = join25(process.cwd(), path8);
+    mkdirSync15(dirname11(path8), { recursive: true });
   } else {
-    const cwd = resolve18(process.cwd());
-    const abs = resolve18(path8);
+    const cwd = resolve17(process.cwd());
+    const abs = resolve17(path8);
     if (abs.startsWith(cwd + "/") || abs === cwd) {
-      mkdirSync16(dirname12(abs), { recursive: true });
+      mkdirSync15(dirname11(abs), { recursive: true });
     }
   }
   return path8;
@@ -32461,7 +32174,7 @@ function withConnectTimeout(attempt, budgetMs, host, port, abandon) {
   const elapsedMs = () => performance.now() - startedAt;
   if (budgetMs === null) return attempt();
   const started = attempt();
-  return new Promise((resolve21, reject) => {
+  return new Promise((resolve20, reject) => {
     let expired = false;
     const timer = setTimeout(() => {
       expired = true;
@@ -32471,7 +32184,7 @@ function withConnectTimeout(attempt, budgetMs, host, port, abandon) {
       (arrived) => {
         clearTimeout(timer);
         if (expired) abandon?.(arrived);
-        else resolve21(arrived);
+        else resolve20(arrived);
       },
       (failure) => {
         clearTimeout(timer);
@@ -33028,10 +32741,10 @@ var init_mysql = __esm({
                 ...timeoutOption
               });
             }
-            return new Promise((resolve21, reject) => {
+            return new Promise((resolve20, reject) => {
               this.connection.connect((err) => {
                 if (err) reject(err);
-                else resolve21();
+                else resolve20();
               });
             });
           },
@@ -33053,10 +32766,10 @@ var init_mysql = __esm({
         }
       }
       queryPromise(sql, params) {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           this.connection.query(sql, params ?? [], (err, results) => {
             if (err) reject(err);
-            else resolve21(results);
+            else resolve20(results);
           });
         });
       }
@@ -33426,11 +33139,11 @@ var init_mssql = __esm({
           };
         }
         await withConnectTimeout(
-          () => new Promise((resolve21, reject) => {
+          () => new Promise((resolve20, reject) => {
             this.connection = new Connection(tediousConfig);
             this.connection.on("connect", (err) => {
               if (err) reject(err);
-              else resolve21();
+              else resolve20();
             });
             this.connection.connect();
           }),
@@ -33475,11 +33188,11 @@ var init_mssql = __esm({
         const tediousModule = requireTedious();
         const Request = tediousModule.Request;
         const TYPES = tediousModule.TYPES;
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           const rows = [];
           const request = new Request(sql, (err, rowCount) => {
             if (err) reject(err);
-            else resolve21({ rows, rowCount });
+            else resolve20({ rows, rowCount });
           });
           if (params) {
             params.forEach((p, i) => {
@@ -33682,8 +33395,8 @@ var init_mssql = __esm({
         throw new Error("Use startTransactionAsync() for MSSQL.");
       }
       async startTransactionAsync() {
-        await new Promise((resolve21, reject) => {
-          this.connection.beginTransaction((err) => err ? reject(err) : resolve21());
+        await new Promise((resolve20, reject) => {
+          this.connection.beginTransaction((err) => err ? reject(err) : resolve20());
         });
         this._inTransaction = true;
       }
@@ -33691,8 +33404,8 @@ var init_mssql = __esm({
         throw new Error("Use commitAsync() for MSSQL.");
       }
       async commitAsync() {
-        await new Promise((resolve21, reject) => {
-          this.connection.commitTransaction((err) => err ? reject(err) : resolve21());
+        await new Promise((resolve20, reject) => {
+          this.connection.commitTransaction((err) => err ? reject(err) : resolve20());
         });
         this._inTransaction = false;
       }
@@ -33700,8 +33413,8 @@ var init_mssql = __esm({
         throw new Error("Use rollbackAsync() for MSSQL.");
       }
       async rollbackAsync() {
-        await new Promise((resolve21, reject) => {
-          this.connection.rollbackTransaction((err) => err ? reject(err) : resolve21());
+        await new Promise((resolve20, reject) => {
+          this.connection.rollbackTransaction((err) => err ? reject(err) : resolve20());
         });
         this._inTransaction = false;
       }
@@ -33971,8 +33684,8 @@ var init_firebird = __esm({
           fbConfig.database = normalizeFirebirdDbIdentifier(fbConfig.database);
         }
         this.db = await withConnectTimeout(
-          () => new Promise((resolve21, reject) => {
-            fb.attach(fbConfig, (err, db) => err ? reject(err) : resolve21(db));
+          () => new Promise((resolve20, reject) => {
+            fb.attach(fbConfig, (err, db) => err ? reject(err) : resolve20(db));
           }),
           connectTimeoutMillis(),
           fbConfig.host,
@@ -34039,20 +33752,20 @@ var init_firebird = __esm({
         return this.transaction ?? this.db;
       }
       queryPromise(sql, params) {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           const translated = this.translateSql(sql);
           this.statementHandle().query(translated, params ?? [], (err, result) => {
             if (err) reject(err);
-            else resolve21(result ?? []);
+            else resolve20(result ?? []);
           });
         });
       }
       executePromise(sql, params) {
-        return new Promise((resolve21, reject) => {
+        return new Promise((resolve20, reject) => {
           const translated = this.translateSql(sql);
           this.statementHandle().execute(translated, params ?? [], (err) => {
             if (err) reject(err);
-            else resolve21();
+            else resolve20();
           });
         });
       }
@@ -34168,12 +33881,12 @@ var init_firebird = __esm({
       }
       async startTransactionAsync() {
         this.ensureConnected();
-        await new Promise((resolve21, reject) => {
+        await new Promise((resolve20, reject) => {
           this.db.transaction(0, (err, transaction) => {
             if (err) reject(err);
             else {
               this.transaction = transaction;
-              resolve21();
+              resolve20();
             }
           });
         });
@@ -34183,12 +33896,12 @@ var init_firebird = __esm({
       }
       async commitAsync() {
         if (!this.transaction) throw new Error("No active transaction to commit.");
-        await new Promise((resolve21, reject) => {
+        await new Promise((resolve20, reject) => {
           this.transaction.commit((err) => {
             if (err) reject(err);
             else {
               this.transaction = null;
-              resolve21();
+              resolve20();
             }
           });
         });
@@ -34198,12 +33911,12 @@ var init_firebird = __esm({
       }
       async rollbackAsync() {
         if (!this.transaction) throw new Error("No active transaction to rollback.");
-        await new Promise((resolve21, reject) => {
+        await new Promise((resolve20, reject) => {
           this.transaction.rollback((err) => {
             if (err) reject(err);
             else {
               this.transaction = null;
-              resolve21();
+              resolve20();
             }
           });
         });
@@ -35264,6 +34977,7 @@ __export(database_exports, {
   getNamedAdapter: () => getNamedAdapter,
   initDatabase: () => initDatabase,
   parseDatabaseUrl: () => parseDatabaseUrl,
+  probeTotal: () => probeTotal,
   resetRequestCaches: () => resetRequestCaches2,
   resolveDbPool: () => resolveDbPool,
   setAdapter: () => setAdapter,
@@ -35317,6 +35031,29 @@ async function adapterCreateTable(adapter, name, columns) {
   if (adapter.createTableAsync) await adapter.createTableAsync(name, columns);
   else adapter.createTable(name, columns);
 }
+async function probeTotal(adapter, sql, params, limit) {
+  if (limit === void 0 || limit <= 0) return void 0;
+  try {
+    const alias = adapter.countSubqueryAlias;
+    const suffix = alias ? ` AS ${alias}` : "";
+    const rows = await adapterFetch(
+      adapter,
+      `SELECT COUNT(*) AS tina4_total FROM (${sql}
+)${suffix}`,
+      params,
+      void 0,
+      void 0,
+      true
+    );
+    const row = Array.isArray(rows) ? rows[0] : void 0;
+    if (!row) return void 0;
+    const value = row["tina4_total"] ?? row["TINA4_TOTAL"] ?? Object.values(row)[0];
+    const n = Number(value);
+    return Number.isFinite(n) ? n : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function extractLastInsertId(result) {
   if (result && typeof result === "object") {
     const r = result;
@@ -35775,65 +35512,13 @@ var init_database = __esm({
         try {
           const rows = await adapterFetch(adapter, sql, params, limit, offset, opts?.noCache);
           this.lastError = null;
-          const total = await this.countProbe(adapter, sql, params, limit);
+          const total = await probeTotal(adapter, sql, params, limit);
           return new DatabaseResult(rows, void 0, total, limit, offset, adapter, sql);
         } catch (e) {
           this.lastError = e?.message ?? String(e);
           throw e;
         }
       }
-      /**
-       * The true row count for `sql`, ignoring the pagination we appended.
-       *
-       * `count` is the TRUE TOTAL for the filter, not the number of rows this page
-       * returned. Node and Ruby used to populate it with `records.length` while
-       * Python and PHP populated it from a probe, so `db.fetch(sql).count` answered
-       * 20 here and 250 there for one query against one table, and every paginated
-       * response built on it under-reported. MEASURED 2026-08-05 on a 250-row table
-       * read with limit=20: Node reported total 20 over 2 pages against Python's
-       * 250 over 13.
-       *
-       * Only probed when a limit was actually applied. With no limit the rows
-       * returned ARE the whole answer for this SQL, so `records.length` is already
-       * the true total and a second round-trip would buy nothing — which is also
-       * what keeps `fetchAll()` at one query.
-       *
-       * BEST EFFORT, and it can never mask a real failure: it runs AFTER the main
-       * query (which has already thrown on bad SQL) and returns undefined on any
-       * error. `undefined` — not 0 — is the miss value, so DatabaseResult falls
-       * back to records.length, a true lower bound. Reporting 0 next to 100 real
-       * records would be the same "states a wrong number authoritatively" defect
-       * this change exists to remove.
-       *
-       * The closing paren goes on its OWN LINE: appended inline, a trailing
-       * `-- comment` in the caller's SQL comments it out and the probe dies with
-       * "incomplete input". Postgres, MySQL and MSSQL additionally require a name
-       * for the derived table; SQLite and Firebird do not, and Firebird rejects
-       * `AS` there — so the alias comes from the adapter, not an assumption.
-       */
-      async countProbe(adapter, sql, params, limit) {
-        if (limit === void 0 || limit <= 0) return void 0;
-        try {
-          const alias = adapter.countSubqueryAlias;
-          const suffix = alias ? ` AS ${alias}` : "";
-          const rows = await adapterFetch(
-            adapter,
-            `SELECT COUNT(*) AS tina4_total FROM (${sql}
-)${suffix}`,
-            params,
-            void 0,
-            void 0,
-            true
-          );
-          const row = Array.isArray(rows) ? rows[0] : void 0;
-          if (!row) return void 0;
-          const value = row["tina4_total"] ?? row["TINA4_TOTAL"] ?? Object.values(row)[0];
-          const n = Number(value);
-          return Number.isFinite(n) ? n : void 0;
-        } catch {
-          return void 0;
-        }
-      }
       /**
        * Fetch a single row or null.
        *
@@ -36519,18 +36204,18 @@ var init_database = __esm({
 });
 
 // src/model.ts
-import { readdirSync as readdirSync18, statSync as statSync17 } from "node:fs";
-import { join as join27, extname as extname8 } from "node:path";
+import { readdirSync as readdirSync17, statSync as statSync17 } from "node:fs";
+import { join as join26, extname as extname8 } from "node:path";
 async function discoverModels(modelsDir) {
   const models = [];
   let files;
   try {
-    files = readdirSync18(modelsDir);
+    files = readdirSync17(modelsDir);
   } catch {
     return models;
   }
   for (const file of files) {
-    const filePath = join27(modelsDir, file);
+    const filePath = join26(modelsDir, file);
     const stat = statSync17(filePath);
     if (!stat.isFile()) continue;
     const ext = extname8(file);
@@ -36545,6 +36230,10 @@ async function discoverModels(modelsDir) {
       }
       const definition = {
         tableName: ModelClass.tableName,
+        // The class name is the type name a generated OpenAPI client wants
+        // (`Item`, not `items`). Carry it so Swagger keys components.schemas by
+        // it. A model exported as `default` keeps its declared class name here.
+        className: typeof ModelClass.name === "string" && ModelClass.name ? ModelClass.name : void 0,
         fields: ModelClass.fields,
         fieldMapping: ModelClass.fieldMapping,
         softDelete: ModelClass.softDelete ?? false,
@@ -36568,8 +36257,8 @@ var init_model = __esm({
 });
 
 // src/migration.ts
-import { existsSync as existsSync26, readdirSync as readdirSync19, readFileSync as readFileSync25, mkdirSync as mkdirSync17, writeFileSync as writeFileSync16 } from "node:fs";
-import { join as join28, resolve as resolve19 } from "node:path";
+import { existsSync as existsSync25, readdirSync as readdirSync18, readFileSync as readFileSync24, mkdirSync as mkdirSync16, writeFileSync as writeFileSync15 } from "node:fs";
+import { join as join27, resolve as resolve18 } from "node:path";
 function unwrapAdapter(db) {
   let cur = db;
   while (cur && cur.constructor?.name === "CachedDatabaseAdapter" && cur.adapter) {
@@ -36877,16 +36566,16 @@ async function rollback(migrationsDir, delimiter2) {
     }
     return rolledBack2;
   }
-  const dir = resolve19(migrationsDir ?? "migrations");
+  const dir = resolve18(migrationsDir ?? "migrations");
   const delim = delimiter2 ?? ";";
   const db = getAdapter();
   const migrations = await getLastBatchMigrations();
   const rolledBack = [];
   for (const migration of migrations) {
     const downFile = `${migration.migration_name}.down.sql`;
-    const downPath = join28(dir, downFile);
-    if (existsSync26(downPath)) {
-      const sqlContent = readFileSync25(downPath, "utf-8").trim();
+    const downPath = join27(dir, downFile);
+    if (existsSync25(downPath)) {
+      const sqlContent = readFileSync24(downPath, "utf-8").trim();
       if (sqlContent) {
         const statements = splitStatements(sqlContent, delim);
         try {
@@ -37046,15 +36735,15 @@ function warnUnprefixedMigrations(files) {
 }
 async function migrate(adapter, options) {
   const db = adapter ?? getAdapter();
-  const dir = resolve19(options?.migrationsDir ?? "migrations");
+  const dir = resolve18(options?.migrationsDir ?? "migrations");
   const delimiter2 = options?.delimiter ?? ";";
   const result = { applied: [], skipped: [], failed: [] };
-  if (!existsSync26(dir)) {
+  if (!existsSync25(dir)) {
     return result;
   }
   await ensureMigrationTableOn(db);
   const files = sortMigrationFiles(
-    readdirSync19(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
+    readdirSync18(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
   );
   if (files.length === 0) return result;
   warnUnprefixedMigrations(files);
@@ -37085,7 +36774,7 @@ async function migrate(adapter, options) {
       result.skipped.push(file);
       continue;
     }
-    const sqlContent = readFileSync25(join28(dir, file), "utf-8").trim();
+    const sqlContent = readFileSync24(join27(dir, file), "utf-8").trim();
     if (!sqlContent) {
       result.skipped.push(file);
       continue;
@@ -37120,21 +36809,21 @@ async function migrate(adapter, options) {
 }
 async function status(adapter, options) {
   const db = adapter ?? getAdapter();
-  const dir = resolve19(options?.migrationsDir ?? "migrations");
+  const dir = resolve18(options?.migrationsDir ?? "migrations");
   const result = { completed: [], pending: [] };
-  if (!existsSync26(dir)) {
+  if (!existsSync25(dir)) {
     return result;
   }
   if (!await adapterTableExists(db, MIGRATION_TABLE)) {
     const files2 = sortMigrationFiles(
-      readdirSync19(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
+      readdirSync18(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
     );
     result.pending = files2;
     return result;
   }
   await ensureMigrationTableOn(db);
   const files = sortMigrationFiles(
-    readdirSync19(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
+    readdirSync18(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
   );
   const appliedNames = /* @__PURE__ */ new Set();
   try {
@@ -37159,12 +36848,18 @@ async function status(adapter, options) {
   return result;
 }
 async function createMigration(description, options) {
-  if (options?.kind === "class") {
+  const kind = (options?.kind ?? "sql").trim().toLowerCase();
+  if (!["sql", "code", "class"].includes(kind)) {
+    throw new Error(
+      `Unknown migration kind "${kind}". Use "sql" (default) or "code" (alias: "class"). An unrecognised kind used to produce a .sql file silently, which is why this now throws.`
+    );
+  }
+  if (kind === "code" || kind === "class") {
     return createClassMigration(description, options);
   }
-  const dir = resolve19(options?.migrationsDir ?? "migrations");
-  if (!existsSync26(dir)) {
-    mkdirSync17(dir, { recursive: true });
+  const dir = resolve18(options?.migrationsDir ?? "migrations");
+  if (!existsSync25(dir)) {
+    mkdirSync16(dir, { recursive: true });
   }
   const safeName = description.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_|_$/g, "");
   const now = /* @__PURE__ */ new Date();
@@ -37178,8 +36873,8 @@ async function createMigration(description, options) {
   ].join("");
   const upFileName = `${timestamp}_${safeName}.sql`;
   const downFileName = `${timestamp}_${safeName}.down.sql`;
-  const upPath = join28(dir, upFileName);
-  const downPath = join28(dir, downFileName);
+  const upPath = join27(dir, upFileName);
+  const downPath = join27(dir, downFileName);
   const upTemplate = `-- Migration: ${description}
 -- Created: ${now.toISOString()}
 
@@ -37188,14 +36883,14 @@ async function createMigration(description, options) {
 -- Created: ${now.toISOString()}
 
 `;
-  writeFileSync16(upPath, upTemplate, "utf-8");
-  writeFileSync16(downPath, downTemplate, "utf-8");
+  writeFileSync15(upPath, upTemplate, "utf-8");
+  writeFileSync15(downPath, downTemplate, "utf-8");
   return { upPath, downPath };
 }
 async function createClassMigration(description, options) {
-  const dir = resolve19(options?.migrationsDir ?? "migrations");
-  if (!existsSync26(dir)) {
-    mkdirSync17(dir, { recursive: true });
+  const dir = resolve18(options?.migrationsDir ?? "migrations");
+  if (!existsSync25(dir)) {
+    mkdirSync16(dir, { recursive: true });
   }
   const safeName = description.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_|_$/g, "");
   const className = description.replace(/[^a-zA-Z0-9 ]+/g, " ").trim().split(/\s+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
@@ -37209,7 +36904,7 @@ async function createClassMigration(description, options) {
     String(now.getSeconds()).padStart(2, "0")
   ].join("");
   const fileName = `${timestamp}_${safeName}.ts`;
-  const filePath = join28(dir, fileName);
+  const filePath = join27(dir, fileName);
   const content = `// Migration: ${description}
 // Created: ${now.toISOString()}
 
@@ -37225,7 +36920,7 @@ export class ${className} {
   }
 }
 `;
-  writeFileSync16(filePath, content, "utf-8");
+  writeFileSync15(filePath, content, "utf-8");
   return filePath;
 }
 var ALTER_ADD_RE, CREATE_TABLE_RE, MIGRATION_TABLE, SMART_QUOTES, SMART_QUOTE_RE, SET_TERM_RE, Migration;
@@ -37286,15 +36981,13 @@ var init_migration = __esm({
        * Scaffold a new migration file.
        *
        * kind="sql"   — creates {timestamp}_{description}.sql + .down.sql (default)
-       * kind="class" — creates {timestamp}_{description}.ts with a TypeScript class template
+       * kind="code"  — creates {timestamp}_{description}.ts with a TypeScript class
+       *                 template. "class" is accepted as a legacy alias.
        *
        * Returns the path to the created up file (or class file).
        */
       async create(description, kind = "sql") {
-        if (kind === "class") {
-          return createClassMigration(description, { migrationsDir: this.dir });
-        }
-        return createMigration(description, { migrationsDir: this.dir });
+        return createMigration(description, { migrationsDir: this.dir, kind });
       }
       /** Return list of completed (applied) migration filenames. */
       async getApplied() {
@@ -37308,10 +37001,10 @@ var init_migration = __esm({
       }
       /** Return sorted list of all migration files on disk (excludes .down.sql). */
       getFiles() {
-        const dir = resolve19(this.dir);
-        if (!existsSync26(dir)) return [];
+        const dir = resolve18(this.dir);
+        if (!existsSync25(dir)) return [];
         return sortMigrationFiles(
-          readdirSync19(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
+          readdirSync18(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
         );
       }
     };
@@ -37537,15 +37230,8 @@ function generateCrudRoutes(models, options = {}) {
         const total = Number(countRow[0]?.total ?? 0);
         const limit = qp.limit ?? 100;
         const page = qp.page ?? 1;
-        res.json({
-          data: rows,
-          meta: {
-            total,
-            page,
-            limit,
-            totalPages: Math.ceil(total / limit)
-          }
-        });
+        const offset = (page - 1) * limit;
+        res.json(new DatabaseResult(rows, void 0, total, limit, offset).toPaginate());
       }
     });
     routes.push({
@@ -37699,6 +37385,7 @@ var init_autoCrud = __esm({
   "src/autoCrud.ts"() {
     "use strict";
     init_database();
+    init_databaseResult();
     init_query();
     init_validation();
     AutoCrud = class _AutoCrud {
@@ -37953,17 +37640,19 @@ var init_queryBuilder = __esm({
         this.ensureDb();
         const sql = this.toSql();
         const allParams = [...this.params, ...this.havingParams];
+        const queryParams = allParams.length > 0 ? allParams : void 0;
         const rows = await adapterFetch(
           this.db,
           sql,
-          allParams.length > 0 ? allParams : void 0,
+          queryParams,
           this.limitVal,
           this.offsetVal
         );
+        const total = await probeTotal(this.db, sql, queryParams, this.limitVal);
         return new DatabaseResult(
           rows,
           void 0,
-          void 0,
+          total,
           this.limitVal,
           this.offsetVal,
           this.db,
@@ -39828,8 +39517,8 @@ var init_seeder = __esm({
 // src/docstore.ts
 import { DatabaseSync as DatabaseSync4 } from "node:sqlite";
 import { randomBytes as randomBytes7 } from "node:crypto";
-import { mkdirSync as mkdirSync18 } from "node:fs";
-import { dirname as dirname13, isAbsolute as isAbsolute5, join as join29 } from "node:path";
+import { mkdirSync as mkdirSync17 } from "node:fs";
+import { dirname as dirname12, isAbsolute as isAbsolute5, join as join28 } from "node:path";
 function iso(d) {
   return d.toISOString();
 }
@@ -40094,8 +39783,8 @@ function resolveStorePath(dbPath) {
   if (dbPath === ":memory:") return dbPath;
   let path8 = dbPath;
   if (!isAbsolute5(path8)) {
-    path8 = join29(process.cwd(), path8);
-    mkdirSync18(dirname13(path8), { recursive: true });
+    path8 = join28(process.cwd(), path8);
+    mkdirSync17(dirname12(path8), { recursive: true });
   }
   return path8;
 }
@@ -40609,8 +40298,8 @@ var init_attachment = __esm({
 
 // src/realtime/storage.ts
 import { randomBytes as randomBytes8 } from "node:crypto";
-import { mkdirSync as mkdirSync19, readFileSync as readFileSync26, writeFileSync as writeFileSync17, unlinkSync as unlinkSync7, statSync as statSync18 } from "node:fs";
-import { resolve as resolve20, sep as sep3 } from "node:path";
+import { mkdirSync as mkdirSync18, readFileSync as readFileSync25, writeFileSync as writeFileSync16, unlinkSync as unlinkSync7, statSync as statSync18 } from "node:fs";
+import { resolve as resolve19, sep as sep3 } from "node:path";
 import { createRequire as createRequire8 } from "node:module";
 function storageKey(filename = "") {
   let ext = "";
@@ -40646,23 +40335,23 @@ var init_storage = __esm({
     LocalStorage = class {
       directory;
       constructor(directory) {
-        this.directory = resolve20(directory || process.env.TINA4_STORAGE_DIR || "data/rt_storage");
-        mkdirSync19(this.directory, { recursive: true });
+        this.directory = resolve19(directory || process.env.TINA4_STORAGE_DIR || "data/rt_storage");
+        mkdirSync18(this.directory, { recursive: true });
       }
       // Resolve inside the root and reject any traversal attempt.
       pathFor(key) {
-        const target = resolve20(this.directory, key);
+        const target = resolve19(this.directory, key);
         if (target !== this.directory && !target.startsWith(this.directory + sep3)) {
           throw new Error(`unsafe storage key: ${JSON.stringify(key)}`);
         }
         return target;
       }
       put(key, data) {
-        writeFileSync17(this.pathFor(key), data);
+        writeFileSync16(this.pathFor(key), data);
       }
       get(key) {
         try {
-          return readFileSync26(this.pathFor(key));
+          return readFileSync25(this.pathFor(key));
         } catch {
           return null;
         }
@@ -41072,7 +40761,6 @@ __export(index_exports, {
   DatabaseUrl: () => DatabaseUrl,
   DocStoreDriverMissing: () => DocStoreDriverMissing,
   FakeData: () => FakeData2,
-  FetchResult: () => FetchResult,
   FirebirdAdapter: () => FirebirdAdapter,
   InvalidId: () => InvalidId,
   LocalStorage: () => LocalStorage,
@@ -41171,7 +40859,6 @@ __export(index_exports, {
 });
 var init_index = __esm({
   "src/index.ts"() {
-    init_types();
     init_databaseResult();
     init_database();
     init_database();
@@ -41212,7 +40899,6 @@ export {
   DatabaseUrl,
   DocStoreDriverMissing,
   FakeData2 as FakeData,
-  FetchResult,
   FirebirdAdapter,
   InvalidId,
   LocalStorage,