tina4-nodejs 3.13.95 → 3.13.96

package/packages/cli/dist/bin.js

@@ -1829,64 +1829,6 @@ var init_middleware = __esm({
   }
 });
 
-// ../orm/src/types.ts
-var FetchResult;
-var init_types = __esm({
-  "../orm/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]();
-      }
-    };
-  }
-});
-
 // ../orm/src/databaseResult.ts
 var DatabaseResult;
 var init_databaseResult = __esm({
@@ -1950,75 +1892,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) */
@@ -3862,7 +3781,7 @@ function withConnectTimeout(attempt, budgetMs, host, port, abandon) {
   const elapsedMs = () => performance.now() - startedAt;
   if (budgetMs === null) return attempt();
   const started = attempt();
-  return new Promise((resolve31, reject) => {
+  return new Promise((resolve30, reject) => {
     let expired = false;
     const timer = setTimeout(() => {
       expired = true;
@@ -3872,7 +3791,7 @@ function withConnectTimeout(attempt, budgetMs, host, port, abandon) {
       (arrived) => {
         clearTimeout(timer);
         if (expired) abandon?.(arrived);
-        else resolve31(arrived);
+        else resolve30(arrived);
       },
       (failure) => {
         clearTimeout(timer);
@@ -4429,10 +4348,10 @@ var init_mysql = __esm({
                 ...timeoutOption
               });
             }
-            return new Promise((resolve31, reject) => {
+            return new Promise((resolve30, reject) => {
               this.connection.connect((err) => {
                 if (err) reject(err);
-                else resolve31();
+                else resolve30();
               });
             });
           },
@@ -4454,10 +4373,10 @@ var init_mysql = __esm({
         }
       }
       queryPromise(sql, params) {
-        return new Promise((resolve31, reject) => {
+        return new Promise((resolve30, reject) => {
           this.connection.query(sql, params ?? [], (err, results) => {
             if (err) reject(err);
-            else resolve31(results);
+            else resolve30(results);
           });
         });
       }
@@ -4827,11 +4746,11 @@ var init_mssql = __esm({
           };
         }
         await withConnectTimeout(
-          () => new Promise((resolve31, reject) => {
+          () => new Promise((resolve30, reject) => {
             this.connection = new Connection(tediousConfig);
             this.connection.on("connect", (err) => {
               if (err) reject(err);
-              else resolve31();
+              else resolve30();
             });
             this.connection.connect();
           }),
@@ -4876,11 +4795,11 @@ var init_mssql = __esm({
         const tediousModule = requireTedious();
         const Request = tediousModule.Request;
         const TYPES = tediousModule.TYPES;
-        return new Promise((resolve31, reject) => {
+        return new Promise((resolve30, reject) => {
           const rows = [];
           const request = new Request(sql, (err, rowCount) => {
             if (err) reject(err);
-            else resolve31({ rows, rowCount });
+            else resolve30({ rows, rowCount });
           });
           if (params) {
             params.forEach((p, i) => {
@@ -5083,8 +5002,8 @@ var init_mssql = __esm({
         throw new Error("Use startTransactionAsync() for MSSQL.");
       }
       async startTransactionAsync() {
-        await new Promise((resolve31, reject) => {
-          this.connection.beginTransaction((err) => err ? reject(err) : resolve31());
+        await new Promise((resolve30, reject) => {
+          this.connection.beginTransaction((err) => err ? reject(err) : resolve30());
         });
         this._inTransaction = true;
       }
@@ -5092,8 +5011,8 @@ var init_mssql = __esm({
         throw new Error("Use commitAsync() for MSSQL.");
       }
       async commitAsync() {
-        await new Promise((resolve31, reject) => {
-          this.connection.commitTransaction((err) => err ? reject(err) : resolve31());
+        await new Promise((resolve30, reject) => {
+          this.connection.commitTransaction((err) => err ? reject(err) : resolve30());
         });
         this._inTransaction = false;
       }
@@ -5101,8 +5020,8 @@ var init_mssql = __esm({
         throw new Error("Use rollbackAsync() for MSSQL.");
       }
       async rollbackAsync() {
-        await new Promise((resolve31, reject) => {
-          this.connection.rollbackTransaction((err) => err ? reject(err) : resolve31());
+        await new Promise((resolve30, reject) => {
+          this.connection.rollbackTransaction((err) => err ? reject(err) : resolve30());
         });
         this._inTransaction = false;
       }
@@ -5372,8 +5291,8 @@ var init_firebird = __esm({
           fbConfig.database = normalizeFirebirdDbIdentifier(fbConfig.database);
         }
         this.db = await withConnectTimeout(
-          () => new Promise((resolve31, reject) => {
-            fb.attach(fbConfig, (err, db) => err ? reject(err) : resolve31(db));
+          () => new Promise((resolve30, reject) => {
+            fb.attach(fbConfig, (err, db) => err ? reject(err) : resolve30(db));
           }),
           connectTimeoutMillis(),
           fbConfig.host,
@@ -5440,20 +5359,20 @@ var init_firebird = __esm({
         return this.transaction ?? this.db;
       }
       queryPromise(sql, params) {
-        return new Promise((resolve31, reject) => {
+        return new Promise((resolve30, reject) => {
           const translated = this.translateSql(sql);
           this.statementHandle().query(translated, params ?? [], (err, result) => {
             if (err) reject(err);
-            else resolve31(result ?? []);
+            else resolve30(result ?? []);
           });
         });
       }
       executePromise(sql, params) {
-        return new Promise((resolve31, reject) => {
+        return new Promise((resolve30, reject) => {
           const translated = this.translateSql(sql);
           this.statementHandle().execute(translated, params ?? [], (err) => {
             if (err) reject(err);
-            else resolve31();
+            else resolve30();
           });
         });
       }
@@ -5569,12 +5488,12 @@ var init_firebird = __esm({
       }
       async startTransactionAsync() {
         this.ensureConnected();
-        await new Promise((resolve31, reject) => {
+        await new Promise((resolve30, reject) => {
           this.db.transaction(0, (err, transaction) => {
             if (err) reject(err);
             else {
               this.transaction = transaction;
-              resolve31();
+              resolve30();
             }
           });
         });
@@ -5584,12 +5503,12 @@ var init_firebird = __esm({
       }
       async commitAsync() {
         if (!this.transaction) throw new Error("No active transaction to commit.");
-        await new Promise((resolve31, reject) => {
+        await new Promise((resolve30, reject) => {
           this.transaction.commit((err) => {
             if (err) reject(err);
             else {
               this.transaction = null;
-              resolve31();
+              resolve30();
             }
           });
         });
@@ -5599,12 +5518,12 @@ var init_firebird = __esm({
       }
       async rollbackAsync() {
         if (!this.transaction) throw new Error("No active transaction to rollback.");
-        await new Promise((resolve31, reject) => {
+        await new Promise((resolve30, reject) => {
           this.transaction.rollback((err) => {
             if (err) reject(err);
             else {
               this.transaction = null;
-              resolve31();
+              resolve30();
             }
           });
         });
@@ -6665,6 +6584,7 @@ __export(database_exports, {
   getNamedAdapter: () => getNamedAdapter,
   initDatabase: () => initDatabase,
   parseDatabaseUrl: () => parseDatabaseUrl,
+  probeTotal: () => probeTotal,
   resetRequestCaches: () => resetRequestCaches,
   resolveDbPool: () => resolveDbPool,
   setAdapter: () => setAdapter,
@@ -6718,6 +6638,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;
@@ -7176,65 +7119,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.
        *
@@ -7946,6 +7837,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,
@@ -8560,7 +8455,13 @@ 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 = resolve4(options?.migrationsDir ?? "migrations");
@@ -8687,15 +8588,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() {
@@ -8938,15 +8837,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({
@@ -9100,6 +8992,7 @@ var init_autoCrud = __esm({
   "../orm/src/autoCrud.ts"() {
     "use strict";
     init_database();
+    init_databaseResult();
     init_query();
     init_validation();
     AutoCrud = class _AutoCrud {
@@ -9354,17 +9247,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,
@@ -12941,7 +12836,6 @@ __export(src_exports, {
   DatabaseUrl: () => DatabaseUrl,
   DocStoreDriverMissing: () => DocStoreDriverMissing,
   FakeData: () => FakeData2,
-  FetchResult: () => FetchResult,
   FirebirdAdapter: () => FirebirdAdapter,
   InvalidId: () => InvalidId,
   LocalStorage: () => LocalStorage,
@@ -13041,7 +12935,6 @@ __export(src_exports, {
 var init_src = __esm({
   "../orm/src/index.ts"() {
     "use strict";
-    init_types();
     init_databaseResult();
     init_database();
     init_database();
@@ -13451,7 +13344,7 @@ ${s}\r
       connect() {
         if (this.connected) return Promise.resolve();
         if (this.connecting) return this.connecting;
-        this.connecting = new Promise((resolve31, reject) => {
+        this.connecting = new Promise((resolve30, reject) => {
           const sock = net.createConnection({ host: this.host, port: this.port });
           sock.setNoDelay(true);
           const onError = (err) => {
@@ -13488,7 +13381,7 @@ ${s}\r
               sock.on("error", (e) => {
                 this.brokenError = e;
               });
-              resolve31();
+              resolve30();
             } catch (e) {
               onError(e);
             }
@@ -13551,12 +13444,12 @@ ${s}\r
       }
       /** Send one command and await its reply (assumes socket is up). */
       raw(args) {
-        return new Promise((resolve31, reject) => {
+        return new Promise((resolve30, reject) => {
           if (!this.sock || this.sock.destroyed) {
             reject(this.brokenError ?? new Error("redis socket not connected"));
             return;
           }
-          this.waiters.push({ resolve: resolve31, reject });
+          this.waiters.push({ resolve: resolve30, reject });
           this.sock.write(_RespClient.encode(args));
         });
       }
@@ -13898,7 +13791,7 @@ ${s}\r
       connect() {
         if (this.connected) return Promise.resolve();
         if (this.connecting) return this.connecting;
-        this.connecting = new Promise((resolve31, reject) => {
+        this.connecting = new Promise((resolve30, reject) => {
           const sock = net.createConnection({ host: this.host, port: this.port });
           sock.setNoDelay(true);
           sock.once("error", (err) => {
@@ -13919,7 +13812,7 @@ ${s}\r
                 p.resolve(this.buffer.toString("utf-8"));
               }
             });
-            resolve31();
+            resolve30();
           });
         });
         return this.connecting;
@@ -13952,13 +13845,13 @@ ${s}\r
       async send(payload, terminator) {
         await this.connect();
         if (!this.sock || this.sock.destroyed) return "";
-        return new Promise((resolve31) => {
+        return new Promise((resolve30) => {
           this.buffer = Buffer.alloc(0);
-          this.pending = { terminator, resolve: resolve31 };
+          this.pending = { terminator, resolve: resolve30 };
           const timer = setTimeout(() => {
-            if (this.pending && this.pending.resolve === resolve31) {
+            if (this.pending && this.pending.resolve === resolve30) {
               this.pending = null;
-              resolve31(this.buffer.toString("utf-8"));
+              resolve30(this.buffer.toString("utf-8"));
             }
           }, 4e3);
           if (timer.unref) timer.unref();
@@ -15484,16 +15377,27 @@ async function parseBody(req2) {
   }
   const contentType = req2.headers["content-type"] ?? "";
   const chunks = [];
-  await new Promise((resolve31, reject) => {
-    req2.on("data", (chunk) => chunks.push(chunk));
-    req2.on("end", resolve31);
+  await new Promise((resolve30, 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) resolve30();
+    });
     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) {
@@ -23327,14 +23231,14 @@ data: ${channel.buffer.shift()}
 `;
               continue;
             }
-            const gotMessage = await new Promise((resolve31) => {
+            const gotMessage = await new Promise((resolve30) => {
               const timer = setTimeout(() => {
                 channel.wake = null;
-                resolve31(false);
+                resolve30(false);
               }, keepaliveMs);
               channel.wake = () => {
                 clearTimeout(timer);
-                resolve31(true);
+                resolve30(true);
               };
             });
             if (!gotMessage) yield `: keep-alive
@@ -25849,7 +25753,7 @@ var init_websocket = __esm({
        * Start the WebSocket server.
        */
       async start() {
-        return new Promise((resolve31, reject) => {
+        return new Promise((resolve30, reject) => {
           this.server = createServer((req2, res) => {
             res.writeHead(426, { "Content-Type": "text/plain" });
             res.end("Upgrade Required");
@@ -25859,7 +25763,7 @@ var init_websocket = __esm({
           });
           this.server.listen(this.port, () => {
             this.startIdleReaper();
-            resolve31();
+            resolve30();
           });
           this.server.on("error", (err) => {
             this.emit("error", err);
@@ -26423,7 +26327,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);
@@ -26446,13 +26350,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;
       }
       /**
@@ -27970,7 +27874,7 @@ var init_queue = __esm({
             const jobs = this.popBatch(resolvedBatchSize);
             if (jobs.length === 0) {
               if (resolvedPollInterval <= 0) break;
-              await new Promise((resolve31) => setTimeout(resolve31, resolvedPollInterval));
+              await new Promise((resolve30) => setTimeout(resolve30, resolvedPollInterval));
               continue;
             }
             yield jobs;
@@ -27980,7 +27884,7 @@ var init_queue = __esm({
             const raw = this.pop();
             if (raw === null) {
               if (resolvedPollInterval <= 0) break;
-              await new Promise((resolve31) => setTimeout(resolve31, resolvedPollInterval));
+              await new Promise((resolve30) => setTimeout(resolve30, resolvedPollInterval));
               continue;
             }
             yield createJob(raw, this);
@@ -32500,23 +32404,23 @@ var init_devAdmin = __esm({
       });
     };
     handleDevAdminJs = async (_req, res) => {
-      const { readFileSync: readFileSync29, existsSync: existsSync37 } = await import("node:fs");
-      const { dirname: dirname16, join: join39, resolve: resolve31 } = await import("node:path");
+      const { readFileSync: readFileSync28, existsSync: existsSync36 } = await import("node:fs");
+      const { dirname: dirname15, join: join38, resolve: resolve30 } = await import("node:path");
       const { fileURLToPath: fileURLToPath9 } = await import("node:url");
-      const dir = dirname16(fileURLToPath9(import.meta.url));
+      const dir = dirname15(fileURLToPath9(import.meta.url));
       const candidates = [
-        join39(dir, "..", "public", "js", "tina4-dev-admin.min.js"),
+        join38(dir, "..", "public", "js", "tina4-dev-admin.min.js"),
         // src/../public/js/
-        join39(dir, "..", "..", "public", "js", "tina4-dev-admin.min.js"),
+        join38(dir, "..", "..", "public", "js", "tina4-dev-admin.min.js"),
         // deeper nesting
-        resolve31(process.cwd(), "node_modules", "tina4-nodejs", "packages", "core", "public", "js", "tina4-dev-admin.min.js"),
-        resolve31(process.cwd(), "public", "js", "tina4-dev-admin.min.js")
+        resolve30(process.cwd(), "node_modules", "tina4-nodejs", "packages", "core", "public", "js", "tina4-dev-admin.min.js"),
+        resolve30(process.cwd(), "public", "js", "tina4-dev-admin.min.js")
         // project public/
       ];
       for (const jsPath of candidates) {
-        if (existsSync37(jsPath)) {
+        if (existsSync36(jsPath)) {
           try {
-            const content = readFileSync29(jsPath, "utf-8");
+            const content = readFileSync28(jsPath, "utf-8");
             res.raw.writeHead(200, { "Content-Type": "application/javascript; charset=utf-8", "Cache-Control": "no-cache" });
             res.raw.end(content);
             return;
@@ -32977,8 +32881,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();
@@ -33011,9 +32919,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();
@@ -33040,11 +32950,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("[...")) {
@@ -33070,19 +32980,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 } }
@@ -33169,6 +33080,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 = [];
@@ -33242,15 +33168,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;
 }
@@ -33272,8 +33218,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)) {
@@ -33283,13 +33233,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" }
+    };
   }
 });
 
@@ -33609,10 +33571,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);
 }
@@ -33884,6 +33865,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") {
@@ -34133,7 +34137,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;
@@ -34349,7 +34355,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: "" };
@@ -34548,8 +34567,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();
@@ -34564,7 +34585,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";
@@ -34617,6 +34638,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",
@@ -34653,6 +34675,7 @@ var init_server = __esm({
     templateCache = null;
     _dispatchFn = null;
     _serverHandle = null;
+    LOOP_WATCHDOG_TICK_MS = 100;
     FALLBACK_STAGES = [
       serveTemplateFallback,
       serveLandingPage,
@@ -34740,433 +34763,6 @@ var init_env = __esm({
   }
 });
 
-// ../core/src/scss.ts
-import { readFileSync as readFileSync23, writeFileSync as writeFileSync17, existsSync as existsSync25, mkdirSync as mkdirSync19, readdirSync as readdirSync18 } from "node:fs";
-import { join as join28, resolve as resolve20, dirname as dirname13 } 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(
-        join28(base, `${name}.scss`),
-        join28(base, `_${name}.scss`),
-        join28(base, name)
-      );
-    }
-    for (const candidate of candidates) {
-      if (existsSync25(candidate) && !imported.has(candidate)) {
-        imported.add(candidate);
-        const fileContent = readFileSync23(candidate, "utf-8");
-        return resolveImports(fileContent, [dirname13(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 = resolve20(filePath);
-        const content = readFileSync23(absPath, "utf-8");
-        const paths = [dirname13(absPath), ...this._importPaths];
-        return compileString(content, paths, { ...this._variables });
-      }
-      /** Add a directory to the import resolution path. */
-      addImportPath(path8) {
-        this._importPaths.push(resolve20(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 = resolve20(scssDir);
-        if (!existsSync25(absDir)) return "";
-        const files = readdirSync18(absDir).filter((f) => f.endsWith(".scss") && !f.startsWith("_")).sort().map((f) => join28(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 = readFileSync23(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 = resolve20(output);
-        const outDir = dirname13(absOutput);
-        if (!existsSync25(outDir)) mkdirSync19(outDir, { recursive: true });
-        let existing = null;
-        try {
-          existing = existsSync25(absOutput) ? readFileSync23(absOutput, "utf-8") : null;
-        } catch {
-          existing = null;
-        }
-        if (existing !== css) {
-          writeFileSync17(absOutput, css, "utf-8");
-        }
-        return css;
-      }
-    };
-    VARIABLE_FLAG = /\s*!(default|global)\s*$/;
-  }
-});
-
 // ../core/src/mqttMessage.ts
 var MqttMessage;
 var init_mqttMessage = __esm({
@@ -35240,7 +34836,7 @@ var init_mqttMessage = __esm({
 import net2 from "node:net";
 import tls from "node:tls";
 import { randomBytes as randomBytes7 } from "node:crypto";
-import { existsSync as existsSync26, readFileSync as readFileSync24 } from "node:fs";
+import { existsSync as existsSync25, readFileSync as readFileSync23 } 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"() {
@@ -35443,7 +35039,7 @@ var init_mqtt = __esm({
        */
       async connect() {
         this.closeSocket();
-        if (this.secure && this.tlsVerify && this.caFile && !existsSync26(this.caFile)) {
+        if (this.secure && this.tlsVerify && this.caFile && !existsSync25(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`
           );
@@ -35680,7 +35276,7 @@ var init_mqtt = __esm({
        * a later client.
        */
       openSocket() {
-        return new Promise((resolve31, reject) => {
+        return new Promise((resolve30, reject) => {
           let settled = false;
           const settle = (fn) => {
             if (settled) return;
@@ -35705,10 +35301,10 @@ var init_mqtt = __esm({
               servername: this.host,
               rejectUnauthorized: this.tlsVerify
             };
-            if (this.tlsVerify && this.caFile) opts.ca = readFileSync24(this.caFile);
-            sock = tls.connect(opts, () => settle(() => resolve31(sock)));
+            if (this.tlsVerify && this.caFile) opts.ca = readFileSync23(this.caFile);
+            sock = tls.connect(opts, () => settle(() => resolve30(sock)));
           } else {
-            sock = net2.createConnection({ host: this.host, port: this.port }, () => settle(() => resolve31(sock)));
+            sock = net2.createConnection({ host: this.host, port: this.port }, () => settle(() => resolve30(sock)));
           }
           sock.once("error", (err) => {
             settle(() => {
@@ -35747,13 +35343,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((resolve31, reject) => {
+        return new Promise((resolve30, reject) => {
           this.socket.write(packet, (err) => {
             if (err) {
               reject(new MqttError(`MQTT write failed: ${err.message}`));
             } else {
               this.lastWriteAt = Date.now();
-              resolve31();
+              resolve30();
             }
           });
         });
@@ -35786,7 +35382,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((resolve31, reject) => {
+        return new Promise((resolve30, reject) => {
           let timer = null;
           if (deadline !== null) {
             const remaining = deadline - Date.now();
@@ -35801,7 +35397,7 @@ var init_mqtt = __esm({
               }
             }, remaining);
           }
-          this.waiter = { need, resolve: resolve31, reject, timer };
+          this.waiter = { need, resolve: resolve30, reject, timer };
           this.serviceWaiter();
         });
       }
@@ -35925,8 +35521,8 @@ var init_mqtt = __esm({
 });
 
 // ../core/src/service.ts
-import { readdirSync as readdirSync19, statSync as statSync18, watchFile, unwatchFile } from "node:fs";
-import { join as join29, extname as extname8 } from "node:path";
+import { readdirSync as readdirSync18, statSync as statSync18, watchFile, unwatchFile } from "node:fs";
+import { join as join28, extname as extname8 } from "node:path";
 import { pathToFileURL } from "node:url";
 function matchCronField(field, value) {
   if (field === "*") return true;
@@ -36092,14 +35688,14 @@ var init_service = __esm({
         const discovered = [];
         let entries;
         try {
-          entries = readdirSync19(dir);
+          entries = readdirSync18(dir);
         } catch {
           return discovered;
         }
         for (const entry of entries) {
           const ext = extname8(entry);
           if (ext !== ".ts" && ext !== ".js") continue;
-          const fullPath = join29(dir, entry);
+          const fullPath = join28(dir, entry);
           const stat = statSync18(fullPath);
           if (!stat.isFile()) continue;
           try {
@@ -36208,14 +35804,14 @@ var init_service = __esm({
         const dir = serviceDir ?? process.env.TINA4_SERVICE_DIR ?? "src/services";
         let entries;
         try {
-          entries = readdirSync19(dir);
+          entries = readdirSync18(dir);
         } catch {
           return;
         }
         for (const entry of entries) {
           const ext = extname8(entry);
           if (ext !== ".ts" && ext !== ".js") continue;
-          const fullPath = join29(dir, entry);
+          const fullPath = join28(dir, entry);
           if (watchedFiles.has(fullPath)) continue;
           watchedFiles.add(fullPath);
           watchFile(fullPath, { interval: 1e3 }, async () => {
@@ -36259,7 +35855,7 @@ import https from "node:https";
 import { URL as URL2 } from "node:url";
 import { randomBytes as randomBytes8 } from "node:crypto";
 import { promises as fsp, createWriteStream } from "node:fs";
-import { basename as basename6 } from "node:path";
+import { basename as basename5 } from "node:path";
 import { pipeline } from "node:stream/promises";
 function sameOrigin(urlA, urlB) {
   try {
@@ -36549,7 +36145,7 @@ var init_api = __esm({
               error: err instanceof Error ? err.message : String(err)
             };
           }
-          uploadName = filename || basename6(filePath);
+          uploadName = filename || basename5(filePath);
         } else {
           return { http_code: null, body: null, headers: {}, error: "upload requires filePath or fileBytes" };
         }
@@ -36764,12 +36360,12 @@ var init_api = __esm({
        * authenticate to.
        */
       performRequest(method, url, headers, data, redirectsLeft) {
-        return new Promise((resolve31) => {
+        return new Promise((resolve30) => {
           let parsed;
           try {
             parsed = new URL2(url);
           } catch (err) {
-            resolve31({ kind: "error", error: err instanceof Error ? err.message : String(err) });
+            resolve30({ kind: "error", error: err instanceof Error ? err.message : String(err) });
             return;
           }
           const isHttps = parsed.protocol === "https:";
@@ -36794,7 +36390,7 @@ var init_api = __esm({
               try {
                 nextUrl = new URL2(location, url).toString();
               } catch {
-                resolve31({ kind: "response", res });
+                resolve30({ kind: "response", res });
                 return;
               }
               const crossOrigin = !sameOrigin(url, nextUrl);
@@ -36812,17 +36408,17 @@ var init_api = __esm({
                   deleteHeaderCaseInsensitive(nextHeaders, name);
                 }
               }
-              this.performRequest(nextMethod, nextUrl, nextHeaders, nextData, redirectsLeft - 1).then(resolve31);
+              this.performRequest(nextMethod, nextUrl, nextHeaders, nextData, redirectsLeft - 1).then(resolve30);
               return;
             }
-            resolve31({ kind: "response", res });
+            resolve30({ kind: "response", res });
           });
           req2.on("timeout", () => {
             req2.destroy();
-            resolve31({ kind: "error", error: `Request timed out after ${this.timeout}s` });
+            resolve30({ kind: "error", error: `Request timed out after ${this.timeout}s` });
           });
           req2.on("error", (err) => {
-            resolve31({ kind: "error", error: err.message });
+            resolve30({ kind: "error", error: err.message });
           });
           if (data) {
             req2.write(data);
@@ -36832,7 +36428,7 @@ var init_api = __esm({
       }
       /** Buffer a response body, parse JSON if possible, and store cookies. */
       readResponse(res) {
-        return new Promise((resolve31) => {
+        return new Promise((resolve30) => {
           const chunks = [];
           res.on("data", (chunk) => {
             chunks.push(chunk);
@@ -36847,7 +36443,7 @@ var init_api = __esm({
             } catch {
               parsed = raw;
             }
-            resolve31({
+            resolve30({
               http_code: res.statusCode ?? null,
               body: parsed,
               headers: respHeaders,
@@ -36855,7 +36451,7 @@ var init_api = __esm({
             });
           });
           res.on("error", (err) => {
-            resolve31({ http_code: null, body: null, headers: {}, error: err.message });
+            resolve30({ http_code: null, body: null, headers: {}, error: err.message });
           });
         });
       }
@@ -36908,14 +36504,14 @@ var init_api = __esm({
 // ../core/src/messenger.ts
 import net3 from "node:net";
 import tls2 from "node:tls";
-import { readFileSync as readFileSync25 } from "node:fs";
-import { basename as basename7 } from "node:path";
+import { readFileSync as readFileSync24 } from "node:fs";
+import { basename as basename6 } 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((resolve31, reject) => {
+  return new Promise((resolve30, reject) => {
     let buffer = "";
     const onData = (chunk) => {
       buffer += chunk.toString("utf-8");
@@ -36927,7 +36523,7 @@ function readResponse(socket) {
         if (line.length >= 4 && line[3] === " ") {
           socket.removeListener("data", onData);
           socket.removeListener("error", onError);
-          resolve31({ code, text: buffer.trim() });
+          resolve30({ code, text: buffer.trim() });
           return;
         }
       }
@@ -36941,10 +36537,10 @@ function readResponse(socket) {
   });
 }
 function sendCommand(socket, command) {
-  return new Promise((resolve31, reject) => {
+  return new Promise((resolve30, reject) => {
     socket.write(command + "\r\n", "utf-8", (err) => {
       if (err) return reject(err);
-      readResponse(socket).then(resolve31, reject);
+      readResponse(socket).then(resolve30, reject);
     });
   });
 }
@@ -37000,8 +36596,8 @@ function buildMimeMessage(options) {
       lines.push(options.body);
     }
     for (const filePath of options.attachments) {
-      const fileName = basename7(filePath);
-      const fileData = readFileSync25(filePath);
+      const fileName = basename6(filePath);
+      const fileData = readFileSync24(filePath);
       const base64Data = fileData.toString("base64");
       lines.push("");
       lines.push(`--${boundary}`);
@@ -37044,7 +36640,7 @@ function imapQuote(s) {
   return '"' + s.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '"';
 }
 function imapReadLine(socket) {
-  return new Promise((resolve31, reject) => {
+  return new Promise((resolve30, reject) => {
     let buffer = "";
     const onData = (chunk) => {
       buffer += chunk.toString("utf-8");
@@ -37052,7 +36648,7 @@ function imapReadLine(socket) {
       if (nlIndex !== -1) {
         socket.removeListener("data", onData);
         socket.removeListener("error", onError);
-        resolve31(buffer);
+        resolve30(buffer);
       }
     };
     const onError = (err) => {
@@ -37064,7 +36660,7 @@ function imapReadLine(socket) {
   });
 }
 function imapCommand(socket, command) {
-  return new Promise((resolve31, reject) => {
+  return new Promise((resolve30, reject) => {
     imapTagCounter++;
     const tag = `T${imapTagCounter}`;
     const fullCommand = `${tag} ${command}\r
@@ -37075,7 +36671,7 @@ function imapCommand(socket, command) {
       if (buffer.includes(`${tag} OK`)) {
         socket.removeListener("data", onData);
         socket.removeListener("error", onError);
-        resolve31(buffer);
+        resolve30(buffer);
         return;
       }
       if (buffer.includes(`${tag} NO`) || buffer.includes(`${tag} BAD`)) {
@@ -37104,91 +36700,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
   };
 }
@@ -37304,89 +36958,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((resolve31, reject) => {
-              socket.once("secureConnect", resolve31);
+            await new Promise((resolve30, reject) => {
+              socket.once("secureConnect", resolve30);
               socket.once("error", reject);
             });
           } else {
             socket = net3.createConnection({ host: this.host, port: this.port });
-            await new Promise((resolve31, reject) => {
-              socket.once("connect", resolve31);
+            await new Promise((resolve30, reject) => {
+              socket.once("connect", resolve30);
               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((resolve31, reject) => {
-              socket.once("secureConnect", resolve31);
+            await new Promise((resolve30, reject) => {
+              socket.once("secureConnect", resolve30);
               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,
@@ -37405,16 +37059,31 @@ 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.
        */
@@ -37423,14 +37092,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((resolve31, reject) => {
-              socket.once("secureConnect", resolve31);
+            await new Promise((resolve30, reject) => {
+              socket.once("secureConnect", resolve30);
               socket.once("error", reject);
             });
           } else {
             socket = net3.createConnection({ host: this.host, port: this.port });
-            await new Promise((resolve31, reject) => {
-              socket.once("connect", resolve31);
+            await new Promise((resolve30, reject) => {
+              socket.once("connect", resolve30);
               socket.once("error", reject);
             });
           }
@@ -37465,14 +37134,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((resolve31, reject) => {
-            socket.once("secureConnect", resolve31);
+          await new Promise((resolve30, reject) => {
+            socket.once("secureConnect", resolve30);
             socket.once("error", reject);
           });
         } else {
           socket = net3.createConnection({ host: this.imapHost, port: this.imapPort });
-          await new Promise((resolve31, reject) => {
-            socket.once("connect", resolve31);
+          await new Promise((resolve30, reject) => {
+            socket.once("connect", resolve30);
             socket.once("error", reject);
           });
         }
@@ -37509,7 +37178,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();
@@ -37517,8 +37186,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) {
@@ -37528,7 +37197,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;
@@ -37539,11 +37208,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);
@@ -37570,14 +37239,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) {
@@ -37587,26 +37256,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);
         }
@@ -37623,7 +37312,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);
@@ -38379,17 +38068,17 @@ __export(ai_exports, {
   skillBlock: () => skillBlock,
   writeOrMerge: () => writeOrMerge
 });
-import { existsSync as existsSync27, mkdirSync as mkdirSync20, writeFileSync as writeFileSync18, readFileSync as readFileSync26 } from "node:fs";
+import { existsSync as existsSync26, mkdirSync as mkdirSync19, writeFileSync as writeFileSync17, readFileSync as readFileSync25 } from "node:fs";
 import { homedir } from "node:os";
-import { join as join30, resolve as resolve21, relative as relative10, dirname as dirname14 } from "node:path";
+import { join as join29, resolve as resolve20, relative as relative10, dirname as dirname13 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 import { execSync as execSync2, execFileSync as execFileSync3 } from "node:child_process";
 import { createInterface } from "node:readline";
 function readVersion() {
   try {
-    const thisDir = dirname14(fileURLToPath7(import.meta.url));
-    const rootPkg = resolve21(thisDir, "..", "..", "..", "package.json");
-    const pkg = JSON.parse(readFileSync26(rootPkg, "utf-8"));
+    const thisDir = dirname13(fileURLToPath7(import.meta.url));
+    const rootPkg = resolve20(thisDir, "..", "..", "..", "package.json");
+    const pkg = JSON.parse(readFileSync25(rootPkg, "utf-8"));
     return pkg.version ?? "0.0.0";
   } catch {
     return "0.0.0";
@@ -38438,8 +38127,8 @@ function downloadSkillsSync(jobs) {
 function installSkills(root = ".", targets) {
   const ref = skillsRef();
   const dests = targets ?? [
-    join30(resolve21(root), ".claude", "skills"),
-    join30(homedir(), ".claude", "skills")
+    join29(resolve20(root), ".claude", "skills"),
+    join29(homedir(), ".claude", "skills")
   ];
   const jobs = [];
   const index = /* @__PURE__ */ new Map();
@@ -38457,9 +38146,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`, join30(dest, skill, "SKILL.md"));
+      add(`${base}/SKILL.md`, join29(dest, skill, "SKILL.md"));
       for (const r of spec.references) {
-        add(`${base}/references/${r}`, join30(dest, skill, "references", r));
+        add(`${base}/references/${r}`, join29(dest, skill, "references", r));
       }
     }
   }
@@ -38471,10 +38160,10 @@ function installSkills(root = ".", targets) {
   return installed;
 }
 function isInstalled(root, tool) {
-  return existsSync27(join30(resolve21(root), tool.contextFile));
+  return existsSync26(join29(resolve20(root), tool.contextFile));
 }
 function showMenu(root = ".") {
-  const r = resolve21(root);
+  const r = resolve20(root);
   console.log("\n  Tina4 AI Context Installer\n");
   for (let i = 0; i < AI_TOOLS.length; i++) {
     const tool = AI_TOOLS[i];
@@ -38492,16 +38181,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((resolve31) => {
+  return new Promise((resolve30) => {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     rl.question("  Select (comma-separated, or 'all'): ", (answer) => {
       rl.close();
-      resolve31(answer.trim());
+      resolve30(answer.trim());
     });
   });
 }
 function installSelected(root, selection) {
-  const rootPath = resolve21(root);
+  const rootPath = resolve20(root);
   const created = [];
   let indices;
   let doInstallTina4Ai = false;
@@ -38594,33 +38283,33 @@ function looksLikeOldFrameworkInstall(existing) {
 function writeOrMerge(contextPath, contextFile, frameworkGuide) {
   const block = skillBlock(contextFile);
   const [start2, end] = markersFor(contextFile);
-  if (!existsSync27(contextPath)) {
-    writeFileSync18(contextPath, frameworkGuide.replace(/\s+$/, "") + "\n\n" + block + "\n", "utf-8");
+  if (!existsSync26(contextPath)) {
+    writeFileSync17(contextPath, frameworkGuide.replace(/\s+$/, "") + "\n\n" + block + "\n", "utf-8");
     return "Installed";
   }
-  const existing = readFileSync26(contextPath, "utf-8");
+  const existing = readFileSync25(contextPath, "utf-8");
   if (hasMarkers(existing, start2, end)) {
-    writeFileSync18(contextPath, replaceMarkerBlock(existing, block, start2, end), "utf-8");
+    writeFileSync17(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";
-    writeFileSync18(contextPath, newContent, "utf-8");
+    writeFileSync17(contextPath, newContent, "utf-8");
     return "Migrated (replaced old framework dump in)";
   }
-  writeFileSync18(contextPath, existing.replace(/\s+$/, "") + "\n\n" + block + "\n", "utf-8");
+  writeFileSync17(contextPath, existing.replace(/\s+$/, "") + "\n\n" + block + "\n", "utf-8");
   return "Appended skill block to";
 }
 function installForTool(root, tool, context) {
   const created = [];
-  const contextPath = join30(root, tool.contextFile);
+  const contextPath = join29(root, tool.contextFile);
   if (tool.configDir) {
-    mkdirSync20(join30(root, tool.configDir), { recursive: true });
+    mkdirSync19(join29(root, tool.configDir), { recursive: true });
   }
-  const parentDir = dirname14(contextPath);
-  mkdirSync20(parentDir, { recursive: true });
+  const parentDir = dirname13(contextPath);
+  mkdirSync19(parentDir, { recursive: true });
   const action = writeOrMerge(contextPath, tool.contextFile, context);
   const rel = relative10(root, contextPath);
   created.push(rel);
@@ -38655,7 +38344,7 @@ function installTina4Ai() {
 function installClaudeSkills(root) {
   const created = [];
   for (const skill of installSkills(root)) {
-    created.push(join30(".claude", "skills", skill));
+    created.push(join29(".claude", "skills", skill));
     console.log(`  ${GREEN2}\u2713${RESET2} Installed .claude/skills/${skill}  (project + global)`);
   }
   return created;
@@ -38996,11 +38685,11 @@ import { tests, assertEqual, runAll } from "tina4-nodejs";
 }
 function generateClaudeCodeContext() {
   try {
-    const thisDir = dirname14(fileURLToPath7(import.meta.url));
-    const repoRoot = resolve21(thisDir, "..", "..", "..");
-    const claudeMdPath = join30(repoRoot, "CLAUDE.md");
-    if (existsSync27(claudeMdPath)) {
-      return readFileSync26(claudeMdPath, "utf-8");
+    const thisDir = dirname13(fileURLToPath7(import.meta.url));
+    const repoRoot = resolve20(thisDir, "..", "..", "..");
+    const claudeMdPath = join29(repoRoot, "CLAUDE.md");
+    if (existsSync26(claudeMdPath)) {
+      return readFileSync25(claudeMdPath, "utf-8");
     }
   } catch {
   }
@@ -40992,7 +40681,6 @@ __export(src_exports3, {
   RouteRef: () => RouteRef,
   Router: () => Router,
   SafeString: () => SafeString2,
-  ScssCompiler: () => ScssCompiler,
   SecurityHeadersMiddleware: () => SecurityHeadersMiddleware,
   ServiceRunner: () => ServiceRunner,
   Session: () => Session,
@@ -41189,7 +40877,6 @@ var init_src3 = __esm({
     init_session();
     init_i18n();
     init_fakeData();
-    init_scss();
     init_queue();
     init_job();
     init_mqtt();
@@ -41464,20 +41151,20 @@ ${cdStep}    npm install
 }
 
 // src/commands/serve.ts
-import { resolve as resolve22 } from "node:path";
-import { existsSync as existsSync28 } from "node:fs";
+import { resolve as resolve21 } from "node:path";
+import { existsSync as existsSync27 } from "node:fs";
 async function serveProject(options) {
   if (options.noReload) {
     process.env.TINA4_NO_RELOAD = "true";
   }
   const port = options.port ?? 7148;
   const cwd = process.cwd();
-  const routesDir = resolve22(cwd, "src/routes");
-  const ormDir = resolve22(cwd, "src/orm");
-  const modelsDir = resolve22(cwd, "src/models");
-  const templatesDir = resolve22(cwd, "src/templates");
-  const staticDir = resolve22(cwd, "public");
-  if (!existsSync28(routesDir) && !existsSync28(modelsDir) && !existsSync28(ormDir)) {
+  const routesDir = resolve21(cwd, "src/routes");
+  const ormDir = resolve21(cwd, "src/orm");
+  const modelsDir = resolve21(cwd, "src/models");
+  const templatesDir = resolve21(cwd, "src/templates");
+  const staticDir = resolve21(cwd, "public");
+  if (!existsSync27(routesDir) && !existsSync27(modelsDir) && !existsSync27(ormDir)) {
     console.error("  Error: Not a Tina4 project. Run this from a project created with 'tina4 init'.");
     process.exit(1);
   }
@@ -41493,12 +41180,12 @@ async function serveProject(options) {
 
 // src/commands/migrate.ts
 init_dotenv();
-import { existsSync as existsSync29, readdirSync as readdirSync20, readFileSync as readFileSync27 } from "node:fs";
-import { join as join31, resolve as resolve23 } from "node:path";
+import { existsSync as existsSync28, readdirSync as readdirSync19, readFileSync as readFileSync26 } from "node:fs";
+import { join as join30, resolve as resolve22 } from "node:path";
 async function runMigrations(migrationDir) {
   loadEnv();
-  const dir = resolve23(migrationDir ?? "migrations");
-  if (!existsSync29(dir)) {
+  const dir = resolve22(migrationDir ?? "migrations");
+  if (!existsSync28(dir)) {
     console.log("  No migrations/ directory found. Nothing to run.");
     return;
   }
@@ -41529,7 +41216,7 @@ async function runMigrations(migrationDir) {
     process.exit(1);
   }
   await ensureMigrationTable2();
-  const files = readdirSync20(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql")).sort((a, b) => {
+  const files = readdirSync19(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql")).sort((a, b) => {
     const aMatch = a.match(/^(\d+)/);
     const bMatch = b.match(/^(\d+)/);
     if (aMatch && bMatch) {
@@ -41551,7 +41238,7 @@ async function runMigrations(migrationDir) {
     if (await isMigrationApplied2(name)) {
       continue;
     }
-    const sql = readFileSync27(join31(dir, file), "utf-8").trim();
+    const sql = readFileSync26(join30(dir, file), "utf-8").trim();
     if (!sql) continue;
     console.log(`  Migrating: ${file}`);
     const adapter = getAdapter2();
@@ -41576,17 +41263,17 @@ async function runMigrations(migrationDir) {
 }
 
 // src/commands/migrateCreate.ts
-import { existsSync as existsSync30, mkdirSync as mkdirSync21, writeFileSync as writeFileSync19 } from "node:fs";
-import { join as join32, resolve as resolve24 } from "node:path";
+import { existsSync as existsSync29, mkdirSync as mkdirSync20, writeFileSync as writeFileSync18 } from "node:fs";
+import { join as join31, resolve as resolve23 } from "node:path";
 async function createMigration2(description) {
   if (!description) {
     console.error("  Usage: tina4 migrate:create <description>");
     console.error('  Example: tina4 migrate:create "create users table"');
     process.exit(1);
   }
-  const dir = resolve24("migrations");
-  if (!existsSync30(dir)) {
-    mkdirSync21(dir, { recursive: true });
+  const dir = resolve23("migrations");
+  if (!existsSync29(dir)) {
+    mkdirSync20(dir, { recursive: true });
   }
   const safeName = description.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_|_$/g, "");
   const now = /* @__PURE__ */ new Date();
@@ -41600,8 +41287,8 @@ async function createMigration2(description) {
   ].join("");
   const upFileName = `${timestamp2}_${safeName}.sql`;
   const downFileName = `${timestamp2}_${safeName}.down.sql`;
-  const upPath = join32(dir, upFileName);
-  const downPath = join32(dir, downFileName);
+  const upPath = join31(dir, upFileName);
+  const downPath = join31(dir, downFileName);
   const upTemplate = `-- Migration: ${description}
 -- Created: ${now.toISOString()}
 
@@ -41610,8 +41297,8 @@ async function createMigration2(description) {
 -- Created: ${now.toISOString()}
 
 `;
-  writeFileSync19(upPath, upTemplate, "utf-8");
-  writeFileSync19(downPath, downTemplate, "utf-8");
+  writeFileSync18(upPath, upTemplate, "utf-8");
+  writeFileSync18(downPath, downTemplate, "utf-8");
   console.log(`  Created migration:  ${upFileName}`);
   console.log(`  Created rollback:   ${downFileName}`);
   console.log(`  Path: ${dir}`);
@@ -41619,10 +41306,10 @@ async function createMigration2(description) {
 
 // src/commands/migrateStatus.ts
 init_dotenv();
-import { resolve as resolve25 } from "node:path";
+import { resolve as resolve24 } from "node:path";
 async function migrateStatus(migrationDir) {
   loadEnv();
-  const dir = resolve25(migrationDir ?? "migrations");
+  const dir = resolve24(migrationDir ?? "migrations");
   let initDatabase2;
   let ensureMigrationTable2;
   let statusFn;
@@ -41667,10 +41354,10 @@ async function migrateStatus(migrationDir) {
 
 // src/commands/migrateRollback.ts
 init_dotenv();
-import { resolve as resolve26 } from "node:path";
+import { resolve as resolve25 } from "node:path";
 async function migrateRollback(migrationDir) {
   loadEnv();
-  const dir = resolve26(migrationDir ?? "migrations");
+  const dir = resolve25(migrationDir ?? "migrations");
   let initDatabase2;
   let ensureMigrationTable2;
   let rollbackFn;
@@ -41710,11 +41397,11 @@ async function migrateRollback(migrationDir) {
 }
 
 // src/commands/routes.ts
-import { existsSync as existsSync31 } from "node:fs";
-import { resolve as resolve27 } from "node:path";
+import { existsSync as existsSync30 } from "node:fs";
+import { resolve as resolve26 } from "node:path";
 async function listRoutes() {
-  const routesDir = resolve27("src/routes");
-  if (!existsSync31(routesDir)) {
+  const routesDir = resolve26("src/routes");
+  if (!existsSync30(routesDir)) {
     console.error("  No src/routes/ directory found. Are you in a Tina4 project?");
     process.exit(1);
   }
@@ -41754,14 +41441,14 @@ async function listRoutes() {
 }
 
 // src/commands/test.ts
-import { existsSync as existsSync32, readdirSync as readdirSync22 } from "node:fs";
-import { resolve as resolve28, join as join33 } from "node:path";
+import { existsSync as existsSync31, readdirSync as readdirSync21 } from "node:fs";
+import { resolve as resolve27, join as join32 } from "node:path";
 import { execSync as execSync3 } from "node:child_process";
 async function runTests(testPath) {
   const cwd = process.cwd();
   if (testPath) {
-    const file = resolve28(testPath);
-    if (!existsSync32(file)) {
+    const file = resolve27(testPath);
+    if (!existsSync31(file)) {
       console.error(`  Error: Test file not found: ${testPath}`);
       process.exit(1);
     }
@@ -41781,14 +41468,14 @@ async function runTests(testPath) {
   ];
   let testFiles = [];
   for (const candidate of candidates) {
-    const fullPath = resolve28(cwd, candidate);
-    if (!existsSync32(fullPath)) continue;
+    const fullPath = resolve27(cwd, candidate);
+    if (!existsSync31(fullPath)) continue;
     if (candidate.endsWith(".ts")) {
       testFiles.push(fullPath);
       break;
     }
     try {
-      const files = readdirSync22(fullPath).filter((f) => f.endsWith(".ts")).map((f) => join33(fullPath, f));
+      const files = readdirSync21(fullPath).filter((f) => f.endsWith(".ts")).map((f) => join32(fullPath, f));
       testFiles.push(...files);
     } catch {
     }
@@ -41817,8 +41504,8 @@ async function runTests(testPath) {
 }
 
 // src/commands/generate.ts
-import { existsSync as existsSync33, mkdirSync as mkdirSync22, writeFileSync as writeFileSync20 } from "node:fs";
-import { join as join34, resolve as resolve29 } from "node:path";
+import { existsSync as existsSync32, mkdirSync as mkdirSync21, writeFileSync as writeFileSync19 } from "node:fs";
+import { join as join33, resolve as resolve28 } from "node:path";
 var FIELD_TYPE_MAP = {
   string: { orm: '"string"', sql: "TEXT", defaultVal: "''" },
   str: { orm: '"string"', sql: "TEXT", defaultVal: "''" },
@@ -41835,16 +41522,16 @@ var FIELD_TYPE_MAP = {
   blob: { orm: '"string"', sql: "BLOB", defaultVal: "NULL" }
 };
 function ensureDir(dir) {
-  if (!existsSync33(dir)) {
-    mkdirSync22(dir, { recursive: true });
+  if (!existsSync32(dir)) {
+    mkdirSync21(dir, { recursive: true });
   }
 }
 function writeFileSafe(path8, content) {
-  if (existsSync33(path8)) {
+  if (existsSync32(path8)) {
     console.log(`  File already exists: ${path8}`);
     return;
   }
-  writeFileSync20(path8, content, "utf-8");
+  writeFileSync19(path8, content, "utf-8");
   console.log(`  Created ${path8}`);
 }
 function toSnake(name) {
@@ -42001,9 +41688,9 @@ async function generate2(what, name, extraArgs = []) {
 function generateModel(name, flags, emitTest = true) {
   const fields = fieldsOrDefault(flags.fields || "");
   const table2 = toTableName(name);
-  const dir = resolve29("src/models");
+  const dir = resolve28("src/models");
   ensureDir(dir);
-  const path8 = join34(dir, `${name}.ts`);
+  const path8 = join33(dir, `${name}.ts`);
   const fieldLines = [
     `    id: { type: "integer" as const, primaryKey: true, autoIncrement: true },`
   ];
@@ -42037,8 +41724,8 @@ function generateRoute(name, flags, emitTest = true) {
   const singular = routePath.endsWith("s") ? routePath.slice(0, -1) : routePath;
   const model = flags.model;
   const isPublic = Boolean(flags.public);
-  const base = resolve29("src/routes/api", routePath);
-  const idDir = join34(base, "[id]");
+  const base = resolve28("src/routes/api", routePath);
+  const idDir = join33(base, "[id]");
   ensureDir(base);
   ensureDir(idDir);
   const table2 = model ? toTableName(model) : "";
@@ -42049,7 +41736,7 @@ function generateRoute(name, flags, emitTest = true) {
   const writeDoc = isPublic ? "Public (--public): no token required." : "Secure by default: requires a Bearer token (use --public to open).";
   if (model) {
     writeFileSafe(
-      join34(base, "get.ts"),
+      join33(base, "get.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 ${modelImportBase}
 export const meta = { summary: "List all ${routePath}", tags: ["${routePath}"] };
@@ -42065,7 +41752,7 @@ export default async function (req: Tina4Request, res: Tina4Response) {
     );
   } else {
     writeFileSafe(
-      join34(base, "get.ts"),
+      join33(base, "get.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 
 export const meta = { summary: "List all ${routePath}", tags: ["${routePath}"] };
@@ -42084,7 +41771,7 @@ ${aiFill(`list_${routePath}`, {
   }
   if (model) {
     writeFileSafe(
-      join34(base, "post.ts"),
+      join33(base, "post.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 ${modelImportBase}${secureOptOut(isPublic)}export const meta = { summary: "Create a new ${singular}", tags: ["${routePath}"] };
 
@@ -42106,7 +41793,7 @@ ${extend(
     );
   } else {
     writeFileSafe(
-      join34(base, "post.ts"),
+      join33(base, "post.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 
 ${secureOptOut(isPublic)}export const meta = { summary: "Create a new ${singular}", tags: ["${routePath}"] };
@@ -42126,7 +41813,7 @@ ${aiFill(`create_${singular}`, {
   }
   if (model) {
     writeFileSafe(
-      join34(idDir, "get.ts"),
+      join33(idDir, "get.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 ${modelImportId}
 export const meta = { summary: "Get a ${singular} by ID", tags: ["${routePath}"] };
@@ -42144,7 +41831,7 @@ export default async function (req: Tina4Request, res: Tina4Response) {
     );
   } else {
     writeFileSafe(
-      join34(idDir, "get.ts"),
+      join33(idDir, "get.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 
 export const meta = { summary: "Get a ${singular} by ID", tags: ["${routePath}"] };
@@ -42163,7 +41850,7 @@ ${aiFill(`get_${singular}`, {
   }
   if (model) {
     writeFileSafe(
-      join34(idDir, "put.ts"),
+      join33(idDir, "put.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 ${modelImportId}${secureOptOut(isPublic)}export const meta = { summary: "Update a ${singular} by ID", tags: ["${routePath}"] };
 
@@ -42191,7 +41878,7 @@ ${extend(
     );
   } else {
     writeFileSafe(
-      join34(idDir, "put.ts"),
+      join33(idDir, "put.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 
 ${secureOptOut(isPublic)}export const meta = { summary: "Update a ${singular} by ID", tags: ["${routePath}"] };
@@ -42211,7 +41898,7 @@ ${aiFill(`update_${singular}`, {
   }
   if (model) {
     writeFileSafe(
-      join34(idDir, "delete.ts"),
+      join33(idDir, "delete.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 ${modelImportId}${secureOptOut(isPublic)}export const meta = { summary: "Delete a ${singular} by ID", tags: ["${routePath}"] };
 
@@ -42230,7 +41917,7 @@ export default async function (req: Tina4Request, res: Tina4Response) {
     );
   } else {
     writeFileSafe(
-      join34(idDir, "delete.ts"),
+      join33(idDir, "delete.ts"),
       `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 
 ${secureOptOut(isPublic)}export const meta = { summary: "Delete a ${singular} by ID", tags: ["${routePath}"] };
@@ -42275,7 +41962,7 @@ function generateCrud(name, flags) {
 }
 function generateMigration(name, flags, fieldsOverride, tableOverride, emitTest = true) {
   const ts = timestamp();
-  const dir = resolve29("migrations");
+  const dir = resolve28("migrations");
   ensureDir(dir);
   let table2;
   if (tableOverride) {
@@ -42287,7 +41974,7 @@ function generateMigration(name, flags, fieldsOverride, tableOverride, emitTest
   const fields = fieldsOverride || parseFields(flags.fields || "");
   const isCreate = name.startsWith("create_") || fieldsOverride !== void 0;
   const fileName = `${ts}_${name}.sql`;
-  const path8 = join34(dir, fileName);
+  const path8 = join33(dir, fileName);
   let upSql;
   let downSql;
   if (isCreate) {
@@ -42319,7 +42006,7 @@ ${upSql}
 ${downSql}
 `;
   writeFileSafe(path8, content);
-  const downPath = join34(dir, `${ts}_${name}.down.sql`);
+  const downPath = join33(dir, `${ts}_${name}.down.sql`);
   const downContent = `-- Rollback: ${name}
 -- Created: ${now}
 
@@ -42330,9 +42017,9 @@ ${downSql}
 }
 function generateMiddleware(name, _flags) {
   const snake = toSnake(name);
-  const dir = resolve29("src/middleware");
+  const dir = resolve28("src/middleware");
   ensureDir(dir);
-  const path8 = join34(dir, `${snake}.ts`);
+  const path8 = join33(dir, `${snake}.ts`);
   const content = `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 
 /**
@@ -42371,9 +42058,9 @@ function generateTest(name, flags) {
   const snake = toSnake(name);
   const singular = snake.endsWith("s") ? snake.slice(0, -1) : snake;
   const model = flags.model;
-  const dir = resolve29("tests");
+  const dir = resolve28("tests");
   ensureDir(dir);
-  const path8 = join34(dir, `${snake}.test.ts`);
+  const path8 = join33(dir, `${snake}.test.ts`);
   if (model && flags["secure-writes"]) {
     const isPublic = Boolean(flags.public);
     const posture = isPublic ? "open (--public)" : "gated";
@@ -42508,9 +42195,9 @@ function generateForm(name, flags) {
     datetime: "datetime-local",
     blob: "file"
   };
-  const dir = resolve29("src/templates/forms");
+  const dir = resolve28("src/templates/forms");
   ensureDir(dir);
-  const path8 = join34(dir, `${table2}.twig`);
+  const path8 = join33(dir, `${table2}.twig`);
   let fieldHtml = "";
   for (const [fname, ftype] of fields) {
     const itype = inputTypes[ftype] || "text";
@@ -42560,9 +42247,9 @@ function generateView(name, flags) {
   const table2 = toTableName(name);
   const routeName = toPlural(table2);
   const cols = fields.map(([f]) => f);
-  const dir = resolve29("src/templates/pages");
+  const dir = resolve28("src/templates/pages");
   ensureDir(dir);
-  const listPath = join34(dir, `${routeName}.twig`);
+  const listPath = join33(dir, `${routeName}.twig`);
   const th = cols.map((c) => `                <th>${c.replace(/_/g, " ").replace(/\b\w/g, (ch) => ch.toUpperCase())}</th>`).join("\n");
   const td = cols.map((c) => `                <td>{{ item.${c} }}</td>`).join("\n");
   const listContent = `{% extends "base.twig" %}
@@ -42598,7 +42285,7 @@ ${td}
 {% endblock %}
 `;
   writeFileSafe(listPath, listContent);
-  const detailPath = join34(dir, `${table2}.twig`);
+  const detailPath = join33(dir, `${table2}.twig`);
   const detailFields = cols.map((c) => `    <div class="mb-3"><strong>${c.replace(/_/g, " ").replace(/\b\w/g, (ch) => ch.toUpperCase())}:</strong> {{ item.${c} }}</div>`).join("\n");
   const detailContent = `{% extends "base.twig" %}
 {% block title %}${name} Detail{% endblock %}
@@ -42620,14 +42307,14 @@ ${detailFields}
 function generateAuth(_flags) {
   console.log("\n  Generating authentication scaffolding...\n");
   generateModel("User", { fields: "email:string,password:string,role:string" }, false);
-  const registerDir = resolve29("src/routes/api/auth/register");
-  const loginDir = resolve29("src/routes/api/auth/login");
-  const meDir = resolve29("src/routes/api/auth/me");
+  const registerDir = resolve28("src/routes/api/auth/register");
+  const loginDir = resolve28("src/routes/api/auth/login");
+  const meDir = resolve28("src/routes/api/auth/me");
   ensureDir(registerDir);
   ensureDir(loginDir);
   ensureDir(meDir);
   writeFileSafe(
-    join34(registerDir, "post.ts"),
+    join33(registerDir, "post.ts"),
     `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 import { hashPassword } from "tina4-nodejs";
 import User from "../../../../models/User.js";
@@ -42658,7 +42345,7 @@ export default async function (req: Tina4Request, res: Tina4Response) {
 `
   );
   writeFileSafe(
-    join34(loginDir, "post.ts"),
+    join33(loginDir, "post.ts"),
     `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 import { checkPassword, getToken } from "tina4-nodejs";
 import User from "../../../../models/User.js";
@@ -42689,7 +42376,7 @@ export default async function (req: Tina4Request, res: Tina4Response) {
 `
   );
   writeFileSafe(
-    join34(meDir, "get.ts"),
+    join33(meDir, "get.ts"),
     `import type { Tina4Request, Tina4Response } from "tina4-nodejs";
 import { authenticateRequest } from "tina4-nodejs";
 
@@ -42705,10 +42392,10 @@ export default async function (req: Tina4Request, res: Tina4Response) {
 }
 `
   );
-  const formsDir = resolve29("src/templates/forms");
+  const formsDir = resolve28("src/templates/forms");
   ensureDir(formsDir);
   writeFileSafe(
-    join34(formsDir, "login.twig"),
+    join33(formsDir, "login.twig"),
     `{% extends "base.twig" %}
 {% block title %}Login{% endblock %}
 {% block content %}
@@ -42732,7 +42419,7 @@ export default async function (req: Tina4Request, res: Tina4Response) {
 `
   );
   writeFileSafe(
-    join34(formsDir, "register.twig"),
+    join33(formsDir, "register.twig"),
     `{% extends "base.twig" %}
 {% block title %}Register{% endblock %}
 {% block content %}
@@ -42766,9 +42453,9 @@ function generateService(name, flags) {
   const snake = toSnake(name);
   const camel = toCamel(toPascal(name)) || snake;
   const cron = flags.cron;
-  const dir = resolve29("src/services");
+  const dir = resolve28("src/services");
   ensureDir(dir);
-  const path8 = join34(dir, `${snake}.ts`);
+  const path8 = join33(dir, `${snake}.ts`);
   let scheduleField;
   let note;
   if (cron && cron !== true) {
@@ -42817,9 +42504,9 @@ function generateQueue(name, _flags) {
   const topic = name.replace(/^\//, "");
   const slug = toSnake(topic.replace(/[^0-9a-zA-Z]+/g, "_")).replace(/^_+|_+$/g, "") || "topic";
   const pascal = toPascal(topic) || "Topic";
-  const dir = resolve29("src/services");
+  const dir = resolve28("src/services");
   ensureDir(dir);
-  const path8 = join34(dir, `${slug}_consumer.ts`);
+  const path8 = join33(dir, `${slug}_consumer.ts`);
   const body = aiFill(`handle${pascal}`, {
     intent: `process ONE ${topic} job payload`,
     given: "payload -> the produced job data (job.payload)",
@@ -42877,9 +42564,9 @@ export default {
   emitQueueTest(topic, slug, pascal);
 }
 function generateValidator(name, _flags) {
-  const dir = resolve29("src/validators");
+  const dir = resolve28("src/validators");
   ensureDir(dir);
-  const path8 = join34(dir, `${toSnake(name)}.ts`);
+  const path8 = join33(dir, `${toSnake(name)}.ts`);
   const rules = extend(
     "add / adjust the validation rules for this payload",
     `e.g. .email("email").minLength("name", 2).integer("age"); ground: tina4_context("validate request body with Validator", "nodejs")`
@@ -42904,9 +42591,9 @@ ${rules}  validator.required("name");   // starter rule (matches the model's def
 }
 function generateSeeder(name, _flags) {
   const table2 = toTableName(name);
-  const dir = resolve29("src/seeds");
+  const dir = resolve28("src/seeds");
   ensureDir(dir);
-  const path8 = join34(dir, `${table2}_seeder.ts`);
+  const path8 = join33(dir, `${table2}_seeder.ts`);
   const overrides = extend(
     "override fields that need a specific shape (seedOrm auto-fills the rest)",
     `e.g. return { email: (f) => f.email(), status: "active" }; ground: tina4_context("seed ORM model with FakeData", "nodejs")`
@@ -42948,9 +42635,9 @@ function generateWebsocket(name, _flags) {
   let slug = toSnake(raw.replace(/^\/+|\/+$/g, "").replace(/[^0-9a-zA-Z]+/g, "_")).replace(/^_+|_+$/g, "") || "ws";
   const base = slug.startsWith("ws_") ? slug.slice(3) : slug;
   const handlerName = `${toCamel(toPascal(base))}Ws`;
-  const dir = resolve29("src/routes");
+  const dir = resolve28("src/routes");
   ensureDir(dir);
-  const path8 = join34(dir, `ws_${base}.ts`);
+  const path8 = join33(dir, `ws_${base}.ts`);
   const body = aiFill(handlerName, {
     intent: `handle an inbound "message" frame on ${wsPath}`,
     given: "data -> the message payload (string); connection -> WebSocketConnection",
@@ -42997,9 +42684,9 @@ function generateListener(name, _flags) {
   const event = name.trim();
   const slug = toSnake(event.replace(/[^0-9a-zA-Z]+/g, "_")).replace(/^_+|_+$/g, "") || "event";
   const handlerName = `on${toPascal(slug)}`;
-  const dir = resolve29("src/listeners");
+  const dir = resolve28("src/listeners");
   ensureDir(dir);
-  const path8 = join34(dir, `${slug}.ts`);
+  const path8 = join33(dir, `${slug}.ts`);
   const body = aiFill(handlerName, {
     intent: `react to the '${event}' event`,
     given: `args -> whatever Events.emit("${event}", ...args) passed`,
@@ -43028,9 +42715,9 @@ Events.on("${event}", ${handlerName});
   emitListenerTest(event, slug);
 }
 function writeTest(testName, content) {
-  const dir = resolve29("tests");
+  const dir = resolve28("tests");
   ensureDir(dir);
-  writeFileSafe(join34(dir, `${testName}.test.ts`), content);
+  writeFileSafe(join33(dir, `${testName}.test.ts`), content);
 }
 function standaloneTest(doc, body) {
   return `${doc}
@@ -43414,15 +43101,15 @@ assert("DOWN drops the ${table2} table", db.tableExists("${table2}") === false);
 }
 
 // src/commands/seed.ts
-import { existsSync as existsSync34, readdirSync as readdirSync23 } from "node:fs";
-import { resolve as resolve30, join as join35 } from "node:path";
+import { existsSync as existsSync33, readdirSync as readdirSync22 } from "node:fs";
+import { resolve as resolve29, join as join34 } from "node:path";
 import { execSync as execSync4 } from "node:child_process";
 async function runSeeds(seedPath) {
   const cwd = process.cwd();
-  const seedDir = resolve30(cwd, "src/seeds");
+  const seedDir = resolve29(cwd, "src/seeds");
   if (seedPath) {
-    const file = resolve30(seedPath);
-    if (!existsSync34(file)) {
+    const file = resolve29(seedPath);
+    if (!existsSync33(file)) {
       console.error(`  Error: Seed file not found: ${seedPath}`);
       process.exit(1);
     }
@@ -43435,14 +43122,14 @@ async function runSeeds(seedPath) {
     }
     return;
   }
-  if (!existsSync34(seedDir)) {
+  if (!existsSync33(seedDir)) {
     console.log("  No seeds directory found.");
     console.log("  Create seed files in src/seeds/ (e.g. src/seeds/001-users.ts)");
     return;
   }
   let seedFiles;
   try {
-    seedFiles = readdirSync23(seedDir).filter((f) => f.endsWith(".ts")).sort().map((f) => join35(seedDir, f));
+    seedFiles = readdirSync22(seedDir).filter((f) => f.endsWith(".ts")).sort().map((f) => join34(seedDir, f));
   } catch {
     console.log("  Could not read src/seeds/ directory.");
     return;
@@ -43580,8 +43267,8 @@ function runMetrics(args = []) {
 // src/commands/queue.ts
 init_dotenv();
 init_queue();
-import { readdirSync as readdirSync24, statSync as statSync19 } from "node:fs";
-import { extname as extname9, join as join36 } from "node:path";
+import { readdirSync as readdirSync23, statSync as statSync19 } from "node:fs";
+import { extname as extname9, join as join35 } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 var BOOLEAN_FLAGS = /* @__PURE__ */ new Set(["once", "json"]);
 function parseFlags2(args) {
@@ -43613,7 +43300,7 @@ async function resolveQueueHandler(servicesDir, topic) {
   let entries;
   try {
     if (!statSync19(servicesDir).isDirectory()) return null;
-    entries = readdirSync24(servicesDir);
+    entries = readdirSync23(servicesDir);
   } catch {
     return null;
   }
@@ -43621,7 +43308,7 @@ async function resolveQueueHandler(servicesDir, topic) {
     if (entry.startsWith("_")) continue;
     const ext = extname9(entry);
     if (ext !== ".ts" && ext !== ".js") continue;
-    const fullPath = join36(servicesDir, entry);
+    const fullPath = join35(servicesDir, entry);
     try {
       if (!statSync19(fullPath).isFile()) continue;
       const mod = await import(pathToFileURL2(fullPath).href);
@@ -43773,8 +43460,8 @@ async function queueCommand(args = []) {
 }
 
 // src/commands/build.ts
-import { accessSync as accessSync2, constants as constants2, existsSync as existsSync35, statSync as statSync20 } from "node:fs";
-import { basename as basename8, delimiter as delimiter2, join as join37 } from "node:path";
+import { accessSync as accessSync2, constants as constants2, existsSync as existsSync34, statSync as statSync20 } from "node:fs";
+import { basename as basename7, delimiter as delimiter2, join as join36 } from "node:path";
 import { spawnSync as spawnSync3 } from "node:child_process";
 function parseFlags3(args) {
   const flags = {};
@@ -43803,7 +43490,7 @@ function whichDocker() {
   for (const dir of pathValue.split(delimiter2)) {
     if (!dir) continue;
     for (const ext of exts) {
-      const candidate = join37(dir, `docker${ext}`);
+      const candidate = join36(dir, `docker${ext}`);
       try {
         accessSync2(candidate, constants2.X_OK);
         if (statSync20(candidate).isFile()) return candidate;
@@ -43817,11 +43504,11 @@ function buildImage(args) {
   const flags = parseFlags3(args);
   let tag = typeof flags.tag === "string" ? flags.tag : "";
   if (!tag) {
-    const dirName = basename8(process.cwd()).toLowerCase();
+    const dirName = basename7(process.cwd()).toLowerCase();
     tag = `${dirName || "tina4app"}:latest`;
   }
   const dockerfile = typeof flags.file === "string" && flags.file ? flags.file : "Dockerfile";
-  if (!existsSync35(dockerfile) || !statSync20(dockerfile).isFile()) {
+  if (!existsSync34(dockerfile) || !statSync20(dockerfile).isFile()) {
     console.log(`  \u2717 No ${dockerfile} found.`);
     console.log("  A Tina4 app deploys as a container. Scaffold a Dockerfile first:");
     console.log("      tina4 deploy docker        (or: tina4nodejs init)");
@@ -43849,30 +43536,30 @@ function buildImage(args) {
 
 // src/bin.ts
 import { execSync as execSync5, spawnSync as spawnSync4 } from "node:child_process";
-import { existsSync as existsSync36, readFileSync as readFileSync28, statSync as statSync21 } from "node:fs";
-import { delimiter as delimiter3, dirname as dirname15, join as join38 } from "node:path";
+import { existsSync as existsSync35, readFileSync as readFileSync27, statSync as statSync21 } from "node:fs";
+import { delimiter as delimiter3, dirname as dirname14, join as join37 } from "node:path";
 import { fileURLToPath as fileURLToPath8, pathToFileURL as pathToFileURL3 } from "node:url";
 function readCliVersion() {
-  let dir = dirname15(fileURLToPath8(import.meta.url));
+  let dir = dirname14(fileURLToPath8(import.meta.url));
   for (let i = 0; i < 6; i++) {
-    const pkgPath = join38(dir, "package.json");
-    if (existsSync36(pkgPath)) {
+    const pkgPath = join37(dir, "package.json");
+    if (existsSync35(pkgPath)) {
       try {
-        const pkg = JSON.parse(readFileSync28(pkgPath, "utf-8"));
+        const pkg = JSON.parse(readFileSync27(pkgPath, "utf-8"));
         if (typeof pkg.version === "string" && pkg.version) return pkg.version;
       } catch {
       }
     }
-    const parent = dirname15(dir);
+    const parent = dirname14(dir);
     if (parent === dir) break;
     dir = parent;
   }
   return "0.0.0";
 }
 function inContainer() {
-  if (existsSync36("/.dockerenv") || existsSync36("/run/.containerenv")) return true;
+  if (existsSync35("/.dockerenv") || existsSync35("/run/.containerenv")) return true;
   try {
-    const blob = readFileSync28("/proc/1/cgroup", "utf-8");
+    const blob = readFileSync27("/proc/1/cgroup", "utf-8");
     return blob.includes("docker") || blob.includes("containerd") || blob.includes("kubepods");
   } catch {
     return false;
@@ -44017,7 +43704,7 @@ async function openConsole() {
   r.context.Database = Database2;
   r.context.Log = Log2;
   r.context.db = db;
-  await new Promise((resolve31) => r.on("exit", resolve31));
+  await new Promise((resolve30) => r.on("exit", resolve30));
 }
 async function installAiContext(args) {
   const { showMenu: showMenu2, installSelected: installSelected2, installAll: installAll2 } = await Promise.resolve().then(() => (init_ai(), ai_exports));
@@ -44175,7 +43862,7 @@ function findClient() {
   for (const dir of (process.env.PATH ?? "").split(delimiter3)) {
     if (!dir) continue;
     for (const name of names) {
-      const candidate = join38(dir, name);
+      const candidate = join37(dir, name);
       try {
         if (statSync21(candidate).isFile()) return candidate;
       } catch {