@kuratchi/js 0.0.9 → 0.0.11

package/dist/compiler/index.js

@@ -1,8 +1,8 @@
 /**
- * Compiler â€" scans a project's routes/ directory, parses .html files,
+ * Compiler �" scans a project's routes/ directory, parses .html files,
  * and generates a single Worker entry point.
  */
-import { parseFile } from './parser.js';
+import { parseFile, stripTopLevelImports } from './parser.js';
 import { compileTemplate } from './template.js';
 import { transpileTypeScript } from './transpile.js';
 import { filePathToPattern } from '../runtime/router.js';
@@ -47,7 +47,8 @@ function rewriteWorkerEnvAliases(source, aliases) {
     for (const alias of aliases) {
         if (!/^[A-Za-z_$][\w$]*$/.test(alias))
             continue;
-        const aliasRegex = new RegExp(`\\b${alias}\\b`, 'g');
+        // Negative lookbehind: don't rewrite property accesses like __m16.env
+        const aliasRegex = new RegExp(`(?<!\\.)\\b${alias}\\b`, 'g');
         out = out.replace(aliasRegex, '__env');
     }
     return out;
@@ -67,9 +68,12 @@ function parseNamedImportBindings(line) {
         .filter(Boolean)
         .map(n => {
         const parts = n.split(/\s+as\s+/).map(p => p.trim()).filter(Boolean);
-        return parts[1] || parts[0] || '';
+        return {
+            imported: parts[0] || '',
+            local: parts[1] || parts[0] || '',
+        };
     })
-        .filter(Boolean);
+        .filter((binding) => !!binding.imported && !!binding.local);
 }
 function filterClientImportsForServer(imports, neededFns) {
     const selected = [];
@@ -77,7 +81,7 @@ function filterClientImportsForServer(imports, neededFns) {
         const bindings = parseNamedImportBindings(line);
         if (bindings.length === 0)
             continue;
-        if (bindings.some(name => neededFns.has(name))) {
+        if (bindings.some((binding) => neededFns.has(binding.local))) {
             selected.push(line);
         }
     }
@@ -86,9 +90,9 @@ function filterClientImportsForServer(imports, neededFns) {
 /**
  * Compile a project's src/routes/ into .kuratchi/routes.js
  *
- * The generated module exports { app } â€" an object with a fetch() method
+ * The generated module exports { app } �" an object with a fetch() method
  * that handles routing, load functions, form actions, and rendering.
- * Returns the path to .kuratchi/worker.js — the stable wrangler entry point that
+ * Returns the path to .kuratchi/worker.js � the stable wrangler entry point that
  * re-exports everything from routes.js (default fetch handler + named DO class exports).
  * No src/index.ts is needed in user projects.
  */
@@ -101,21 +105,21 @@ export function compile(options) {
     }
     // Discover all .html route files
     const routeFiles = discoverRoutes(routesDir);
-    // Component compilation cache â€" only compile components that are actually imported
+    // Component compilation cache �" only compile components that are actually imported
     const libDir = path.join(srcDir, 'lib');
-    const compiledComponentCache = new Map(); // fileName â†' compiled function code
-    const componentStyleCache = new Map(); // fileName â†' escaped CSS string (or empty)
+    const compiledComponentCache = new Map(); // fileName �' compiled function code
+    const componentStyleCache = new Map(); // fileName �' escaped CSS string (or empty)
     // Tracks which prop names inside a component are used as action={propName}.
-    // e.g. db-studio uses action={runQueryAction} â†' stores 'runQueryAction'.
+    // e.g. db-studio uses action={runQueryAction} �' stores 'runQueryAction'.
     // When the route passes runQueryAction={runAdminSqlQuery}, the compiler knows
     // to add 'runAdminSqlQuery' to the route's actionFunctions.
-    const componentActionCache = new Map(); // fileName â†' Set of action prop names
+    const componentActionCache = new Map(); // fileName �' Set of action prop names
     function compileComponent(fileName) {
         if (compiledComponentCache.has(fileName))
             return compiledComponentCache.get(fileName);
         let filePath;
         let funcName;
-        // Package component: "@kuratchi/ui:badge" â†' resolve from package
+        // Package component: "@kuratchi/ui:badge" �' resolve from package
         const pkgMatch = fileName.match(/^(@[^:]+):(.+)$/);
         if (pkgMatch) {
             const pkgName = pkgMatch[1]; // e.g. "@kuratchi/ui"
@@ -142,9 +146,7 @@ export function compile(options) {
         const compParsed = parseFile(rawSource, { kind: 'component', filePath });
         // propsCode = script body with all import lines stripped out
         const propsCode = compParsed.script
-            ? compParsed.script
-                .replace(/^\s*import[\s\S]*?from\s+['"][^'"]+['"]\s*;?/gm, '')
-                .trim()
+            ? stripTopLevelImports(compParsed.script)
             : '';
         const devDecls = buildDevAliasDeclarations(compParsed.devAliases, !!options.isDev);
         const effectivePropsCode = [devDecls, propsCode].filter(Boolean).join('\n');
@@ -155,7 +157,7 @@ export function compile(options) {
                 : '';
         // template source (parseFile already removes the <script> block)
         let source = compParsed.template;
-        // Extract optional <style> block â€" CSS is scoped and injected once per route at compile time
+        // Extract optional <style> block �" CSS is scoped and injected once per route at compile time
         let styleBlock = '';
         const styleMatch = source.match(/<style[\s>][\s\S]*?<\/style>/i);
         if (styleMatch) {
@@ -201,7 +203,7 @@ export function compile(options) {
             }
         }
         // Scan the component template for action={propName} uses.
-        // These prop names are "action props" â€" when the route passes actionProp={routeFn},
+        // These prop names are "action props" �" when the route passes actionProp={routeFn},
         // the compiler knows to add routeFn to the route's actionFunctions so it ends up
         // in the route's actions map and can be dispatched at runtime.
         const actionPropNames = new Set();
@@ -221,7 +223,7 @@ export function compile(options) {
         compiledComponentCache.set(fileName, compiled);
         return compiled;
     }
-    // App layout: src/routes/layout.html (convention â€" wraps all routes automatically)
+    // App layout: src/routes/layout.html (convention �" wraps all routes automatically)
     const layoutFile = path.join(routesDir, 'layout.html');
     let compiledLayout = null;
     const layoutComponentNames = new Map();
@@ -229,6 +231,17 @@ export function compile(options) {
         let source = fs.readFileSync(layoutFile, 'utf-8');
         // Inject UI theme CSS if configured in kuratchi.config.ts
         const themeCSS = readUiTheme(projectDir);
+        const uiConfigValues = readUiConfigValues(projectDir);
+        // Patch <html> tag: set server-default theme class and data-radius from config
+        if (uiConfigValues) {
+            source = patchHtmlTag(source, uiConfigValues.theme, uiConfigValues.radius);
+        }
+        // Inject anti-FOUC theme init before CSS so saved light/dark/system preference
+        // is restored before first paint, preventing a flash on hard navigations.
+        if (uiConfigValues) {
+            const themeInitScript = `<script>(function(){try{var d=document.documentElement;var s=localStorage.getItem('kui-theme');var fallback=d.getAttribute('data-theme')==='system'?'system':(d.classList.contains('dark')?'dark':'light');var p=(s==='light'||s==='dark'||s==='system')?s:fallback;d.classList.remove('dark');d.removeAttribute('data-theme');if(p==='dark'){d.classList.add('dark');}else if(p==='system'){d.setAttribute('data-theme','system');}}catch(e){}})()</script>`;
+            source = source.replace('</head>', themeInitScript + '\n</head>');
+        }
         if (themeCSS) {
             source = source.replace('</head>', `<style>${themeCSS}</style>\n</head>`);
         }
@@ -239,384 +252,385 @@ export function compile(options) {
         // - server actions bound via onX={serverAction(...)} -> [data-action][data-action-event]
         // - declarative confirm="..."
         // - declarative checkbox groups: data-select-all / data-select-item
-        const bridgeSource = `(function(){
-  function by(sel, root){ return Array.prototype.slice.call((root || document).querySelectorAll(sel)); }
-  var __refreshSeq = Object.create(null);
-  function syncGroup(group){
-    var items = by('[data-select-item]').filter(function(el){ return el.getAttribute('data-select-item') === group; });
-    var masters = by('[data-select-all]').filter(function(el){ return el.getAttribute('data-select-all') === group; });
-    if(!items.length || !masters.length) return;
-    var all = items.every(function(i){ return !!i.checked; });
-    var any = items.some(function(i){ return !!i.checked; });
-    masters.forEach(function(m){ m.checked = all; m.indeterminate = any && !all; });
-  }
-  function inferQueryKey(getName, argsRaw){
-    if(!getName) return '';
-    return 'query:' + String(getName) + '|' + (argsRaw || '[]');
-  }
-  function blockKey(el){
-    if(!el || !el.getAttribute) return '';
-    var explicit = el.getAttribute('data-key');
-    if(explicit) return 'key:' + explicit;
-    var inferred = inferQueryKey(el.getAttribute('data-get'), el.getAttribute('data-get-args'));
-    if(inferred) return inferred;
-    var asName = el.getAttribute('data-as');
-    if(asName) return 'as:' + asName;
-    return '';
-  }
-  function escHtml(v){
-    return String(v || '').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-  }
-  function setBlocksLoading(blocks){
-    blocks.forEach(function(el){
-      el.setAttribute('aria-busy','true');
-      el.setAttribute('data-kuratchi-loading','1');
-      var text = el.getAttribute('data-loading-text');
-      if(text && !el.hasAttribute('data-as')){ el.innerHTML = '<p>' + escHtml(text) + '</p>'; return; }
-      el.style.opacity = '0.6';
-    });
-  }
-  function clearBlocksLoading(blocks){
-    blocks.forEach(function(el){
-      el.removeAttribute('aria-busy');
-      el.removeAttribute('data-kuratchi-loading');
-      el.style.opacity = '';
-    });
-  }
-  function replaceBlocksWithKey(key){
-    if(!key || typeof DOMParser === 'undefined'){ location.reload(); return Promise.resolve(); }
-    var oldBlocks = by('[data-get]').filter(function(el){ return blockKey(el) === key; });
-    if(!oldBlocks.length){ location.reload(); return Promise.resolve(); }
-    var first = oldBlocks[0];
-    var qFn = first ? (first.getAttribute('data-get') || '') : '';
-    var qArgs = first ? String(first.getAttribute('data-get-args') || '[]') : '[]';
-    var seq = (__refreshSeq[key] || 0) + 1;
-    __refreshSeq[key] = seq;
-    setBlocksLoading(oldBlocks);
-    var headers = { 'x-kuratchi-refresh': '1' };
-    if(qFn){ headers['x-kuratchi-query-fn'] = String(qFn); headers['x-kuratchi-query-args'] = qArgs; }
-    return fetch(location.pathname + location.search, { headers: headers })
-      .then(function(r){ if(!r.ok) throw new Error('HTTP ' + r.status); return r.text(); })
-      .then(function(html){
-        if(__refreshSeq[key] !== seq) return;
-        var doc = new DOMParser().parseFromString(html, 'text/html');
-        var newBlocks = by('[data-get]', doc).filter(function(el){ return blockKey(el) === key; });
-        if(!oldBlocks.length || !newBlocks.length){ location.reload(); return; }
-        for(var i=0;i<oldBlocks.length;i++){ if(newBlocks[i]) oldBlocks[i].outerHTML = newBlocks[i].outerHTML; }
-        by('[data-select-all]').forEach(function(m){ var g=m.getAttribute('data-select-all'); if(g) syncGroup(g); });
-      })
-      .catch(function(){
-        if(__refreshSeq[key] === seq) clearBlocksLoading(oldBlocks);
-        location.reload();
-      });
-  }
-  function replaceBlocksByDescriptor(fnName, argsRaw){
-    if(!fnName || typeof DOMParser === 'undefined'){ location.reload(); return Promise.resolve(); }
-    var normalizedArgs = String(argsRaw || '[]');
-    var oldBlocks = by('[data-get]').filter(function(el){
-      return (el.getAttribute('data-get') || '') === String(fnName) &&
-        String(el.getAttribute('data-get-args') || '[]') === normalizedArgs;
-    });
-    if(!oldBlocks.length){ location.reload(); return Promise.resolve(); }
-    var key = 'fn:' + String(fnName) + '|' + normalizedArgs;
-    var seq = (__refreshSeq[key] || 0) + 1;
-    __refreshSeq[key] = seq;
-    setBlocksLoading(oldBlocks);
-    return fetch(location.pathname + location.search, {
-      headers: {
-        'x-kuratchi-refresh': '1',
-        'x-kuratchi-query-fn': String(fnName),
-        'x-kuratchi-query-args': normalizedArgs,
-      }
-    })
-      .then(function(r){ if(!r.ok) throw new Error('HTTP ' + r.status); return r.text(); })
-      .then(function(html){
-        if(__refreshSeq[key] !== seq) return;
-        var doc = new DOMParser().parseFromString(html, 'text/html');
-        var newBlocks = by('[data-get]', doc).filter(function(el){
-          return (el.getAttribute('data-get') || '') === String(fnName) &&
-            String(el.getAttribute('data-get-args') || '[]') === normalizedArgs;
-        });
-        if(!newBlocks.length){ location.reload(); return; }
-        for(var i=0;i<oldBlocks.length;i++){ if(newBlocks[i]) oldBlocks[i].outerHTML = newBlocks[i].outerHTML; }
-        by('[data-select-all]').forEach(function(m){ var g=m.getAttribute('data-select-all'); if(g) syncGroup(g); });
-      })
-      .catch(function(){
-        if(__refreshSeq[key] === seq) clearBlocksLoading(oldBlocks);
-        location.reload();
-      });
-  }
-  function refreshByDescriptor(fnName, argsRaw){
-    if(!fnName) { location.reload(); return Promise.resolve(); }
-    return replaceBlocksByDescriptor(fnName, argsRaw || '[]');
-  }
-  function refreshNearest(el){
-    var host = el && el.closest ? el.closest('[data-get]') : null;
-    if(!host){ location.reload(); return Promise.resolve(); }
-    return replaceBlocksWithKey(blockKey(host));
-  }
-  function refreshTargets(raw){
-    if(!raw){ location.reload(); return Promise.resolve(); }
-    var keys = String(raw).split(',').map(function(v){ return v.trim(); }).filter(Boolean);
-    if(!keys.length){ location.reload(); return Promise.resolve(); }
-    return Promise.all(keys.map(function(k){ return replaceBlocksWithKey('key:' + k); })).then(function(){});
-  }
-  function act(e){
-    if(e.type === 'click'){
-      var g = e.target && e.target.closest ? e.target.closest('[data-get]') : null;
-      if(g && !g.hasAttribute('data-as') && !g.hasAttribute('data-action')){
-        var getUrl = g.getAttribute('data-get');
-        if(getUrl){
-          if(/^[a-z][a-z0-9+\-.]*:/i.test(getUrl) && !/^https?:/i.test(getUrl)) return;
-          e.preventDefault();
-          location.assign(getUrl);
-          return;
-        }
-      }
-      var r = e.target && e.target.closest ? e.target.closest('[data-refresh]') : null;
-      if(r && !r.hasAttribute('data-action')){
-        e.preventDefault();
-        var rf = r.getAttribute('data-refresh');
-        var ra = r.getAttribute('data-refresh-args');
-        if(ra !== null){ refreshByDescriptor(rf, ra || '[]'); return; }
-        if(rf && rf.trim()){ refreshTargets(rf); return; }
-        refreshNearest(r);
-        return;
-      }
-    }
-    var sel = '[data-action][data-action-event="' + e.type + '"]';
-    var b = e.target && e.target.closest ? e.target.closest(sel) : null;
-    if(!b) return;
-    e.preventDefault();
-    var fd = new FormData();
-    fd.append('_action', b.getAttribute('data-action') || '');
-    fd.append('_args', b.getAttribute('data-args') || '[]');
-    var m = b.getAttribute('data-action-method');
-    if(m) fd.append('_method', String(m).toUpperCase());
-    fetch(location.pathname, { method: 'POST', body: fd })
-      .then(function(r){
-        if(!r.ok){
-          return r.json().then(function(j){ throw new Error((j && j.error) || ('HTTP ' + r.status)); }).catch(function(){ throw new Error('HTTP ' + r.status); });
-        }
-        return r.json();
-      })
-      .then(function(){
-        if(!b.hasAttribute('data-refresh')) return;
-        var refreshFn = b.getAttribute('data-refresh');
-        var refreshArgs = b.getAttribute('data-refresh-args');
-        if(refreshArgs !== null){ return refreshByDescriptor(refreshFn, refreshArgs || '[]'); }
-        if(refreshFn && refreshFn.trim()){ return refreshTargets(refreshFn); }
-        return refreshNearest(b);
-      })
-      .catch(function(err){ console.error('[kuratchi] client action error:', err); });
-  }
-  ['click','change','input','focus','blur'].forEach(function(ev){ document.addEventListener(ev, act, true); });
-  function autoLoadQueries(){
-    var seen = Object.create(null);
-    by('[data-get][data-as]').forEach(function(el){
-      var fn = el.getAttribute('data-get');
-      if(!fn) return;
-      var args = String(el.getAttribute('data-get-args') || '[]');
-      var key = String(fn) + '|' + args;
-      if(seen[key]) return;
-      seen[key] = true;
-      replaceBlocksByDescriptor(fn, args);
-    });
-  }
-  if(document.readyState === 'loading'){
-    document.addEventListener('DOMContentLoaded', autoLoadQueries, { once: true });
-  } else {
-    autoLoadQueries();
-  }
-  document.addEventListener('click', function(e){
-    var b = e.target && e.target.closest ? e.target.closest('[command="fill-dialog"]') : null;
-    if(!b) return;
-    var targetId = b.getAttribute('commandfor');
-    if(!targetId) return;
-    var dialog = document.getElementById(targetId);
-    if(!dialog) return;
-    var raw = b.getAttribute('data-dialog-data');
-    if(!raw) return;
-    var data;
-    try { data = JSON.parse(raw); } catch(_err) { return; }
-    Object.keys(data).forEach(function(k){
-      var inp = dialog.querySelector('[name="col_' + k + '"]');
-      if(inp){
-        inp.value = data[k] === null || data[k] === undefined ? '' : String(data[k]);
-        inp.placeholder = data[k] === null || data[k] === undefined ? 'NULL' : '';
-      }
-      var hidden = dialog.querySelector('#dialog-field-' + k);
-      if(hidden){
-        hidden.value = data[k] === null || data[k] === undefined ? '' : String(data[k]);
-      }
-    });
-    var rowidInp = dialog.querySelector('[name="rowid"]');
-    if(rowidInp && data.rowid !== undefined) rowidInp.value = String(data.rowid);
-    if(typeof dialog.showModal === 'function') dialog.showModal();
-  }, true);
-  (function initPoll(){
-    var prev = {};
-    function bindPollEl(el){
-      if(!el || !el.getAttribute) return;
-      if(el.getAttribute('data-kuratchi-poll-bound') === '1') return;
-      var fn = el.getAttribute('data-poll');
-      if(!fn) return;
-      el.setAttribute('data-kuratchi-poll-bound', '1');
-      var args = el.getAttribute('data-poll-args') || '[]';
-      var iv = parseInt(el.getAttribute('data-interval') || '', 10) || 3000;
-      var key = String(fn) + args;
-      if(!(key in prev)) prev[key] = null;
-      (function tick(){
-        setTimeout(function(){
-          fetch(location.pathname + '?_rpc=' + encodeURIComponent(String(fn)) + '&_args=' + encodeURIComponent(args), { headers: { 'x-kuratchi-rpc': '1' } })
-            .then(function(r){ return r.json(); })
-            .then(function(j){
-              if(j && j.ok){
-                var s = JSON.stringify(j.data);
-                if(prev[key] !== null && prev[key] !== s){ location.reload(); return; }
-                prev[key] = s;
-              }
-              tick();
-            })
-            .catch(function(){ tick(); });
-        }, iv);
-      })();
-    }
-    function scan(){
-      by('[data-poll]').forEach(bindPollEl);
-    }
-    scan();
-    setInterval(scan, 500);
-  })();
-  function confirmClick(e){
-    var el = e.target && e.target.closest ? e.target.closest('[confirm]') : null;
-    if(!el) return;
-    var msg = el.getAttribute('confirm');
-    if(!msg) return;
-    if(!window.confirm(msg)){ e.preventDefault(); e.stopPropagation(); }
-  }
-  document.addEventListener('click', confirmClick, true);
-  document.addEventListener('submit', function(e){
-    var f = e.target && e.target.matches && e.target.matches('form[confirm]') ? e.target : null;
-    if(!f) return;
-    var msg = f.getAttribute('confirm');
-    if(!msg) return;
-    if(!window.confirm(msg)){ e.preventDefault(); e.stopPropagation(); }
-  }, true);
-  document.addEventListener('submit', function(e){
-    if(e.defaultPrevented) return;
-    var f = e.target;
-    if(!f || !f.querySelector) return;
-    var aInput = f.querySelector('input[name="_action"]');
-    if(!aInput) return;
-    var aName = aInput.value;
-    if(!aName) return;
-    f.setAttribute('data-action-loading', aName);
-    Array.prototype.slice.call(f.querySelectorAll('button[type="submit"],button:not([type="button"]):not([type="reset"])')).forEach(function(b){ b.disabled = true; });
-  }, true);
-  document.addEventListener('change', function(e){
-    var t = e.target;
-    if(!t || !t.getAttribute) return;
-    var gAll = t.getAttribute('data-select-all');
-    if(gAll){
-      by('[data-select-item]').filter(function(i){ return i.getAttribute('data-select-item') === gAll; }).forEach(function(i){ i.checked = !!t.checked; });
-      syncGroup(gAll);
-      return;
-    }
-    var gItem = t.getAttribute('data-select-item');
-    if(gItem) syncGroup(gItem);
-  }, true);
-  by('[data-select-all]').forEach(function(m){ var g = m.getAttribute('data-select-all'); if(g) syncGroup(g); });
+        const bridgeSource = `(function(){
+  function by(sel, root){ return Array.prototype.slice.call((root || document).querySelectorAll(sel)); }
+  var __refreshSeq = Object.create(null);
+  function syncGroup(group){
+    var items = by('[data-select-item]').filter(function(el){ return el.getAttribute('data-select-item') === group; });
+    var masters = by('[data-select-all]').filter(function(el){ return el.getAttribute('data-select-all') === group; });
+    if(!items.length || !masters.length) return;
+    var all = items.every(function(i){ return !!i.checked; });
+    var any = items.some(function(i){ return !!i.checked; });
+    masters.forEach(function(m){ m.checked = all; m.indeterminate = any && !all; });
+  }
+  function inferQueryKey(getName, argsRaw){
+    if(!getName) return '';
+    return 'query:' + String(getName) + '|' + (argsRaw || '[]');
+  }
+  function blockKey(el){
+    if(!el || !el.getAttribute) return '';
+    var explicit = el.getAttribute('data-key');
+    if(explicit) return 'key:' + explicit;
+    var inferred = inferQueryKey(el.getAttribute('data-get'), el.getAttribute('data-get-args'));
+    if(inferred) return inferred;
+    var asName = el.getAttribute('data-as');
+    if(asName) return 'as:' + asName;
+    return '';
+  }
+  function escHtml(v){
+    return String(v || '').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  }
+  function setBlocksLoading(blocks){
+    blocks.forEach(function(el){
+      el.setAttribute('aria-busy','true');
+      el.setAttribute('data-kuratchi-loading','1');
+      var text = el.getAttribute('data-loading-text');
+      if(text && !el.hasAttribute('data-as')){ el.innerHTML = '<p>' + escHtml(text) + '</p>'; return; }
+      el.style.opacity = '0.6';
+    });
+  }
+  function clearBlocksLoading(blocks){
+    blocks.forEach(function(el){
+      el.removeAttribute('aria-busy');
+      el.removeAttribute('data-kuratchi-loading');
+      el.style.opacity = '';
+    });
+  }
+  function replaceBlocksWithKey(key){
+    if(!key || typeof DOMParser === 'undefined'){ location.reload(); return Promise.resolve(); }
+    var oldBlocks = by('[data-get]').filter(function(el){ return blockKey(el) === key; });
+    if(!oldBlocks.length){ location.reload(); return Promise.resolve(); }
+    var first = oldBlocks[0];
+    var qFn = first ? (first.getAttribute('data-get') || '') : '';
+    var qArgs = first ? String(first.getAttribute('data-get-args') || '[]') : '[]';
+    var seq = (__refreshSeq[key] || 0) + 1;
+    __refreshSeq[key] = seq;
+    setBlocksLoading(oldBlocks);
+    var headers = { 'x-kuratchi-refresh': '1' };
+    if(qFn){ headers['x-kuratchi-query-fn'] = String(qFn); headers['x-kuratchi-query-args'] = qArgs; }
+    return fetch(location.pathname + location.search, { headers: headers })
+      .then(function(r){ if(!r.ok) throw new Error('HTTP ' + r.status); return r.text(); })
+      .then(function(html){
+        if(__refreshSeq[key] !== seq) return;
+        var doc = new DOMParser().parseFromString(html, 'text/html');
+        var newBlocks = by('[data-get]', doc).filter(function(el){ return blockKey(el) === key; });
+        if(!oldBlocks.length || !newBlocks.length){ location.reload(); return; }
+        for(var i=0;i<oldBlocks.length;i++){ if(newBlocks[i]) oldBlocks[i].outerHTML = newBlocks[i].outerHTML; }
+        by('[data-select-all]').forEach(function(m){ var g=m.getAttribute('data-select-all'); if(g) syncGroup(g); });
+      })
+      .catch(function(){
+        if(__refreshSeq[key] === seq) clearBlocksLoading(oldBlocks);
+        location.reload();
+      });
+  }
+  function replaceBlocksByDescriptor(fnName, argsRaw){
+    if(!fnName || typeof DOMParser === 'undefined'){ location.reload(); return Promise.resolve(); }
+    var normalizedArgs = String(argsRaw || '[]');
+    var oldBlocks = by('[data-get]').filter(function(el){
+      return (el.getAttribute('data-get') || '') === String(fnName) &&
+        String(el.getAttribute('data-get-args') || '[]') === normalizedArgs;
+    });
+    if(!oldBlocks.length){ location.reload(); return Promise.resolve(); }
+    var key = 'fn:' + String(fnName) + '|' + normalizedArgs;
+    var seq = (__refreshSeq[key] || 0) + 1;
+    __refreshSeq[key] = seq;
+    setBlocksLoading(oldBlocks);
+    return fetch(location.pathname + location.search, {
+      headers: {
+        'x-kuratchi-refresh': '1',
+        'x-kuratchi-query-fn': String(fnName),
+        'x-kuratchi-query-args': normalizedArgs,
+      }
+    })
+      .then(function(r){ if(!r.ok) throw new Error('HTTP ' + r.status); return r.text(); })
+      .then(function(html){
+        if(__refreshSeq[key] !== seq) return;
+        var doc = new DOMParser().parseFromString(html, 'text/html');
+        var newBlocks = by('[data-get]', doc).filter(function(el){
+          return (el.getAttribute('data-get') || '') === String(fnName) &&
+            String(el.getAttribute('data-get-args') || '[]') === normalizedArgs;
+        });
+        if(!newBlocks.length){ location.reload(); return; }
+        for(var i=0;i<oldBlocks.length;i++){ if(newBlocks[i]) oldBlocks[i].outerHTML = newBlocks[i].outerHTML; }
+        by('[data-select-all]').forEach(function(m){ var g=m.getAttribute('data-select-all'); if(g) syncGroup(g); });
+      })
+      .catch(function(){
+        if(__refreshSeq[key] === seq) clearBlocksLoading(oldBlocks);
+        location.reload();
+      });
+  }
+  function refreshByDescriptor(fnName, argsRaw){
+    if(!fnName) { location.reload(); return Promise.resolve(); }
+    return replaceBlocksByDescriptor(fnName, argsRaw || '[]');
+  }
+  function refreshNearest(el){
+    var host = el && el.closest ? el.closest('[data-get]') : null;
+    if(!host){ location.reload(); return Promise.resolve(); }
+    return replaceBlocksWithKey(blockKey(host));
+  }
+  function refreshTargets(raw){
+    if(!raw){ location.reload(); return Promise.resolve(); }
+    var keys = String(raw).split(',').map(function(v){ return v.trim(); }).filter(Boolean);
+    if(!keys.length){ location.reload(); return Promise.resolve(); }
+    return Promise.all(keys.map(function(k){ return replaceBlocksWithKey('key:' + k); })).then(function(){});
+  }
+  function act(e){
+    if(e.type === 'click'){
+      var g = e.target && e.target.closest ? e.target.closest('[data-get]') : null;
+      if(g && !g.hasAttribute('data-as') && !g.hasAttribute('data-action')){
+        var getUrl = g.getAttribute('data-get');
+        if(getUrl){
+          if(/^[a-z][a-z0-9+\-.]*:/i.test(getUrl) && !/^https?:/i.test(getUrl)) return;
+          e.preventDefault();
+          location.assign(getUrl);
+          return;
+        }
+      }
+      var r = e.target && e.target.closest ? e.target.closest('[data-refresh]') : null;
+      if(r && !r.hasAttribute('data-action')){
+        e.preventDefault();
+        var rf = r.getAttribute('data-refresh');
+        var ra = r.getAttribute('data-refresh-args');
+        if(ra !== null){ refreshByDescriptor(rf, ra || '[]'); return; }
+        if(rf && rf.trim()){ refreshTargets(rf); return; }
+        refreshNearest(r);
+        return;
+      }
+    }
+    var sel = '[data-action][data-action-event="' + e.type + '"]';
+    var b = e.target && e.target.closest ? e.target.closest(sel) : null;
+    if(!b) return;
+    e.preventDefault();
+    var fd = new FormData();
+    fd.append('_action', b.getAttribute('data-action') || '');
+    fd.append('_args', b.getAttribute('data-args') || '[]');
+    var m = b.getAttribute('data-action-method');
+    if(m) fd.append('_method', String(m).toUpperCase());
+    fetch(location.pathname, { method: 'POST', body: fd })
+      .then(function(r){
+        if(!r.ok){
+          return r.json().then(function(j){ throw new Error((j && j.error) || ('HTTP ' + r.status)); }).catch(function(){ throw new Error('HTTP ' + r.status); });
+        }
+        return r.json();
+      })
+      .then(function(j){
+        if(j && j.redirectTo){ location.assign(j.redirectTo); return; }
+        if(!b.hasAttribute('data-refresh')) return;
+        var refreshFn = b.getAttribute('data-refresh');
+        var refreshArgs = b.getAttribute('data-refresh-args');
+        if(refreshArgs !== null){ return refreshByDescriptor(refreshFn, refreshArgs || '[]'); }
+        if(refreshFn && refreshFn.trim()){ return refreshTargets(refreshFn); }
+        return refreshNearest(b);
+      })
+      .catch(function(err){ console.error('[kuratchi] client action error:', err); });
+  }
+  ['click','change','input','focus','blur'].forEach(function(ev){ document.addEventListener(ev, act, true); });
+  function autoLoadQueries(){
+    var seen = Object.create(null);
+    by('[data-get][data-as]').forEach(function(el){
+      var fn = el.getAttribute('data-get');
+      if(!fn) return;
+      var args = String(el.getAttribute('data-get-args') || '[]');
+      var key = String(fn) + '|' + args;
+      if(seen[key]) return;
+      seen[key] = true;
+      replaceBlocksByDescriptor(fn, args);
+    });
+  }
+  if(document.readyState === 'loading'){
+    document.addEventListener('DOMContentLoaded', autoLoadQueries, { once: true });
+  } else {
+    autoLoadQueries();
+  }
+  document.addEventListener('click', function(e){
+    var b = e.target && e.target.closest ? e.target.closest('[command="fill-dialog"]') : null;
+    if(!b) return;
+    var targetId = b.getAttribute('commandfor');
+    if(!targetId) return;
+    var dialog = document.getElementById(targetId);
+    if(!dialog) return;
+    var raw = b.getAttribute('data-dialog-data');
+    if(!raw) return;
+    var data;
+    try { data = JSON.parse(raw); } catch(_err) { return; }
+    Object.keys(data).forEach(function(k){
+      var inp = dialog.querySelector('[name="col_' + k + '"]');
+      if(inp){
+        inp.value = data[k] === null || data[k] === undefined ? '' : String(data[k]);
+        inp.placeholder = data[k] === null || data[k] === undefined ? 'NULL' : '';
+      }
+      var hidden = dialog.querySelector('#dialog-field-' + k);
+      if(hidden){
+        hidden.value = data[k] === null || data[k] === undefined ? '' : String(data[k]);
+      }
+    });
+    var rowidInp = dialog.querySelector('[name="rowid"]');
+    if(rowidInp && data.rowid !== undefined) rowidInp.value = String(data.rowid);
+    if(typeof dialog.showModal === 'function') dialog.showModal();
+  }, true);
+  (function initPoll(){
+    var prev = {};
+    function bindPollEl(el){
+      if(!el || !el.getAttribute) return;
+      if(el.getAttribute('data-kuratchi-poll-bound') === '1') return;
+      var fn = el.getAttribute('data-poll');
+      if(!fn) return;
+      el.setAttribute('data-kuratchi-poll-bound', '1');
+      var args = el.getAttribute('data-poll-args') || '[]';
+      var iv = parseInt(el.getAttribute('data-interval') || '', 10) || 3000;
+      var key = String(fn) + args;
+      if(!(key in prev)) prev[key] = null;
+      (function tick(){
+        setTimeout(function(){
+          fetch(location.pathname + '?_rpc=' + encodeURIComponent(String(fn)) + '&_args=' + encodeURIComponent(args), { headers: { 'x-kuratchi-rpc': '1' } })
+            .then(function(r){ return r.json(); })
+            .then(function(j){
+              if(j && j.ok){
+                var s = JSON.stringify(j.data);
+                if(prev[key] !== null && prev[key] !== s){ location.reload(); return; }
+                prev[key] = s;
+              }
+              tick();
+            })
+            .catch(function(){ tick(); });
+        }, iv);
+      })();
+    }
+    function scan(){
+      by('[data-poll]').forEach(bindPollEl);
+    }
+    scan();
+    setInterval(scan, 500);
+  })();
+  function confirmClick(e){
+    var el = e.target && e.target.closest ? e.target.closest('[confirm]') : null;
+    if(!el) return;
+    var msg = el.getAttribute('confirm');
+    if(!msg) return;
+    if(!window.confirm(msg)){ e.preventDefault(); e.stopPropagation(); }
+  }
+  document.addEventListener('click', confirmClick, true);
+  document.addEventListener('submit', function(e){
+    var f = e.target && e.target.matches && e.target.matches('form[confirm]') ? e.target : null;
+    if(!f) return;
+    var msg = f.getAttribute('confirm');
+    if(!msg) return;
+    if(!window.confirm(msg)){ e.preventDefault(); e.stopPropagation(); }
+  }, true);
+  document.addEventListener('submit', function(e){
+    if(e.defaultPrevented) return;
+    var f = e.target;
+    if(!f || !f.querySelector) return;
+    var aInput = f.querySelector('input[name="_action"]');
+    if(!aInput) return;
+    var aName = aInput.value;
+    if(!aName) return;
+    f.setAttribute('data-action-loading', aName);
+    Array.prototype.slice.call(f.querySelectorAll('button[type="submit"],button:not([type="button"]):not([type="reset"])')).forEach(function(b){ b.disabled = true; });
+  }, true);
+  document.addEventListener('change', function(e){
+    var t = e.target;
+    if(!t || !t.getAttribute) return;
+    var gAll = t.getAttribute('data-select-all');
+    if(gAll){
+      by('[data-select-item]').filter(function(i){ return i.getAttribute('data-select-item') === gAll; }).forEach(function(i){ i.checked = !!t.checked; });
+      syncGroup(gAll);
+      return;
+    }
+    var gItem = t.getAttribute('data-select-item');
+    if(gItem) syncGroup(gItem);
+  }, true);
+  by('[data-select-all]').forEach(function(m){ var g = m.getAttribute('data-select-all'); if(g) syncGroup(g); });
 })();`;
-        const reactiveRuntimeSource = `(function(g){
-  if(g.__kuratchiReactive) return;
-  const targetMap = new WeakMap();
-  const proxyMap = new WeakMap();
-  let active = null;
-  const queue = new Set();
-  let flushing = false;
-  function queueRun(fn){
-    queue.add(fn);
-    if(flushing) return;
-    flushing = true;
-    Promise.resolve().then(function(){
-      try {
-        const jobs = Array.from(queue);
-        queue.clear();
-        for (const job of jobs) job();
-      } finally {
-        flushing = false;
-      }
-    });
-  }
-  function cleanup(effect){
-    const deps = effect.__deps || [];
-    for (const dep of deps) dep.delete(effect);
-    effect.__deps = [];
-  }
-  function track(target, key){
-    if(!active) return;
-    let depsMap = targetMap.get(target);
-    if(!depsMap){ depsMap = new Map(); targetMap.set(target, depsMap); }
-    let dep = depsMap.get(key);
-    if(!dep){ dep = new Set(); depsMap.set(key, dep); }
-    if(dep.has(active)) return;
-    dep.add(active);
-    if(!active.__deps) active.__deps = [];
-    active.__deps.push(dep);
-  }
-  function trigger(target, key){
-    const depsMap = targetMap.get(target);
-    if(!depsMap) return;
-    const effects = new Set();
-    const add = function(k){
-      const dep = depsMap.get(k);
-      if(dep) dep.forEach(function(e){ effects.add(e); });
-    };
-    add(key);
-    add('*');
-    effects.forEach(function(e){ queueRun(e); });
-  }
-  function isObject(value){ return value !== null && typeof value === 'object'; }
-  function proxify(value){
-    if(!isObject(value)) return value;
-    if(proxyMap.has(value)) return proxyMap.get(value);
-    const proxy = new Proxy(value, {
-      get(target, key, receiver){
-        track(target, key);
-        const out = Reflect.get(target, key, receiver);
-        return isObject(out) ? proxify(out) : out;
-      },
-      set(target, key, next, receiver){
-        const prev = target[key];
-        const result = Reflect.set(target, key, next, receiver);
-        if(prev !== next) trigger(target, key);
-        if(Array.isArray(target) && key !== 'length') trigger(target, 'length');
-        return result;
-      },
-      deleteProperty(target, key){
-        const had = Object.prototype.hasOwnProperty.call(target, key);
-        const result = Reflect.deleteProperty(target, key);
-        if(had) trigger(target, key);
-        return result;
-      }
-    });
-    proxyMap.set(value, proxy);
-    return proxy;
-  }
-  function effect(fn){
-    const run = function(){
-      cleanup(run);
-      active = run;
-      try { fn(); } finally { active = null; }
-    };
-    run.__deps = [];
-    run();
-    return function(){ cleanup(run); };
-  }
-  function state(initial){ return proxify(initial); }
-  function replace(_prev, next){ return proxify(next); }
-  g.__kuratchiReactive = { state, effect, replace };
+        const reactiveRuntimeSource = `(function(g){
+  if(g.__kuratchiReactive) return;
+  const targetMap = new WeakMap();
+  const proxyMap = new WeakMap();
+  let active = null;
+  const queue = new Set();
+  let flushing = false;
+  function queueRun(fn){
+    queue.add(fn);
+    if(flushing) return;
+    flushing = true;
+    Promise.resolve().then(function(){
+      try {
+        const jobs = Array.from(queue);
+        queue.clear();
+        for (const job of jobs) job();
+      } finally {
+        flushing = false;
+      }
+    });
+  }
+  function cleanup(effect){
+    const deps = effect.__deps || [];
+    for (const dep of deps) dep.delete(effect);
+    effect.__deps = [];
+  }
+  function track(target, key){
+    if(!active) return;
+    let depsMap = targetMap.get(target);
+    if(!depsMap){ depsMap = new Map(); targetMap.set(target, depsMap); }
+    let dep = depsMap.get(key);
+    if(!dep){ dep = new Set(); depsMap.set(key, dep); }
+    if(dep.has(active)) return;
+    dep.add(active);
+    if(!active.__deps) active.__deps = [];
+    active.__deps.push(dep);
+  }
+  function trigger(target, key){
+    const depsMap = targetMap.get(target);
+    if(!depsMap) return;
+    const effects = new Set();
+    const add = function(k){
+      const dep = depsMap.get(k);
+      if(dep) dep.forEach(function(e){ effects.add(e); });
+    };
+    add(key);
+    add('*');
+    effects.forEach(function(e){ queueRun(e); });
+  }
+  function isObject(value){ return value !== null && typeof value === 'object'; }
+  function proxify(value){
+    if(!isObject(value)) return value;
+    if(proxyMap.has(value)) return proxyMap.get(value);
+    const proxy = new Proxy(value, {
+      get(target, key, receiver){
+        track(target, key);
+        const out = Reflect.get(target, key, receiver);
+        return isObject(out) ? proxify(out) : out;
+      },
+      set(target, key, next, receiver){
+        const prev = target[key];
+        const result = Reflect.set(target, key, next, receiver);
+        if(prev !== next) trigger(target, key);
+        if(Array.isArray(target) && key !== 'length') trigger(target, 'length');
+        return result;
+      },
+      deleteProperty(target, key){
+        const had = Object.prototype.hasOwnProperty.call(target, key);
+        const result = Reflect.deleteProperty(target, key);
+        if(had) trigger(target, key);
+        return result;
+      }
+    });
+    proxyMap.set(value, proxy);
+    return proxy;
+  }
+  function effect(fn){
+    const run = function(){
+      cleanup(run);
+      active = run;
+      try { fn(); } finally { active = null; }
+    };
+    run.__deps = [];
+    run();
+    return function(){ cleanup(run); };
+  }
+  function state(initial){ return proxify(initial); }
+  function replace(_prev, next){ return proxify(next); }
+  g.__kuratchiReactive = { state, effect, replace };
 })(window);`;
         const actionScript = `<script>${options.isDev ? bridgeSource : compactInlineJs(bridgeSource)}</script>`;
         const reactiveRuntimeScript = `<script>${options.isDev ? reactiveRuntimeSource : compactInlineJs(reactiveRuntimeSource)}</script>`;
@@ -631,7 +645,7 @@ export function compile(options) {
         const layoutParsed = parseFile(source, { kind: 'layout', filePath: layoutFile });
         const hasLayoutScript = layoutParsed.script && (Object.keys(layoutParsed.componentImports).length > 0 || layoutParsed.hasLoad);
         if (hasLayoutScript) {
-            // Dynamic layout â€" has component imports and/or data declarations
+            // Dynamic layout �" has component imports and/or data declarations
             // Compile component imports from layout
             for (const [pascalName, fileName] of Object.entries(layoutParsed.componentImports)) {
                 compileComponent(fileName);
@@ -640,8 +654,25 @@ export function compile(options) {
             // Replace <slot></slot> with content parameter injection
             let layoutTemplate = layoutParsed.template.replace(/<slot\s*><\/slot>/g, '{@raw __content}');
             layoutTemplate = layoutTemplate.replace(/<slot\s*\/>/g, '{@raw __content}');
-            // Build layout action names so action={fn} works in layouts
+            // Build layout action names so action={fn} works in layouts, including action props
+            // passed through child components like <Dashboard footerSignOutAction={signOut}>.
             const layoutActionNames = new Set(layoutParsed.actionFunctions);
+            for (const [pascalName, compFileName] of layoutComponentNames.entries()) {
+                const actionPropNames = componentActionCache.get(compFileName);
+                const compTagRegex = new RegExp(`<${pascalName}\\b([\\s\\S]*?)(?:/?)>`, 'g');
+                for (const tagMatch of layoutParsed.template.matchAll(compTagRegex)) {
+                    const attrs = tagMatch[1];
+                    if (actionPropNames && actionPropNames.size > 0) {
+                        for (const propName of actionPropNames) {
+                            const propRegex = new RegExp(`\\b${propName}=\\{([A-Za-z_$][\\w$]*)\\}`);
+                            const propMatch = attrs.match(propRegex);
+                            if (propMatch) {
+                                layoutActionNames.add(propMatch[1]);
+                            }
+                        }
+                    }
+                }
+            }
             // Compile the layout template with component + action support
             const layoutRenderBody = compileTemplate(layoutTemplate, layoutComponentNames, layoutActionNames);
             // Collect component CSS for layout
@@ -659,17 +690,17 @@ export function compile(options) {
                 finalLayoutBody = [lines[0], ...styleLines, ...lines.slice(1)].join('\n');
             }
             // Build the layout script body (data vars, etc.)
-            let layoutScriptBody = layoutParsed.script.replace(/^\s*import[\s\S]*?from\s+['"][^'"]+['"]\s*;?/gm, '').trim();
+            let layoutScriptBody = stripTopLevelImports(layoutParsed.script);
             const layoutDevDecls = buildDevAliasDeclarations(layoutParsed.devAliases, !!options.isDev);
             layoutScriptBody = [layoutDevDecls, layoutScriptBody].filter(Boolean).join('\n');
-            compiledLayout = `function __layout(__content) {
-  const __esc = (v) => { if (v == null) return ''; return String(v).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;'); };
-  ${layoutScriptBody ? layoutScriptBody + '\n  ' : ''}${finalLayoutBody}
-  return __html;
+            compiledLayout = `function __layout(__content) {
+  const __esc = (v) => { if (v == null) return ''; return String(v).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;'); };
+  ${layoutScriptBody ? layoutScriptBody + '\n  ' : ''}${finalLayoutBody}
+  return __html;
 }`;
         }
         else {
-            // Static layout â€" no components, use fast string split (original behavior)
+            // Static layout �" no components, use fast string split (original behavior)
             const slotMarker = '<slot></slot>';
             const slotIdx = source.indexOf(slotMarker);
             if (slotIdx === -1) {
@@ -682,7 +713,7 @@ export function compile(options) {
         }
     }
     // Custom error pages: src/routes/NNN.html (e.g. 404.html, 500.html, 401.html, 403.html)
-    // Only compiled if the user explicitly creates them â€" otherwise the framework's built-in default is used
+    // Only compiled if the user explicitly creates them �" otherwise the framework's built-in default is used
     const compiledErrorPages = new Map();
     for (const file of fs.readdirSync(routesDir)) {
         const match = file.match(/^(\d{3})\.html$/);
@@ -702,6 +733,7 @@ export function compile(options) {
     const doConfig = readDoConfig(projectDir);
     const containerConfig = readWorkerClassConfig(projectDir, 'containers');
     const workflowConfig = readWorkerClassConfig(projectDir, 'workflows');
+    const agentConfig = discoverConventionClassFiles(projectDir, path.join('src', 'server'), '.agent.ts', '.agent');
     const doHandlers = doConfig.length > 0
         ? discoverDoHandlers(srcDir, doConfig, ormDatabases)
         : [];
@@ -860,7 +892,7 @@ export function compile(options) {
     const compiledRoutes = [];
     const allImports = [];
     let moduleCounter = 0;
-    // Layout server import resolution â€" resolve non-component imports to module IDs
+    // Layout server import resolution �" resolve non-component imports to module IDs
     let isLayoutAsync = false;
     let compiledLayoutActions = null;
     if (compiledLayout && fs.existsSync(path.join(routesDir, 'layout.html'))) {
@@ -905,9 +937,27 @@ export function compile(options) {
                 const callRegex = new RegExp(`\\b${fnName}\\s*\\(`, 'g');
                 compiledLayout = compiledLayout.replace(callRegex, `${moduleId}.${fnName}(`);
             }
-            // Generate layout actions map for action={fn} in layouts
-            if (layoutParsedForImports.actionFunctions.length > 0) {
-                const actionEntries = layoutParsedForImports.actionFunctions
+            // Generate layout actions map for action={fn} in layouts and action props passed
+            // through layout components.
+            const layoutActionNames = new Set(layoutParsedForImports.actionFunctions);
+            for (const [pascalName, compFileName] of layoutComponentNames.entries()) {
+                const actionPropNames = componentActionCache.get(compFileName);
+                const compTagRegex = new RegExp(`<${pascalName}\\b([\\s\\S]*?)(?:/?)>`, 'g');
+                for (const tagMatch of layoutParsedForImports.template.matchAll(compTagRegex)) {
+                    const attrs = tagMatch[1];
+                    if (actionPropNames && actionPropNames.size > 0) {
+                        for (const propName of actionPropNames) {
+                            const propRegex = new RegExp(`\\b${propName}=\\{([A-Za-z_$][\\w$]*)\\}`);
+                            const propMatch = attrs.match(propRegex);
+                            if (propMatch) {
+                                layoutActionNames.add(propMatch[1]);
+                            }
+                        }
+                    }
+                }
+            }
+            if (layoutActionNames.size > 0) {
+                const actionEntries = Array.from(layoutActionNames)
                     .filter(fn => fn in layoutFnToModule)
                     .map(fn => `'${fn}': ${layoutFnToModule[fn]}.${fn}`)
                     .join(', ');
@@ -916,7 +966,7 @@ export function compile(options) {
                 }
             }
         }
-        // Detect if the compiled layout uses await â†' make it async
+        // Detect if the compiled layout uses await �' make it async
         isLayoutAsync = /\bawait\b/.test(compiledLayout);
         if (isLayoutAsync) {
             compiledLayout = compiledLayout.replace(/^function __layout\(/, 'async function __layout(');
@@ -953,119 +1003,184 @@ export function compile(options) {
             compiledRoutes.push(`{ pattern: '${pattern}', __api: true, ${methodEntries} }`);
             continue;
         }
-        // ── Page route (page.html) ──
+        // -- Page route (page.html) --
         const source = fs.readFileSync(fullPath, 'utf-8');
         const parsed = parseFile(source, { kind: 'route', filePath: fullPath });
-        // Build a mapping: functionName â†' moduleId for all imports in this route
+        let effectiveTemplate = parsed.template;
+        const routeScriptParts = [];
+        const routeScriptSegments = [];
+        const routeServerImportEntries = parsed.serverImports.map((line) => ({
+            line,
+            importerDir: path.dirname(fullPath),
+        }));
+        const routeClientImportEntries = parsed.clientImports.map((line) => ({
+            line,
+            importerDir: path.dirname(fullPath),
+        }));
+        const mergedActionFunctions = [...parsed.actionFunctions];
+        const mergedDataVars = [...parsed.dataVars];
+        const mergedPollFunctions = [...parsed.pollFunctions];
+        const mergedDataGetQueries = parsed.dataGetQueries.map((query) => ({ ...query }));
+        const mergedComponentImports = { ...parsed.componentImports };
+        const mergedWorkerEnvAliases = [...parsed.workerEnvAliases];
+        const mergedDevAliases = [...parsed.devAliases];
+        for (const layoutRelPath of rf.layouts) {
+            if (layoutRelPath === 'layout.html')
+                continue;
+            const layoutPath = path.join(routesDir, layoutRelPath);
+            if (!fs.existsSync(layoutPath))
+                continue;
+            const layoutSource = fs.readFileSync(layoutPath, 'utf-8');
+            const layoutParsed = parseFile(layoutSource, { kind: 'layout', filePath: layoutPath });
+            if (layoutParsed.loadFunction) {
+                throw new Error(`${layoutRelPath} cannot export load(); nested layouts currently share the child route load lifecycle.`);
+            }
+            const layoutSlot = layoutParsed.template.match(/<slot\s*><\/slot>|<slot\s*\/>/);
+            if (!layoutSlot) {
+                throw new Error(`${layoutRelPath} must contain <slot></slot> or <slot />`);
+            }
+            if (layoutParsed.script) {
+                routeScriptParts.push(layoutParsed.script);
+                routeScriptSegments.push({ script: layoutParsed.script, dataVars: [...layoutParsed.dataVars] });
+            }
+            for (const line of layoutParsed.serverImports) {
+                routeServerImportEntries.push({ line, importerDir: path.dirname(layoutPath) });
+            }
+            for (const line of layoutParsed.clientImports) {
+                routeClientImportEntries.push({ line, importerDir: path.dirname(layoutPath) });
+            }
+            for (const fnName of layoutParsed.actionFunctions) {
+                if (!mergedActionFunctions.includes(fnName))
+                    mergedActionFunctions.push(fnName);
+            }
+            for (const varName of layoutParsed.dataVars) {
+                if (!mergedDataVars.includes(varName))
+                    mergedDataVars.push(varName);
+            }
+            for (const fnName of layoutParsed.pollFunctions) {
+                if (!mergedPollFunctions.includes(fnName))
+                    mergedPollFunctions.push(fnName);
+            }
+            for (const query of layoutParsed.dataGetQueries) {
+                if (!mergedDataGetQueries.some((existing) => existing.asName === query.asName)) {
+                    mergedDataGetQueries.push({ ...query });
+                }
+            }
+            for (const [pascalName, fileName] of Object.entries(layoutParsed.componentImports)) {
+                mergedComponentImports[pascalName] = fileName;
+            }
+            for (const alias of layoutParsed.workerEnvAliases) {
+                if (!mergedWorkerEnvAliases.includes(alias))
+                    mergedWorkerEnvAliases.push(alias);
+            }
+            for (const alias of layoutParsed.devAliases) {
+                if (!mergedDevAliases.includes(alias))
+                    mergedDevAliases.push(alias);
+            }
+            effectiveTemplate = layoutParsed.template.replace(layoutSlot[0], effectiveTemplate);
+        }
+        if (parsed.script) {
+            routeScriptParts.push(parsed.script);
+            routeScriptSegments.push({ script: parsed.script, dataVars: [...parsed.dataVars] });
+        }
+        const routeImportDecls = [];
+        const routeImportDeclMap = new Map();
+        const routeScriptReferenceSource = [...routeScriptParts.map((script) => stripTopLevelImports(script)), parsed.loadFunction || ''].join('\n');
+        const mergedParsed = {
+            ...parsed,
+            template: effectiveTemplate,
+            script: routeScriptParts.length > 0 ? routeScriptParts.join('\n\n') : parsed.script,
+            serverImports: routeServerImportEntries.map((entry) => entry.line),
+            clientImports: routeClientImportEntries.map((entry) => entry.line),
+            actionFunctions: mergedActionFunctions,
+            dataVars: mergedDataVars,
+            componentImports: mergedComponentImports,
+            pollFunctions: mergedPollFunctions,
+            dataGetQueries: mergedDataGetQueries,
+            workerEnvAliases: mergedWorkerEnvAliases,
+            devAliases: mergedDevAliases,
+            scriptImportDecls: routeImportDecls,
+            scriptSegments: routeScriptSegments,
+        };
+        // Build a mapping: functionName ? moduleId for all imports in this route
         const fnToModule = {};
         const outFileDir = path.join(projectDir, '.kuratchi');
         const neededServerFns = new Set([
-            ...parsed.actionFunctions,
-            ...parsed.pollFunctions,
-            ...parsed.dataGetQueries.map((q) => q.fnName),
+            ...mergedActionFunctions,
+            ...mergedPollFunctions,
+            ...mergedDataGetQueries.map((q) => q.fnName),
         ]);
-        const routeServerImports = parsed.serverImports.length > 0
-            ? parsed.serverImports
-            : filterClientImportsForServer(parsed.clientImports, neededServerFns);
+        const routeServerImports = routeServerImportEntries.length > 0
+            ? routeServerImportEntries
+            : routeClientImportEntries.filter((entry) => filterClientImportsForServer([entry.line], neededServerFns).length > 0);
         if (routeServerImports.length > 0) {
-            const routeFileDir = path.dirname(fullPath);
-            for (const imp of routeServerImports) {
+            for (const entry of routeServerImports) {
+                const imp = entry.line;
                 const pathMatch = imp.match(/from\s+['"]([^'"]+)['"]/);
                 if (!pathMatch)
                     continue;
                 const origPath = pathMatch[1];
-                // Bare module specifiers (packages) â€" pass through as-is
-                const importPath = resolveCompiledImportPath(origPath, routeFileDir, outFileDir);
+                const importPath = resolveCompiledImportPath(origPath, entry.importerDir, outFileDir);
                 const moduleId = `__m${moduleCounter++}`;
                 allImports.push(`import * as ${moduleId} from '${importPath}';`);
-                // Extract named imports and map them to this module
-                const names = parseNamedImportBindings(imp);
-                if (names.length > 0) {
-                    for (const name of names) {
-                        fnToModule[name] = moduleId;
+                const namedBindings = parseNamedImportBindings(imp);
+                if (namedBindings.length > 0) {
+                    for (const binding of namedBindings) {
+                        fnToModule[binding.local] = moduleId;
+                        if (routeScriptReferenceSource.includes(binding.local) && !routeImportDeclMap.has(binding.local)) {
+                            routeImportDeclMap.set(binding.local, `const ${binding.local} = ${moduleId}.${binding.imported};`);
+                        }
                     }
                 }
-                // Handle: import * as X from '...'
                 const starMatch = imp.match(/import\s*\*\s*as\s+(\w+)/);
                 if (starMatch) {
                     fnToModule[starMatch[1]] = moduleId;
+                    if (routeScriptReferenceSource.includes(starMatch[1]) && !routeImportDeclMap.has(starMatch[1])) {
+                        routeImportDeclMap.set(starMatch[1], `const ${starMatch[1]} = ${moduleId};`);
+                    }
                 }
             }
         }
-        // Build per-route component names from explicit imports
-        // componentImports: { StatCard: 'stat-card' } â†' componentNames maps PascalCase â†' fileName
+        routeImportDecls.push(...routeImportDeclMap.values());
         const routeComponentNames = new Map();
-        for (const [pascalName, fileName] of Object.entries(parsed.componentImports)) {
-            // Compile the component on first use
+        for (const [pascalName, fileName] of Object.entries(mergedComponentImports)) {
             compileComponent(fileName);
             routeComponentNames.set(pascalName, fileName);
         }
-        // Discover action functions passed as props to components.
-        // A component like db-studio uses action={runQueryAction} where runQueryAction is a prop.
-        // When the route passes runQueryAction={runAdminSqlQuery}, we need runAdminSqlQuery in
-        // the route's actions map so the runtime can dispatch it.
-        // Strategy: for each component, we know which prop names are action props (from cache).
-        // We then scan the route template for that component's usage and extract the bound values.
         for (const [pascalName, compFileName] of routeComponentNames.entries()) {
             const actionPropNames = componentActionCache.get(compFileName);
-            // Find all usages of <PascalName ...> in the route template and extract prop bindings.
-            // Match <ComponentName ... propName={value} ... > across multiple lines.
-            const compTagRegex = new RegExp(`<${pascalName}\\b([\\s\\S]*?)/>`, 'g');
-            for (const tagMatch of parsed.template.matchAll(compTagRegex)) {
+            const compTagRegex = new RegExp(`<${pascalName}\\b([\\s\\S]*?)(?:/?)>`, 'g');
+            for (const tagMatch of effectiveTemplate.matchAll(compTagRegex)) {
                 const attrs = tagMatch[1];
                 if (actionPropNames && actionPropNames.size > 0) {
                     for (const propName of actionPropNames) {
-                        // Find propName={identifier} binding
                         const propRegex = new RegExp(`\\b${propName}=\\{([A-Za-z_$][\\w$]*)\\}`);
                         const propMatch = attrs.match(propRegex);
                         if (propMatch) {
                             const routeFnName = propMatch[1];
-                            // Only add if this function is actually imported by the route
-                            if (routeFnName in fnToModule && !parsed.actionFunctions.includes(routeFnName)) {
-                                parsed.actionFunctions.push(routeFnName);
+                            if (routeFnName in fnToModule && !mergedActionFunctions.includes(routeFnName)) {
+                                mergedActionFunctions.push(routeFnName);
                             }
                         }
                     }
                 }
             }
         }
-        // Compile template to render function body (pass component names and action names)
-        // An identifier is a valid server action if it is either:
-        //   1. Directly imported (present in fnToModule), or
-        //   2. A top-level script declaration (present in dataVars) â€" covers cases like
-        //      `const fn = importedFn` or `async function fn() {}` where the binding
-        //      is locally declared but delegates to an imported function.
-        const dataVarsSet = new Set(parsed.dataVars);
-        const actionNames = new Set(parsed.actionFunctions.filter(fn => fn in fnToModule || dataVarsSet.has(fn)));
-        // Opaque per-route RPC IDs keep implementation details out of rendered HTML.
+        const dataVarsSet = new Set(mergedDataVars);
+        const actionNames = new Set(mergedActionFunctions.filter(fn => fn in fnToModule || dataVarsSet.has(fn)));
         const rpcNameMap = new Map();
         let rpcCounter = 0;
-        for (const fnName of parsed.pollFunctions) {
+        for (const fnName of mergedPollFunctions) {
             if (!rpcNameMap.has(fnName)) {
                 rpcNameMap.set(fnName, `rpc_${i}_${rpcCounter++}`);
             }
         }
-        for (const q of parsed.dataGetQueries) {
+        for (const q of mergedDataGetQueries) {
             if (!rpcNameMap.has(q.fnName)) {
                 rpcNameMap.set(q.fnName, `rpc_${i}_${rpcCounter++}`);
             }
             q.rpcId = rpcNameMap.get(q.fnName);
         }
-        // Apply nested route layouts (excluding root layout.html which is handled globally)
-        let effectiveTemplate = parsed.template;
-        for (const layoutRelPath of rf.layouts) {
-            if (layoutRelPath === 'layout.html')
-                continue;
-            const layoutPath = path.join(routesDir, layoutRelPath);
-            if (!fs.existsSync(layoutPath))
-                continue;
-            const layoutSource = fs.readFileSync(layoutPath, 'utf-8');
-            const layoutSlot = layoutSource.match(/<slot\s*><\/slot>|<slot\s*\/>/);
-            if (!layoutSlot) {
-                throw new Error(`${layoutRelPath} must contain <slot></slot> or <slot />`);
-            }
-            effectiveTemplate = layoutSource.replace(layoutSlot[0], effectiveTemplate);
-        }
         const renderBody = compileTemplate(effectiveTemplate, routeComponentNames, actionNames, rpcNameMap);
         // Collect component CSS for this route (compile-time dedup)
         const routeComponentStyles = [];
@@ -1080,14 +1195,14 @@ export function compile(options) {
             pattern,
             renderBody,
             isDev: !!options.isDev,
-            parsed,
+            parsed: mergedParsed,
             fnToModule,
             rpcNameMap,
             componentStyles: routeComponentStyles,
         });
         compiledRoutes.push(routeObj);
     }
-    // Scan src/assets/ for static files to embed
+    // Scan src/assets/ for static files to embed (recursive)
     const assetsDir = path.join(srcDir, 'assets');
     const compiledAssets = [];
     if (fs.existsSync(assetsDir)) {
@@ -1098,15 +1213,23 @@ export function compile(options) {
             '.svg': 'image/svg+xml',
             '.txt': 'text/plain; charset=utf-8',
         };
-        for (const file of fs.readdirSync(assetsDir).sort()) {
-            const ext = path.extname(file).toLowerCase();
-            const mime = mimeTypes[ext];
-            if (!mime)
-                continue; // skip unknown file types
-            const content = fs.readFileSync(path.join(assetsDir, file), 'utf-8');
-            const etag = '"' + crypto.createHash('md5').update(content).digest('hex').slice(0, 12) + '"';
-            compiledAssets.push({ name: file, content, mime, etag });
-        }
+        const scanAssets = (dir, prefix) => {
+            for (const entry of fs.readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
+                if (entry.isDirectory()) {
+                    scanAssets(path.join(dir, entry.name), prefix ? `${prefix}/${entry.name}` : entry.name);
+                    continue;
+                }
+                const ext = path.extname(entry.name).toLowerCase();
+                const mime = mimeTypes[ext];
+                if (!mime)
+                    continue;
+                const content = fs.readFileSync(path.join(dir, entry.name), 'utf-8');
+                const etag = '"' + crypto.createHash('md5').update(content).digest('hex').slice(0, 12) + '"';
+                const name = prefix ? `${prefix}/${entry.name}` : entry.name;
+                compiledAssets.push({ name, content, mime, etag });
+            }
+        };
+        scanAssets(assetsDir, '');
     }
     // Collect only the components that were actually imported by routes
     const compiledComponents = Array.from(compiledComponentCache.values());
@@ -1147,12 +1270,12 @@ export function compile(options) {
         fs.mkdirSync(outDir, { recursive: true });
     }
     writeIfChanged(outFile, output);
-    // Generate .kuratchi/worker.js — the stable wrangler entry point.
+    // Generate .kuratchi/worker.js � the stable wrangler entry point.
     // routes.js already exports the default fetch handler and all named DO classes;
     // worker.js explicitly re-exports them so wrangler.jsonc can reference a
     // stable filename while routes.js is freely regenerated.
     const workerFile = path.join(outDir, 'worker.js');
-    const workerClassExports = [...containerConfig, ...workflowConfig]
+    const workerClassExports = [...agentConfig, ...containerConfig, ...workflowConfig]
         .map((entry) => {
         const importPath = toWorkerImportPath(projectDir, outDir, entry.file);
         if (entry.exportKind === 'default') {
@@ -1170,7 +1293,7 @@ export function compile(options) {
     writeIfChanged(workerFile, workerLines.join('\n'));
     return workerFile;
 }
-// â"€â"€ Helpers â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
+// �"��"� Helpers �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
 /**
  * Write a file only if its content has changed.
  * Prevents unnecessary filesystem events that would retrigger wrangler's file watcher.
@@ -1246,10 +1369,10 @@ function readUiTheme(projectDir) {
     const uiBlock = readConfigBlock(source, 'ui');
     if (!uiBlock)
         return null;
-    // Adapter form defaults to "default" theme when ui config is present.
+    // Adapter form defaults to the bundled Kuratchi UI theme when ui config is present.
     const themeMatch = uiBlock.body.match(/theme\s*:\s*['"]([^'"]+)['"]/);
     const themeValue = themeMatch?.[1] ?? 'default';
-    if (themeValue === 'default') {
+    if (themeValue === 'default' || themeValue === 'dark' || themeValue === 'light' || themeValue === 'system') {
         // Resolve @kuratchi/ui/src/styles/theme.css from package
         const candidates = [
             path.join(projectDir, 'node_modules', '@kuratchi/ui', 'src', 'styles', 'theme.css'),
@@ -1261,10 +1384,10 @@ function readUiTheme(projectDir) {
                 return fs.readFileSync(candidate, 'utf-8');
             }
         }
-        console.warn('[kuratchi] ui.theme: "default" configured but @kuratchi/ui theme.css not found');
+        console.warn(`[kuratchi] ui.theme: "${themeValue}" configured but @kuratchi/ui theme.css not found`);
         return null;
     }
-    // Custom path â€" resolve relative to project root
+    // Custom path �" resolve relative to project root
     const customPath = path.resolve(projectDir, themeValue);
     if (fs.existsSync(customPath)) {
         return fs.readFileSync(customPath, 'utf-8');
@@ -1272,6 +1395,74 @@ function readUiTheme(projectDir) {
     console.warn(`[kuratchi] ui.theme: "${themeValue}" not found at ${customPath}`);
     return null;
 }
+/**
+ * Read ui.theme and ui.radius config values from kuratchi.config.ts.
+ * Returns null if no ui block is present.
+ */
+function readUiConfigValues(projectDir) {
+    const configPath = path.join(projectDir, 'kuratchi.config.ts');
+    if (!fs.existsSync(configPath))
+        return null;
+    const source = fs.readFileSync(configPath, 'utf-8');
+    const uiBlock = readConfigBlock(source, 'ui');
+    if (!uiBlock)
+        return null;
+    const themeMatch = uiBlock.body.match(/theme\s*:\s*['"]([^'"]+)['"]/);
+    const radiusMatch = uiBlock.body.match(/radius\s*:\s*['"]([^'"]+)['"]/);
+    return {
+        theme: themeMatch?.[1] ?? 'dark',
+        radius: radiusMatch?.[1] ?? 'default',
+    };
+}
+/**
+ * Patch the opening <html> tag in a layout source string to reflect ui config.
+ * theme='dark'   ? ensures class="dark" is present, removes data-theme.
+ * theme='light'  ? ensures class="dark" is absent, removes data-theme.
+ * theme='system' ? removes class="dark", sets data-theme="system".
+ * radius='none'|'full' ? sets data-radius; radius='default' ? removes it.
+ */
+function patchHtmlTag(source, theme, radius) {
+    return source.replace(/(<html\b)([^>]*)(>)/i, (_m, open, attrs, close) => {
+        if (theme === 'dark') {
+            if (/\bclass\s*=\s*"([^"]*)"/i.test(attrs)) {
+                attrs = attrs.replace(/class\s*=\s*"([^"]*)"/i, (_mc, cls) => {
+                    const classes = cls.split(/\s+/).filter(Boolean);
+                    if (!classes.includes('dark'))
+                        classes.unshift('dark');
+                    return `class="${classes.join(' ')}"`;
+                });
+            }
+            else {
+                attrs += ' class="dark"';
+            }
+            attrs = attrs.replace(/\s*data-theme\s*=\s*"[^"]*"/i, '');
+        }
+        else if (theme === 'light') {
+            attrs = attrs.replace(/class\s*=\s*"([^"]*)"/i, (_mc, cls) => {
+                const classes = cls.split(/\s+/).filter(Boolean).filter((c) => c !== 'dark');
+                return classes.length ? `class="${classes.join(' ')}"` : '';
+            });
+            attrs = attrs.replace(/\s*data-theme\s*=\s*"[^"]*"/i, '');
+        }
+        else if (theme === 'system') {
+            attrs = attrs.replace(/class\s*=\s*"([^"]*)"/i, (_mc, cls) => {
+                const classes = cls.split(/\s+/).filter(Boolean).filter((c) => c !== 'dark');
+                return classes.length ? `class="${classes.join(' ')}"` : '';
+            });
+            if (/data-theme\s*=/i.test(attrs)) {
+                attrs = attrs.replace(/data-theme\s*=\s*"[^"]*"/i, 'data-theme="system"');
+            }
+            else {
+                attrs += ' data-theme="system"';
+            }
+        }
+        attrs = attrs.replace(/\s*data-radius\s*=\s*"[^"]*"/i, '');
+        if (radius === 'none' || radius === 'full') {
+            attrs += ` data-radius="${radius}"`;
+        }
+        return open + attrs + close;
+    });
+}
 /**
  * Resolve a component .html file from a package (e.g. @kuratchi/ui).
  * Searches: node_modules, then workspace siblings (../../packages/).
@@ -1282,7 +1473,7 @@ function resolvePackageComponent(projectDir, pkgName, componentFile) {
     if (fs.existsSync(nmPath))
         return nmPath;
     // 2. Try workspace layout: project is in apps/X or packages/X, sibling packages in packages/
-    // @kuratchi/ui â†' kuratchi-ui (convention: scope stripped, slash â†' dash)
+    // @kuratchi/ui �' kuratchi-ui (convention: scope stripped, slash �' dash)
     const pkgDirName = pkgName.replace(/^@/, '').replace(/\//g, '-');
     const workspaceRoot = path.resolve(projectDir, '../..');
     const wsPath = path.join(workspaceRoot, 'packages', pkgDirName, 'src', 'lib', componentFile + '.html');
@@ -1320,7 +1511,7 @@ function discoverRoutes(routesDir) {
         for (const entry of entries) {
             if (entry.isDirectory()) {
                 const childPrefix = prefix ? `${prefix}/${entry.name}` : entry.name;
-                // Folder-based page route: routes/db/page.html → /db
+                // Folder-based page route: routes/db/page.html ? /db
                 const pageFile = path.join(dir, entry.name, 'page.html');
                 if (fs.existsSync(pageFile)) {
                     const routeFile = `${childPrefix}/page.html`;
@@ -1342,7 +1533,7 @@ function discoverRoutes(routesDir) {
                 walk(path.join(dir, entry.name), childPrefix);
             }
             else if (entry.name === 'layout.html' || entry.name === '404.html' || entry.name === '500.html') {
-                // Skip — layout.html is the app layout, 404/500 are error pages, not routes
+                // Skip � layout.html is the app layout, 404/500 are error pages, not routes
                 continue;
             }
             else if (entry.name === 'index.ts' || entry.name === 'index.js') {
@@ -1354,7 +1545,7 @@ function discoverRoutes(routesDir) {
                 }
             }
             else if (entry.name === 'page.html') {
-                // page.html in current directory → index route for this prefix
+                // page.html in current directory ? index route for this prefix
                 const routeFile = prefix ? `${prefix}/page.html` : 'page.html';
                 if (!registered.has(routeFile)) {
                     registered.add(routeFile);
@@ -1362,7 +1553,7 @@ function discoverRoutes(routesDir) {
                 }
             }
             else if (entry.name.endsWith('.html') && entry.name !== 'page.html') {
-                // File-based route: routes/about.html → /about (fallback)
+                // File-based route: routes/about.html ? /about (fallback)
                 const name = prefix
                     ? `${prefix}/${entry.name.replace('.html', '')}`
                     : entry.name.replace('.html', '');
@@ -1384,19 +1575,79 @@ function discoverRoutes(routesDir) {
     });
     return results;
 }
+function buildSegmentedScriptBody(opts) {
+    const { segments, fnToModule, importDecls, workerEnvAliases, devAliases, isDev, asyncMode } = opts;
+    const lines = [];
+    const routeDevDecls = buildDevAliasDeclarations(devAliases, isDev);
+    if (routeDevDecls)
+        lines.push(routeDevDecls);
+    if (importDecls)
+        lines.push(importDecls);
+    lines.push('const __segmentData: Record<string, any> = {};');
+    const availableVars = [];
+    let segmentIndex = 0;
+    for (const segment of segments) {
+        if (!segment.script)
+            continue;
+        let segmentBody = stripTopLevelImports(segment.script);
+        segmentBody = rewriteImportedFunctionCalls(segmentBody, fnToModule);
+        segmentBody = rewriteWorkerEnvAliases(segmentBody, workerEnvAliases);
+        if (!segmentBody.trim())
+            continue;
+        const returnVars = segment.dataVars.filter((name) => /^[A-Za-z_$][\w$]*$/.test(name));
+        const segmentVar = '__segment_' + segmentIndex++;
+        const invokePrefix = asyncMode ? 'await ' : '';
+        const factoryPrefix = asyncMode ? 'async ' : '';
+        lines.push('const ' + segmentVar + ' = ' + invokePrefix + '(' + factoryPrefix + '(__ctx: Record<string, any>) => {');
+        lines.push(segmentBody);
+        lines.push(returnVars.length > 0 ? 'return { ' + returnVars.join(', ') + ' };' : 'return {};');
+        lines.push('})(__segmentData);');
+        lines.push('Object.assign(__segmentData, ' + segmentVar + ');');
+        for (const name of returnVars) {
+            if (!availableVars.includes(name))
+                availableVars.push(name);
+        }
+    }
+    if (!asyncMode && availableVars.length > 0) {
+        lines.push('const { ' + availableVars.join(', ') + ' } = __segmentData;');
+    }
+    return lines.join('\n');
+}
 function buildRouteObject(opts) {
     const { pattern, renderBody, isDev, parsed, fnToModule, rpcNameMap, componentStyles } = opts;
     const hasFns = Object.keys(fnToModule).length > 0;
     const parts = [];
     parts.push(`    pattern: '${pattern}'`);
     const queryVars = parsed.dataGetQueries?.map((q) => q.asName) ?? [];
-    let scriptBody = parsed.script
-        ? parsed.script.replace(/^\s*import[\s\S]*?from\s+['"][^'"]+['"]\s*;?/gm, '').trim()
-        : '';
+    const scriptSegments = (parsed.scriptSegments ?? [])
+        .filter((segment) => !!segment.script);
+    const hasSegmentedScripts = scriptSegments.length > 1;
     const routeDevDecls = buildDevAliasDeclarations(parsed.devAliases, isDev);
-    scriptBody = [routeDevDecls, scriptBody].filter(Boolean).join('\n');
-    scriptBody = rewriteImportedFunctionCalls(scriptBody, fnToModule);
-    scriptBody = rewriteWorkerEnvAliases(scriptBody, parsed.workerEnvAliases);
+    const routeImportDecls = (parsed.scriptImportDecls ?? []).join('\n');
+    let scriptBody = '';
+    let scriptUsesAwait = false;
+    if (hasSegmentedScripts) {
+        const combinedScript = scriptSegments.map((segment) => stripTopLevelImports(segment.script)).join('\n');
+        scriptUsesAwait = /\bawait\b/.test(combinedScript);
+        scriptBody = buildSegmentedScriptBody({
+            segments: scriptSegments,
+            fnToModule,
+            importDecls: routeImportDecls,
+            workerEnvAliases: parsed.workerEnvAliases,
+            devAliases: parsed.devAliases,
+            isDev,
+            asyncMode: scriptUsesAwait,
+        });
+    }
+    else {
+        scriptBody = parsed.script
+            ? stripTopLevelImports(parsed.script)
+            : '';
+        scriptBody = [routeDevDecls, routeImportDecls, scriptBody].filter(Boolean).join('\n');
+        scriptBody = rewriteImportedFunctionCalls(scriptBody, fnToModule);
+        scriptBody = rewriteWorkerEnvAliases(scriptBody, parsed.workerEnvAliases);
+        scriptUsesAwait = /\bawait\b/.test(scriptBody);
+    }
     let explicitLoadFunction = parsed.loadFunction
         ? parsed.loadFunction.replace(/^export\s+/, '').trim()
         : '';
@@ -1404,8 +1655,10 @@ function buildRouteObject(opts) {
         explicitLoadFunction = [routeDevDecls, explicitLoadFunction].filter(Boolean).join('\n');
         explicitLoadFunction = rewriteImportedFunctionCalls(explicitLoadFunction, fnToModule);
         explicitLoadFunction = rewriteWorkerEnvAliases(explicitLoadFunction, parsed.workerEnvAliases);
+        if (routeImportDecls)
+            explicitLoadFunction = explicitLoadFunction.replace('{', `{\n${routeImportDecls}\n`);
     }
-    if (explicitLoadFunction && /\bawait\b/.test(scriptBody)) {
+    if (explicitLoadFunction && scriptUsesAwait) {
         throw new Error(`[kuratchi compiler] ${pattern}\nTop-level await cannot be mixed with export async function load(). Move async server work into load().`);
     }
     if (scriptBody) {
@@ -1414,11 +1667,10 @@ function buildRouteObject(opts) {
     if (explicitLoadFunction) {
         explicitLoadFunction = transpileTypeScript(explicitLoadFunction, `route-load:${pattern}.ts`);
     }
-    const scriptUsesAwait = /\bawait\b/.test(scriptBody);
     const scriptReturnVars = parsed.script
         ? parsed.dataVars.filter((v) => !queryVars.includes(v))
         : [];
-    // Load function â€" internal server prepass for async route script bodies
+    // Load function �" internal server prepass for async route script bodies
     // and data-get query state hydration.
     const hasDataGetQueries = Array.isArray(parsed.dataGetQueries) && parsed.dataGetQueries.length > 0;
     if (explicitLoadFunction) {
@@ -1441,13 +1693,15 @@ function buildRouteObject(opts) {
                 const argsExpr = (q.argsExpr || '').trim();
                 const asName = q.asName;
                 const defaultArgs = argsExpr ? `[${argsExpr}]` : '[]';
+                const moduleId = fnToModule[fnName];
+                const qualifiedFn = moduleId ? `${moduleId}.${fnName}` : fnName;
                 queryLines.push(`let ${asName} = { state: 'loading', loading: true, error: null, data: null, empty: false, success: false };`);
                 queryLines.push(`const __qOverride_${asName} = __getLocals().__queryOverride;`);
                 queryLines.push(`const __qArgs_${asName} = ${defaultArgs};`);
                 queryLines.push(`const __qShouldRun_${asName} = !!(__qOverride_${asName} && __qOverride_${asName}.fn === '${rpcId}' && Array.isArray(__qOverride_${asName}.args) && JSON.stringify(__qOverride_${asName}.args) === JSON.stringify(__qArgs_${asName}));`);
                 queryLines.push(`if (__qShouldRun_${asName}) {`);
                 queryLines.push(`  try {`);
-                queryLines.push(`    const __qData_${asName} = await ${fnName}(...__qArgs_${asName});`);
+                queryLines.push(`    const __qData_${asName} = await ${qualifiedFn}(...__qArgs_${asName});`);
                 queryLines.push(`    const __qEmpty_${asName} = Array.isArray(__qData_${asName}) ? __qData_${asName}.length === 0 : (__qData_${asName} == null);`);
                 queryLines.push(`    ${asName} = { state: __qEmpty_${asName} ? 'empty' : 'success', loading: false, error: null, data: __qData_${asName}, empty: __qEmpty_${asName}, success: !__qEmpty_${asName} };`);
                 queryLines.push(`  } catch (err) {`);
@@ -1459,10 +1713,26 @@ function buildRouteObject(opts) {
             loadBody = [loadBody, queryLines.join('\n')].filter(Boolean).join('\n');
         }
         const loadReturnVars = [...scriptReturnVars, ...queryVars];
-        const returnObj = loadReturnVars.length > 0 ? `\n      return { ${loadReturnVars.join(', ')} };` : '';
-        parts.push(`    async load(params = {}) {\n      ${loadBody}${returnObj}\n    }`);
+        let returnObj = '';
+        if (loadReturnVars.length > 0) {
+            if (hasSegmentedScripts && scriptUsesAwait) {
+                const segmentReturnEntries = scriptReturnVars.map((name) => name + ': __segmentData.' + name);
+                const queryReturnEntries = queryVars
+                    .filter((name) => !scriptReturnVars.includes(name))
+                    .map((name) => name);
+                returnObj = `
+      return { ${[...segmentReturnEntries, ...queryReturnEntries].join(', ')} };`;
+            }
+            else {
+                returnObj = `
+      return { ${loadReturnVars.join(', ')} };`;
+            }
+        }
+        parts.push(`    async load(__routeParams = {}) {
+      ${loadBody}${returnObj}
+    }`);
     }
-    // Actions â€" functions referenced via action={fn} in the template
+    // Actions �" functions referenced via action={fn} in the template
     if (hasFns && parsed.actionFunctions.length > 0) {
         const actionEntries = parsed.actionFunctions
             .map(fn => {
@@ -1472,7 +1742,7 @@ function buildRouteObject(opts) {
             .join(', ');
         parts.push(`    actions: { ${actionEntries} }`);
     }
-    // RPC â€" functions referenced via data-poll={fn(args)} in the template
+    // RPC �" functions referenced via data-poll={fn(args)} in the template
     if (hasFns && parsed.pollFunctions.length > 0) {
         const rpcEntries = parsed.pollFunctions
             .map(fn => {
@@ -1483,7 +1753,7 @@ function buildRouteObject(opts) {
             .join(', ');
         parts.push(`    rpc: { ${rpcEntries} }`);
     }
-    // Render function â€" template compiled to JS with native flow control
+    // Render function �" template compiled to JS with native flow control
     // Destructure data vars so templates reference them directly (e.g., {todos} not {data.todos})
     // Auto-inject action state objects so templates can reference signIn.error, signIn.loading, etc.
     const renderPrelude = (scriptBody && !scriptUsesAwait) ? scriptBody : '';
@@ -1511,9 +1781,9 @@ function buildRouteObject(opts) {
         const styleLines = componentStyles.map(css => `__html += \`${css}\\n\`;`);
         finalRenderBody = [lines[0], ...styleLines, ...lines.slice(1)].join('\n');
     }
-    parts.push(`    render(data) {
-      ${destructure}${renderPrelude ? renderPrelude + '\n      ' : ''}${finalRenderBody}
-      return __html;
+    parts.push(`    render(data) {
+      ${destructure}${renderPrelude ? renderPrelude + '\n      ' : ''}${finalRenderBody}
+      return __html;
     }`);
     return `  {\n${parts.join(',\n')}\n  }`;
 }
@@ -1526,7 +1796,7 @@ function readOrmConfig(projectDir) {
     if (!ormBlock)
         return [];
     // Extract schema imports: import { todoSchema } from './src/schemas/todo';
-    const importMap = new Map(); // exportName â†' importPath
+    const importMap = new Map(); // exportName �' importPath
     const importRegex = /import\s*\{\s*([^}]+)\s*\}\s*from\s*['"]([^'"]+)['"]/g;
     let m;
     while ((m = importRegex.exec(source)) !== null) {
@@ -1663,7 +1933,7 @@ function readDoConfig(projectDir) {
             if (list.length > 0)
                 entry.files = list;
         }
-        // (inject config removed â€" DO methods are org-scoped, no auto-injection needed)
+        // (inject config removed �" DO methods are org-scoped, no auto-injection needed)
         entries.push(entry);
     }
     // Match string shorthand: BINDING: 'ClassName' (skip bindings already found)
@@ -1762,6 +2032,35 @@ function readWorkerClassConfig(projectDir, key) {
     }
     return entries;
 }
+function resolveClassExportFromFile(absPath, errorLabel) {
+    if (!fs.existsSync(absPath)) {
+        throw new Error(`[kuratchi] ${errorLabel} file not found: ${absPath}`);
+    }
+    const fileSource = fs.readFileSync(absPath, 'utf-8');
+    const defaultClass = fileSource.match(/export\s+default\s+class\s+(\w+)/);
+    if (defaultClass) {
+        return { className: defaultClass[1], exportKind: 'default' };
+    }
+    const namedClass = fileSource.match(/export\s+class\s+(\w+)/);
+    if (namedClass) {
+        return { className: namedClass[1], exportKind: 'named' };
+    }
+    throw new Error(`[kuratchi] ${errorLabel} must export a class via "export class X" or "export default class X". File: ${absPath}`);
+}
+function discoverConventionClassFiles(projectDir, dir, suffix, errorLabel) {
+    const absDir = path.join(projectDir, dir);
+    const files = discoverFilesWithSuffix(absDir, suffix);
+    if (files.length === 0)
+        return [];
+    return files.map((absPath) => {
+        const resolved = resolveClassExportFromFile(absPath, errorLabel);
+        return {
+            className: resolved.className,
+            file: path.relative(projectDir, absPath).replace(/\\/g, '/'),
+            exportKind: resolved.exportKind,
+        };
+    });
+}
 function discoverFilesWithSuffix(dir, suffix) {
     if (!fs.existsSync(dir))
         return [];
@@ -1999,7 +2298,7 @@ function generateHandlerProxy(handler, projectDir) {
         ? methods.filter((m) => m.isAsync).map((m) => m.name)
         : [];
     const lines = [
-        `// Auto-generated by KuratchiJS compiler â€" do not edit.`,
+        `// Auto-generated by KuratchiJS compiler �" do not edit.`,
         `import { __getDoStub } from '${RUNTIME_DO_IMPORT}';`,
         ...(handler.mode === 'class' ? [`import ${handlerLocal} from '${origRelPath}';`] : []),
         ``,
@@ -2093,34 +2392,34 @@ function generateRoutesModule(opts) {
     const runtimeImport = opts.hasRuntime && opts.runtimeImportPath
         ? `import __kuratchiRuntime from '${opts.runtimeImportPath}';`
         : '';
-    // Auth session init â€" thin cookie parsing injected into Worker entry
+    // Auth session init �" thin cookie parsing injected into Worker entry
     let authInit = '';
     if (opts.authConfig && opts.authConfig.sessionEnabled) {
         const cookieName = opts.authConfig.cookieName;
-        authInit = `
-// â"€â"€ Auth Session Init â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
-function __parseCookies(header) {
-  const map = {};
-  if (!header) return map;
-  for (const pair of header.split(';')) {
-    const eq = pair.indexOf('=');
-    if (eq === -1) continue;
-    map[pair.slice(0, eq).trim()] = pair.slice(eq + 1).trim();
-  }
-  return map;
-}
-
-function __initAuth(request) {
-  const cookies = __parseCookies(request.headers.get('cookie'));
-  __setLocal('session', null);
-  __setLocal('user', null);
-  __setLocal('auth', {
-    cookies,
-    sessionCookie: cookies['${cookieName}'] || null,
-    cookieName: '${cookieName}',
-  });
-}
+        authInit = `
+// �"��"� Auth Session Init �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
+function __parseCookies(header) {
+  const map = {};
+  if (!header) return map;
+  for (const pair of header.split(';')) {
+    const eq = pair.indexOf('=');
+    if (eq === -1) continue;
+    map[pair.slice(0, eq).trim()] = pair.slice(eq + 1).trim();
+  }
+  return map;
+}
+
+function __initAuth(request) {
+  const cookies = __parseCookies(request.headers.get('cookie'));
+  __setLocal('session', null);
+  __setLocal('user', null);
+  __setLocal('auth', {
+    cookies,
+    sessionCookie: cookies['${cookieName}'] || null,
+    cookieName: '${cookieName}',
+  });
+}
 `;
     }
     const workerImport = `import { WorkerEntrypoint, env as __env } from 'cloudflare:workers';`;
@@ -2148,42 +2447,42 @@ function __initAuth(request) {
                 `import { kuratchiORM } from '@kuratchi/orm';`,
                 ...schemaImports,
             ].join('\n');
-            migrationInit = `
-// â"€â"€ ORM Auto-Migration â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
-let __migrated = false;
-const __ormDatabases = [
-${migrateEntries.join(',\n')}
-];
-
-async function __runMigrations() {
-  if (__migrated) return;
-  __migrated = true;
-  for (const db of __ormDatabases) {
-    const binding = __env[db.binding];
-    if (!binding) continue;
-    try {
-      const executor = (sql, params) => {
-        let stmt = binding.prepare(sql);
-        if (params?.length) stmt = stmt.bind(...params);
-        return stmt.all().then(r => ({ success: r.success ?? true, data: r.results, results: r.results }));
-      };
-      const result = await runMigrations({ execute: executor, schema: db.schema });
-      if (result.applied) {
-        console.log('[kuratchi] ' + db.binding + ': migrated (' + result.statementsRun + ' statements)');
-      }
-      if (result.warnings.length) {
-        result.warnings.forEach(w => console.warn('[kuratchi] ' + db.binding + ': ' + w));
-      }
-    } catch (err) {
-      console.error('[kuratchi] ' + db.binding + ' migration failed:', err.message);
-    }
-  }
-}
+            migrationInit = `
+// �"��"� ORM Auto-Migration �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
+let __migrated = false;
+const __ormDatabases = [
+${migrateEntries.join(',\n')}
+];
+
+async function __runMigrations() {
+  if (__migrated) return;
+  __migrated = true;
+  for (const db of __ormDatabases) {
+    const binding = __env[db.binding];
+    if (!binding) continue;
+    try {
+      const executor = (sql, params) => {
+        let stmt = binding.prepare(sql);
+        if (params?.length) stmt = stmt.bind(...params);
+        return stmt.all().then(r => ({ success: r.success ?? true, data: r.results, results: r.results }));
+      };
+      const result = await runMigrations({ execute: executor, schema: db.schema });
+      if (result.applied) {
+        console.log('[kuratchi] ' + db.binding + ': migrated (' + result.statementsRun + ' statements)');
+      }
+      if (result.warnings.length) {
+        result.warnings.forEach(w => console.warn('[kuratchi] ' + db.binding + ': ' + w));
+      }
+    } catch (err) {
+      console.error('[kuratchi] ' + db.binding + ' migration failed:', err.message);
+    }
+  }
+}
 `;
         }
     }
-    // Auth plugin init â€" import config + call @kuratchi/auth setup functions
+    // Auth plugin init �" import config + call @kuratchi/auth setup functions
     let authPluginImports = '';
     let authPluginInit = '';
     const ac = opts.authConfig;
@@ -2234,15 +2533,15 @@ async function __runMigrations() {
             initLines.push(`  if (__kuratchiConfig.auth?.organizations) __configOrg(__kuratchiConfig.auth.organizations);`);
         }
         authPluginImports = imports.join('\n');
-        authPluginInit = `
-// â"€â"€ Auth Plugin Init â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
-function __initAuthPlugins() {
-${initLines.join('\n')}
-}
+        authPluginInit = `
+// �"��"� Auth Plugin Init �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
+function __initAuthPlugins() {
+${initLines.join('\n')}
+}
 `;
     }
-    // â"€â"€ Durable Object class generation â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
+    // �"��"� Durable Object class generation �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
     let doImports = '';
     let doClassCode = '';
     let doResolverInit = '';
@@ -2400,7 +2699,7 @@ ${initLines.join('\n')}
             }
             // Register stub resolver
             if (doEntry.stubId) {
-                // Config-driven: e.g. stubId: 'user.orgId' â†' __u.orgId
+                // Config-driven: e.g. stubId: 'user.orgId' �' __u.orgId
                 const fieldPath = doEntry.stubId.startsWith('user.') ? `__u.${doEntry.stubId.slice(5)}` : doEntry.stubId;
                 const checkField = doEntry.stubId.startsWith('user.') ? doEntry.stubId.slice(5) : doEntry.stubId;
                 doResolverLines.push(`  __registerDoResolver('${doEntry.binding}', async () => {`);
@@ -2410,402 +2709,417 @@ ${initLines.join('\n')}
                 doResolverLines.push(`  });`);
             }
             else {
-                // No stubId config â€" stub must be obtained manually
-                doResolverLines.push(`  // No 'stubId' config for ${doEntry.binding} â€" stub must be obtained manually`);
+                // No stubId config �" stub must be obtained manually
+                doResolverLines.push(`  // No 'stubId' config for ${doEntry.binding} �" stub must be obtained manually`);
             }
         }
         doImports = doImportLines.join('\n');
-        doClassCode = `\n// â"€â"€ Durable Object Classes (generated) â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€\n\n` + doClassLines.join('\n') + '\n';
+        doClassCode = `\n// �"��"� Durable Object Classes (generated) �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�\n\n` + doClassLines.join('\n') + '\n';
         doResolverInit = `\nfunction __initDoResolvers() {\n${doResolverLines.join('\n')}\n}\n`;
     }
-    return `// Generated by KuratchiJS compiler â€" do not edit.
-${opts.isDev ? '\nglobalThis.__kuratchi_DEV__ = true;\n' : ''}
-${workerImport}
-${contextImport}
-${runtimeImport ? runtimeImport + '\n' : ''}${migrationImports ? migrationImports + '\n' : ''}${authPluginImports ? authPluginImports + '\n' : ''}${doImports ? doImports + '\n' : ''}${opts.serverImports.join('\n')}
-
-// â"€â"€ Assets â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
-const __assets = {
-${opts.compiledAssets.map(a => `  ${JSON.stringify(a.name)}: { content: ${JSON.stringify(a.content)}, mime: ${JSON.stringify(a.mime)}, etag: ${JSON.stringify(a.etag)} }`).join(',\n')}
-};
-
-// â"€â"€ Router â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
-const __staticRoutes = new Map();  // exact path â†' index (O(1) lookup)
-const __dynamicRoutes = [];        // regex-based routes (params/wildcards)
-
-function __addRoute(pattern, index) {
-  if (!pattern.includes(':') && !pattern.includes('*')) {
-    // Static route â€" direct Map lookup, no regex needed
-    __staticRoutes.set(pattern, index);
-  } else {
-    // Dynamic route â€" build regex for param extraction
-    const paramNames = [];
-    let regexStr = pattern
-      .replace(/\\*(\\w+)/g, (_, name) => { paramNames.push(name); return '(?<' + name + '>.+)'; })
-      .replace(/:(\\w+)/g, (_, name) => { paramNames.push(name); return '(?<' + name + '>[^/]+)'; });
-    __dynamicRoutes.push({ regex: new RegExp('^' + regexStr + '$'), paramNames, index });
-  }
-}
-
-function __match(pathname) {
-  const normalized = pathname === '/' ? '/' : pathname.replace(/\\/$/, '');
-  // Fast path: static routes (most common)
-  const staticIdx = __staticRoutes.get(normalized);
-  if (staticIdx !== undefined) return { params: {}, index: staticIdx };
-  // Slow path: dynamic routes with params
-  for (const route of __dynamicRoutes) {
-    const m = normalized.match(route.regex);
-    if (m) {
-      const params = {};
-      for (const name of route.paramNames) params[name] = m.groups?.[name] ?? '';
-      return { params, index: route.index };
-    }
-  }
-  return null;
-}
-
-// â"€â"€ Layout â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
-${layoutBlock}
-
-${layoutActionsBlock}
-
-// â"€â"€ Error pages â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
-const __errorMessages = {
-  400: 'Bad Request',
-  401: 'Unauthorized',
-  403: 'Forbidden',
-  404: 'Not Found',
-  405: 'Method Not Allowed',
-  408: 'Request Timeout',
-  429: 'Too Many Requests',
-  500: 'Internal Server Error',
-  502: 'Bad Gateway',
-  503: 'Service Unavailable',
-};
-
-// Built-in default error page â€" clean, dark, minimal, centered
-function __errorPage(status, detail) {
-  const title = __errorMessages[status] || 'Error';
-  const detailHtml = detail ? '<p style="font-family:ui-monospace,monospace;font-size:0.8rem;color:#555;background:#111;padding:0.5rem 1rem;border-radius:6px;max-width:480px;margin:1rem auto 0;word-break:break-word">' + __esc(detail) + '</p>' : '';
-  return '<div style="display:flex;align-items:center;justify-content:center;min-height:60vh;text-align:center;padding:2rem">'
-    + '<div>'
-    + '<p style="font-size:5rem;font-weight:700;margin:0;color:#333;line-height:1">' + status + '</p>'
-    + '<p style="font-size:1rem;color:#555;margin:0.5rem 0 0;letter-spacing:0.05em">' + __esc(title) + '</p>'
-    + detailHtml
-    + '</div>'
-    + '</div>';
-}
-
-${customErrorFunctions ? '// Custom error page overrides (user-created NNN.html)\n' + customErrorFunctions + '\n' : ''}
-// Dispatch: use custom override if it exists, otherwise built-in default
-const __customErrors = {${Array.from(opts.compiledErrorPages.keys()).map(s => ` ${s}: __error_${s}`).join(',')} };
-
-function __error(status, detail) {
-  if (__customErrors[status]) return __customErrors[status](detail);
-  return __errorPage(status, detail);
-}
-
-${opts.compiledComponents.length > 0 ? '// â"€â"€ Components â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€\n\n' + opts.compiledComponents.join('\n\n') + '\n' : ''}${migrationInit}${authInit}${authPluginInit}${doResolverInit}${doClassCode}
-// â"€â"€ Route definitions â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
-const routes = [
-${opts.compiledRoutes.join(',\n')}
-];
-
-for (let i = 0; i < routes.length; i++) __addRoute(routes[i].pattern, i);
-
-// â"€â"€ Response helpers â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
-const __defaultSecHeaders = {
-  'X-Content-Type-Options': 'nosniff',
-  'X-Frame-Options': 'DENY',
-  'Referrer-Policy': 'strict-origin-when-cross-origin',
-};
-
-function __secHeaders(response) {
-  for (const [k, v] of Object.entries(__defaultSecHeaders)) {
-    if (!response.headers.has(k)) response.headers.set(k, v);
-  }
-  return response;
-}
-
-function __attachCookies(response) {
-  const cookies = __getLocals().__setCookieHeaders;
-  if (cookies && cookies.length > 0) {
-    const newResponse = new Response(response.body, response);
-    for (const h of cookies) newResponse.headers.append('Set-Cookie', h);
-    return __secHeaders(newResponse);
-  }
-  return __secHeaders(response);
-}
-
-function __isSameOrigin(request, url) {
-  const fetchSite = request.headers.get('sec-fetch-site');
-  if (fetchSite && fetchSite !== 'same-origin' && fetchSite !== 'same-site' && fetchSite !== 'none') {
-    return false;
-  }
-  const origin = request.headers.get('origin');
-  if (!origin) return true;
-  try { return new URL(origin).origin === url.origin; } catch { return false; }
-}
-
-${opts.isLayoutAsync ? 'async ' : ''}function __render(route, data) {
-  let html = route.render(data);
-  const headMatch = html.match(/<head>([\\s\\S]*?)<\\/head>/);
-  if (headMatch) {
-    html = html.replace(headMatch[0], '');
-    const layoutHtml = ${opts.isLayoutAsync ? 'await ' : ''}__layout(html);
-    return __attachCookies(new Response(layoutHtml.replace('</head>', headMatch[1] + '</head>'), {
-      headers: { 'content-type': 'text/html; charset=utf-8' }
-    }));
-  }
-  return __attachCookies(new Response(${opts.isLayoutAsync ? 'await ' : ''}__layout(html), { headers: { 'content-type': 'text/html; charset=utf-8' } }));
-}
-
-const __runtimeDef = (typeof __kuratchiRuntime !== 'undefined' && __kuratchiRuntime && typeof __kuratchiRuntime === 'object') ? __kuratchiRuntime : {};
-const __runtimeEntries = Object.entries(__runtimeDef).filter(([, step]) => step && typeof step === 'object');
-
-async function __runRuntimeRequest(ctx, next) {
-  let idx = -1;
-  async function __dispatch(i) {
-    if (i <= idx) throw new Error('[kuratchi runtime] next() called multiple times in request phase');
-    idx = i;
-    const entry = __runtimeEntries[i];
-    if (!entry) return next();
-    const [, step] = entry;
-    if (typeof step.request !== 'function') return __dispatch(i + 1);
-    return await step.request(ctx, () => __dispatch(i + 1));
-  }
-  return __dispatch(0);
-}
-
-async function __runRuntimeRoute(ctx, next) {
-  let idx = -1;
-  async function __dispatch(i) {
-    if (i <= idx) throw new Error('[kuratchi runtime] next() called multiple times in route phase');
-    idx = i;
-    const entry = __runtimeEntries[i];
-    if (!entry) return next();
-    const [, step] = entry;
-    if (typeof step.route !== 'function') return __dispatch(i + 1);
-    return await step.route(ctx, () => __dispatch(i + 1));
-  }
-  return __dispatch(0);
-}
-
-async function __runRuntimeResponse(ctx, response) {
-  let out = response;
-  for (const [, step] of __runtimeEntries) {
-    if (typeof step.response !== 'function') continue;
-    out = await step.response(ctx, out);
-    if (!(out instanceof Response)) {
-      throw new Error('[kuratchi runtime] response handlers must return a Response');
-    }
-  }
-  return out;
-}
-
-async function __runRuntimeError(ctx, error) {
-  for (const [name, step] of __runtimeEntries) {
-    if (typeof step.error !== 'function') continue;
-    try {
-      const handled = await step.error(ctx, error);
-      if (handled instanceof Response) return handled;
-    } catch (hookErr) {
-      console.error('[kuratchi runtime] error handler failed in step', name, hookErr);
-    }
-  }
-  return null;
-}
-
-// â"€â"€ Exported Worker entrypoint â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€â"€
-
+    return `// Generated by KuratchiJS compiler �" do not edit.
+${opts.isDev ? '\nglobalThis.__kuratchi_DEV__ = true;\n' : ''}
+${workerImport}
+${contextImport}
+${runtimeImport ? runtimeImport + '\n' : ''}${migrationImports ? migrationImports + '\n' : ''}${authPluginImports ? authPluginImports + '\n' : ''}${doImports ? doImports + '\n' : ''}${opts.serverImports.join('\n')}
+
+// �"��"� Assets �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
+const __assets = {
+${opts.compiledAssets.map(a => `  ${JSON.stringify(a.name)}: { content: ${JSON.stringify(a.content)}, mime: ${JSON.stringify(a.mime)}, etag: ${JSON.stringify(a.etag)} }`).join(',\n')}
+};
+
+// �"��"� Router �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
+const __staticRoutes = new Map();  // exact path �' index (O(1) lookup)
+const __dynamicRoutes = [];        // regex-based routes (params/wildcards)
+
+function __addRoute(pattern, index) {
+  if (!pattern.includes(':') && !pattern.includes('*')) {
+    // Static route �" direct Map lookup, no regex needed
+    __staticRoutes.set(pattern, index);
+  } else {
+    // Dynamic route �" build regex for param extraction
+    const paramNames = [];
+    let regexStr = pattern
+      .replace(/\\*(\\w+)/g, (_, name) => { paramNames.push(name); return '(?<' + name + '>.+)'; })
+      .replace(/:(\\w+)/g, (_, name) => { paramNames.push(name); return '(?<' + name + '>[^/]+)'; });
+    __dynamicRoutes.push({ regex: new RegExp('^' + regexStr + '$'), paramNames, index });
+  }
+}
+
+function __match(pathname) {
+  const normalized = pathname === '/' ? '/' : pathname.replace(/\\/$/, '');
+  // Fast path: static routes (most common)
+  const staticIdx = __staticRoutes.get(normalized);
+  if (staticIdx !== undefined) return { params: {}, index: staticIdx };
+  // Slow path: dynamic routes with params
+  for (const route of __dynamicRoutes) {
+    const m = normalized.match(route.regex);
+    if (m) {
+      const params = {};
+      for (const name of route.paramNames) params[name] = m.groups?.[name] ?? '';
+      return { params, index: route.index };
+    }
+  }
+  return null;
+}
+
+// �"��"� Layout �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
+${layoutBlock}
+
+${layoutActionsBlock}
+
+// �"��"� Error pages �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
+const __errorMessages = {
+  400: 'Bad Request',
+  401: 'Unauthorized',
+  403: 'Forbidden',
+  404: 'Not Found',
+  405: 'Method Not Allowed',
+  408: 'Request Timeout',
+  429: 'Too Many Requests',
+  500: 'Internal Server Error',
+  502: 'Bad Gateway',
+  503: 'Service Unavailable',
+};
+
+// Built-in default error page �" clean, dark, minimal, centered
+function __errorPage(status, detail) {
+  const title = __errorMessages[status] || 'Error';
+  const detailHtml = detail ? '<p style="font-family:ui-monospace,monospace;font-size:0.8rem;color:#555;background:#111;padding:0.5rem 1rem;border-radius:6px;max-width:480px;margin:1rem auto 0;word-break:break-word">' + __esc(detail) + '</p>' : '';
+  return '<div style="display:flex;align-items:center;justify-content:center;min-height:60vh;text-align:center;padding:2rem">'
+    + '<div>'
+    + '<p style="font-size:5rem;font-weight:700;margin:0;color:#333;line-height:1">' + status + '</p>'
+    + '<p style="font-size:1rem;color:#555;margin:0.5rem 0 0;letter-spacing:0.05em">' + __esc(title) + '</p>'
+    + detailHtml
+    + '</div>'
+    + '</div>';
+}
+
+${customErrorFunctions ? '// Custom error page overrides (user-created NNN.html)\n' + customErrorFunctions + '\n' : ''}
+// Dispatch: use custom override if it exists, otherwise built-in default
+const __customErrors = {${Array.from(opts.compiledErrorPages.keys()).map(s => ` ${s}: __error_${s}`).join(',')} };
+
+function __error(status, detail) {
+  if (__customErrors[status]) return __customErrors[status](detail);
+  return __errorPage(status, detail);
+}
+
+${opts.compiledComponents.length > 0 ? '// �"��"� Components �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�\n\n' + opts.compiledComponents.join('\n\n') + '\n' : ''}${migrationInit}${authInit}${authPluginInit}${doResolverInit}${doClassCode}
+// �"��"� Route definitions �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
+const routes = [
+${opts.compiledRoutes.join(',\n')}
+];
+
+for (let i = 0; i < routes.length; i++) __addRoute(routes[i].pattern, i);
+
+// �"��"� Response helpers �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
+const __defaultSecHeaders = {
+  'X-Content-Type-Options': 'nosniff',
+  'X-Frame-Options': 'DENY',
+  'Referrer-Policy': 'strict-origin-when-cross-origin',
+};
+
+function __secHeaders(response) {
+  for (const [k, v] of Object.entries(__defaultSecHeaders)) {
+    if (!response.headers.has(k)) response.headers.set(k, v);
+  }
+  return response;
+}
+
+function __attachCookies(response) {
+  const cookies = __getLocals().__setCookieHeaders;
+  if (cookies && cookies.length > 0) {
+    const newResponse = new Response(response.body, response);
+    for (const h of cookies) newResponse.headers.append('Set-Cookie', h);
+    return __secHeaders(newResponse);
+  }
+  return __secHeaders(response);
+}
+
+function __isSameOrigin(request, url) {
+  const fetchSite = request.headers.get('sec-fetch-site');
+  if (fetchSite && fetchSite !== 'same-origin' && fetchSite !== 'same-site' && fetchSite !== 'none') {
+    return false;
+  }
+  const origin = request.headers.get('origin');
+  if (!origin) return true;
+  try { return new URL(origin).origin === url.origin; } catch { return false; }
+}
+
+${opts.isLayoutAsync ? 'async ' : ''}function __render(route, data) {
+  let html = route.render(data);
+  const headMatch = html.match(/<head>([\\s\\S]*?)<\\/head>/);
+  if (headMatch) {
+    html = html.replace(headMatch[0], '');
+    const layoutHtml = ${opts.isLayoutAsync ? 'await ' : ''}__layout(html);
+    return __attachCookies(new Response(layoutHtml.replace('</head>', headMatch[1] + '</head>'), {
+      headers: { 'content-type': 'text/html; charset=utf-8' }
+    }));
+  }
+  return __attachCookies(new Response(${opts.isLayoutAsync ? 'await ' : ''}__layout(html), { headers: { 'content-type': 'text/html; charset=utf-8' } }));
+}
+
+const __runtimeDef = (typeof __kuratchiRuntime !== 'undefined' && __kuratchiRuntime && typeof __kuratchiRuntime === 'object') ? __kuratchiRuntime : {};
+const __runtimeEntries = Object.entries(__runtimeDef).filter(([, step]) => step && typeof step === 'object');
+
+async function __runRuntimeRequest(ctx, next) {
+  let idx = -1;
+  async function __dispatch(i) {
+    if (i <= idx) throw new Error('[kuratchi runtime] next() called multiple times in request phase');
+    idx = i;
+    const entry = __runtimeEntries[i];
+    if (!entry) return next();
+    const [, step] = entry;
+    if (typeof step.request !== 'function') return __dispatch(i + 1);
+    return await step.request(ctx, () => __dispatch(i + 1));
+  }
+  return __dispatch(0);
+}
+
+async function __runRuntimeRoute(ctx, next) {
+  let idx = -1;
+  async function __dispatch(i) {
+    if (i <= idx) throw new Error('[kuratchi runtime] next() called multiple times in route phase');
+    idx = i;
+    const entry = __runtimeEntries[i];
+    if (!entry) return next();
+    const [, step] = entry;
+    if (typeof step.route !== 'function') return __dispatch(i + 1);
+    return await step.route(ctx, () => __dispatch(i + 1));
+  }
+  return __dispatch(0);
+}
+
+async function __runRuntimeResponse(ctx, response) {
+  let out = response;
+  for (const [, step] of __runtimeEntries) {
+    if (typeof step.response !== 'function') continue;
+    out = await step.response(ctx, out);
+    if (!(out instanceof Response)) {
+      throw new Error('[kuratchi runtime] response handlers must return a Response');
+    }
+  }
+  return out;
+}
+
+async function __runRuntimeError(ctx, error) {
+  for (const [name, step] of __runtimeEntries) {
+    if (typeof step.error !== 'function') continue;
+    try {
+      const handled = await step.error(ctx, error);
+      if (handled instanceof Response) return handled;
+    } catch (hookErr) {
+      console.error('[kuratchi runtime] error handler failed in step', name, hookErr);
+    }
+  }
+  return null;
+}
+
+// �"��"� Exported Worker entrypoint �"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"��"�
+
 export default class extends WorkerEntrypoint {
   async fetch(request) {
     __setRequestContext(this.ctx, request, __env);
 ${migrationInit ? '    await __runMigrations();\n' : ''}${authInit ? '    __initAuth(request);\n' : ''}${authPluginInit ? '    __initAuthPlugins();\n' : ''}${doResolverInit ? '    __initDoResolvers();\n' : ''}
-    const __runtimeCtx = {
-      request,
-      env: __env,
-      ctx: this.ctx,
-      url: new URL(request.url),
-      params: {},
-      locals: __getLocals(),
-    };
-
-    const __coreFetch = async () => {
-      const request = __runtimeCtx.request;
-      const url = __runtimeCtx.url;
-${ac?.hasRateLimit ? '\n      // Rate limiting - check before route handlers\n      { const __rlRes = await __checkRL(); if (__rlRes) return __secHeaders(__rlRes); }\n' : ''}${ac?.hasTurnstile ? '      // Turnstile bot protection\n      { const __tsRes = await __checkTS(); if (__tsRes) return __secHeaders(__tsRes); }\n' : ''}${ac?.hasGuards ? '      // Route guards - redirect if not authenticated\n      { const __gRes = __checkGuard(); if (__gRes) return __secHeaders(__gRes); }\n' : ''}
-
-      // Serve static assets from src/assets/ at /_assets/*
-      if (url.pathname.startsWith('/_assets/')) {
-        const name = url.pathname.slice('/_assets/'.length);
-        const asset = __assets[name];
-        if (asset) {
-          if (request.headers.get('if-none-match') === asset.etag) {
-            return new Response(null, { status: 304 });
-          }
-          return new Response(asset.content, {
-            headers: { 'content-type': asset.mime, 'cache-control': 'public, max-age=31536000, immutable', 'etag': asset.etag }
-          });
-        }
-        return __secHeaders(new Response('Not Found', { status: 404 }));
-      }
-
-      const match = __match(url.pathname);
-
-      if (!match) {
-        return __secHeaders(new Response(${opts.isLayoutAsync ? 'await ' : ''}__layout(__error(404)), { status: 404, headers: { 'content-type': 'text/html; charset=utf-8' } }));
-      }
-
-      __runtimeCtx.params = match.params;
-      const route = routes[match.index];
-      __setLocal('params', match.params);
-
-      // API route: dispatch to method handler
-      if (route.__api) {
-        const method = request.method;
-        if (method === 'OPTIONS') {
-          const handler = route['OPTIONS'];
-          if (typeof handler === 'function') return __secHeaders(await handler(__runtimeCtx));
-          const allowed = ['GET','POST','PUT','PATCH','DELETE','HEAD','OPTIONS'].filter(m => typeof route[m] === 'function').join(', ');
-          return __secHeaders(new Response(null, { status: 204, headers: { 'Allow': allowed, 'Access-Control-Allow-Methods': allowed } }));
-        }
-        const handler = route[method];
-        if (typeof handler !== 'function') {
-          const allowed = ['GET','POST','PUT','PATCH','DELETE','HEAD','OPTIONS'].filter(m => typeof route[m] === 'function').join(', ');
-          return __secHeaders(new Response(JSON.stringify({ error: 'Method Not Allowed' }), { status: 405, headers: { 'content-type': 'application/json', 'Allow': allowed } }));
-        }
-        return __secHeaders(await handler(__runtimeCtx));
-      }
-
-      const __qFn = request.headers.get('x-kuratchi-query-fn') || '';
-      const __qArgsRaw = request.headers.get('x-kuratchi-query-args') || '[]';
-      let __qArgs = [];
-      try {
-        const __parsed = JSON.parse(__qArgsRaw);
-        __qArgs = Array.isArray(__parsed) ? __parsed : [];
-      } catch {}
-      __setLocal('__queryOverride', __qFn ? { fn: __qFn, args: __qArgs } : null);
-      if (!__getLocals().__breadcrumbs) {
-        __setLocal('breadcrumbs', __buildDefaultBreadcrumbs(url.pathname, match.params));
-      }
-
-      // RPC call: GET ?_rpc=fnName&_args=[...] -> JSON response
-      const __rpcName = url.searchParams.get('_rpc');
-      if (request.method === 'GET' && __rpcName && route.rpc && Object.hasOwn(route.rpc, __rpcName)) {
-        if (request.headers.get('x-kuratchi-rpc') !== '1') {
-          return __secHeaders(new Response(JSON.stringify({ ok: false, error: 'Forbidden' }), {
-            status: 403, headers: { 'content-type': 'application/json', 'cache-control': 'no-store' }
-          }));
-        }
-        try {
-          const __rpcArgsStr = url.searchParams.get('_args');
-          let __rpcArgs = [];
-          if (__rpcArgsStr) {
-            const __parsed = JSON.parse(__rpcArgsStr);
-            __rpcArgs = Array.isArray(__parsed) ? __parsed : [];
-          }
-          const __rpcResult = await route.rpc[__rpcName](...__rpcArgs);
-          return __secHeaders(new Response(JSON.stringify({ ok: true, data: __rpcResult }), {
-            headers: { 'content-type': 'application/json', 'cache-control': 'no-store' }
-          }));
-        } catch (err) {
-          console.error('[kuratchi] RPC error:', err);
-          const __errMsg = typeof __kuratchi_DEV__ !== 'undefined' ? err.message : 'Internal Server Error';
-          return __secHeaders(new Response(JSON.stringify({ ok: false, error: __errMsg }), {
-            status: 500, headers: { 'content-type': 'application/json', 'cache-control': 'no-store' }
-          }));
-        }
-      }
-
-      // Form action: POST with hidden _action field in form body
-      if (request.method === 'POST') {
-        if (!__isSameOrigin(request, url)) {
-          return __secHeaders(new Response('Forbidden', { status: 403 }));
-        }
-        const formData = await request.formData();
-        const actionName = formData.get('_action');
-        const __actionFn = (actionName && route.actions && Object.hasOwn(route.actions, actionName) ? route.actions[actionName] : null)
-          || (actionName && __layoutActions && Object.hasOwn(__layoutActions, actionName) ? __layoutActions[actionName] : null);
-        if (actionName && __actionFn) {
-          // Check if this is a fetch-based action call (onclick) with JSON args
-          const argsStr = formData.get('_args');
-          const isFetchAction = argsStr !== null;
-          try {
-            if (isFetchAction) {
-              const __parsed = JSON.parse(argsStr);
-              const args = Array.isArray(__parsed) ? __parsed : [];
-              await __actionFn(...args);
-            } else {
-              await __actionFn(formData);
-            }
-          } catch (err) {
-            console.error('[kuratchi] Action error:', err);
-            if (isFetchAction) {
-              const __errMsg = typeof __kuratchi_DEV__ !== 'undefined' ? err.message : 'Internal Server Error';
-              return __secHeaders(new Response(JSON.stringify({ ok: false, error: __errMsg }), {
-                status: 500, headers: { 'content-type': 'application/json' }
-              }));
-            }
-            const __loaded = route.load ? await route.load(match.params) : {};
-            const data = (__loaded && typeof __loaded === 'object') ? __loaded : { value: __loaded };
-            data.params = match.params;
-            data.breadcrumbs = __getLocals().__breadcrumbs ?? [];
-            const __allActions = Object.assign({}, route.actions, __layoutActions || {});
-            Object.keys(__allActions).forEach(function(k) { if (!(k in data)) data[k] = { error: undefined, loading: false, success: false }; });
-            const __errMsg = (err && err.isActionError) ? err.message : (typeof __kuratchi_DEV__ !== 'undefined' && err && err.message) ? err.message : 'Action failed';
-            data[actionName] = { error: __errMsg, loading: false, success: false };
-            return ${opts.isLayoutAsync ? 'await ' : ''}__render(route, data);
-          }
-          // Fetch-based actions return lightweight JSON (no page re-render)
-          if (isFetchAction) {
-            return __attachCookies(new Response(JSON.stringify({ ok: true }), {
-              headers: { 'content-type': 'application/json' }
-            }));
-          }
-          // POST-Redirect-GET: redirect to custom target or back to same URL
-          const __locals = __getLocals();
-          const redirectTo = __locals.__redirectTo || url.pathname;
-          const redirectStatus = Number(__locals.__redirectStatus) || 303;
-          return __attachCookies(new Response(null, { status: redirectStatus, headers: { 'location': redirectTo } }));
-        }
-      }
-
-      // GET (or unmatched POST): load + render
-      try {
-        const __loaded = route.load ? await route.load(match.params) : {};
-        const data = (__loaded && typeof __loaded === 'object') ? __loaded : { value: __loaded };
-        data.params = match.params;
-        data.breadcrumbs = __getLocals().__breadcrumbs ?? [];
-        const __allActionsGet = Object.assign({}, route.actions, __layoutActions || {});
-        Object.keys(__allActionsGet).forEach(function(k) { if (!(k in data)) data[k] = { error: undefined, loading: false, success: false }; });
-        return ${opts.isLayoutAsync ? 'await ' : ''}__render(route, data);
-      } catch (err) {
-        console.error('[kuratchi] Route load/render error:', err);
-        const __pageErrStatus = (err && err.isPageError && err.status) ? err.status : 500;
-        const __errDetail = (err && err.isPageError) ? err.message : (typeof __kuratchi_DEV__ !== 'undefined' && err && err.message) ? err.message : undefined;
-        return __secHeaders(new Response(${opts.isLayoutAsync ? 'await ' : ''}__layout(__error(__pageErrStatus, __errDetail)), { status: __pageErrStatus, headers: { 'content-type': 'text/html; charset=utf-8' } }));
-      }
-    };
-
-    try {
-      const __requestResponse = await __runRuntimeRequest(__runtimeCtx, async () => {
-        return __runRuntimeRoute(__runtimeCtx, __coreFetch);
-      });
-      return await __runRuntimeResponse(__runtimeCtx, __requestResponse);
-    } catch (err) {
-      const __handled = await __runRuntimeError(__runtimeCtx, err);
-      if (__handled) return __secHeaders(__handled);
-      throw err;
-    }
-  }
-}
+    const __runtimeCtx = {
+      request,
+      env: __env,
+      ctx: this.ctx,
+      url: new URL(request.url),
+      params: {},
+      locals: __getLocals(),
+    };
+
+    const __coreFetch = async () => {
+      const request = __runtimeCtx.request;
+      const url = __runtimeCtx.url;
+${ac?.hasRateLimit ? '\n      // Rate limiting - check before route handlers\n      { const __rlRes = await __checkRL(); if (__rlRes) return __secHeaders(__rlRes); }\n' : ''}${ac?.hasTurnstile ? '      // Turnstile bot protection\n      { const __tsRes = await __checkTS(); if (__tsRes) return __secHeaders(__tsRes); }\n' : ''}${ac?.hasGuards ? '      // Route guards - redirect if not authenticated\n      { const __gRes = __checkGuard(); if (__gRes) return __secHeaders(__gRes); }\n' : ''}
+
+      // Serve static assets from src/assets/ at /_assets/*
+      if (url.pathname.startsWith('/_assets/')) {
+        const name = url.pathname.slice('/_assets/'.length);
+        const asset = __assets[name];
+        if (asset) {
+          if (request.headers.get('if-none-match') === asset.etag) {
+            return new Response(null, { status: 304 });
+          }
+          return new Response(asset.content, {
+            headers: { 'content-type': asset.mime, 'cache-control': 'public, max-age=31536000, immutable', 'etag': asset.etag }
+          });
+        }
+        return __secHeaders(new Response('Not Found', { status: 404 }));
+      }
+
+      const match = __match(url.pathname);
+
+      if (!match) {
+        return __secHeaders(new Response(${opts.isLayoutAsync ? 'await ' : ''}__layout(__error(404)), { status: 404, headers: { 'content-type': 'text/html; charset=utf-8' } }));
+      }
+
+      __runtimeCtx.params = match.params;
+      const route = routes[match.index];
+      __setLocal('params', match.params);
+
+      // API route: dispatch to method handler
+      if (route.__api) {
+        const method = request.method;
+        if (method === 'OPTIONS') {
+          const handler = route['OPTIONS'];
+          if (typeof handler === 'function') return __secHeaders(await handler(__runtimeCtx));
+          const allowed = ['GET','POST','PUT','PATCH','DELETE','HEAD','OPTIONS'].filter(m => typeof route[m] === 'function').join(', ');
+          return __secHeaders(new Response(null, { status: 204, headers: { 'Allow': allowed, 'Access-Control-Allow-Methods': allowed } }));
+        }
+        const handler = route[method];
+        if (typeof handler !== 'function') {
+          const allowed = ['GET','POST','PUT','PATCH','DELETE','HEAD','OPTIONS'].filter(m => typeof route[m] === 'function').join(', ');
+          return __secHeaders(new Response(JSON.stringify({ error: 'Method Not Allowed' }), { status: 405, headers: { 'content-type': 'application/json', 'Allow': allowed } }));
+        }
+        return __secHeaders(await handler(__runtimeCtx));
+      }
+
+      const __qFn = request.headers.get('x-kuratchi-query-fn') || '';
+      const __qArgsRaw = request.headers.get('x-kuratchi-query-args') || '[]';
+      let __qArgs = [];
+      try {
+        const __parsed = JSON.parse(__qArgsRaw);
+        __qArgs = Array.isArray(__parsed) ? __parsed : [];
+      } catch {}
+      __setLocal('__queryOverride', __qFn ? { fn: __qFn, args: __qArgs } : null);
+      if (!__getLocals().__breadcrumbs) {
+        __setLocal('breadcrumbs', __buildDefaultBreadcrumbs(url.pathname, match.params));
+      }
+
+      // RPC call: GET ?_rpc=fnName&_args=[...] -> JSON response
+      const __rpcName = url.searchParams.get('_rpc');
+      if (request.method === 'GET' && __rpcName && route.rpc && Object.hasOwn(route.rpc, __rpcName)) {
+        if (request.headers.get('x-kuratchi-rpc') !== '1') {
+          return __secHeaders(new Response(JSON.stringify({ ok: false, error: 'Forbidden' }), {
+            status: 403, headers: { 'content-type': 'application/json', 'cache-control': 'no-store' }
+          }));
+        }
+        try {
+          const __rpcArgsStr = url.searchParams.get('_args');
+          let __rpcArgs = [];
+          if (__rpcArgsStr) {
+            const __parsed = JSON.parse(__rpcArgsStr);
+            __rpcArgs = Array.isArray(__parsed) ? __parsed : [];
+          }
+          const __rpcResult = await route.rpc[__rpcName](...__rpcArgs);
+          return __secHeaders(new Response(JSON.stringify({ ok: true, data: __rpcResult }), {
+            headers: { 'content-type': 'application/json', 'cache-control': 'no-store' }
+          }));
+        } catch (err) {
+          console.error('[kuratchi] RPC error:', err);
+          const __errMsg = typeof __kuratchi_DEV__ !== 'undefined' ? err.message : 'Internal Server Error';
+          return __secHeaders(new Response(JSON.stringify({ ok: false, error: __errMsg }), {
+            status: 500, headers: { 'content-type': 'application/json', 'cache-control': 'no-store' }
+          }));
+        }
+      }
+
+      // Form action: POST with hidden _action field in form body
+      if (request.method === 'POST') {
+        if (!__isSameOrigin(request, url)) {
+          return __secHeaders(new Response('Forbidden', { status: 403 }));
+        }
+        const formData = await request.formData();
+        const actionName = formData.get('_action');
+        const __actionFn = (actionName && route.actions && Object.hasOwn(route.actions, actionName) ? route.actions[actionName] : null)
+          || (actionName && __layoutActions && Object.hasOwn(__layoutActions, actionName) ? __layoutActions[actionName] : null);
+        if (actionName && __actionFn) {
+          // Check if this is a fetch-based action call (onclick) with JSON args
+          const argsStr = formData.get('_args');
+          const isFetchAction = argsStr !== null;
+          try {
+            if (isFetchAction) {
+              const __parsed = JSON.parse(argsStr);
+              const args = Array.isArray(__parsed) ? __parsed : [];
+              await __actionFn(...args);
+            } else {
+              await __actionFn(formData);
+            }
+          } catch (err) {
+            if (err && err.isRedirectError) {
+              const __redirectTo = err.location || url.pathname;
+              const __redirectStatus = Number(err.status) || 303;
+              if (isFetchAction) {
+                return __attachCookies(__secHeaders(new Response(JSON.stringify({ ok: true, redirectTo: __redirectTo, redirectStatus: __redirectStatus }), {
+                  headers: { 'content-type': 'application/json' }
+                })));
+              }
+              return __attachCookies(new Response(null, { status: __redirectStatus, headers: { 'location': __redirectTo } }));
+            }
+            console.error('[kuratchi] Action error:', err);
+            if (isFetchAction) {
+              const __errMsg = typeof __kuratchi_DEV__ !== 'undefined' && err && err.message ? err.message : 'Internal Server Error';
+              return __secHeaders(new Response(JSON.stringify({ ok: false, error: __errMsg }), {
+                status: 500, headers: { 'content-type': 'application/json' }
+              }));
+            }
+            const __loaded = route.load ? await route.load(match.params) : {};
+            const data = (__loaded && typeof __loaded === 'object') ? __loaded : { value: __loaded };
+            data.params = match.params;
+            data.breadcrumbs = __getLocals().__breadcrumbs ?? [];
+            const __allActions = Object.assign({}, route.actions, __layoutActions || {});
+            Object.keys(__allActions).forEach(function(k) { if (!(k in data)) data[k] = { error: undefined, loading: false, success: false }; });
+            const __errMsg = (err && err.isActionError) ? err.message : (typeof __kuratchi_DEV__ !== 'undefined' && err && err.message) ? err.message : 'Action failed';
+            data[actionName] = { error: __errMsg, loading: false, success: false };
+            return ${opts.isLayoutAsync ? 'await ' : ''}__render(route, data);
+          }
+          // Fetch-based actions return lightweight JSON (no page re-render)
+          if (isFetchAction) {
+            return __attachCookies(new Response(JSON.stringify({ ok: true }), {
+              headers: { 'content-type': 'application/json' }
+            }));
+          }
+          // POST-Redirect-GET: redirect to custom target or back to same URL
+          const __locals = __getLocals();
+          const redirectTo = __locals.__redirectTo || url.pathname;
+          const redirectStatus = Number(__locals.__redirectStatus) || 303;
+          return __attachCookies(new Response(null, { status: redirectStatus, headers: { 'location': redirectTo } }));
+        }
+      }
+
+      // GET (or unmatched POST): load + render
+      try {
+        const __loaded = route.load ? await route.load(match.params) : {};
+        const data = (__loaded && typeof __loaded === 'object') ? __loaded : { value: __loaded };
+        data.params = match.params;
+        data.breadcrumbs = __getLocals().__breadcrumbs ?? [];
+        const __allActionsGet = Object.assign({}, route.actions, __layoutActions || {});
+        Object.keys(__allActionsGet).forEach(function(k) { if (!(k in data)) data[k] = { error: undefined, loading: false, success: false }; });
+        return ${opts.isLayoutAsync ? 'await ' : ''}__render(route, data);
+      } catch (err) {
+        if (err && err.isRedirectError) {
+          const __redirectTo = err.location || url.pathname;
+          const __redirectStatus = Number(err.status) || 303;
+          return __attachCookies(new Response(null, { status: __redirectStatus, headers: { 'location': __redirectTo } }));
+        }
+        console.error('[kuratchi] Route load/render error:', err);
+        const __pageErrStatus = (err && err.isPageError && err.status) ? err.status : 500;
+        const __errDetail = (err && err.isPageError) ? err.message : (typeof __kuratchi_DEV__ !== 'undefined' && err && err.message) ? err.message : undefined;
+        return __secHeaders(new Response(${opts.isLayoutAsync ? 'await ' : ''}__layout(__error(__pageErrStatus, __errDetail)), { status: __pageErrStatus, headers: { 'content-type': 'text/html; charset=utf-8' } }));
+      }
+    };
+
+    try {
+      const __requestResponse = await __runRuntimeRequest(__runtimeCtx, async () => {
+        return __runRuntimeRoute(__runtimeCtx, __coreFetch);
+      });
+      return await __runRuntimeResponse(__runtimeCtx, __requestResponse);
+    } catch (err) {
+      const __handled = await __runRuntimeError(__runtimeCtx, err);
+      if (__handled) return __secHeaders(__handled);
+      throw err;
+    }
+  }
+}
 `;
 }
 function resolveRuntimeImportPath(projectDir) {