tina4-nodejs 3.13.148 → 3.13.149

package/packages/orm/dist/index.js

@@ -1467,7 +1467,10 @@ var init_sqlTranslator = __esm({
       static appendLimit(sql, limit, offset) {
         if (limit === void 0 || limit === null || limit <= 0) return sql;
         if (_SQLTranslator.hasTrailingLimit(sql)) return sql;
-        const trimmed = sql.replace(/[\s;]+$/, "");
+        const trailing = " 	\n\r\f\v;";
+        let end = sql.length;
+        while (end > 0 && trailing.includes(sql[end - 1])) end--;
+        const trimmed = sql.slice(0, end);
         const suffix = offset !== void 0 && offset > 0 ? `LIMIT ${limit} OFFSET ${offset}` : `LIMIT ${limit}`;
         return `${trimmed}
 ${suffix}`;
@@ -2791,11 +2794,11 @@ function getToken(payload, secretOrExpiresIn, expiresIn = 60, algorithm) {
   if (resolvedExpiresIn !== 0) {
     claims.exp = now + resolvedExpiresIn * 60;
   }
-  const h = base64urlEncode(Buffer.from(JSON.stringify(header)));
+  const h2 = base64urlEncode(Buffer.from(JSON.stringify(header)));
   const p = base64urlEncode(Buffer.from(JSON.stringify(claims)));
-  const signingInput = `${h}.${p}`;
+  const signingInput = `${h2}.${p}`;
   const signature = sign(signingInput, resolvedSecret, resolvedAlgorithm);
-  return `${h}.${p}.${signature}`;
+  return `${h2}.${p}.${signature}`;
 }
 function validToken(token, secret, algorithm) {
   const resolvedSecret = secret ?? process.env.TINA4_SECRET ?? "";
@@ -2806,8 +2809,8 @@ function validToken(token, secret, algorithm) {
   try {
     const parts = token.split(".");
     if (parts.length !== 3) return null;
-    const [h, p, sig] = parts;
-    const header = JSON.parse(base64urlDecode(h).toString());
+    const [h2, p, sig] = parts;
+    const header = JSON.parse(base64urlDecode(h2).toString());
     if (header.alg !== resolvedAlgorithm) return null;
     if (HMAC_DIGESTS.has(resolvedAlgorithm)) {
       const weak = insecureSecretMessage(resolvedSecret);
@@ -2816,7 +2819,7 @@ function validToken(token, secret, algorithm) {
         return null;
       }
     }
-    const signingInput = `${h}.${p}`;
+    const signingInput = `${h2}.${p}`;
     if (!verifySignature(signingInput, sig, resolvedSecret, resolvedAlgorithm)) {
       return null;
     }
@@ -4593,7 +4596,7 @@ function any(path10, handler, middlewares, meta) {
 function websocket(path10, handler, options) {
   return defaultRouter.websocket(path10, handler, options);
 }
-var WsRouteRef, RouteRef, Router, RouteGroup, defaultRouter;
+var WsRouteRef, RouteRef, Router, RouteGroup, TINA4_DEFAULT_ROUTER, globalRouterHost, defaultRouter;
 var init_router = __esm({
   "../core/src/router.ts"() {
     "use strict";
@@ -5230,7 +5233,9 @@ var init_router = __esm({
         callback(nestedGroup);
       }
     };
-    defaultRouter = new Router();
+    TINA4_DEFAULT_ROUTER = /* @__PURE__ */ Symbol.for("tina4.defaultRouter");
+    globalRouterHost = globalThis;
+    defaultRouter = globalRouterHost[TINA4_DEFAULT_ROUTER] ?? (globalRouterHost[TINA4_DEFAULT_ROUTER] = new Router());
   }
 });
 
@@ -5480,6 +5485,7 @@ __export(engine_exports, {
   Frond: () => Frond,
   MEMO_CACHE_MAX: () => MEMO_CACHE_MAX,
   TEMPLATE_CACHE_MAX: () => TEMPLATE_CACHE_MAX,
+  escapeHtml: () => escapeHtml,
   expressionFormCache: () => expressionFormCache,
   filterChainCache: () => filterChainCache,
   pathParseCache: () => pathParseCache,
@@ -6404,6 +6410,9 @@ function splitArgs(raw) {
 function htmlEscape(str) {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#x27;");
 }
+function escapeHtml(value) {
+  return htmlEscape(String(value));
+}
 function jsEscape(value) {
   let out = "";
   for (const ch of String(value)) {
@@ -6580,11 +6589,11 @@ function _buildFormTokenJwt(descriptor = "") {
   if (_formTokenSessionId) {
     payload.session_id = _formTokenSessionId;
   }
-  const h = _b64url(Buffer.from(JSON.stringify(header)));
+  const h2 = _b64url(Buffer.from(JSON.stringify(header)));
   const p = _b64url(Buffer.from(JSON.stringify(payload)));
-  const sigInput = `${h}.${p}`;
+  const sigInput = `${h2}.${p}`;
   const sig = _b64url(createHmac2("sha256", secret).update(sigInput).digest());
-  return `${h}.${p}.${sig}`;
+  return `${h2}.${p}.${sig}`;
 }
 function _generateFormToken(descriptor = "") {
   const token = _buildFormTokenJwt(descriptor);
@@ -13827,8 +13836,9 @@ __export(generate_exports, {
   toSnake: () => toSnake,
   toTableName: () => toTableName
 });
-import { existsSync as existsSync13, mkdirSync as mkdirSync8, writeFileSync as writeFileSync7 } from "node:fs";
-import { join as join15, relative as relative2, resolve as resolve6, sep as sep3 } from "node:path";
+import { existsSync as existsSync13, mkdirSync as mkdirSync8, writeFileSync as writeFileSync7, readdirSync as readdirSync6, copyFileSync } from "node:fs";
+import { join as join15, relative as relative2, resolve as resolve6, sep as sep3, dirname as dirname7 } from "node:path";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
 function ensureDir(dir) {
   if (__resolution.dryRun) return;
   if (!existsSync13(dir)) {
@@ -13911,7 +13921,7 @@ function currentResolution() {
     transformations: [...__resolution.body.transformations]
   };
   if (__resolution.body.edit_hints) {
-    body.edit_hints = __resolution.body.edit_hints.map((h) => ({ ...h }));
+    body.edit_hints = __resolution.body.edit_hints.map((h2) => ({ ...h2 }));
   }
   if (__resolution.body.next) {
     body.next = [...__resolution.body.next];
@@ -14437,23 +14447,144 @@ ${aiFill(`delete_${singular}`, {
 }
 function generateCrud(name, flags) {
   const table2 = resolveTable(name, flags, { announce: false });
-  const routeName = pluralizeReserved(toSnake(name));
   const isPublic = Boolean(flags.public);
   if (!__resolution.jsonMode) console.log(`
   Generating CRUD for ${name}...
 `);
   generateModel(name, flags, false);
-  generateRoute(routeName, { ...flags, model: name }, false);
-  generateForm(name, flags);
-  generateView(name, flags);
-  generateTest(routeName, { model: name, "secure-writes": true, public: isPublic });
+  generateCrudAdminRoute(name, table2, isPublic);
+  if (!flags["no-templates"]) copyCrudTemplates();
+  generateCrudGateTest(name, table2, isPublic);
   if (!__resolution.jsonMode) {
     console.log(`
   CRUD generation complete for ${name}.`);
     console.log("  Run: tina4nodejs migrate");
-    console.log("  Visit: /swagger to see the API docs");
+    console.log(`  Visit: /admin/${table2} for the admin UI, or /swagger for the API docs`);
+  }
+}
+function generateCrudAdminRoute(model, table2, isPublic) {
+  const dir = resolve6("src/routes/admin", table2);
+  ensureDir(dir);
+  pushRoute(`/admin/${table2}`);
+  if (__resolution.target === "crud") {
+    setResolutionField("file_path", `src/routes/admin/${table2}/get.ts`);
+  }
+  const secureExport = isPublic ? "" : "export const secure = true;\n\n";
+  const publicOpt = isPublic ? ", public: true" : "";
+  const writeDoc = isPublic ? "--public: the admin page and the writes are OPEN (no token)." : "Secure by default: the admin page AND the writes require a valid Bearer token (pass --public to open them).";
+  const pageDoc = isPublic ? "" : `
+// NOTE: the admin page is secured (export const secure = true). A browser needs a valid
+// token/session to open it; wire your login (Auth / Session) or run
+// \`generate crud ${model} --public\` for an open page. The AutoCrud READ API
+// (GET /api/${table2}, GET /api/${table2}/{id}) stays public by AutoCrud's default.`;
+  const content = `import ${model} from "../../../models/${model}.js";
+import { Crud } from "tina4-nodejs/orm";
+import type { Tina4Request, Tina4Response } from "tina4-nodejs";
+
+// ${model} admin \u2014 one server-rendered CRUD page (searchable, sortable,
+// paginated table + create/edit/delete modals). The REST backend (GET list,
+// GET/{id}, POST, PUT, DELETE) is AutoCrud; this file owns only the GET admin
+// page. ${writeDoc}${pageDoc}
+//
+// Restyle the UI by editing src/templates/crud/*.twig (copied into this app).
+// Register the AutoCrud backend for the model at load (idempotent).
+await Crud.registerBackend(${model}, { public: ${isPublic} });
+
+${secureExport}export const meta = { summary: "${model} admin", tags: ["admin"] };
+
+export default async function (req: Tina4Request, res: Tina4Response) {
+  return res.html(await Crud.toCrud(req, { model: ${model}, title: "${model} Admin"${publicOpt} }));
+}
+`;
+  writeFileSafe(join15(dir, "get.ts"), content);
+}
+function frameworkCrudTemplatesDir() {
+  const here = dirname7(fileURLToPath4(import.meta.url));
+  const candidates = [
+    resolve6(here, "../../../core/templates/crud"),
+    // monorepo: packages/cli/src/commands -> packages/core/templates/crud
+    resolve6(here, "../../core/templates/crud"),
+    // built layout fallback
+    resolve6(here, "../templates/crud")
+    // flattened publish fallback
+  ];
+  return candidates.find((c) => existsSync13(c)) ?? null;
+}
+function copyCrudTemplates() {
+  const sourceDir = frameworkCrudTemplatesDir();
+  if (!sourceDir) {
+    if (!__resolution.jsonMode) console.log("  Skipped crud templates (framework templates not found)");
+    return;
+  }
+  const targetDir = resolve6("src/templates/crud");
+  ensureDir(targetDir);
+  for (const file of readdirSync6(sourceDir).filter((f) => f.endsWith(".twig")).sort()) {
+    const dest = join15(targetDir, file);
+    if (existsSync13(dest)) {
+      if (!__resolution.jsonMode) console.log(`  File already exists: ${dest}`);
+      continue;
+    }
+    if (__resolution.dryRun) continue;
+    copyFileSync(join15(sourceDir, file), dest);
+    __resolution.actionsTaken.push(`wrote ${dest}`);
+    if (!__resolution.jsonMode) console.log(`  Created ${dest}`);
   }
 }
+function generateCrudGateTest(model, table2, isPublic) {
+  const dir = resolve6("tests");
+  ensureDir(dir);
+  const posture = isPublic ? "open (--public)" : "gated";
+  const writeCase = isPublic ? `  // --public opened the write: no 401 gate (the handler, not the gate, answers).
+  assert("anonymous POST is NOT gated (--public)",
+    (await client.post("/api/${table2}", { json: { name: "test" } })).status !== 401);` : `  // Secure by default: a tokenless POST is rejected by the gate with 401.
+  assert("anonymous POST is gated -> 401",
+    (await client.post("/api/${table2}", { json: { name: "test" } })).status === 401);
+  // A valid Bearer token passes the gate (the gate no longer answers 401).
+  const token = getToken({ userId: 1 });
+  assert("authenticated POST passes the gate (not 401)",
+    (await client.post("/api/${table2}", { json: { name: "test" }, headers: { authorization: \`Bearer \${token}\` } })).status !== 401);`;
+  const pageCase = isPublic ? `  assert("admin page is NOT gated (--public)", (await client.get("/admin/${table2}")).status !== 401);` : `  assert("admin page is secured -> 401 without a token", (await client.get("/admin/${table2}")).status === 401);`;
+  const content = `/**
+ * ${model} CRUD admin (ADR-0094) \u2014 reads public, writes ${posture}, page ${isPublic ? "public" : "secured"}.
+ *
+ * Real end-to-end via TestClient: no mocks \u2014 real Router, real auth gate, real
+ * JWT, real route discovery. The admin route registers the AutoCrud backend at
+ * load; discoverRoutes imports it, so the /api/${table2} REST routes exist here.
+ * This gate test proves the SECURE-BY-DEFAULT posture (what registers, what is
+ * gated vs open) \u2014 adapter-independent, since the auth gate runs before the
+ * handler. Run with: npx tsx tests/${table2}.test.ts
+ */
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { defaultRouter, TestClient, getToken, discoverRoutes } from "tina4-nodejs";
+
+process.env.TINA4_SECRET = process.env.TINA4_SECRET ?? "tina4-test-secret-0123456789abcdef0123456789";
+const here = dirname(fileURLToPath(import.meta.url));
+
+let pass = 0;
+let fail = 0;
+function assert(label: string, ok: boolean): void {
+  if (ok) { pass++; console.log(\`  PASS \${label}\`); }
+  else { fail++; console.log(\`  FAIL \${label}\`); }
+}
+
+// Discovering the routes imports src/routes/admin/${table2}/get.ts, whose
+// top-level Crud.registerBackend() adds the AutoCrud routes to defaultRouter.
+for (const def of await discoverRoutes(resolve(here, "../src/routes"))) defaultRouter.addRoute(def);
+const patterns = defaultRouter.getRoutes().map((r) => \`\${r.method} \${r.pattern}\`);
+const client = new TestClient();
+
+assert("AutoCrud GET list route registered", patterns.includes("GET /api/${table2}"));
+assert("AutoCrud POST route registered", patterns.includes("POST /api/${table2}"));
+assert("admin page route registered", patterns.includes("GET /admin/${table2}"));
+${pageCase}
+${writeCase}
+
+console.log(\`\\nResults: \${pass} passed, \${fail} failed\`);
+process.exit(fail > 0 ? 1 : 0);
+`;
+  writeFileSafe(join15(dir, `${table2}.test.ts`), content);
+}
 function generateMigration(name, flags, fieldsOverride, tableOverride, emitTest = true) {
   const ts = timestamp();
   const dir = resolve6("migrations");
@@ -14595,7 +14726,7 @@ import { Router, TestClient, getToken, discoverRoutes } from "tina4-nodejs";
 import { initDatabase } from "tina4-nodejs/orm";
 import ${model} from "../src/models/${model}.js";
 
-process.env.TINA4_SECRET = process.env.TINA4_SECRET ?? "test-secret";
+process.env.TINA4_SECRET = process.env.TINA4_SECRET ?? "tina4-test-secret-0123456789abcdef0123456789";
 const here = dirname(fileURLToPath(import.meta.url));
 
 let pass = 0;
@@ -15558,7 +15689,7 @@ import { Router, TestClient, discoverRoutes } from "tina4-nodejs";
 import { initDatabase } from "tina4-nodejs/orm";
 import User from "../src/models/User.js";
 
-process.env.TINA4_SECRET = process.env.TINA4_SECRET ?? "test-secret";
+process.env.TINA4_SECRET = process.env.TINA4_SECRET ?? "tina4-test-secret-0123456789abcdef0123456789";
 delete process.env.TINA4_API_KEY;
 const here = dirname(fileURLToPath(import.meta.url));`;
   const body = `await initDatabase({ url: "sqlite:///test_auth.db" });
@@ -15745,7 +15876,7 @@ var init_generate = __esm({
     GENERATORS = {
       model: { handler: generateModel, usage: '<Name> [--fields "name:string,price:float"] [--table-name <name>]', summary: "ORM model + matching migration" },
       route: { handler: generateRoute, usage: "<name> [--model Name] [--public]", summary: "CRUD route file, secure by default (--public opens writes)" },
-      crud: { handler: generateCrud, usage: '<Name> [--fields "..."] [--public]', summary: "Model + migration + routes + form + view + test" },
+      crud: { handler: generateCrud, usage: '<Name> [--fields "..."] [--public] [--no-templates]', summary: "Model + migration + AutoCrud-backed admin page (toCrud) + editable crud/ templates + gate test" },
       migration: { handler: (n, f) => generateMigration(n, f, void 0, void 0, !f["no-test"]), usage: "<description>", summary: "Timestamped migration file (UP/DOWN)" },
       middleware: { handler: generateMiddleware, usage: "<Name>", summary: "Middleware with before/after hooks" },
       test: { handler: generateTest, usage: "<name> [--model Name]", summary: "Test file" },
@@ -15774,8 +15905,9 @@ var init_generate = __esm({
       ],
       crud: ({ name, table: table2 }) => [
         `Apply the migration:   npx tina4nodejs migrate`,
-        `Serve and try:         npx tina4nodejs serve  ->  visit /swagger`,
-        `Run the gate test:     npx tsx tests/${pluralizeReserved(toSnake(name))}.test.ts`,
+        `Serve and try:         npx tina4nodejs serve  ->  visit /admin/${table2} (or /swagger)`,
+        `Run the gate test:     npx tsx tests/${table2}.test.ts`,
+        `Restyle the UI:        edit src/templates/crud/*.twig`,
         `Change fields: edit src/models/${name}.ts then re-run generate crud`
       ],
       migration: () => [
@@ -18724,8 +18856,8 @@ __export(context_exports, {
   fts5Supported: () => fts5Supported
 });
 import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
-import { existsSync as existsSync15, mkdirSync as mkdirSync10, readFileSync as readFileSync13, readdirSync as readdirSync7, realpathSync as realpathSync5 } from "node:fs";
-import { basename as basename4, dirname as dirname8, extname as extname4, isAbsolute as isAbsolute4, join as join17, relative as relative4, resolve as resolve8 } from "node:path";
+import { existsSync as existsSync15, mkdirSync as mkdirSync10, readFileSync as readFileSync13, readdirSync as readdirSync8, realpathSync as realpathSync5 } from "node:fs";
+import { basename as basename4, dirname as dirname9, extname as extname4, isAbsolute as isAbsolute4, join as join17, relative as relative4, resolve as resolve8 } from "node:path";
 function fts5Supported() {
   try {
     const conn = new DatabaseSync2(":memory:");
@@ -18748,7 +18880,7 @@ function realResolve(abs) {
   } catch {
   }
   try {
-    return join17(realpathSync5(dirname8(abs)), basename4(abs));
+    return join17(realpathSync5(dirname9(abs)), basename4(abs));
   } catch {
     return abs;
   }
@@ -18836,7 +18968,7 @@ var init_context = __esm({
         const check = fts5Check ?? fts5Supported;
         this.available = Boolean(check());
         if (!this.available) return;
-        const parent = dirname8(this.path);
+        const parent = dirname9(this.path);
         if (parent !== "" && parent !== ".") {
           mkdirSync10(parent, { recursive: true });
         }
@@ -18914,7 +19046,7 @@ var init_context = __esm({
         this.root = rootAbs;
         let total = 0;
         const walk2 = (dir) => {
-          const entries = readdirSync7(dir, { withFileTypes: true });
+          const entries = readdirSync8(dir, { withFileTypes: true });
           const files = [];
           const subdirs = [];
           for (const e of entries) {
@@ -20830,7 +20962,7 @@ var init_mongoBackend = __esm({
           return null;
         }
       }
-      push(queue, payload, delay, priority) {
+      push(queue, payload, delay2, priority) {
         const id = randomUUID4();
         const now = (/* @__PURE__ */ new Date()).toISOString();
         const job = {
@@ -20839,7 +20971,7 @@ var init_mongoBackend = __esm({
           status: "pending",
           createdAt: now,
           attempts: 0,
-          delayUntil: delay ? new Date(Date.now() + delay * 1e3).toISOString() : null,
+          delayUntil: delay2 ? new Date(Date.now() + delay2 * 1e3).toISOString() : null,
           // The pop sort has always been { priority: -1, createdAt: 1 }, but this
           // field was never written, so every job scored undefined and the queue
           // ran pure FIFO. Priority did not even reach here: the backend interface
@@ -21008,7 +21140,7 @@ var init_job = __esm({
 });
 
 // ../core/src/queueBackends/liteBackend.ts
-import { mkdirSync as mkdirSync11, readdirSync as readdirSync8, readFileSync as readFileSync14, writeFileSync as writeFileSync9, unlinkSync as unlinkSync6, existsSync as existsSync16 } from "node:fs";
+import { mkdirSync as mkdirSync11, readdirSync as readdirSync9, readFileSync as readFileSync14, writeFileSync as writeFileSync9, unlinkSync as unlinkSync6, existsSync as existsSync16 } from "node:fs";
 import { join as join18 } from "node:path";
 import { randomUUID as randomUUID5 } from "node:crypto";
 var LiteBackend;
@@ -21070,7 +21202,7 @@ var init_liteBackend = __esm({
        */
       close() {
       }
-      push(queue, payload, delay, priority) {
+      push(queue, payload, delay2, priority) {
         const dir = this.ensureDir(queue);
         const id = randomUUID5();
         const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -21080,7 +21212,7 @@ var init_liteBackend = __esm({
           status: "pending",
           createdAt: now,
           attempts: 0,
-          delayUntil: delay ? new Date(Date.now() + delay * 1e3).toISOString() : null,
+          delayUntil: delay2 ? new Date(Date.now() + delay2 * 1e3).toISOString() : null,
           priority: priority ?? 0,
           topic: queue,
           error: void 0
@@ -21099,7 +21231,7 @@ var init_liteBackend = __esm({
         const dir = this.ensureDir(queue);
         let filenames;
         try {
-          filenames = readdirSync8(dir).filter((f) => f.endsWith(".queue-data"));
+          filenames = readdirSync9(dir).filter((f) => f.endsWith(".queue-data"));
         } catch {
           return [];
         }
@@ -21164,7 +21296,7 @@ var init_liteBackend = __esm({
         const reservedDir = this.ensureReservedDir(queue);
         let filenames;
         try {
-          filenames = readdirSync8(reservedDir).filter((f) => f.endsWith(".queue-data"));
+          filenames = readdirSync9(reservedDir).filter((f) => f.endsWith(".queue-data"));
         } catch {
           return;
         }
@@ -21275,7 +21407,7 @@ var init_liteBackend = __esm({
         const scanDir = isDead ? this.ensureFailedDir(queue) : isReserved ? this.ensureReservedDir(queue) : this.ensureDir(queue);
         let files;
         try {
-          files = readdirSync8(scanDir).filter((f) => f.endsWith(".queue-data"));
+          files = readdirSync9(scanDir).filter((f) => f.endsWith(".queue-data"));
         } catch {
           return 0;
         }
@@ -21296,7 +21428,7 @@ var init_liteBackend = __esm({
         const dir = this.ensureDir(queue);
         let count = 0;
         try {
-          const files = readdirSync8(dir).filter((f) => f.endsWith(".queue-data"));
+          const files = readdirSync9(dir).filter((f) => f.endsWith(".queue-data"));
           for (const file of files) {
             unlinkSync6(join18(dir, file));
             count++;
@@ -21306,7 +21438,7 @@ var init_liteBackend = __esm({
         const failedDir = join18(dir, "failed");
         try {
           if (existsSync16(failedDir)) {
-            const files = readdirSync8(failedDir).filter((f) => f.endsWith(".queue-data"));
+            const files = readdirSync9(failedDir).filter((f) => f.endsWith(".queue-data"));
             for (const file of files) {
               unlinkSync6(join18(failedDir, file));
               count++;
@@ -21317,7 +21449,7 @@ var init_liteBackend = __esm({
         const reservedDir = join18(dir, "reserved");
         try {
           if (existsSync16(reservedDir)) {
-            const files = readdirSync8(reservedDir).filter((f) => f.endsWith(".queue-data"));
+            const files = readdirSync9(reservedDir).filter((f) => f.endsWith(".queue-data"));
             for (const file of files) {
               unlinkSync6(join18(reservedDir, file));
               count++;
@@ -21339,7 +21471,7 @@ var init_liteBackend = __esm({
         const dir = this.ensureDir(queue);
         const results = [];
         try {
-          const files = readdirSync8(dir).filter((f) => f.endsWith(".queue-data")).sort();
+          const files = readdirSync9(dir).filter((f) => f.endsWith(".queue-data")).sort();
           for (const file of files) {
             try {
               const job = JSON.parse(readFileSync14(join18(dir, file), "utf-8"));
@@ -21363,7 +21495,7 @@ var init_liteBackend = __esm({
        */
       retry(queue, jobId, delaySeconds) {
         try {
-          const queues = readdirSync8(this.basePath);
+          const queues = readdirSync9(this.basePath);
           for (const q of queues) {
             const failedDir = join18(this.basePath, q, "failed");
             const filePath = join18(failedDir, `${jobId}.queue-data`);
@@ -21389,7 +21521,7 @@ var init_liteBackend = __esm({
         const failedDir = this.ensureFailedDir(queue);
         const results = [];
         try {
-          const files = readdirSync8(failedDir).filter((f) => f.endsWith(".queue-data")).sort();
+          const files = readdirSync9(failedDir).filter((f) => f.endsWith(".queue-data")).sort();
           for (const file of files) {
             try {
               const job = JSON.parse(readFileSync14(join18(failedDir, file), "utf-8"));
@@ -21410,7 +21542,7 @@ var init_liteBackend = __esm({
         if (isDead) {
           const failedDir = this.ensureFailedDir(queue);
           try {
-            const files = readdirSync8(failedDir).filter((f) => f.endsWith(".queue-data"));
+            const files = readdirSync9(failedDir).filter((f) => f.endsWith(".queue-data"));
             for (const file of files) {
               try {
                 unlinkSync6(join18(failedDir, file));
@@ -21423,7 +21555,7 @@ var init_liteBackend = __esm({
         } else {
           const dir = this.ensureDir(queue);
           try {
-            const files = readdirSync8(dir).filter((f) => f.endsWith(".queue-data"));
+            const files = readdirSync9(dir).filter((f) => f.endsWith(".queue-data"));
             for (const file of files) {
               try {
                 const job = JSON.parse(readFileSync14(join18(dir, file), "utf-8"));
@@ -21449,7 +21581,7 @@ var init_liteBackend = __esm({
         const queueDir = this.ensureDir(queue);
         let count = 0;
         try {
-          const files = readdirSync8(failedDir).filter((f) => f.endsWith(".queue-data"));
+          const files = readdirSync9(failedDir).filter((f) => f.endsWith(".queue-data"));
           for (const file of files) {
             try {
               const filePath = join18(failedDir, file);
@@ -21476,7 +21608,7 @@ var init_liteBackend = __esm({
         const dir = this.ensureDir(queue);
         let files;
         try {
-          files = readdirSync8(dir).filter((f) => f.endsWith(".queue-data"));
+          files = readdirSync9(dir).filter((f) => f.endsWith(".queue-data"));
         } catch {
           return null;
         }
@@ -21717,11 +21849,11 @@ var init_queue = __esm({
        *
        * @param priority — Higher value = higher priority. Default 0.
        */
-      push(payload, delay, priority = 0) {
+      push(payload, delay2, priority = 0) {
         if (this.externalBackend) {
-          return this.externalBackend.push(this.topic, payload, delay, priority);
+          return this.externalBackend.push(this.topic, payload, delay2, priority);
         }
-        return this.liteBackend.push(this.topic, payload, delay, priority);
+        return this.liteBackend.push(this.topic, payload, delay2, priority);
       }
       /**
        * Atomically claim the next available job from this queue's topic. Returns null if empty.
@@ -21952,11 +22084,11 @@ var init_queue = __esm({
        * shares the same retarget path consume()/process() use — keeping produce and
        * consume symmetric on the same topic argument.
        */
-      produce(topic, payload, priority = 0, delay = 0) {
+      produce(topic, payload, priority = 0, delay2 = 0) {
         const previous = this.topic;
         this.retarget(topic);
         try {
-          return this.push(payload, delay, priority);
+          return this.push(payload, delay2, priority);
         } finally {
           this.retarget(previous);
         }
@@ -22957,7 +23089,7 @@ var init_projectIndex = __esm({
           }
         }
         hits.sort((a, b) => b[0] - a[0]);
-        return hits.slice(0, Math.max(1, limit)).map((h) => h[1]);
+        return hits.slice(0, Math.max(1, limit)).map((h2) => h2[1]);
       },
       fileEntry(relPath) {
         ProjectIndex.refresh();
@@ -23486,7 +23618,7 @@ __export(docs_exports, {
 });
 import * as fs8 from "node:fs";
 import * as path8 from "node:path";
-import { fileURLToPath as fileURLToPath4 } from "node:url";
+import { fileURLToPath as fileURLToPath5 } from "node:url";
 function detectFrameworkRoots() {
   const corePackageRoot = path8.resolve(__DIRNAME, "..");
   const packagesRoot = path8.resolve(corePackageRoot, "..");
@@ -23893,7 +24025,7 @@ var init_docs = __esm({
       "hash"
     ]);
     _DOCS_CACHE = /* @__PURE__ */ new Map();
-    __FILENAME = fileURLToPath4(import.meta.url);
+    __FILENAME = fileURLToPath5(import.meta.url);
     __DIRNAME = path8.dirname(__FILENAME);
     USER_DIRS = ["src/orm", "src/routes", "src/app", "src/services", "src/models"];
     CAMEL_SPLIT = /([a-z0-9])([A-Z])|([A-Z]+)([A-Z][a-z])/g;
@@ -24270,11 +24402,12 @@ ${end}
 
 // ../core/src/devAdmin.ts
 import { cpus as osCpus } from "node:os";
-import { readFileSync as readFileSync18, writeFileSync as writeFileSync13, existsSync as existsSync20, readdirSync as readdirSync12, mkdirSync as mkdirSync14, copyFileSync, statSync as statSync15, openSync as openSync4, closeSync as closeSync4, fstatSync as fstatSync2, fchmodSync as fchmodSync2, ftruncateSync, constants as constants3, realpathSync as realpathSync6, lstatSync } from "node:fs";
-import { join as join22, dirname as dirname10, resolve as resolve12, relative as relative9, sep as sep6, basename as basename5 } from "node:path";
-import { fileURLToPath as fileURLToPath5 } from "node:url";
+import { readFileSync as readFileSync18, writeFileSync as writeFileSync13, existsSync as existsSync20, readdirSync as readdirSync13, mkdirSync as mkdirSync14, copyFileSync as copyFileSync2, statSync as statSync15, openSync as openSync4, closeSync as closeSync4, fstatSync as fstatSync2, fchmodSync as fchmodSync2, ftruncateSync, constants as constants3, realpathSync as realpathSync6, lstatSync } from "node:fs";
+import { join as join22, dirname as dirname11, resolve as resolve12, relative as relative9, sep as sep6, basename as basename5 } from "node:path";
+import { fileURLToPath as fileURLToPath6 } from "node:url";
 import { timingSafeEqual as timingSafeEqual2 } from "node:crypto";
-function escapeHtml(value) {
+import net2 from "node:net";
+function escapeHtml2(value) {
   return String(value).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
 }
 function devSameOriginOk(req2) {
@@ -24312,6 +24445,42 @@ function devHostAllowed(hostHeader) {
   if (configured) allowed.add(configured);
   return allowed.has(name);
 }
+function ipInCidr(ip, entry) {
+  try {
+    ip = (ip ?? "").trim();
+    if (ip.toLowerCase().startsWith("::ffff:")) ip = ip.slice(7);
+    const ipFam = net2.isIP(ip);
+    if (!ipFam) return false;
+    entry = (entry ?? "").trim();
+    const bl = new net2.BlockList();
+    if (entry.includes("/")) {
+      const [addr, bitsStr] = entry.split("/");
+      const bits = Number(bitsStr);
+      const fam = net2.isIP(addr);
+      if (!fam || !Number.isInteger(bits)) return false;
+      bl.addSubnet(addr, bits, fam === 4 ? "ipv4" : "ipv6");
+    } else {
+      const fam = net2.isIP(entry);
+      if (!fam) return false;
+      bl.addAddress(entry, fam === 4 ? "ipv4" : "ipv6");
+    }
+    return bl.check(ip, ipFam === 4 ? "ipv4" : "ipv6");
+  } catch {
+    return false;
+  }
+}
+function devPeerAllowed(remoteIp) {
+  const ip = (remoteIp ?? "").trim();
+  if (isLoopback(ip)) return true;
+  const configured = (process.env.TINA4_DEV_ALLOWED_PEERS ?? "").trim();
+  if (!configured) return false;
+  return configured.split(",").some((entry) => entry.trim() !== "" && ipInCidr(ip, entry));
+}
+function devToolbarAllowed(req2) {
+  if (!devHostAllowed(req2.header("host"))) return false;
+  const peer = req2.socket?.remoteAddress ?? "";
+  return devPeerAllowed(peer);
+}
 function devRequestDenial(req2) {
   const path10 = (req2.path ?? "").replace(/\/+/g, "/");
   const isMcp = DEV_MCP_PREFIXES.some((prefix) => path10 === prefix || path10.startsWith(prefix + "/"));
@@ -24321,9 +24490,12 @@ function devRequestDenial(req2) {
   if (!devSameOriginOk(req2)) {
     return { status: 403, error: "dev-admin: refused (cross-origin request)" };
   }
+  if (DEV_PUBLIC_ASSETS.has(path10)) {
+    return null;
+  }
   if (!isMcp) {
     const peer = req2.socket?.remoteAddress ?? "";
-    if (!(isLoopback(peer) || mcpTokenOk(req2, true))) {
+    if (!(devPeerAllowed(peer) || mcpTokenOk(req2, true))) {
       return { status: 403, error: "dev-admin: refused (non-loopback peer)" };
     }
   }
@@ -24412,7 +24584,7 @@ function mapQueueJob(job, topic, status2) {
 function readQueueDir(dir, topic, status2) {
   if (!existsSync20(dir)) return [];
   const jobs = [];
-  for (const filename of readdirSync12(dir).sort()) {
+  for (const filename of readdirSync13(dir).sort()) {
     if (!filename.endsWith(".queue-data")) continue;
     try {
       jobs.push(mapQueueJob(JSON.parse(readFileSync18(join22(dir, filename), "utf-8")), topic, status2));
@@ -24554,12 +24726,12 @@ function upsertDevEnvVar(key, value) {
 }
 function formatUptime(seconds) {
   const d = Math.floor(seconds / 86400);
-  const h = Math.floor(seconds % 86400 / 3600);
+  const h2 = Math.floor(seconds % 86400 / 3600);
   const m = Math.floor(seconds % 3600 / 60);
   const s = Math.floor(seconds % 60);
   const parts = [];
   if (d > 0) parts.push(`${d}d`);
-  if (h > 0) parts.push(`${h}h`);
+  if (h2 > 0) parts.push(`${h2}h`);
   if (m > 0) parts.push(`${m}m`);
   parts.push(`${s}s`);
   return parts.join(" ");
@@ -24580,7 +24752,7 @@ function parseEnvFile() {
 function walkDirRecursive(dir) {
   const results = [];
   if (!existsSync20(dir)) return results;
-  for (const entry of readdirSync12(dir)) {
+  for (const entry of readdirSync13(dir)) {
     const full = join22(dir, entry);
     if (statSync15(full).isDirectory()) {
       results.push(...walkDirRecursive(full));
@@ -24610,8 +24782,8 @@ function handleGalleryDeploy(router) {
     for (const srcFile of allFiles) {
       const rel = relative9(gallerySrc, srcFile);
       const dest = join22(projectSrc, rel);
-      mkdirSync14(dirname10(dest), { recursive: true });
-      copyFileSync(srcFile, dest);
+      mkdirSync14(dirname11(dest), { recursive: true });
+      copyFileSync2(srcFile, dest);
       copied.push(rel);
     }
     try {
@@ -24641,9 +24813,9 @@ function realPathOf(target) {
       present = true;
     } catch {
     }
-    if (present || dirname10(existing) === existing) break;
+    if (present || dirname11(existing) === existing) break;
     tail.unshift(basename5(existing));
-    existing = dirname10(existing);
+    existing = dirname11(existing);
   }
   return join22(realpathSync6(existing), ...tail);
 }
@@ -24767,9 +24939,9 @@ function applyMcpOutcome(res, outcome) {
 }
 function renderToolbarHtml(ctx) {
   const nodeVersion = process.version;
-  const method = escapeHtml(ctx.method);
-  const path10 = escapeHtml(ctx.path);
-  const matchedPattern = escapeHtml(ctx.matchedPattern);
+  const method = escapeHtml2(ctx.method);
+  const path10 = escapeHtml2(ctx.path);
+  const matchedPattern = escapeHtml2(ctx.matchedPattern);
   const reload = ctx.reload === false ? "0" : "1";
   return `<link rel="stylesheet" href="/__dev/toolbar.css">
 <div id="tina4-dev-toolbar" data-reload="${reload}">
@@ -24955,7 +25127,7 @@ function toolbarJs() {
     connect();
 })();`;
 }
-var cpuCount, DEV_MCP_PREFIXES, DEV_SECRET_BASENAMES, DEV_SECRET_SUFFIXES, MessageLog, RequestInspector, ErrorTracker, DevMailboxStore, DevQueue, WsTracker, DevAdmin, handleDashboard, _reloadMtime, _reloadFile, handleMtime, handleReload, handleMessages, handleMessagesClear, handleRequests, handleRequestsClear, handleSystem, handleMessagesSearch, handleQueue, handleQueueTopics, handleQueueDeadLetters, handleQueueRetry, handleQueuePurge, handleQueueReplay, handleMailbox, handleMailboxRead, handleMailboxSeed, handleMailboxClear, handleTable, handleTables, handleSeed, handleQuery, handleBroken, handleBrokenResolve, handleBrokenClear, handleWebsockets, handleWebsocketsDisconnect, handleTool, DEFAULT_MCP_URL, handleGroundingStatus, handleGroundingToken, handleMigrate, handleSeedRun, handleTest, handleThreads, handleThreadsSub, handleConnections, handleConnectionsTest, handleConnectionsSave, __devAdminFilename, __devAdminDirname, handleGalleryList, handleVersionCheck, handleThoughts, handleSuperviseStub, DEV_FILES_IGNORED, handleFiles, DEV_ADMIN_LANG_MAP, handleFileRead, handleFileSave, handleFileRaw, handleFileRename, handleFileDelete, handleDepsSearch, handleDepsInstall, handleGitStatus, handleMcpTools, handleMcpCall, handleMcpStreamable, handleMcpDelete, handleMcpGet405, handleMcpLegacyMessage, handleMcpSse, handleScaffoldList, handleScaffoldRun, handlePlanCurrent, handlePlanList, handlePlanCreate, handlePlanSwitch, handlePlanCompleteStep, handlePlanAddStep, handlePlanNote, handlePlanArchive, handlePlanRead, handlePlanFlesh, handleIndexRebuild, handleIndexSearch, handleIndexFile, handleIndexOverview, handleDocsSearch, handleDocsClass, handleDocsMethod, handleDocsIndex, handleDocsWellKnown, handleDevAdminJs, handleToolbarCss, handleToolbarJs;
+var cpuCount, DEV_MCP_PREFIXES, DEV_PUBLIC_ASSETS, DEV_SECRET_BASENAMES, DEV_SECRET_SUFFIXES, MessageLog, RequestInspector, ErrorTracker, DevMailboxStore, DevQueue, WsTracker, DevAdmin, handleDashboard, _reloadMtime, _reloadFile, handleMtime, handleReload, handleMessages, handleMessagesClear, handleRequests, handleRequestsClear, handleSystem, handleMessagesSearch, handleQueue, handleQueueTopics, handleQueueDeadLetters, handleQueueRetry, handleQueuePurge, handleQueueReplay, handleMailbox, handleMailboxRead, handleMailboxSeed, handleMailboxClear, handleTable, handleTables, handleSeed, handleQuery, handleBroken, handleBrokenResolve, handleBrokenClear, handleWebsockets, handleWebsocketsDisconnect, handleTool, DEFAULT_MCP_URL, handleGroundingStatus, handleGroundingToken, handleMigrate, handleSeedRun, handleTest, handleThreads, handleThreadsSub, handleConnections, handleConnectionsTest, handleConnectionsSave, __devAdminFilename, __devAdminDirname, handleGalleryList, handleVersionCheck, handleThoughts, handleSuperviseStub, DEV_FILES_IGNORED, handleFiles, DEV_ADMIN_LANG_MAP, handleFileRead, handleFileSave, handleFileRaw, handleFileRename, handleFileDelete, handleDepsSearch, handleDepsInstall, handleGitStatus, handleMcpTools, handleMcpCall, handleMcpStreamable, handleMcpDelete, handleMcpGet405, handleMcpLegacyMessage, handleMcpSse, handleScaffoldList, handleScaffoldRun, handlePlanCurrent, handlePlanList, handlePlanCreate, handlePlanSwitch, handlePlanCompleteStep, handlePlanAddStep, handlePlanNote, handlePlanArchive, handlePlanRead, handlePlanFlesh, handleIndexRebuild, handleIndexSearch, handleIndexFile, handleIndexOverview, handleDocsSearch, handleDocsClass, handleDocsMethod, handleDocsIndex, handleDocsWellKnown, handleDevAdminJs, handleToolbarCss, handleToolbarJs;
 var init_devAdmin = __esm({
   "../core/src/devAdmin.ts"() {
     "use strict";
@@ -24968,6 +25140,7 @@ var init_devAdmin = __esm({
     init_version();
     cpuCount = osCpus().length;
     DEV_MCP_PREFIXES = ["/__dev/api/mcp", "/__dev/mcp"];
+    DEV_PUBLIC_ASSETS = /* @__PURE__ */ new Set(["/__dev/toolbar.css", "/__dev/toolbar.js"]);
     DEV_SECRET_BASENAMES = /* @__PURE__ */ new Set([
       ".env",
       ".envrc",
@@ -25669,7 +25842,7 @@ var init_devAdmin = __esm({
         const queueDir = queueBasePath2();
         let topics = [];
         if (existsSync20(queueDir)) {
-          topics = readdirSync12(queueDir).filter((d) => {
+          topics = readdirSync13(queueDir).filter((d) => {
             try {
               return statSync15(join22(queueDir, d)).isDirectory();
             } catch {
@@ -26173,13 +26346,13 @@ var init_devAdmin = __esm({
         res.json({ success: false, error: msg });
       }
     };
-    __devAdminFilename = fileURLToPath5(import.meta.url);
-    __devAdminDirname = dirname10(__devAdminFilename);
+    __devAdminFilename = fileURLToPath6(import.meta.url);
+    __devAdminDirname = dirname11(__devAdminFilename);
     handleGalleryList = (_req, res) => {
       const galleryDir = resolve12(__devAdminDirname, "..", "gallery");
       const items = [];
       if (existsSync20(galleryDir)) {
-        const entries = readdirSync12(galleryDir).sort();
+        const entries = readdirSync13(galleryDir).sort();
         for (const entry of entries) {
           const entryPath = join22(galleryDir, entry);
           const metaFile = join22(entryPath, "meta.json");
@@ -26283,7 +26456,7 @@ var init_devAdmin = __esm({
         if (cwdInGit !== "") cwdInGit += "/";
       }
       const entries = [];
-      for (const name of readdirSync12(target).sort()) {
+      for (const name of readdirSync13(target).sort()) {
         if (devFilesHidden(name)) continue;
         const full = join22(target, name);
         const entryRel = relative9(root, full).replace(/\\/g, "/");
@@ -26314,7 +26487,7 @@ var init_devAdmin = __esm({
         if (isDir) {
           hasChildren = false;
           try {
-            for (const c of readdirSync12(full)) {
+            for (const c of readdirSync13(full)) {
               if (devFilesHidden(c)) continue;
               hasChildren = true;
               break;
@@ -26406,7 +26579,7 @@ var init_devAdmin = __esm({
         return;
       }
       try {
-        mkdirSync14(dirname10(target), { recursive: true });
+        mkdirSync14(dirname11(target), { recursive: true });
         const existed = existsSync20(target);
         writeFileSync13(target, content, "utf-8");
         try {
@@ -26478,7 +26651,7 @@ var init_devAdmin = __esm({
       }
       try {
         const { renameSync: renameSync3 } = await import("node:fs");
-        mkdirSync14(dirname10(dst), { recursive: true });
+        mkdirSync14(dirname11(dst), { recursive: true });
         renameSync3(src, dst);
         res.json({ ok: true, from: relative9(root, src), to: relative9(root, dst) });
       } catch (e) {
@@ -26499,8 +26672,8 @@ var init_devAdmin = __esm({
         return;
       }
       try {
-        const { rmSync } = await import("node:fs");
-        rmSync(target, { recursive: true, force: true });
+        const { rmSync: rmSync2 } = await import("node:fs");
+        rmSync2(target, { recursive: true, force: true });
         res.json({ ok: true, deleted: relative9(root, target) });
       } catch (e) {
         res.json({ error: e.message }, 500);
@@ -26835,10 +27008,10 @@ var init_devAdmin = __esm({
       });
     };
     handleDevAdminJs = async (_req, res) => {
-      const { readFileSync: readFileSync27, existsSync: existsSync28 } = await import("node:fs");
-      const { dirname: dirname15, join: join33, resolve: resolve21 } = await import("node:path");
-      const { fileURLToPath: fileURLToPath8 } = await import("node:url");
-      const dir = dirname15(fileURLToPath8(import.meta.url));
+      const { readFileSync: readFileSync27, existsSync: existsSync29 } = await import("node:fs");
+      const { dirname: dirname17, join: join33, resolve: resolve21 } = await import("node:path");
+      const { fileURLToPath: fileURLToPath10 } = await import("node:url");
+      const dir = dirname17(fileURLToPath10(import.meta.url));
       const candidates = [
         join33(dir, "..", "public", "js", "tina4-dev-admin.min.js"),
         // src/../public/js/
@@ -26849,7 +27022,7 @@ var init_devAdmin = __esm({
         // project public/
       ];
       for (const jsPath of candidates) {
-        if (existsSync28(jsPath)) {
+        if (existsSync29(jsPath)) {
           try {
             const content = readFileSync27(jsPath, "utf-8");
             res.raw.writeHead(200, { "Content-Type": "application/javascript; charset=utf-8", "Cache-Control": "no-cache" });
@@ -26874,7 +27047,7 @@ var init_devAdmin = __esm({
 });
 
 // ../core/src/i18n.ts
-import { readFileSync as readFileSync19, readdirSync as readdirSync13, existsSync as existsSync21 } from "node:fs";
+import { readFileSync as readFileSync19, readdirSync as readdirSync14, existsSync as existsSync21 } from "node:fs";
 import { join as join23, resolve as resolve13 } from "node:path";
 var I18n;
 var init_i18n = __esm({
@@ -26956,7 +27129,7 @@ var init_i18n = __esm({
           return [this._defaultLocale];
         }
         try {
-          const files = readdirSync13(this._localeDir);
+          const files = readdirSync14(this._localeDir);
           const locales = files.filter((f) => f.endsWith(".json") || f.endsWith(".yml") || f.endsWith(".yaml")).map((f) => f.replace(/\.(json|ya?ml)$/, "")).sort();
           return locales.length > 0 ? locales : [this._defaultLocale];
         } catch {
@@ -28212,10 +28385,10 @@ var init_docsAutoDiscovery = __esm({
 
 // ../core/src/server.ts
 import { randomBytes as randomBytes7 } from "node:crypto";
-import { resolve as resolve15, dirname as dirname11, join as join25, relative as relative10 } from "node:path";
-import { existsSync as existsSync23, readdirSync as readdirSync14, readFileSync as readFileSync21, statSync as statSync16 } from "node:fs";
+import { resolve as resolve15, dirname as dirname12, join as join25, relative as relative10 } from "node:path";
+import { existsSync as existsSync23, readdirSync as readdirSync15, readFileSync as readFileSync21, statSync as statSync16 } from "node:fs";
 import { isatty } from "node:tty";
-import { fileURLToPath as fileURLToPath6 } from "node:url";
+import { fileURLToPath as fileURLToPath7 } from "node:url";
 import { execFileSync as execFileSync3, exec } from "node:child_process";
 import cluster from "node:cluster";
 import os2 from "node:os";
@@ -28255,7 +28428,7 @@ async function autoMigrateOnStartup(migrationDir = "migrations", base = process.
   if (!existsSync23(dir)) return;
   let hasSql = false;
   try {
-    hasSql = readdirSync14(dir).some((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"));
+    hasSql = readdirSync15(dir).some((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"));
   } catch {
     return;
   }
@@ -28425,7 +28598,7 @@ function injectDevToolbar(html, ctx) {
 function walkGalleryFiles(dir) {
   const results = [];
   if (!existsSync23(dir)) return results;
-  for (const f of readdirSync14(dir)) {
+  for (const f of readdirSync15(dir)) {
     const full = join25(dir, f);
     if (statSync16(full).isDirectory()) results.push(...walkGalleryFiles(full));
     else results.push(full);
@@ -28437,7 +28610,7 @@ function getGalleryDeployedState() {
   const state = {};
   if (!existsSync23(galleryDir)) return state;
   try {
-    const entries = readdirSync14(galleryDir).sort();
+    const entries = readdirSync15(galleryDir).sort();
     for (const entry of entries) {
       const entryPath = join25(galleryDir, entry);
       const metaFile = join25(entryPath, "meta.json");
@@ -28488,7 +28661,7 @@ function resolveTemplate(pathname, templatesDir) {
     const pagesDir = resolve15(templatesDir, TEMPLATE_PAGES_DIR);
     if (existsSync23(pagesDir)) {
       const scan = (dir, prefix) => {
-        for (const entry of readdirSync14(dir, { withFileTypes: true })) {
+        for (const entry of readdirSync15(dir, { withFileTypes: true })) {
           if (entry.name.startsWith("_")) continue;
           const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
           if (entry.isDirectory()) {
@@ -28807,7 +28980,7 @@ function isInjectableHtml(res) {
   return isHtmlResponse(res) && !res.raw.getHeader("content-encoding");
 }
 function injectIntoHtml(ctx, devToolbar, html) {
-  if (!devToolbar) return injectFeedbackWidget(ctx.req, html);
+  if (!devToolbar || !devToolbarAllowed(ctx.req)) return injectFeedbackWidget(ctx.req, html);
   const toolbarCtx = {
     version: TINA4_VERSION,
     method: ctx.req.method ?? "GET",
@@ -29175,7 +29348,7 @@ function wireLocaleGlobal(frondEngine, base) {
   const localeDir = resolve15(base, process.env.TINA4_LOCALE_DIR ?? "src/locales");
   if (!existsSync23(localeDir)) return;
   try {
-    const localeFiles = readdirSync14(localeDir).filter((file) => file.endsWith(".json"));
+    const localeFiles = readdirSync15(localeDir).filter((file) => file.endsWith(".json"));
     if (localeFiles.length === 0 || frondEngine.globals?.t) return;
     const i18nInstance = new I18n(process.env.TINA4_LOCALE ?? "en", localeDir);
     frondEngine.addGlobal("t", (key, params) => i18nInstance.t(key, params));
@@ -29590,8 +29763,8 @@ var init_server = __esm({
     init_i18n();
     init_background();
     init_version();
-    __filename = fileURLToPath6(import.meta.url);
-    __dirname = dirname11(__filename);
+    __filename = fileURLToPath7(import.meta.url);
+    __dirname = dirname12(__filename);
     BUILTIN_ERROR_TEMPLATES_DIR = resolve15(__dirname, "..", "templates");
     BUILTIN_PUBLIC_DIR = resolve15(__dirname, "..", "public");
     swaggerAssetsEnabled = false;
@@ -29753,7 +29926,7 @@ var init_env = __esm({
 
 // ../core/src/fakeData.ts
 import { randomInt, randomUUID as randomUUID6 } from "node:crypto";
-import { existsSync as existsSync24, readdirSync as readdirSync15 } from "node:fs";
+import { existsSync as existsSync24, readdirSync as readdirSync16 } from "node:fs";
 import { resolve as resolve16, join as join26 } from "node:path";
 function mulberry32(seed) {
   let s = seed | 0;
@@ -30253,7 +30426,7 @@ var init_fakeData = __esm({
       async seedDir(seedDir) {
         const dir = resolve16(seedDir ?? "src/seeds");
         if (!existsSync24(dir)) return [];
-        const files = readdirSync15(dir).filter((f) => f.endsWith(".ts") || f.endsWith(".js")).sort();
+        const files = readdirSync16(dir).filter((f) => f.endsWith(".ts") || f.endsWith(".js")).sort();
         const executed = [];
         for (const file of files) {
           const fullPath = join26(dir, file);
@@ -30359,7 +30532,7 @@ var init_mqttMessage = __esm({
 });
 
 // ../core/src/mqtt.ts
-import net2 from "node:net";
+import net3 from "node:net";
 import tls from "node:tls";
 import { randomBytes as randomBytes8 } from "node:crypto";
 import { existsSync as existsSync25, readFileSync as readFileSync22 } from "node:fs";
@@ -30830,7 +31003,7 @@ var init_mqtt = __esm({
             if (this.tlsVerify && this.caFile) opts.ca = readFileSync22(this.caFile);
             sock = tls.connect(opts, () => settle(() => resolve21(sock)));
           } else {
-            sock = net2.createConnection({ host: this.host, port: this.port }, () => settle(() => resolve21(sock)));
+            sock = net3.createConnection({ host: this.host, port: this.port }, () => settle(() => resolve21(sock)));
           }
           sock.once("error", (err) => {
             settle(() => {
@@ -31047,7 +31220,7 @@ var init_mqtt = __esm({
 });
 
 // ../core/src/service.ts
-import { readdirSync as readdirSync16, statSync as statSync17, watchFile, unwatchFile } from "node:fs";
+import { readdirSync as readdirSync17, statSync as statSync17, watchFile, unwatchFile } from "node:fs";
 import { join as join27, extname as extname7 } from "node:path";
 import { pathToFileURL } from "node:url";
 function matchCronField(field, value) {
@@ -31215,7 +31388,7 @@ var init_service = __esm({
         const discovered = [];
         let entries;
         try {
-          entries = readdirSync16(dir);
+          entries = readdirSync17(dir);
         } catch {
           return discovered;
         }
@@ -31342,7 +31515,7 @@ var init_service = __esm({
         const dir = serviceDir ?? process.env.TINA4_SERVICE_DIR ?? "src/services";
         let entries;
         try {
-          entries = readdirSync16(dir);
+          entries = readdirSync17(dir);
         } catch {
           return;
         }
@@ -31449,9 +31622,9 @@ function ipToBytes(ip) {
 }
 function parseCidr(cidr) {
   const [netStr, bitsStr] = cidr.split("/");
-  const net4 = ipToBytes(netStr);
-  if (!net4) return null;
-  return { net: net4, bits: Number(bitsStr) };
+  const net5 = ipToBytes(netStr);
+  if (!net5) return null;
+  return { net: net5, bits: Number(bitsStr) };
 }
 function inCidr(packed, cidr) {
   if (packed.length !== cidr.net.length) return false;
@@ -32030,11 +32203,11 @@ var init_api = __esm({
             path: null
           };
         }
-        const net4 = await this.performRequest("GET", url, headers, data, MAX_REDIRECTS);
-        if (net4.kind === "error") {
-          return { http_code: null, headers: {}, error: net4.error, path: null };
+        const net5 = await this.performRequest("GET", url, headers, data, MAX_REDIRECTS);
+        if (net5.kind === "error") {
+          return { http_code: null, headers: {}, error: net5.error, path: null };
         }
-        const res = net4.res;
+        const res = net5.res;
         const code = res.statusCode ?? null;
         const respHeaders = flattenHeaders(res.headers);
         if (code === null || code >= 400) {
@@ -32292,11 +32465,11 @@ var init_api = __esm({
         if (this.transportFn) {
           return this.callTransport(method, url, headers, data);
         }
-        const net4 = await this.performRequest(method, url, headers, data, MAX_REDIRECTS);
-        if (net4.kind === "error") {
-          return { http_code: null, body: null, headers: {}, error: net4.error };
+        const net5 = await this.performRequest(method, url, headers, data, MAX_REDIRECTS);
+        if (net5.kind === "error") {
+          return { http_code: null, body: null, headers: {}, error: net5.error };
         }
-        return this.readResponse(net4.res);
+        return this.readResponse(net5.res);
       }
       /**
        * Invoke a user-injected transport and normalize its result. The transport
@@ -32473,7 +32646,7 @@ var init_api = __esm({
 });
 
 // ../core/src/messenger.ts
-import net3 from "node:net";
+import net4 from "node:net";
 import tls2 from "node:tls";
 import { readFileSync as readFileSync23 } from "node:fs";
 import { basename as basename7 } from "node:path";
@@ -32485,6 +32658,32 @@ function normaliseEncryption(value, kind) {
   }
   return normalised;
 }
+function resolveSendTimeoutMs(optionTimeout) {
+  if (optionTimeout === void 0 || optionTimeout === null) {
+    return resolveEnvTimeoutSeconds(process.env.TINA4_MAIL_TIMEOUT) * 1e3;
+  }
+  if (!Number.isInteger(optionTimeout) || optionTimeout < 1) {
+    throw new Error(
+      `Messenger timeout must be a whole number of seconds and at least 1, got ${optionTimeout}.`
+    );
+  }
+  return optionTimeout * 1e3;
+}
+function resolveEnvTimeoutSeconds(raw) {
+  if (!raw || raw.trim() === "") return DEFAULT_TIMEOUT_SECONDS;
+  const trimmed = raw.trim();
+  const seconds = /^\d+$/.test(trimmed) ? Number(trimmed) : NaN;
+  if (Number.isInteger(seconds) && seconds >= 1) return seconds;
+  warnBadMailTimeout(raw);
+  return DEFAULT_TIMEOUT_SECONDS;
+}
+function warnBadMailTimeout(raw) {
+  if (_timeoutWarned.has(raw)) return;
+  _timeoutWarned.add(raw);
+  Log.warning(
+    `TINA4_MAIL_TIMEOUT must be a whole number of seconds and at least 1, got ${JSON.stringify(raw)} - using the default of ${DEFAULT_TIMEOUT_SECONDS} seconds`
+  );
+}
 function failOnIdle(socket, timeoutMs, what) {
   socket.setTimeout(timeoutMs, () => {
     socket.destroy(new Error(`${what} timed out after ${timeoutMs / 1e3}s`));
@@ -32496,7 +32695,7 @@ function connectVerifiedTls(host, port, socket) {
     host,
     port,
     socket,
-    servername: net3.isIP(host) ? void 0 : host,
+    servername: net4.isIP(host) ? void 0 : host,
     rejectUnauthorized: true
   });
   return new Promise((resolve21, reject) => {
@@ -32508,7 +32707,7 @@ function connectVerifiedTls(host, port, socket) {
   });
 }
 function connectPlain(host, port) {
-  const socket = net3.createConnection({ host, port });
+  const socket = net4.createConnection({ host, port });
   return new Promise((resolve21, reject) => {
     socket.once("connect", () => {
       socket.removeListener("error", reject);
@@ -32746,7 +32945,7 @@ function decodeTransfer(body, encoding) {
     }
   }
   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.replace(/=\r?\n/g, "").replace(/=([0-9A-Fa-f]{2})/g, (_m, h2) => String.fromCharCode(parseInt(h2, 16)));
   }
   return body;
 }
@@ -32863,7 +33062,7 @@ function parseFullMessage(uid, response) {
 function createMessenger() {
   return new Messenger();
 }
-var MAIL_ENCRYPTION_VALUES, SMTP_SEND_TIMEOUT_MS, SMTP_CHECK_TIMEOUT_MS, MessengerConnectionError, SmtpCommandError, Messenger, imapTagCounter;
+var MAIL_ENCRYPTION_VALUES, SMTP_SEND_TIMEOUT_MS, SMTP_CHECK_TIMEOUT_MS, _timeoutWarned, DEFAULT_TIMEOUT_SECONDS, MessengerConnectionError, SmtpCommandError, Messenger, imapTagCounter;
 var init_messenger = __esm({
   "../core/src/messenger.ts"() {
     "use strict";
@@ -32873,6 +33072,8 @@ var init_messenger = __esm({
     MAIL_ENCRYPTION_VALUES = ["ssl", "tls", "starttls", "none"];
     SMTP_SEND_TIMEOUT_MS = 3e4;
     SMTP_CHECK_TIMEOUT_MS = 1e4;
+    _timeoutWarned = /* @__PURE__ */ new Set();
+    DEFAULT_TIMEOUT_SECONDS = 30;
     MessengerConnectionError = class extends Error {
       constructor(message) {
         super(message);
@@ -32902,6 +33103,8 @@ var init_messenger = __esm({
       imapUser;
       imapPass;
       imapEncryption;
+      /** Resolved SMTP send timeout, in milliseconds (see the constructor). */
+      timeoutMs;
       constructor(options) {
         this.smtpConfigured = Boolean(options?.host ?? process.env.TINA4_MAIL_HOST);
         this.host = options?.host ?? process.env.TINA4_MAIL_HOST ?? "localhost";
@@ -32923,6 +33126,7 @@ var init_messenger = __esm({
         this.imapUser = options?.imapUser ?? process.env.TINA4_MAIL_IMAP_USERNAME ?? this.username;
         this.imapPass = options?.imapPass ?? process.env.TINA4_MAIL_IMAP_PASSWORD ?? this.password;
         this.imapEncryption = normaliseEncryption(options?.imapEncryption ?? process.env.TINA4_MAIL_IMAP_ENCRYPTION ?? "tls", "IMAP");
+        this.timeoutMs = resolveSendTimeoutMs(options?.timeout);
       }
       /**
        * How the SMTP connection is secured (ADR-0071 section 1). Port 465 is the
@@ -33058,7 +33262,7 @@ var init_messenger = __esm({
       async sendSmtp(options, recipients, messageId) {
         let socket = null;
         try {
-          socket = await this.openSmtpSession();
+          socket = await this.openSmtpSession(this.timeoutMs);
           await this.authenticateSmtp(socket);
           await this.sendSmtpEnvelope(socket, recipients.allRecipients);
           await this.sendSmtpMessage(socket, options, recipients, messageId);
@@ -34107,13 +34311,13 @@ var init_htmlElement = __esm({
 // ../core/src/ai.ts
 import { existsSync as existsSync26, mkdirSync as mkdirSync17, writeFileSync as writeFileSync16, readFileSync as readFileSync24 } from "node:fs";
 import { homedir } from "node:os";
-import { join as join28, resolve as resolve17, relative as relative11, dirname as dirname12 } from "node:path";
-import { fileURLToPath as fileURLToPath7 } from "node:url";
+import { join as join28, resolve as resolve17, relative as relative11, dirname as dirname13 } from "node:path";
+import { fileURLToPath as fileURLToPath8 } from "node:url";
 import { execSync, execFileSync as execFileSync4 } from "node:child_process";
 import { createInterface } from "node:readline";
 function readVersion() {
   try {
-    const thisDir = dirname12(fileURLToPath7(import.meta.url));
+    const thisDir = dirname13(fileURLToPath8(import.meta.url));
     const rootPkg = resolve17(thisDir, "..", "..", "..", "package.json");
     const pkg = JSON.parse(readFileSync24(rootPkg, "utf-8"));
     return pkg.version ?? "0.0.0";
@@ -34329,7 +34533,7 @@ function replaceMarkerBlock(existing, block, start2, end) {
 }
 function looksLikeOldFrameworkInstall(existing) {
   const head = existing.replace(/^\s+/, "").slice(0, 400);
-  return OLD_FRAMEWORK_HEADERS.some((h) => head.startsWith(h));
+  return OLD_FRAMEWORK_HEADERS.some((h2) => head.startsWith(h2));
 }
 function writeOrMerge(contextPath, contextFile, frameworkGuide) {
   const block = skillBlock(contextFile);
@@ -34359,7 +34563,7 @@ function installForTool(root, tool, context) {
   if (tool.configDir) {
     mkdirSync17(join28(root, tool.configDir), { recursive: true });
   }
-  const parentDir = dirname12(contextPath);
+  const parentDir = dirname13(contextPath);
   mkdirSync17(parentDir, { recursive: true });
   const action = writeOrMerge(contextPath, tool.contextFile, context);
   const rel = relative11(root, contextPath);
@@ -34736,7 +34940,7 @@ import { tests, assertEqual, runAll } from "tina4-nodejs";
 }
 function generateClaudeCodeContext() {
   try {
-    const thisDir = dirname12(fileURLToPath7(import.meta.url));
+    const thisDir = dirname13(fileURLToPath8(import.meta.url));
     const repoRoot = resolve17(thisDir, "..", "..", "..");
     const claudeMdPath = join28(repoRoot, "CLAUDE.md");
     if (existsSync26(claudeMdPath)) {
@@ -35584,8 +35788,8 @@ var init_aiClient = __esm({
       static retryDelay(headers, deadline) {
         const value = Array.isArray(headers["retry-after"]) ? headers["retry-after"][0] : headers["retry-after"];
         const requested = value !== void 0 && Number.isFinite(Number(value)) ? Math.max(0, Number(value) * 1e3) : 100;
-        const delay = Math.min(requested, Math.max(0, deadline - performance.now()));
-        return new Promise((resolve21) => setTimeout(resolve21, delay));
+        const delay2 = Math.min(requested, Math.max(0, deadline - performance.now()));
+        return new Promise((resolve21) => setTimeout(resolve21, delay2));
       }
       static async requestJson(config, headers, body) {
         const deadline = performance.now() + config.totalTimeout * 1e3;
@@ -38640,7 +38844,7 @@ __export(sqlite_exports, {
 });
 import { DatabaseSync as DatabaseSync3 } from "node:sqlite";
 import { mkdirSync as mkdirSync18 } from "node:fs";
-import { dirname as dirname13, isAbsolute as isAbsolute5, join as join29, resolve as resolve18, sep as sep7 } from "node:path";
+import { dirname as dirname14, isAbsolute as isAbsolute5, join as join29, resolve as resolve18, sep as sep7 } from "node:path";
 function isIdentifier(str) {
   return /^[A-Za-z_][A-Za-z0-9_]*$/.test(str);
 }
@@ -38677,7 +38881,7 @@ function resolveSqlitePath(dbPath) {
   }
   const cwd = resolve18(process.cwd());
   const path10 = join29(cwd, dbPath);
-  const parent = dirname13(path10);
+  const parent = dirname14(path10);
   const absParent = resolve18(parent);
   if (absParent !== cwd && !absParent.startsWith(cwd + sep7)) {
     throw new Error(
@@ -41106,9 +41310,75 @@ __export(mongodb_exports, {
 function isMatchAllWhere(where) {
   return where != null && MATCH_ALL_WHERE.test(where);
 }
+function isSqlWs(ch) {
+  return ch === " " || ch === "	" || ch === "\n" || ch === "\r" || ch === "\f" || ch === "\v";
+}
+function isWordChar(ch) {
+  return ch >= "a" && ch <= "z" || ch >= "A" && ch <= "Z" || ch >= "0" && ch <= "9" || ch === "_";
+}
+function onlyWs(sql, start2, end) {
+  for (let i = start2; i < end; i++) if (!isSqlWs(sql[i])) return false;
+  return true;
+}
+function keywordAt(upper, keyword, from) {
+  let at = upper.indexOf(keyword, from);
+  while (at >= 0) {
+    const end = at + keyword.length;
+    const okBefore = at === 0 || isSqlWs(upper[at - 1]);
+    const okAfter = end >= upper.length || isSqlWs(upper[end]);
+    if (okBefore && okAfter) return at;
+    at = upper.indexOf(keyword, at + 1);
+  }
+  return -1;
+}
+function earliest(positions, fallback) {
+  let min = fallback;
+  for (const p of positions) if (p >= 0 && p < min) min = p;
+  return min;
+}
+function readIdentifier(sql, from) {
+  let i = from;
+  while (i < sql.length && isSqlWs(sql[i])) i++;
+  if (i < sql.length && QUOTE_CHARS.includes(sql[i])) i++;
+  const start2 = i;
+  while (i < sql.length && isWordChar(sql[i])) i++;
+  if (i === start2) return null;
+  const name = sql.slice(start2, i);
+  if (i < sql.length && QUOTE_CHARS.includes(sql[i])) i++;
+  return [name, i];
+}
+function keywordGapEnd(upper, sql, keyword, from) {
+  const at = keywordAt(upper, keyword, from);
+  if (at < 0 || !onlyWs(sql, from, at)) return -1;
+  return at + keyword.length;
+}
+function stripQuotes(value) {
+  let result = value;
+  if (result.length > 0 && (result[0] === '"' || result[0] === "'")) result = result.slice(1);
+  const last = result.length - 1;
+  if (last >= 0 && (result[last] === '"' || result[last] === "'")) result = result.slice(0, last);
+  return result;
+}
+function splitOnAnd(where) {
+  const parts = [];
+  const lower = where.toLowerCase();
+  let segStart = 0;
+  let i = 0;
+  while (i < where.length) {
+    if (lower.startsWith("and", i) && i > 0 && isSqlWs(where[i - 1]) && i + 3 < where.length && isSqlWs(where[i + 3])) {
+      parts.push(where.slice(segStart, i));
+      i += 3;
+      segStart = i;
+      continue;
+    }
+    i++;
+  }
+  parts.push(where.slice(segStart));
+  return parts;
+}
 function parseWhereClause(where, params, paramOffset = 0) {
   const filter = {};
-  const parts = where.split(/\s+AND\s+/i);
+  const parts = splitOnAnd(where);
   let paramIndex = paramOffset;
   for (const part of parts) {
     const trimmed = part.trim();
@@ -41181,27 +41451,57 @@ function requireWriteFilter(filter, operation, table2) {
     );
   }
 }
-function parseSelect(sql, params) {
-  const match = sql.match(/^SELECT\s+(.*?)\s+FROM\s+["']?(\w+)["']?(?:\s+WHERE\s+(.*?))?(?:\s+ORDER\s+BY\s+(.*?))?(?:\s+LIMIT\s+(\d+))?(?:\s+OFFSET\s+(\d+))?$/is);
-  if (!match) return null;
-  const [, cols, collection, whereClause, orderBy, limitStr, skipStr] = match;
+function buildProjection(cols) {
   const projection = {};
-  if (cols && cols.trim() !== "*") {
-    for (const col of cols.split(",")) {
-      const name = col.trim().replace(/^["']|["']$/g, "");
-      if (name && name !== "*") projection[name] = 1;
-    }
-  }
-  const filter = whereClause ? parseWhereClause(whereClause.trim(), params).filter : {};
+  if (!cols || cols.trim() === "*") return projection;
+  for (const col of cols.split(",")) {
+    const name = stripQuotes(col.trim());
+    if (name && name !== "*") projection[name] = 1;
+  }
+  return projection;
+}
+function stripTrailingDirection(part) {
+  const lower = part.toLowerCase();
+  let suffix = 0;
+  if (lower.endsWith("asc")) suffix = 3;
+  else if (lower.endsWith("desc")) suffix = 4;
+  else return part;
+  const beforeIdx = part.length - suffix - 1;
+  if (beforeIdx < 0 || !isSqlWs(part[beforeIdx])) return part;
+  let i = beforeIdx;
+  while (i >= 0 && isSqlWs(part[i])) i--;
+  return part.slice(0, i + 1);
+}
+function parseOrderBy(orderBy) {
   const sort = {};
-  if (orderBy) {
-    for (const part of orderBy.split(",")) {
-      const trimmed = part.trim();
-      const desc = /DESC$/i.test(trimmed);
-      const col = trimmed.replace(/\s+(ASC|DESC)$/i, "").replace(/^["']|["']$/g, "").trim();
-      sort[col] = desc ? -1 : 1;
-    }
+  for (const rawPart of orderBy.split(",")) {
+    const trimmed = rawPart.trim();
+    const desc = trimmed.toLowerCase().endsWith("desc");
+    const col = stripQuotes(stripTrailingDirection(trimmed)).trim();
+    sort[col] = desc ? -1 : 1;
   }
+  return sort;
+}
+function parseSelect(sql, params) {
+  const upper = sql.toUpperCase();
+  if (!(upper.startsWith("SELECT") && (sql.length === 6 || isSqlWs(sql[6])))) return null;
+  const fromAt = keywordAt(upper, "FROM", 6);
+  if (fromAt < 0) return null;
+  const cols = sql.slice(6, fromAt).trim();
+  const ident = readIdentifier(sql, fromAt + 4);
+  if (!ident) return null;
+  const [collection, afterColl] = ident;
+  const whereAt = keywordAt(upper, "WHERE", afterColl);
+  const orderAt = keywordAt(upper, "ORDER BY", afterColl);
+  const limitAt = keywordAt(upper, "LIMIT", afterColl);
+  const offsetAt = keywordAt(upper, "OFFSET", afterColl);
+  const end = sql.length;
+  const whereClause = whereAt < 0 ? void 0 : sql.slice(whereAt + 5, earliest([orderAt, limitAt, offsetAt], end)).trim();
+  const orderBy = orderAt < 0 ? void 0 : sql.slice(orderAt + 8, earliest([limitAt, offsetAt], end)).trim();
+  const limitStr = limitAt < 0 ? void 0 : sql.slice(limitAt + 5, earliest([offsetAt], end)).trim();
+  const skipStr = offsetAt < 0 ? void 0 : sql.slice(offsetAt + 6).trim();
+  const projection = buildProjection(cols);
+  const filter = whereClause ? parseWhereClause(whereClause, params).filter : {};
   return {
     type: "find",
     collection,
@@ -41209,7 +41509,7 @@ function parseSelect(sql, params) {
     projection: Object.keys(projection).length > 0 ? projection : void 0,
     limit: limitStr ? parseInt(limitStr, 10) : void 0,
     skip: skipStr ? parseInt(skipStr, 10) : void 0,
-    sort: orderBy ? sort : void 0
+    sort: orderBy ? parseOrderBy(orderBy) : void 0
   };
 }
 function parseInsert(sql, params) {
@@ -41245,20 +41545,33 @@ function parseSetClause(setClause, params) {
   return { document, consumed };
 }
 function parseUpdate(sql, params) {
-  const match = sql.match(/^UPDATE\s+["']?(\w+)["']?\s+SET\s+(.*?)(?:\s+WHERE\s+(.+))?$/is);
-  if (!match) return null;
-  const [, collection, setClause, whereClause] = match;
+  const upper = sql.toUpperCase();
+  if (!(upper.startsWith("UPDATE") && sql.length > 6 && isSqlWs(sql[6]))) return null;
+  const ident = readIdentifier(sql, 6);
+  if (!ident) return null;
+  const [collection, afterColl] = ident;
+  const setAt = keywordAt(upper, "SET", afterColl);
+  if (setAt < 0 || !onlyWs(sql, afterColl, setAt)) return null;
+  const whereAt = keywordAt(upper, "WHERE", setAt + 3);
+  const setClause = sql.slice(setAt + 3, whereAt < 0 ? sql.length : whereAt).trim();
+  const whereClause = whereAt < 0 ? void 0 : sql.slice(whereAt + 5).trim();
   const set = parseSetClause(setClause, params);
-  const matchAll = isMatchAllWhere(whereClause?.trim());
-  const filter = whereClause ? parseWhereClause(whereClause.trim(), params, set.consumed).filter : {};
+  const matchAll = isMatchAllWhere(whereClause);
+  const filter = whereClause ? parseWhereClause(whereClause, params, set.consumed).filter : {};
   return { type: "updateMany", collection, filter, update: { $set: set.document }, matchAll };
 }
 function parseDelete(sql, params) {
-  const match = sql.match(/^DELETE\s+FROM\s+["']?(\w+)["']?(?:\s+WHERE\s+(.+))?$/is);
-  if (!match) return null;
-  const [, collection, whereClause] = match;
-  const matchAll = isMatchAllWhere(whereClause?.trim());
-  const filter = whereClause ? parseWhereClause(whereClause.trim(), params).filter : {};
+  const upper = sql.toUpperCase();
+  if (!upper.startsWith("DELETE")) return null;
+  const fromAt = keywordAt(upper, "FROM", 6);
+  if (fromAt < 0 || !onlyWs(sql, 6, fromAt)) return null;
+  const ident = readIdentifier(sql, fromAt + 4);
+  if (!ident) return null;
+  const [collection, afterColl] = ident;
+  const whereAt = keywordAt(upper, "WHERE", afterColl);
+  const whereClause = whereAt < 0 ? void 0 : sql.slice(whereAt + 5).trim();
+  const matchAll = isMatchAllWhere(whereClause);
+  const filter = whereClause ? parseWhereClause(whereClause, params).filter : {};
   return { type: "deleteMany", collection, filter, matchAll };
 }
 function parseCreate(sql) {
@@ -41266,10 +41579,23 @@ function parseCreate(sql) {
   return match ? { type: "raw", collection: match[1] } : null;
 }
 function parseCount(sql, params) {
-  const match = sql.match(/^SELECT\s+COUNT\(\*\)\s+AS\s+(\w+)\s+FROM\s+["']?(\w+)["']?(?:\s+WHERE\s+(.+))?$/is);
-  if (!match) return null;
-  const [, alias, collection, whereClause] = match;
-  const filter = whereClause ? parseWhereClause(whereClause.trim(), params).filter : {};
+  const upper = sql.toUpperCase();
+  if (!upper.startsWith("SELECT")) return null;
+  const afterCount = keywordGapEnd(upper, sql, "COUNT(*)", 6);
+  if (afterCount < 0) return null;
+  const afterAs = keywordGapEnd(upper, sql, "AS", afterCount);
+  if (afterAs < 0) return null;
+  const aliasIdent = readIdentifier(sql, afterAs);
+  if (!aliasIdent) return null;
+  const [alias, afterAlias] = aliasIdent;
+  const afterFrom = keywordGapEnd(upper, sql, "FROM", afterAlias);
+  if (afterFrom < 0) return null;
+  const coll = readIdentifier(sql, afterFrom);
+  if (!coll) return null;
+  const [collection, afterColl] = coll;
+  const whereAt = keywordAt(upper, "WHERE", afterColl);
+  const whereClause = whereAt < 0 ? void 0 : sql.slice(whereAt + 5).trim();
+  const filter = whereClause ? parseWhereClause(whereClause, params).filter : {};
   return { type: "aggregate", collection, pipeline: [{ $match: filter }, { $count: alias }] };
 }
 function parseSql(sql, params = []) {
@@ -41295,12 +41621,13 @@ function fieldTypeToJsonSchema(def) {
       return { bsonType: "string" };
   }
 }
-var MATCH_ALL_WHERE, MongodbAdapter;
+var MATCH_ALL_WHERE, QUOTE_CHARS, MongodbAdapter;
 var init_mongodb = __esm({
   "src/adapters/mongodb.ts"() {
     "use strict";
     init_connectTimeout();
     MATCH_ALL_WHERE = /^\s*1\s*=\s*1\s*$/;
+    QUOTE_CHARS = `"'`;
     MongodbAdapter = class {
       constructor(config) {
         this.config = config;
@@ -43624,13 +43951,13 @@ var init_database = __esm({
 });
 
 // src/model.ts
-import { readdirSync as readdirSync17, statSync as statSync18 } from "node:fs";
+import { readdirSync as readdirSync18, statSync as statSync18 } from "node:fs";
 import { join as join30, extname as extname8 } from "node:path";
 async function discoverModels(modelsDir) {
   const models = [];
   let files;
   try {
-    files = readdirSync17(modelsDir);
+    files = readdirSync18(modelsDir);
   } catch {
     return models;
   }
@@ -43677,8 +44004,10 @@ var init_model = __esm({
 });
 
 // src/migration.ts
-import { existsSync as existsSync27, readdirSync as readdirSync18, readFileSync as readFileSync25, mkdirSync as mkdirSync19, writeFileSync as writeFileSync17 } from "node:fs";
+import { existsSync as existsSync27, readdirSync as readdirSync19, readFileSync as readFileSync25, mkdirSync as mkdirSync19, writeFileSync as writeFileSync17, rmSync } from "node:fs";
 import { join as join31, resolve as resolve19 } from "node:path";
+import { tmpdir } from "node:os";
+import { createHash as createHash10 } from "node:crypto";
 function unwrapAdapter(db) {
   let cur = db;
   while (cur && cur.constructor?.name === "CachedDatabaseAdapter" && cur.adapter) {
@@ -44157,17 +44486,113 @@ function warnUnprefixedMigrations(files) {
     );
   }
 }
+async function acquireMigrationLock(db, dir) {
+  let engine = "";
+  try {
+    engine = (db.getDatabaseType() || "").toLowerCase();
+  } catch {
+    engine = "";
+  }
+  try {
+    if (engine.startsWith("postgres")) {
+      await adapterQuery(db, `SELECT pg_advisory_lock(${PG_ADVISORY_KEY}) AS locked`);
+      return { kind: "postgres" };
+    }
+    if (engine.startsWith("mysql")) {
+      await adapterQuery(db, `SELECT GET_LOCK('${MIGRATION_LOCK_NAME}', -1) AS locked`);
+      return { kind: "mysql" };
+    }
+    if (engine === "mssql" || engine === "sqlserver") {
+      await adapterExecute(
+        db,
+        `DECLARE @res INT; EXEC @res = sp_getapplock @Resource = '${MIGRATION_LOCK_NAME}', @LockMode = 'Exclusive', @LockOwner = 'Session', @LockTimeout = -1`
+      );
+      return { kind: "mssql" };
+    }
+  } catch (err) {
+    Log.debug(`DB migration lock unavailable (${engine}): ${err instanceof Error ? err.message : err}; using a file lock`);
+  }
+  return acquireFileLock(dir);
+}
+async function acquireFileLock(dir) {
+  const lockFile = join31(tmpdir(), `tina4-migration-${createHash10("sha256").update(resolve19(dir)).digest("hex")}.lock`);
+  const deadline = Date.now() + 6e4;
+  for (; ; ) {
+    try {
+      writeFileSync17(lockFile, String(process.pid), { flag: "wx" });
+      return { kind: "file", resource: lockFile };
+    } catch (err) {
+      if (err.code !== "EEXIST") {
+        Log.debug(`file migration lock unavailable: ${err instanceof Error ? err.message : err}; running unlocked`);
+        return { kind: "none" };
+      }
+      if (isStaleLock(lockFile)) {
+        try {
+          rmSync(lockFile, { force: true });
+        } catch {
+        }
+        continue;
+      }
+      if (Date.now() > deadline) {
+        Log.debug("file migration lock wait timed out; running unlocked");
+        return { kind: "none" };
+      }
+      await delay(50);
+    }
+  }
+}
+function isStaleLock(lockFile) {
+  let raw;
+  try {
+    raw = readFileSync25(lockFile, "utf-8").trim();
+  } catch {
+    return false;
+  }
+  const pid = parseInt(raw, 10);
+  if (!raw || !Number.isFinite(pid) || pid <= 0) {
+    return false;
+  }
+  try {
+    process.kill(pid, 0);
+    return false;
+  } catch (err) {
+    return err.code === "ESRCH";
+  }
+}
+async function releaseMigrationLock(db, lock) {
+  try {
+    if (lock.kind === "postgres") {
+      await adapterQuery(db, `SELECT pg_advisory_unlock(${PG_ADVISORY_KEY}) AS released`);
+    } else if (lock.kind === "mysql") {
+      await adapterQuery(db, `SELECT RELEASE_LOCK('${MIGRATION_LOCK_NAME}') AS released`);
+    } else if (lock.kind === "mssql") {
+      await adapterExecute(db, `EXEC sp_releaseapplock @Resource = '${MIGRATION_LOCK_NAME}', @LockOwner = 'Session'`);
+    } else if (lock.kind === "file" && lock.resource) {
+      rmSync(lock.resource, { recursive: true, force: true });
+    }
+  } catch (err) {
+    Log.debug(`migration lock release failed (${lock.kind}): ${err instanceof Error ? err.message : err}`);
+  }
+}
 async function migrate(adapter, options) {
   const db = adapter ?? getAdapter();
   const dir = resolve19(options?.migrationsDir ?? "migrations");
   const delimiter2 = options?.delimiter ?? ";";
-  const result = { applied: [], skipped: [], failed: [] };
   if (!existsSync27(dir)) {
-    return result;
+    return { applied: [], skipped: [], failed: [] };
+  }
+  const lock = await acquireMigrationLock(db, dir);
+  try {
+    return await runPendingMigrations(db, dir, delimiter2);
+  } finally {
+    await releaseMigrationLock(db, lock);
   }
+}
+async function runPendingMigrations(db, dir, delimiter2) {
+  const result = { applied: [], skipped: [], failed: [] };
   await ensureMigrationTableOn(db);
   const files = sortMigrationFiles(
-    readdirSync18(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
+    readdirSync19(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
   );
   if (files.length === 0) return result;
   warnUnprefixedMigrations(files);
@@ -44240,14 +44665,14 @@ async function status(adapter, options) {
   }
   if (!await adapterTableExists(db, MIGRATION_TABLE)) {
     const files2 = sortMigrationFiles(
-      readdirSync18(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
+      readdirSync19(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
     );
     result.pending = files2;
     return result;
   }
   await ensureMigrationTableOn(db);
   const files = sortMigrationFiles(
-    readdirSync18(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
+    readdirSync19(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
   );
   const appliedNames = /* @__PURE__ */ new Set();
   try {
@@ -44347,7 +44772,7 @@ export class ${className} {
   writeFileSync17(filePath, content, "utf-8");
   return filePath;
 }
-var ALTER_ADD_RE, CREATE_TABLE_RE, MIGRATION_TABLE, SMART_QUOTES, SMART_QUOTE_RE, SET_TERM_RE, Migration;
+var ALTER_ADD_RE, CREATE_TABLE_RE, MIGRATION_TABLE, SMART_QUOTES, SMART_QUOTE_RE, SET_TERM_RE, MIGRATION_LOCK_NAME, PG_ADVISORY_KEY, delay, Migration;
 var init_migration = __esm({
   "src/migration.ts"() {
     "use strict";
@@ -44372,6 +44797,12 @@ var init_migration = __esm({
     };
     SMART_QUOTE_RE = new RegExp(`[${Object.keys(SMART_QUOTES).join("")}]`, "g");
     SET_TERM_RE = /^SET\s+TERM\s+(\S+)$/i;
+    MIGRATION_LOCK_NAME = "tina4_migration_lock";
+    PG_ADVISORY_KEY = BigInt.asIntN(
+      64,
+      BigInt("0x" + createHash10("sha256").update(MIGRATION_LOCK_NAME).digest("hex").slice(0, 16))
+    ).toString();
+    delay = (ms) => new Promise((r) => setTimeout(r, ms));
     Migration = class {
       db;
       dir;
@@ -44428,7 +44859,7 @@ var init_migration = __esm({
         const dir = resolve19(this.dir);
         if (!existsSync27(dir)) return [];
         return sortMigrationFiles(
-          readdirSync18(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
+          readdirSync19(dir).filter((f) => f.endsWith(".sql") && !f.endsWith(".down.sql"))
         );
       }
     };
@@ -44436,17 +44867,40 @@ var init_migration = __esm({
 });
 
 // src/query.ts
-function resolveFieldColumn(fields, columnOf, key) {
-  const field = resolveField(fields, columnOf, key);
-  return field === null ? null : columnOf(field);
+function resolveFieldColumn(fields, columnOf2, key) {
+  const field = resolveField(fields, columnOf2, key);
+  return field === null ? null : columnOf2(field);
 }
-function resolveField(fields, columnOf, key) {
+function resolveField(fields, columnOf2, key) {
   if (Object.hasOwn(fields, key)) return key;
   for (const field of Object.keys(fields)) {
-    if (columnOf(field) === key) return field;
+    if (columnOf2(field) === key) return field;
   }
   return null;
 }
+function applySearch(options, conditions, params, quote) {
+  const searchTerm = (options.search ?? "").trim();
+  if (searchTerm === "" || !options.searchColumns || options.searchColumns.length === 0) return;
+  const likeParts = options.searchColumns.map((col) => `${quote(col)} LIKE ?`);
+  conditions.push(`(${likeParts.join(" OR ")})`);
+  for (const _ of options.searchColumns) params.push(`%${searchTerm}%`);
+}
+function orderPart(rawPart, bareDir, column2) {
+  const trimmed = rawPart.trim();
+  if (trimmed === "") return null;
+  const descending = trimmed.startsWith("-");
+  const col = column2("sort", descending ? trimmed.slice(1) : trimmed);
+  return `${col} ${bareDir ?? (descending ? "DESC" : "ASC")}`;
+}
+function buildOrderClause(options, column2) {
+  if (!options.sort) return "";
+  const rawParts = options.sort.split(",");
+  const first = rawParts[0].trim();
+  const singleBare = rawParts.length === 1 && first !== "" && !first.startsWith("-");
+  const bareDir = singleBare && String(options.sortDir).toLowerCase() === "desc" ? "DESC" : null;
+  const parts = rawParts.map((part) => orderPart(part, bareDir, column2)).filter((term) => term !== null);
+  return parts.length > 0 ? `ORDER BY ${parts.join(", ")}` : "";
+}
 function buildQuery(tableName, options, extraConditions, quote = quoteIdentifierAnsi, resolveColumn = () => null) {
   const conditions = [];
   const params = [];
@@ -44474,19 +44928,9 @@ function buildQuery(tableName, options, extraConditions, quote = quoteIdentifier
       }
     }
   }
+  applySearch(options, conditions, params, quote);
   const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-  let orderClause = "";
-  if (options.sort) {
-    const parts = [];
-    for (const part of options.sort.split(",")) {
-      const trimmed = part.trim();
-      if (trimmed === "") continue;
-      const descending = trimmed.startsWith("-");
-      const col = column2("sort", descending ? trimmed.slice(1) : trimmed);
-      parts.push(`${col} ${descending ? "DESC" : "ASC"}`);
-    }
-    if (parts.length > 0) orderClause = `ORDER BY ${parts.join(", ")}`;
-  }
+  const orderClause = buildOrderClause(options, column2);
   const limit = Math.min(options.limit ?? DEFAULT_ROW_CAP, DEFAULT_ROW_CAP);
   const page = Math.max(options.page ?? 1, 1);
   const offset = (page - 1) * limit;
@@ -44504,32 +44948,41 @@ function buildQuery(tableName, options, extraConditions, quote = quoteIdentifier
     filterParams: params
   };
 }
-function parseQueryString(query) {
-  const options = {};
+function parseFilterParams(query) {
   const filter = /* @__PURE__ */ Object.create(null);
   for (const [key, value] of Object.entries(query)) {
     if (key.startsWith("sort[")) {
       throw new InvalidQueryParameterError("Query parameter 'sort' must be a single comma-separated string");
     }
     if (!key.startsWith("filter[")) continue;
-    const filterMatch = key.match(/^filter\[([^\]]*)\](.*)$/s);
-    if (!filterMatch) throw new UnknownFieldError("filter", key.slice("filter[".length));
-    const [, field, rest] = filterMatch;
-    if (rest === "") {
-      filter[field] = value;
-      continue;
-    }
-    const operator = rest.match(/^\[([^[\]]*)\]$/)?.[1];
-    if (operator === void 0 || !Object.hasOwn(operatorMap, operator)) throw filterValueError(field);
-    if (!filter[field] || typeof filter[field] !== "object") {
-      filter[field] = {};
-    }
-    filter[field][operator] = value;
+    addFilterKey(filter, key, value);
+  }
+  return filter;
+}
+function addFilterKey(filter, key, value) {
+  const filterMatch = key.match(/^filter\[([^\]]*)\](.*)$/s);
+  if (!filterMatch) throw new UnknownFieldError("filter", key.slice("filter[".length));
+  const [, field, rest] = filterMatch;
+  if (rest === "") {
+    filter[field] = value;
+    return;
   }
+  const operator = rest.match(/^\[([^[\]]*)\]$/)?.[1];
+  if (operator === void 0 || !Object.hasOwn(operatorMap, operator)) throw filterValueError(field);
+  if (!filter[field] || typeof filter[field] !== "object") {
+    filter[field] = {};
+  }
+  filter[field][operator] = value;
+}
+function parseQueryString(query) {
+  const options = {};
+  const filter = parseFilterParams(query);
   if (Object.keys(filter).length > 0) {
     options.filter = filter;
   }
   if (query.sort) options.sort = query.sort;
+  if (query.search !== void 0) options.search = query.search;
+  if (query.sort_dir !== void 0) options.sortDir = query.sort_dir;
   if (query.page) options.page = parseInt(query.page, 10);
   if (query.limit) options.limit = parseInt(query.limit, 10);
   if (query.offset !== void 0) {
@@ -44665,12 +45118,12 @@ var init_validation = __esm({
 });
 
 // src/autoCrud.ts
-function allowListedBody(fields, columnOf, pkField, body, isCreate) {
+function allowListedBody(fields, columnOf2, pkField, body, isCreate) {
   const pkDef = fields[pkField];
   const stripPk = isCreate ? pkDef?.autoIncrement === true : true;
   const allowed = {};
   for (const [key, value] of Object.entries(body ?? {})) {
-    const field = resolveField(fields, columnOf, key);
+    const field = resolveField(fields, columnOf2, key);
     if (field === null) continue;
     if (field === "is_deleted") continue;
     if (stripPk && field === pkField) continue;
@@ -44714,6 +45167,9 @@ function generateCrudRoutes(models, options = {}) {
         let built;
         try {
           const qp = parseQueryString(req2.query ?? {});
+          if ((qp.search ?? "").trim() !== "") {
+            qp.searchColumns = Object.entries(fields).filter(([, def]) => def.type === "string" || def.type === "text").map(([name]) => getDbCol(name));
+          }
           built = buildQuery(tableName, qp, extraConditions, q, (key) => resolveFieldColumn(fields, getDbCol, key));
         } catch (err) {
           if (err instanceof UnknownFieldError) {
@@ -44961,6 +45417,567 @@ var init_autoCrud = __esm({
   }
 });
 
+// src/crudHelpers.ts
+function columnOf(model, prop) {
+  return model.fieldMapping?.[prop] ?? prop;
+}
+function primaryKeyProp(model) {
+  for (const [name, def] of Object.entries(model.fields)) {
+    if (def.primaryKey) return name;
+  }
+  return "id";
+}
+function searchableProps(model) {
+  return Object.entries(model.fields).filter(([, def]) => def.type === "string" || def.type === "text").map(([name]) => name);
+}
+function columnAlignment(model, col) {
+  const type2 = model?.fields?.[col]?.type;
+  return type2 === "integer" || type2 === "number" || type2 === "float" || type2 === "decimal" ? "text-end" : "text-start";
+}
+function prettyLabel(col) {
+  return String(col).split("_").map((p) => p ? p.charAt(0).toUpperCase() + p.slice(1) : p).join(" ");
+}
+function crudSortProp(model, requested, pkProp) {
+  const req2 = (requested ?? "").trim();
+  if (req2 === "") return pkProp;
+  if (Object.hasOwn(model.fields, req2)) return req2;
+  for (const name of Object.keys(model.fields)) {
+    if (columnOf(model, name) === req2) return name;
+  }
+  return pkProp;
+}
+function cellValue(record, col) {
+  return record[col];
+}
+function buildCells(columns, record, editable, aligns) {
+  return columns.map((col, index) => {
+    const raw = cellValue(record, col);
+    const value = h(raw === null || raw === void 0 ? "" : raw);
+    const css = aligns[index];
+    return editable ? `<td class="${css}" contenteditable="true" data-field="${h(col)}">${value}</td>` : `<td class="${css}">${value}</td>`;
+  }).join("");
+}
+function stripOrderAndLimit(sql) {
+  const cut = (line, keyword) => {
+    const hasNewline = line.endsWith("\n");
+    const content = hasNewline ? line.slice(0, -1) : line;
+    const at = content.toUpperCase().indexOf(keyword);
+    if (at < 0) return line;
+    const after = at + keyword.length;
+    if (content.length <= after) return line;
+    return content.slice(0, at) + (hasNewline ? "\n" : "");
+  };
+  const src = String(sql);
+  const lines = [];
+  let start2 = 0;
+  for (let i = 0; i < src.length; i++) {
+    if (src[i] === "\n") {
+      lines.push(src.slice(start2, i + 1));
+      start2 = i + 1;
+    }
+  }
+  lines.push(src.slice(start2));
+  return lines.map((line) => cut(cut(line, "ORDER BY "), "LIMIT ")).join("").trim();
+}
+function extractColumns(sql) {
+  const colsStr = selectProjection(sql);
+  if (colsStr === null || colsStr === "*") return ["*"];
+  return colsStr.split(",").map((c) => columnAlias(c.trim()));
+}
+function selectProjection(sql) {
+  const upper = sql.toUpperCase();
+  const selectAt = keywordIndex(upper, "SELECT", 0);
+  if (selectAt < 0) return null;
+  const colsStart = selectAt + "SELECT".length;
+  const fromAt = keywordIndex(upper, "FROM", colsStart);
+  if (fromAt < 0) return null;
+  return sql.slice(colsStart, fromAt).trim();
+}
+function columnAlias(trimmed) {
+  const asAt = keywordIndex(trimmed.toUpperCase(), "AS", 0);
+  if (asAt >= 0) {
+    const after = trimmed.slice(asAt + "AS".length).trim();
+    let endIdx = 0;
+    while (endIdx < after.length && !SQL_WS.includes(after[endIdx]) && after[endIdx] !== ",") endIdx++;
+    const word = after.slice(0, endIdx);
+    if (word) return word;
+  }
+  if (trimmed.includes(".")) return trimmed.split(".").pop().trim();
+  return trimmed;
+}
+function keywordIndex(upperHaystack, keyword, from) {
+  let at = upperHaystack.indexOf(keyword, from);
+  while (at >= 0) {
+    const afterIdx = at + keyword.length;
+    const boundaryBefore = at === 0 || SQL_WS.includes(upperHaystack[at - 1]);
+    const boundaryAfter = afterIdx >= upperHaystack.length || SQL_WS.includes(upperHaystack[afterIdx]);
+    if (boundaryBefore && boundaryAfter) return at;
+    at = upperHaystack.indexOf(keyword, at + 1);
+  }
+  return -1;
+}
+var h, SQL_WS;
+var init_crudHelpers = __esm({
+  "src/crudHelpers.ts"() {
+    "use strict";
+    init_engine();
+    h = escapeHtml;
+    SQL_WS = " 	\n\r\f\v";
+  }
+});
+
+// src/crudTable.ts
+function sortIndicator(sortCol, col, sortDir) {
+  if (String(sortCol) !== String(col)) return "";
+  const arrow = sortDir === "asc" ? "&#9650;" : "&#9660;";
+  return ` <span class="sort-indicator">${arrow}</span>`;
+}
+function sortUrl(requestPath, col, nextDir, page, search, limit) {
+  const query = `sort=${encodeURIComponent(col)}&sort_dir=${nextDir}&page=${page}&search=${encodeURIComponent(search)}&limit=${limit}`;
+  return h(`${requestPath}?${query}`);
+}
+function pageUrl(requestPath, p, search, sortCol, sortDir, limit) {
+  const query = `page=${p}&search=${encodeURIComponent(search)}&sort=${encodeURIComponent(sortCol)}&sort_dir=${sortDir}&limit=${limit}`;
+  return h(`${requestPath}?${query}`);
+}
+function pageControls(page, totalPages, requestPath, search, sortCol, sortDir, limit) {
+  if (totalPages <= 1) return [];
+  const controls = [];
+  if (page > 1) {
+    controls.push({
+      label: "Prev",
+      page: page - 1,
+      active: false,
+      inactive: true,
+      url: pageUrl(requestPath, page - 1, search, sortCol, sortDir, limit)
+    });
+  }
+  let startPage = Math.max(page - 3, 1);
+  const endPage = Math.min(startPage + 6, totalPages);
+  startPage = Math.max(endPage - 6, 1);
+  for (let p = startPage; p <= endPage; p++) {
+    controls.push({
+      label: p,
+      page: p,
+      active: p === page,
+      inactive: p !== page,
+      url: pageUrl(requestPath, p, search, sortCol, sortDir, limit)
+    });
+  }
+  if (page < totalPages) {
+    controls.push({
+      label: "Next",
+      page: page + 1,
+      active: false,
+      inactive: true,
+      url: pageUrl(requestPath, page + 1, search, sortCol, sortDir, limit)
+    });
+  }
+  return controls;
+}
+function jsConfig(opts) {
+  const aligns = {};
+  const labels = {};
+  for (const col of opts.columns) {
+    aligns[col] = columnAlignment(opts.model, col);
+    labels[col] = prettyLabel(col);
+  }
+  const config = {
+    api: opts.apiPath,
+    pk: opts.pk,
+    columns: opts.columns,
+    editable: opts.editable,
+    aligns,
+    labels,
+    limit: opts.limit,
+    search: opts.search,
+    sort: opts.sortCol,
+    sort_dir: opts.sortDir,
+    page: opts.page
+  };
+  return JSON.stringify(config).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/&/g, "\\u0026");
+}
+function headerCell(opts, col, align) {
+  const header = { label: h(prettyLabel(col)), align };
+  if (!opts.sortable) {
+    header.plain = true;
+    return header;
+  }
+  const nextDir = String(opts.sortCol) === String(col) && opts.sortDir === "asc" ? "desc" : "asc";
+  header.sortable = true;
+  header.col = h(col);
+  header.next_dir = nextDir;
+  header.url = sortUrl(opts.requestPath, col, nextDir, opts.page, opts.search, opts.limit);
+  header.indicator = sortIndicator(opts.sortCol, col, opts.sortDir);
+  return header;
+}
+function tableData(opts) {
+  const aligns = opts.columns.map((col) => columnAlignment(opts.model, col));
+  const headers = opts.columns.map((col, index) => headerCell(opts, col, aligns[index]));
+  const rows = opts.records.map((record) => ({
+    id: h(cellValue(record, opts.pk) ?? ""),
+    cells: buildCells(opts.columns, record, opts.editable, aligns)
+  }));
+  return {
+    headers,
+    rows,
+    empty: opts.records.length === 0,
+    colspan: opts.columns.length + 1,
+    editable: opts.editable,
+    readonly: !opts.editable,
+    inline_script: opts.inlineScript,
+    table_name: h(opts.tableName),
+    table_id_attr: opts.tableId ? ` id="${h(opts.tableId)}"` : ""
+  };
+}
+var init_crudTable = __esm({
+  "src/crudTable.ts"() {
+    "use strict";
+    init_crudHelpers();
+  }
+});
+
+// src/crudRender.ts
+import { existsSync as existsSync28 } from "node:fs";
+import { resolve as pathResolve, join as pathJoin, dirname as dirname15 } from "node:path";
+import { fileURLToPath as fileURLToPath9 } from "node:url";
+function frondFor(dir) {
+  let engine = frondCache2.get(dir);
+  if (!engine) {
+    setCspNonceProvider(currentCspNonce);
+    engine = new Frond(dir);
+    frondCache2.set(dir, engine);
+  }
+  return engine;
+}
+function renderCrudTemplate(name, data) {
+  const templateFile = `crud/${name}.twig`;
+  const userDir = pathResolve(process.cwd(), "src", "templates");
+  if (existsSync28(pathJoin(userDir, templateFile))) {
+    return frondFor(userDir).render(templateFile, data);
+  }
+  return frondFor(FRAMEWORK_TEMPLATES_DIR).render(templateFile, data);
+}
+function renderModalForm(mode, columns, pk, edit) {
+  const fields = columns.map((col) => {
+    const label = prettyLabel(col);
+    return {
+      id: `${mode}-${col}`,
+      name: h(col),
+      label: h(label),
+      value: "",
+      placeholder: h(`Enter ${label.toLowerCase()}`),
+      type: "text",
+      required_attr: "",
+      input: true
+    };
+  });
+  return renderCrudTemplate("form", {
+    wrap: true,
+    form_id_attr: ` id="form-${mode}"`,
+    action: "",
+    form_method: "POST",
+    method_override: null,
+    edit,
+    mode,
+    pk: h(pk),
+    modal_footer: true,
+    submit_button: false,
+    fields
+  });
+}
+function renderModals(editableColumns, pk) {
+  return renderCrudTemplate("modals", {
+    create_form: renderModalForm("create", editableColumns, pk, false),
+    edit_form: renderModalForm("edit", editableColumns, pk, true)
+  });
+}
+function generateTable(records, options = {}) {
+  const rows = records ?? [];
+  const tableName = String(options.tableName ?? "data");
+  const primaryKey = String(options.primaryKey ?? "id");
+  const editable = options.editable ?? true;
+  const columns = rows.length === 0 ? [] : Object.keys(rows[0]);
+  return renderCrudTemplate(
+    "table",
+    tableData({
+      columns,
+      records: rows,
+      pk: primaryKey,
+      tableName,
+      editable,
+      sortable: false,
+      inlineScript: editable,
+      requestPath: "",
+      search: "",
+      sortCol: "",
+      sortDir: "asc",
+      page: 1,
+      limit: 10,
+      tableId: `crud-${tableName}`,
+      model: null
+    })
+  );
+}
+function buildOptions(options, selectedValue) {
+  return (options ?? []).map((opt) => {
+    const selected = String(opt.value) === String(selectedValue) ? " selected" : "";
+    return `<option value="${h(opt.value)}"${selected}>${h(opt.label)}</option>`;
+  }).join("");
+}
+function fieldInputShape(field, base) {
+  const value = field.value;
+  switch (field.type ?? "string") {
+    case "text":
+      return { ...base, textarea: true };
+    case "boolean":
+      return { ...base, checkbox: true, checked_attr: value ? " checked" : "" };
+    case "select":
+      return { ...base, select: true, options_html: buildOptions(field.options, value) };
+    case "date":
+      return { ...base, input: true, type: "date" };
+    case "integer":
+    case "number":
+    case "float":
+    case "decimal":
+      return { ...base, input: true, type: "number" };
+    default:
+      return { ...base, input: true, type: "text" };
+  }
+}
+function buildCustomField(field) {
+  const name = String(field.name ?? "");
+  const label = field.label ?? name.charAt(0).toUpperCase() + name.slice(1);
+  const base = {
+    id: h(name),
+    name: h(name),
+    label: h(String(label)),
+    value: h(field.value ?? ""),
+    placeholder: "",
+    required_attr: field.required ? " required" : ""
+  };
+  return fieldInputShape(field, base);
+}
+function generateForm2(fields, options = {}) {
+  const verb = String(options.method ?? "POST").toUpperCase();
+  return renderCrudTemplate("form", {
+    wrap: true,
+    form_id_attr: "",
+    action: h(options.action ?? "/"),
+    form_method: h(verb),
+    method_override: ["PUT", "PATCH", "DELETE"].includes(verb) ? verb : null,
+    edit: false,
+    modal_footer: false,
+    submit_button: true,
+    fields: (fields ?? []).map((f) => buildCustomField(f))
+  });
+}
+var FRAMEWORK_TEMPLATES_DIR, frondCache2;
+var init_crudRender = __esm({
+  "src/crudRender.ts"() {
+    "use strict";
+    init_engine();
+    init_csp();
+    init_crudHelpers();
+    init_crudTable();
+    FRAMEWORK_TEMPLATES_DIR = pathResolve(
+      dirname15(fileURLToPath9(import.meta.url)),
+      "..",
+      "..",
+      "core",
+      "templates"
+    );
+    frondCache2 = /* @__PURE__ */ new Map();
+  }
+});
+
+// src/crud.ts
+function _resetCrudRegistrations() {
+  registeredTables.clear();
+}
+function discoveredFrom(model) {
+  return {
+    filePath: `src/models/${model.name ?? model.tableName}.ts`,
+    modelClass: model,
+    definition: {
+      tableName: model.tableName,
+      className: model.name,
+      fields: model.fields,
+      fieldMapping: model.fieldMapping,
+      softDelete: model.softDelete ?? false,
+      tableFilter: model.tableFilter,
+      dbName: model._db
+    }
+  };
+}
+async function registerBackend(model, options = {}) {
+  const prefix = options.prefix ?? "/api";
+  const key = `${prefix}::${model.tableName}`;
+  if (registeredTables.has(key)) return;
+  const routes = generateCrudRoutes([discoveredFrom(model)], { public: options.public === true });
+  for (const route of routes) defaultRouter.addRoute(route);
+  registeredTables.add(key);
+}
+async function fetchModelData(model, opts) {
+  const orderBy = `${opts.sort} ${opts.sortDir.toUpperCase()}`;
+  const search = opts.search.trim();
+  const searchable = search === "" ? [] : searchableProps(model);
+  let rows;
+  if (searchable.length === 0) {
+    rows = await model.all(opts.limit, opts.offset, void 0, orderBy);
+  } else {
+    const whereClause = searchable.map((prop) => `${columnOf(model, prop)} LIKE ?`).join(" OR ");
+    const params = searchable.map(() => `%${search}%`);
+    rows = await model.where(whereClause, params, opts.limit, opts.offset, void 0, orderBy);
+  }
+  const total = typeof rows.getTotalRecords === "function" ? rows.getTotalRecords() : rows.length;
+  const records = rows.map((r) => typeof r.toDict === "function" ? r.toDict() : r);
+  return [records, total];
+}
+async function fetchSqlData(sql, opts) {
+  let adapter;
+  try {
+    adapter = getAdapter();
+  } catch {
+    return [[], 0];
+  }
+  const base = stripOrderAndLimit(sql);
+  const dir = opts.sortDir.toUpperCase();
+  const search = opts.search.trim();
+  if (search === "") {
+    const countRow2 = await adapterQuery(adapter, `SELECT COUNT(*) as cnt FROM (${base}) AS _crud_cnt`, []);
+    const total2 = Number(countRow2[0]?.cnt ?? 0);
+    const rows2 = await adapterFetch(adapter, `${base} ORDER BY ${opts.sort} ${dir}`, [], opts.limit, opts.offset);
+    return [rows2, total2];
+  }
+  const columns = extractColumns(sql);
+  const searchParts = columns.map((col) => `CAST(${col} AS TEXT) LIKE ?`);
+  const params = columns.map(() => `%${search}%`);
+  const countRow = await adapterQuery(
+    adapter,
+    `SELECT COUNT(*) as cnt FROM (${base}) AS _crud_cnt WHERE ${searchParts.join(" OR ")}`,
+    params
+  );
+  const total = Number(countRow[0]?.cnt ?? 0);
+  const rows = await adapterFetch(
+    adapter,
+    `SELECT * FROM (${base}) AS _crud_sub WHERE ${searchParts.join(" OR ")} ORDER BY ${opts.sort} ${dir}`,
+    params,
+    opts.limit,
+    opts.offset
+  );
+  return [rows, total];
+}
+function parseCrudRequest(request, model, pkProp, limit) {
+  const query = request && request.query || {};
+  const page = Math.max(parseInt(String(query.page ?? "1"), 10) || 1, 1);
+  const search = String(query.search ?? "").trim();
+  const sortProp = crudSortProp(model, query.sort, pkProp);
+  const sortColumn = columnOf(model, sortProp);
+  const sortDir = query.sort_dir === "desc" ? "desc" : "asc";
+  const requestPath = request && typeof request.path === "string" ? request.path : "/";
+  return { page, search, sortProp, sortColumn, sortDir, offset: (page - 1) * limit, requestPath };
+}
+function clampLimit(raw) {
+  const limit = Number(raw ?? 10);
+  return !Number.isFinite(limit) || limit <= 0 ? 10 : limit;
+}
+async function toCrud(request, options) {
+  const model = options.model;
+  if (!model || !model.tableName || !model.fields) {
+    throw new Error("Crud.toCrud requires a model (an ORM class)");
+  }
+  const sql = options.sql;
+  const title = String(options.title ?? "CRUD");
+  const prefix = String(options.prefix ?? "/api");
+  const limit = clampLimit(options.limit);
+  const tableName = String(model.tableName);
+  const pkProp = primaryKeyProp(model);
+  const columns = Object.keys(model.fields);
+  await registerBackend(model, { prefix, public: options.public });
+  const req2 = parseCrudRequest(request, model, pkProp, limit);
+  const fetchOpts = {
+    search: req2.search,
+    sort: req2.sortColumn,
+    sortDir: req2.sortDir,
+    limit,
+    offset: req2.offset
+  };
+  const [records, total] = sql ? await fetchSqlData(sql, fetchOpts) : await fetchModelData(model, fetchOpts);
+  const totalPages = total > 0 ? Math.ceil(total / limit) : 1;
+  const apiPath = `${prefix}/${tableName}`;
+  const editableColumns = columns.filter((c) => c !== pkProp);
+  const tableHtml = renderCrudTemplate(
+    "table",
+    tableData({
+      columns,
+      records,
+      pk: pkProp,
+      tableName,
+      editable: false,
+      sortable: true,
+      inlineScript: false,
+      requestPath: req2.requestPath,
+      search: req2.search,
+      sortCol: req2.sortProp,
+      sortDir: req2.sortDir,
+      page: req2.page,
+      limit,
+      tableId: null,
+      model
+    })
+  );
+  return renderCrudTemplate("page", {
+    title: h(title),
+    search: h(req2.search),
+    request_path: h(req2.requestPath),
+    info_count: records.length,
+    info_total: total,
+    info_page: req2.page,
+    info_total_pages: totalPages,
+    table_html: tableHtml,
+    modals_html: renderModals(editableColumns, pkProp),
+    show_pagination: totalPages > 1,
+    controls: pageControls(req2.page, totalPages, req2.requestPath, req2.search, req2.sortProp, req2.sortDir, limit),
+    config_json: jsConfig({
+      apiPath,
+      pk: pkProp,
+      columns,
+      editable: editableColumns,
+      model,
+      limit,
+      search: req2.search,
+      sortCol: req2.sortProp,
+      sortDir: req2.sortDir,
+      page: req2.page
+    })
+  });
+}
+var registeredTables, Crud, CRUD;
+var init_crud = __esm({
+  "src/crud.ts"() {
+    "use strict";
+    init_router();
+    init_autoCrud();
+    init_database();
+    init_crudHelpers();
+    init_crudTable();
+    init_crudRender();
+    init_crudRender();
+    init_crudHelpers();
+    registeredTables = /* @__PURE__ */ new Set();
+    Crud = {
+      toCrud,
+      registerBackend,
+      generateTable,
+      generateForm: generateForm2,
+      stripOrderAndLimit,
+      _resetCrudRegistrations
+    };
+    CRUD = Crud;
+  }
+});
+
 // src/queryBuilder.ts
 var QueryBuilder;
 var init_queryBuilder = __esm({
@@ -47313,7 +48330,7 @@ var init_seeder = __esm({
 import { DatabaseSync as DatabaseSync4 } from "node:sqlite";
 import { randomBytes as randomBytes11 } from "node:crypto";
 import { mkdirSync as mkdirSync20 } from "node:fs";
-import { dirname as dirname14, isAbsolute as isAbsolute6, join as join32 } from "node:path";
+import { dirname as dirname16, isAbsolute as isAbsolute6, join as join32 } from "node:path";
 function iso(d) {
   return d.toISOString();
 }
@@ -47584,7 +48601,7 @@ function resolveStorePath(dbPath) {
   let path10 = dbPath;
   if (!isAbsolute6(path10)) {
     path10 = join32(process.cwd(), path10);
-    mkdirSync20(dirname14(path10), { recursive: true });
+    mkdirSync20(dirname16(path10), { recursive: true });
   }
   return path10;
 }
@@ -49334,7 +50351,9 @@ __export(index_exports, {
   AutoCrud: () => AutoCrud,
   BaseModel: () => BaseModel,
   CONNECT_TIMEOUT_TOLERANCE_MS: () => CONNECT_TIMEOUT_TOLERANCE_MS,
+  CRUD: () => CRUD,
   CachedDatabaseAdapter: () => CachedDatabaseAdapter,
+  Crud: () => Crud,
   Cursor: () => Cursor,
   DEFAULT_DATABASE_CONNECT_TIMEOUT_SECONDS: () => DEFAULT_DATABASE_CONNECT_TIMEOUT_SECONDS,
   DEFAULT_GRAPH_CONNECT_TIMEOUT_SECONDS: () => DEFAULT_GRAPH_CONNECT_TIMEOUT_SECONDS,
@@ -49381,6 +50400,7 @@ __export(index_exports, {
   SqliteCollection: () => SqliteCollection,
   SqliteDatabase: () => SqliteDatabase,
   UnknownFieldError: () => UnknownFieldError,
+  _resetCrudRegistrations: () => _resetCrudRegistrations,
   adapterColumns: () => adapterColumns,
   adapterCommit: () => adapterCommit,
   adapterCreateTable: () => adapterCreateTable,
@@ -49413,6 +50433,8 @@ __export(index_exports, {
   ensureMigrationTable: () => ensureMigrationTable,
   extractLastInsertId: () => extractLastInsertId,
   generateCrudRoutes: () => generateCrudRoutes,
+  generateForm: () => generateForm2,
+  generateTable: () => generateTable,
   getAdapter: () => getAdapter,
   getAppliedMigrations: () => getAppliedMigrations,
   getCollection: () => getCollection,
@@ -49432,10 +50454,13 @@ __export(index_exports, {
   realtime: () => realtime,
   recordMigration: () => recordMigration,
   redactCredentials: () => redactCredentials,
+  registerBackend: () => registerBackend,
   removeMigrationRecord: () => removeMigrationRecord,
   resetDefaultStore: () => resetDefaultStore,
   resetRequestCaches: () => resetRequestCaches2,
   resolveDbPool: () => resolveDbPool,
+  resolveField: () => resolveField,
+  resolveFieldColumn: () => resolveFieldColumn,
   resolveFirebirdCharset: () => resolveFirebirdCharset,
   resolveGraphConnectTimeout: () => resolveGraphConnectTimeout,
   resolveSqlitePath: () => resolveSqlitePath,
@@ -49453,8 +50478,10 @@ __export(index_exports, {
   splitStatements: () => splitStatements,
   status: () => status,
   storageKey: () => storageKey,
+  stripOrderAndLimit: () => stripOrderAndLimit,
   stripTrailingSemicolons: () => stripTrailingSemicolons,
   syncModels: () => syncModels,
+  toCrud: () => toCrud,
   validate: () => validate,
   withConnectTimeout: () => withConnectTimeout,
   wrapWithCache: () => wrapWithCache
@@ -49470,6 +50497,7 @@ var init_index = __esm({
     init_model();
     init_migration();
     init_autoCrud();
+    init_crud();
     init_query();
     init_validation();
     init_baseModel();
@@ -49501,7 +50529,9 @@ export {
   AutoCrud,
   BaseModel,
   CONNECT_TIMEOUT_TOLERANCE_MS,
+  CRUD,
   CachedDatabaseAdapter,
+  Crud,
   Cursor,
   DEFAULT_DATABASE_CONNECT_TIMEOUT_SECONDS,
   DEFAULT_GRAPH_CONNECT_TIMEOUT_SECONDS,
@@ -49548,6 +50578,7 @@ export {
   SqliteCollection,
   SqliteDatabase,
   UnknownFieldError,
+  _resetCrudRegistrations,
   adapterColumns,
   adapterCommit,
   adapterCreateTable,
@@ -49580,6 +50611,8 @@ export {
   ensureMigrationTable,
   extractLastInsertId,
   generateCrudRoutes,
+  generateForm2 as generateForm,
+  generateTable,
   getAdapter,
   getAppliedMigrations,
   getCollection,
@@ -49599,10 +50632,13 @@ export {
   realtime,
   recordMigration,
   redactCredentials,
+  registerBackend,
   removeMigrationRecord,
   resetDefaultStore,
   resetRequestCaches2 as resetRequestCaches,
   resolveDbPool,
+  resolveField,
+  resolveFieldColumn,
   resolveFirebirdCharset,
   resolveGraphConnectTimeout,
   resolveSqlitePath,
@@ -49620,8 +50656,10 @@ export {
   splitStatements,
   status,
   storageKey,
+  stripOrderAndLimit,
   stripTrailingSemicolons,
   syncModels,
+  toCrud,
   validate,
   withConnectTimeout,
   wrapWithCache