@zenithbuild/cli 0.4.5 → 0.4.6

package/dist/zen-build.js

@@ -4,7 +4,6 @@ var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __toESM = (mod, isNodeMode, target) => {
   target = mod != null ? __create(__getProtoOf(mod)) : {};
@@ -17,31 +16,7 @@ var __toESM = (mod, isNodeMode, target) => {
       });
   return to;
 };
-var __moduleCache = /* @__PURE__ */ new WeakMap;
-var __toCommonJS = (from) => {
-  var entry = __moduleCache.get(from), desc;
-  if (entry)
-    return entry;
-  entry = __defProp({}, "__esModule", { value: true });
-  if (from && typeof from === "object" || typeof from === "function")
-    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    }));
-  __moduleCache.set(from, entry);
-  return entry;
-};
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {
-      get: all[name],
-      enumerable: true,
-      configurable: true,
-      set: (newValue) => all[name] = () => newValue
-    });
-};
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = import.meta.require;
 
 // node_modules/picocolors/picocolors.js
@@ -114,21 +89,21 @@ var require_picocolors = __commonJS((exports, module) => {
   module.exports.createColors = createColors;
 });
 
-// node_modules/@zenithbuild/compiler/native/compiler-native/compiler-native.node
+// ../zenith-compiler/native/compiler-native/compiler-native.node
 var require_compiler_native = __commonJS((exports, module) => {
-  module.exports = __require("./compiler-native-frej59m4.node");
+  module.exports = __require("./compiler-native-694q7spj.node");
 });
 
-// node_modules/@zenithbuild/compiler/native/compiler-native/index.js
+// ../zenith-compiler/native/compiler-native/index.js
 var require_compiler_native2 = __commonJS((exports, module) => {
-  var __dirname = "/Users/judahsullivan/Personal/zenith/zenith-cli/node_modules/@zenithbuild/compiler/native/compiler-native";
+  var __dirname = "/Users/judahsullivan/Personal/zenith/zenith-compiler/native/compiler-native";
   var { join } = __require("path");
   var { statSync } = __require("fs");
   var nativeBinding;
   var nodePath = join(__dirname, "compiler-native.node");
   var mtime = statSync(nodePath).mtimeMs;
   try {
-    delete __require.cache[__require.resolve("/Users/judahsullivan/Personal/zenith/zenith-cli/node_modules/@zenithbuild/compiler/native/compiler-native/compiler-native.node")];
+    delete __require.cache[__require.resolve("/Users/judahsullivan/Personal/zenith/zenith-compiler/native/compiler-native/compiler-native.node")];
     nativeBinding = require_compiler_native();
   } catch (e) {
     console.error("[Zenith Native] Failed to load native binding:", e.message);
@@ -137,74 +112,6 @@ var require_compiler_native2 = __commonJS((exports, module) => {
   module.exports = nativeBinding;
 });
 
-// node_modules/@zenithbuild/compiler/dist/discovery/componentDiscovery.js
-var exports_componentDiscovery = {};
-__export(exports_componentDiscovery, {
-  isComponentTag: () => isComponentTag,
-  getComponent: () => getComponent,
-  discoverComponents: () => discoverComponents
-});
-function discoverComponents(baseDir) {
-  if (native7 && native7.discoverComponentsNative) {
-    try {
-      const raw = native7.discoverComponentsNative(baseDir);
-      const components = new Map;
-      for (const [name, metadata] of Object.entries(raw)) {
-        components.set(name, metadata);
-      }
-      return components;
-    } catch (error4) {
-      console.warn(`[Zenith Native] Discovery failed for ${baseDir}: ${error4.message}`);
-    }
-  }
-  return new Map;
-}
-function isComponentTag(tagName) {
-  if (native7 && native7.isComponentTagNative) {
-    return native7.isComponentTagNative(tagName);
-  }
-  return tagName.length > 0 && tagName[0] === tagName[0]?.toUpperCase();
-}
-function getComponent(components, name) {
-  return components.get(name);
-}
-var native7;
-var init_componentDiscovery = __esm(() => {
-  try {
-    try {
-      native7 = require_compiler_native2();
-    } catch {
-      native7 = require_compiler_native2();
-    }
-  } catch (e2) {}
-});
-
-// node_modules/@zenithbuild/compiler/dist/transform/componentResolver.js
-var exports_componentResolver = {};
-__export(exports_componentResolver, {
-  resolveComponentsInIR: () => resolveComponentsInIR
-});
-function resolveComponentsInIR(ir, components) {
-  console.error(`[ZenithDebug] resolveComponentsInIR called with ${components.size} components`);
-  for (const [name, meta] of components) {
-    console.error(`[ZenithDebug] Component '${name}': script=${meta.script ? meta.script.length : "null"} bytes`);
-  }
-  const irJson = JSON.stringify(ir);
-  const componentsRecord = {};
-  for (const [key, value] of components) {
-    componentsRecord[key] = value;
-  }
-  const componentsJson = JSON.stringify(componentsRecord);
-  console.error(`[ZenithDebug] Calling resolveComponentsNative...`);
-  const resolvedJson = import_compiler_native.resolveComponentsNative(irJson, componentsJson);
-  console.error(`[ZenithDebug] resolveComponentsNative returned ${resolvedJson.length} bytes`);
-  return JSON.parse(resolvedJson);
-}
-var import_compiler_native;
-var init_componentResolver = __esm(() => {
-  import_compiler_native = __toESM(require_compiler_native2(), 1);
-});
-
 // src/main.ts
 import process2 from "process";
 
@@ -416,7 +323,7 @@ function showServerPanel(options) {
 `);
 }
 
-// node_modules/@zenithbuild/compiler/dist/transform/transformTemplate.js
+// ../zenith-compiler/dist/transform/transformTemplate.js
 function transformTemplate(ir) {
   let native;
   try {
@@ -438,7 +345,7 @@ function transformTemplate(ir) {
   throw new Error("[Zenith Native] Transformation bridge unavailable");
 }
 
-// node_modules/@zenithbuild/compiler/dist/finalize/finalizeOutput.js
+// ../zenith-compiler/dist/finalize/finalizeOutput.js
 var native;
 try {
   try {
@@ -486,7 +393,7 @@ ${errorMessage}`);
   return output;
 }
 
-// node_modules/@zenithbuild/compiler/dist/errors/compilerError.js
+// ../zenith-compiler/dist/errors/compilerError.js
 class CompilerError extends Error {
   file;
   line;
@@ -528,7 +435,7 @@ class InvariantError extends CompilerError {
   }
 }
 
-// node_modules/@zenithbuild/compiler/dist/validate/invariants.js
+// ../zenith-compiler/dist/validate/invariants.js
 var native2;
 try {
   try {
@@ -558,7 +465,7 @@ function validateIr(ir) {
   }
 }
 
-// node_modules/@zenithbuild/compiler/dist/parseZenFile.js
+// ../zenith-compiler/dist/parseZenFile.js
 import { readFileSync } from "fs";
 var native3;
 try {
@@ -580,6 +487,10 @@ function parseZenFile(filePath, sourceInput) {
     }
   }
   if (native3 && native3.parseTemplateNative && native3.parseScriptNative && native3.extractStylesNative) {
+    console.log(`[ZenithDebug] parseZenFile: filePath=${filePath}, sourceLen=${source.length}`);
+    if (filePath.endsWith("index.zen")) {
+      console.log(`[ZenithDebug] source snippet: ${source.substring(0, 500)}`);
+    }
     try {
       const template = native3.parseTemplateNative(source, filePath);
       const script = native3.parseScriptNative(source);
@@ -599,7 +510,7 @@ function parseZenFile(filePath, sourceInput) {
   throw new Error(`[Zenith Native] Parser bridge unavailable - cannot compile ${filePath}`);
 }
 
-// node_modules/@zenithbuild/compiler/dist/discovery/layouts.js
+// ../zenith-compiler/dist/discovery/componentDiscovery.js
 var native4;
 try {
   try {
@@ -608,10 +519,53 @@ try {
     native4 = require_compiler_native2();
   }
 } catch (e) {}
+function discoverComponents(baseDir) {
+  if (native4 && native4.discoverComponentsNative) {
+    try {
+      const raw = native4.discoverComponentsNative(baseDir);
+      const components = new Map;
+      for (const [name, metadata] of Object.entries(raw)) {
+        components.set(name, metadata);
+      }
+      return components;
+    } catch (error3) {
+      console.warn(`[Zenith Native] Discovery failed for ${baseDir}: ${error3.message}`);
+    }
+  }
+  return new Map;
+}
+
+// ../zenith-compiler/dist/transform/componentResolver.js
+var import_compiler_native = __toESM(require_compiler_native2(), 1);
+function resolveComponentsInIR(ir, components) {
+  console.error(`[ZenithDebug] resolveComponentsInIR called with ${components.size} components`);
+  for (const [name, meta] of components) {
+    console.error(`[ZenithDebug] Component '${name}': script=${meta.script ? meta.script.length : "null"} bytes`);
+  }
+  const irJson = JSON.stringify(ir);
+  const componentsRecord = {};
+  for (const [key, value] of components) {
+    componentsRecord[key] = value;
+  }
+  const componentsJson = JSON.stringify(componentsRecord);
+  console.error(`[ZenithDebug] Calling resolveComponentsNative...`);
+  const resolvedJson = import_compiler_native.resolveComponentsNative(irJson, componentsJson);
+  console.error(`[ZenithDebug] resolveComponentsNative returned ${resolvedJson.length} bytes`);
+  return JSON.parse(resolvedJson);
+}
+// ../zenith-compiler/dist/discovery/layouts.js
+var native5;
+try {
+  try {
+    native5 = require_compiler_native2();
+  } catch {
+    native5 = require_compiler_native2();
+  }
+} catch (e) {}
 function discoverLayouts(layoutsDir) {
-  if (native4 && native4.discoverLayoutsNative) {
+  if (native5 && native5.discoverLayoutsNative) {
     try {
-      const raw = native4.discoverLayoutsNative(layoutsDir);
+      const raw = native5.discoverLayoutsNative(layoutsDir);
       const layouts = new Map;
       for (const [name, metadata] of Object.entries(raw)) {
         const meta = metadata;
@@ -632,17 +586,17 @@ function discoverLayouts(layoutsDir) {
   }
   return new Map;
 }
-// node_modules/@zenithbuild/compiler/dist/transform/layoutProcessor.js
-var native5;
+// ../zenith-compiler/dist/transform/layoutProcessor.js
+var native6;
 try {
   try {
-    native5 = require_compiler_native2();
+    native6 = require_compiler_native2();
   } catch {
-    native5 = require_compiler_native2();
+    native6 = require_compiler_native2();
   }
 } catch (e) {}
 function processLayout(source, layout, props = {}) {
-  if (native5 && native5.process_layout_native) {
+  if (native6 && native6.processLayoutNative) {
     try {
       const layoutForNative = {
         name: layout.name,
@@ -650,18 +604,18 @@ function processLayout(source, layout, props = {}) {
         scripts: layout.scripts,
         styles: layout.styles
       };
-      return native5.process_layout_native(source, JSON.stringify(layoutForNative), JSON.stringify(props));
+      return native6.processLayoutNative(source, JSON.stringify(layoutForNative), JSON.stringify(props));
     } catch (error3) {
       console.warn(`[Zenith Native] Layout processing failed: ${error3.message}`);
     }
   }
   return source;
 }
-// node_modules/rolldown/dist/shared/binding-C-UNREnT.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/binding-C-UNREnT.mjs
 import { createRequire } from "module";
 var __create2 = Object.create;
 var __defProp2 = Object.defineProperty;
-var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames2 = Object.getOwnPropertyNames;
 var __getProtoOf2 = Object.getPrototypeOf;
 var __hasOwnProp2 = Object.prototype.hasOwnProperty;
@@ -673,7 +627,7 @@ var __copyProps = (to, from, except, desc) => {
       if (!__hasOwnProp2.call(to, key) && key !== except) {
         __defProp2(to, key, {
           get: ((k) => from[k]).bind(null, key),
-          enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
         });
       }
     }
@@ -1289,7 +1243,7 @@ var require_binding = /* @__PURE__ */ __commonJSMin((exports, module) => {
   module.exports.startAsyncRuntime = nativeBinding.startAsyncRuntime;
 });
 
-// node_modules/rolldown/dist/shared/logs-NH298mHo.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/logs-NH298mHo.mjs
 function spaces(index) {
   let result = "";
   while (index--)
@@ -1456,7 +1410,7 @@ function augmentCodeLocation(properties, pos, source, id) {
   }
 }
 
-// node_modules/rolldown/dist/shared/normalize-string-or-regex-Dq50a7l9.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/normalize-string-or-regex-Dq50a7l9.mjs
 var import_binding = /* @__PURE__ */ __toESM2(require_binding(), 1);
 var BuiltinPlugin = class {
   enforce;
@@ -1494,7 +1448,7 @@ function isReadonlyArray(input) {
   return Array.isArray(input);
 }
 
-// node_modules/rolldown/dist/shared/misc-CCZIsXVO.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/misc-CCZIsXVO.mjs
 function arraify(value) {
   return Array.isArray(value) ? value : [value];
 }
@@ -1513,7 +1467,7 @@ function unsupported(info3) {
 }
 function noop(..._args) {}
 
-// node_modules/rolldown/dist/shared/parse-ast-index-B6LAhWD8.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/parse-ast-index-B6LAhWD8.mjs
 function wrap$1(result) {
   let program, module, comments, errors;
   return {
@@ -1601,10 +1555,10 @@ function parseAst(sourceText, options, filename) {
   }), filename, sourceText);
 }
 
-// node_modules/rolldown/dist/shared/bindingify-input-options-Cb-01HR1.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/bindingify-input-options-Cb-01HR1.mjs
 import path2 from "path";
 
-// node_modules/@rolldown/pluginutils/dist/filter/composable-filters.js
+// ../zenith-compiler/node_modules/@rolldown/pluginutils/dist/filter/composable-filters.js
 class And {
   kind;
   args;
@@ -1695,7 +1649,7 @@ function include(expr) {
 function exclude(expr) {
   return new Exclude(expr);
 }
-// node_modules/rolldown/dist/shared/bindingify-input-options-Cb-01HR1.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/bindingify-input-options-Cb-01HR1.mjs
 import fsp from "fs/promises";
 var version = "1.0.0-rc.1";
 var VERSION = version;
@@ -3917,7 +3871,7 @@ function bindingifyPreserveEntrySignatures(preserveEntrySignatures) {
     };
 }
 
-// node_modules/rolldown/dist/shared/rolldown-build-KB1YaNe-.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/rolldown-build-KB1YaNe-.mjs
 import { Worker } from "worker_threads";
 import path3 from "path";
 import { styleText } from "util";
@@ -6043,7 +5997,7 @@ var RolldownBuild = class RolldownBuild2 {
   }
 };
 
-// node_modules/rolldown/dist/shared/watch-B2WRkpw2.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/watch-B2WRkpw2.mjs
 var signals = [];
 signals.push("SIGHUP", "SIGINT", "SIGTERM");
 if (process.platform !== "win32")
@@ -6231,13 +6185,13 @@ function onExit(...args2) {
 }
 var import_binding5 = /* @__PURE__ */ __toESM2(require_binding());
 
-// node_modules/rolldown/dist/shared/rolldown-CIC_OHw3.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/shared/rolldown-CIC_OHw3.mjs
 var rolldown = async (input) => {
   validateOption("input", input);
   return new RolldownBuild(await PluginDriver.callOptionsHook(input));
 };
 
-// node_modules/rolldown/dist/index.mjs
+// ../zenith-compiler/node_modules/rolldown/dist/index.mjs
 import { isMainThread } from "worker_threads";
 var import_binding6 = /* @__PURE__ */ __toESM2(require_binding(), 1);
 if (isMainThread) {
@@ -6248,7 +6202,7 @@ if (isMainThread) {
 }
 var BindingMagicString = import_binding6.BindingMagicString;
 
-// node_modules/@zenithbuild/compiler/dist/bundler.js
+// ../zenith-compiler/dist/bundler.js
 async function bundlePageScript(plan) {
   const VIRTUAL_ENTRY = "\x00zenith:entry";
   const virtualModules = new Map;
@@ -6292,21 +6246,21 @@ async function bundlePageScript(plan) {
   }
   return output[0].code;
 }
-// node_modules/@zenithbuild/compiler/dist/ssg-build.js
+// ../zenith-compiler/dist/ssg-build.js
 import fs5 from "fs";
 import path8 from "path";
 
-// node_modules/@zenithbuild/router/src/manifest.ts
+// ../zenith-compiler/node_modules/@zenithbuild/router/src/manifest.ts
 import fs2 from "fs";
 import path4 from "path";
 
-// node_modules/@zenithbuild/router/index.js
+// ../zenith-compiler/node_modules/@zenithbuild/router/index.js
 import { createRequire as createRequire2 } from "module";
 var require2 = createRequire2(import.meta.url);
-var native6 = require2("./zenith-router.node");
-var { generateRouteManifestNative, renderRouteNative, resolveRouteNative, generateRuntimeRouterNative, SegmentType, routerBridge } = native6;
+var native7 = require2("./zenith-router.node");
+var { generateRouteManifestNative, renderRouteNative, resolveRouteNative, generateRuntimeRouterNative, SegmentType, routerBridge } = native7;
 
-// node_modules/@zenithbuild/router/src/manifest.ts
+// ../zenith-compiler/node_modules/@zenithbuild/router/src/manifest.ts
 var SEGMENT_SCORES = {
   [SegmentType.Static]: 10,
   [SegmentType.Dynamic]: 5,
@@ -6435,7 +6389,7 @@ function generateRouteDefinition(filePath, pagesDir) {
   };
 }
 
-// node_modules/@zenithbuild/compiler/dist/build-analyzer.js
+// ../zenith-compiler/dist/build-analyzer.js
 function analyzePageSource(source) {
   const scriptMatch = source.match(/<script[^>]*>([\s\S]*?)<\/script>/i);
   const scriptContent = scriptMatch?.[1] || "";
@@ -6493,24 +6447,42 @@ function getBuildOutputType(analysis) {
   return "static";
 }
 
-// node_modules/@zenithbuild/compiler/dist/runtime/bundle-generator.js
+// ../zenith-compiler/dist/runtime/bundle-generator.js
 import { readFileSync as readFileSync2, existsSync } from "fs";
 import path5 from "path";
 function generateBundleJS(pluginData) {
   const serializedData = pluginData ? JSON.stringify(pluginData).replace(/<\/script/g, "<\\/script") : "{}";
   const rootDir = process.cwd();
-  const coreDistPath = path5.join(rootDir, "../zenith-core/dist/runtime");
+  let coreRuntimePath = path5.join(rootDir, "../zenith-core/dist/runtime");
+  if (!existsSync(coreRuntimePath)) {
+    coreRuntimePath = path5.join(rootDir, "../zenith-core/core");
+  }
   let reactivityJS = "";
   let lifecycleJS = "";
   try {
-    const reactivityFile = path5.join(coreDistPath, "reactivity/index.js");
-    const lifecycleFile = path5.join(coreDistPath, "lifecycle/index.js");
-    if (existsSync(reactivityFile))
-      reactivityJS = readFileSync2(reactivityFile, "utf-8");
-    if (existsSync(lifecycleFile))
-      lifecycleJS = readFileSync2(lifecycleFile, "utf-8");
+    let reactivityFile = path5.join(coreRuntimePath, "reactivity/index.js");
+    if (!existsSync(reactivityFile))
+      reactivityFile = path5.join(coreRuntimePath, "reactivity/index.ts");
+    let lifecycleFile = path5.join(coreRuntimePath, "lifecycle/index.js");
+    if (!existsSync(lifecycleFile))
+      lifecycleFile = path5.join(coreRuntimePath, "lifecycle/index.ts");
+    if (existsSync(reactivityFile) && reactivityFile.endsWith(".js")) {
+      reactivityJS = transformExportsToGlobal(readFileSync2(reactivityFile, "utf-8"));
+    }
+    if (existsSync(lifecycleFile) && lifecycleFile.endsWith(".js")) {
+      lifecycleJS = transformExportsToGlobal(readFileSync2(lifecycleFile, "utf-8"));
+    }
   } catch (e2) {
-    console.warn("[Zenith] Could not load runtime from core dist, falling back to basic support", e2);
+    console.warn("[Zenith] Could not load runtime from core, falling back to internal", e2);
+  }
+  if (!reactivityJS || !lifecycleJS) {
+    const compilerRoot = path5.resolve(path5.dirname(import.meta.url.replace("file://", "")), "../../..");
+    const nativeRuntimePath = path5.join(compilerRoot, "native/compiler-native/src/hydration_runtime.js");
+    if (existsSync(nativeRuntimePath)) {
+      const nativeJS = readFileSync2(nativeRuntimePath, "utf-8");
+      reactivityJS = nativeJS;
+      lifecycleJS = " ";
+    }
   }
   return `/*!
  * Zenith Runtime v1.0.1
@@ -6532,6 +6504,73 @@ ${lifecycleJS ? `  // ============================================
   // ============================================
   ${lifecycleJS}` : `  // Fallback: Lifecycle not found`}
   
+  // ----------------------------------------------------------------------
+  // COMPAT: Expose internal exports as globals
+  // ----------------------------------------------------------------------
+  // The code above was stripped of "export { ... }" but assigned to internal variables.
+  // We need to map them back to global scope if they weren't attached by the code itself.
+  
+  // Reactivity primitives map (internal name -> global alias)
+  // Based on zenith-core/core/reactivity/index.ts re-exports:
+  // export { zenSignal, zenState, ... }
+  
+  // Since we stripped exports, we rely on the fact that the bundled code 
+  // defines variables like "var zenSignal = ..." or "function zenSignal...".
+  // Note: Minified code variables might be renamed (e.g., "var P=..."). 
+  // Ideally, @zenithbuild/core should export an IIFE build for this purpose.
+  // For now, we assume the code above already does "global.zenSignal = ..." 
+  // OR we rely on the Aliases section below to do the mapping if the names match.
+
+  // ============================================
+  // Lifecycle Hooks (Required for hydration)
+  // ============================================
+  // These functions are required by the runtime - define them if not injected from core
+  
+  const mountCallbacks = [];
+  const unmountCallbacks = [];
+  let isMounted = false;
+  
+  function zenOnMount(fn) {
+    if (isMounted) {
+      // Already mounted, run immediately
+      const cleanup = fn();
+      if (typeof cleanup === 'function') {
+        unmountCallbacks.push(cleanup);
+      }
+    } else {
+      mountCallbacks.push(fn);
+    }
+  }
+  
+  function zenOnUnmount(fn) {
+    unmountCallbacks.push(fn);
+  }
+  
+  // Called by hydration when page mounts
+  function triggerMount() {
+    isMounted = true;
+    for (let i = 0; i < mountCallbacks.length; i++) {
+      try {
+        const cleanup = mountCallbacks[i]();
+        if (typeof cleanup === 'function') {
+          unmountCallbacks.push(cleanup);
+        }
+      } catch(e) {
+        console.error('[Zenith] Mount callback error:', e);
+      }
+    }
+    mountCallbacks.length = 0;
+  }
+  
+  // Called by router when page unmounts
+  function triggerUnmount() {
+    isMounted = false;
+    for (let i = 0; i < unmountCallbacks.length; i++) {
+      try { unmountCallbacks[i](); } catch(e) { console.error('[Zenith] Unmount error:', e); }
+    }
+    unmountCallbacks.length = 0;
+  }
+  
   // ============================================
   // Component Instance System
   // ============================================
@@ -6567,27 +6606,27 @@ ${lifecycleJS ? `  // ============================================
       
       // Reactivity (uses global primitives but tracks for cleanup)
       signal: function(initial) {
-        return zenSignal(initial);
+        return global.zenSignal(initial);
       },
       state: function(initial) {
-        return zenState(initial);
+        return global.zenState(initial);
       },
       ref: function(initial) {
-        return zenRef(initial);
+        return global.zenRef(initial);
       },
       effect: function(fn) {
-        const cleanup = zenEffect(fn);
+        const cleanup = global.zenEffect(fn);
         instanceEffects.push(cleanup);
         return cleanup;
       },
       memo: function(fn) {
-        return zenMemo(fn);
+        return global.zenMemo(fn);
       },
       batch: function(fn) {
-        zenBatch(fn);
+        global.zenBatch(fn);
       },
       untrack: function(fn) {
-        return zenUntrack(fn);
+        return global.zenUntrack(fn);
       },
       
       // Lifecycle execution
@@ -6848,41 +6887,59 @@ ${lifecycleJS ? `  // ============================================
   /**
    * Hydrate static HTML with dynamic expressions
    */
+  /**
+   * Hydrate static HTML with dynamic expressions (Comment-based)
+   */
   function zenithHydrate(pageState, container) {
     try {
       container = container || document;
       
-      // Find all text expression placeholders
-      const textNodes = container.querySelectorAll('[data-zen-text]');
-      textNodes.forEach(el => updateNode(el, el.getAttribute('data-zen-text'), pageState));
+      // Walker to find comment nodes efficiently
+      const walker = document.createTreeWalker(
+        container, 
+        NodeFilter.SHOW_COMMENT, 
+        null, 
+        false
+      );
       
-      // Find all attribute expression placeholders
-      const attrNodes = container.querySelectorAll('[data-zen-attr-class], [data-zen-attr-style], [data-zen-attr-src], [data-zen-attr-href]');
-      attrNodes.forEach(el => {
-        const attrMatch = Array.from(el.attributes).find(a => a.name.startsWith('data-zen-attr-'));
-        if (attrMatch) updateNode(el, attrMatch.value, pageState);
-      });
-
-      // Find all loop placeholders
-      const loopNodes = container.querySelectorAll('template[data-zen-loop]');
-      loopNodes.forEach(el => updateLoopBinding(el, el.getAttribute('data-zen-loop'), pageState));
+      const exprLocationMap = new Map();
+      let node;
+      
+      while(node = walker.nextNode()) {
+        const content = node.nodeValue || '';
+        if (content.startsWith('zen:expr_')) {
+          const exprId = content.replace('zen:expr_', '');
+          exprLocationMap.set(node, exprId);
+        }
+      }
+      
+      // Process expressions
+      for (const [commentNode, exprId] of exprLocationMap) {
+        updateNode(commentNode, exprId, pageState);
+      }
       
-      // Wire up event handlers
+      // Wire up event handlers (still attribute based, usually safe)
       const eventTypes = ['click', 'change', 'input', 'submit', 'focus', 'blur', 'keyup', 'keydown'];
       eventTypes.forEach(eventType => {
         const elements = container.querySelectorAll('[data-zen-' + eventType + ']');
         elements.forEach(el => {
           const handlerName = el.getAttribute('data-zen-' + eventType);
-          if (handlerName && (global[handlerName] || getExpression(handlerName))) {
+          // Check global scope (window) or expression registry
+          if (handlerName) {
             el.addEventListener(eventType, function(e) {
-              const handler = global[handlerName] || getExpression(handlerName);
-              if (typeof handler === 'function') handler(e, el);
+               // Resolve handler at runtime to allow for late definition
+               const handler = global[handlerName] || getExpression(handlerName);
+               if (typeof handler === 'function') {
+                 handler(e, el);
+               } else {
+                 console.warn('[Zenith] Handler not found:', handlerName);
+               }
             });
           }
         });
       });
       
-      // Trigger mount (only if container is root)
+      // Trigger mount
       if (container === document || container.id === 'app' || container.tagName === 'BODY') {
         triggerMount();
       }
@@ -6890,6 +6947,45 @@ ${lifecycleJS ? `  // ============================================
       renderErrorPage(e, { activity: 'zenithHydrate' });
     }
   }
+
+  // Update logic for comment placeholders
+  function updateNode(placeholder, exprId, pageState) {
+    const expr = getExpression(exprId);
+    if (!expr) return;
+    
+    // Store reference to current nodes for cleanup
+    let currentNodes = [];
+    
+    zenEffect(function() {
+      try {
+        const result = expr(pageState);
+        
+        // Cleanup old nodes
+        currentNodes.forEach(n => n.remove());
+        currentNodes = [];
+        
+        if (result == null || result === false) {
+           // Render nothing
+        } else if (result instanceof Node) {
+           placeholder.parentNode.insertBefore(result, placeholder);
+           currentNodes.push(result);
+        } else if (Array.isArray(result)) {
+           result.flat(Infinity).forEach(item => {
+             const n = item instanceof Node ? item : document.createTextNode(String(item));
+             placeholder.parentNode.insertBefore(n, placeholder);
+             currentNodes.push(n);
+           });
+        } else {
+           // Primitive
+           const n = document.createTextNode(String(result));
+           placeholder.parentNode.insertBefore(n, placeholder);
+           currentNodes.push(n);
+        }
+      } catch (e) {
+        renderErrorPage(e, { expressionId: exprId });
+      }
+    });
+  }
   
   // ============================================
   // zenith:content - Content Engine
@@ -7273,15 +7369,15 @@ ${lifecycleJS ? `  // ============================================
   // Export to window.__zenith
   // ============================================
   
-  global.__zenith = {
-    // Reactivity primitives
-    signal: zenSignal,
-    state: zenState,
-    effect: zenEffect,
-    memo: zenMemo,
-    ref: zenRef,
-    batch: zenBatch,
-    untrack: zenUntrack,
+  global.__zenith = Object.assign(global.__zenith || {}, {
+    // Reactivity primitives (from hydration_runtime.js via global)
+    signal: global.zenSignal,
+    state: global.zenState,
+    effect: global.zenEffect,
+    memo: global.zenMemo,
+    ref: global.zenRef,
+    batch: global.zenBatch,
+    untrack: global.zenUntrack,
     // zenith:content
     defineSchema: defineSchema,
     zenCollection: zenCollection,
@@ -7306,36 +7402,31 @@ ${lifecycleJS ? `  // ============================================
     createInstance: createComponentInstance,
     defineComponent: defineComponent,
     instantiate: instantiateComponent
-  };
+  });
   
-  // Expose with zen* prefix for direct usage
-  global.zenSignal = zenSignal;
-  global.zenState = zenState;
-  global.zenEffect = zenEffect;
-  global.zenMemo = zenMemo;
-  global.zenRef = zenRef;
-  global.zenBatch = zenBatch;
-  global.zenUntrack = zenUntrack;
-  global.zenOnMount = zenOnMount;
-  global.zenOnUnmount = zenOnUnmount;
-  global.zenithHydrate = zenithHydrate;
+  // NOTE: zen* primitives (zenSignal, zenState, zenEffect, etc.) are already 
+  // assigned to global by hydration_runtime.js IIFE - no need to reassign here.
   
-  // Clean aliases
-  global.signal = zenSignal;
-  global.state = zenState;
-  global.effect = zenEffect;
-  global.memo = zenMemo;
-  global.ref = zenRef;
-  global.batch = zenBatch;
-  global.untrack = zenUntrack;
-  global.onMount = zenOnMount;
-  global.onUnmount = zenOnUnmount;
+  // Clean aliases (point to already-assigned globals)
+  global.signal = global.zenSignal;
+  global.state = global.zenState;
+  global.effect = global.zenEffect;
+  global.memo = global.zenMemo;
+  global.ref = global.zenRef;
+  global.batch = global.zenBatch;
+  global.untrack = global.zenUntrack;
+  global.onMount = global.zenOnMount;
+  global.onUnmount = global.zenOnUnmount;
   
   // useZenOrder hook exports
   global.createZenOrder = createZenOrder;
   global.processRawSections = processRawSections;
   global.slugify = slugify;
   
+  // zenith:content exports
+  global.zenCollection = zenCollection;
+  global.ZenCollection = ZenCollection;
+  
   // ============================================
   // SPA Router Runtime
   // ============================================
@@ -7719,8 +7810,26 @@ ${lifecycleJS ? `  // ============================================
 })(typeof window !== 'undefined' ? window : this);
 `;
 }
+function transformExportsToGlobal(code2) {
+  const exportPattern = /export\s*\{\s*([^}]+)\s*\};?/g;
+  return code2.replace(exportPattern, (match, content) => {
+    const parts = content.split(",");
+    const assignments = parts.map((part) => {
+      const trimmed = part.trim();
+      if (!trimmed)
+        return "";
+      const asMatch = trimmed.match(/^(\S+)\s+as\s+(\S+)$/);
+      if (asMatch) {
+        return `global.${asMatch[2]} = ${asMatch[1]};`;
+      }
+      return `global.${trimmed} = ${trimmed};`;
+    });
+    return assignments.join(`
+`);
+  });
+}
 
-// node_modules/@zenithbuild/compiler/dist/css/index.js
+// ../zenith-compiler/dist/css/index.js
 import { spawn, spawnSync } from "child_process";
 import path6 from "path";
 import fs3 from "fs";
@@ -7865,7 +7974,7 @@ function resolveGlobalsCss(projectRoot) {
   return null;
 }
 
-// node_modules/@zenithbuild/compiler/dist/core/config/loader.js
+// ../zenith-compiler/dist/core/config/loader.js
 import fs4 from "fs";
 import path7 from "path";
 async function loadZenithConfig(projectRoot) {
@@ -7899,7 +8008,7 @@ async function loadZenithConfig(projectRoot) {
   }
 }
 
-// node_modules/@zenithbuild/compiler/dist/core/plugins/registry.js
+// ../zenith-compiler/dist/core/plugins/registry.js
 var pluginDataStore = {};
 function getPluginDataByNamespace(namespace) {
   return pluginDataStore[namespace] || [];
@@ -7950,7 +8059,7 @@ function createPluginContext(projectRoot) {
   };
 }
 
-// node_modules/@zenithbuild/compiler/dist/core/plugins/bridge.js
+// ../zenith-compiler/dist/core/plugins/bridge.js
 var hookRegistry = new Map;
 function registerHook(hook, handler) {
   if (!hookRegistry.has(hook)) {
@@ -7999,7 +8108,7 @@ function createBridgeAPI() {
   };
 }
 
-// node_modules/@zenithbuild/compiler/dist/ssg-build.js
+// ../zenith-compiler/dist/ssg-build.js
 async function compilePage(pagePath, pagesDir, baseDir = process.cwd()) {
   const source = fs5.readFileSync(pagePath, "utf-8");
   const analysis = analyzePageSource(source);
@@ -8289,14 +8398,16 @@ async function buildSSG(options) {
     console.log(`   ${page.routePath.padEnd(20)} \u2192 ${page.outputDir}/index.html (${type})`);
   }
 }
-// node_modules/@zenithbuild/compiler/dist/index.js
+// ../zenith-compiler/dist/index.js
 async function compileZenSource(source, filePath, options) {
   let ir = parseZenFile(filePath, source);
-  if (options?.componentsDir) {
-    const { discoverComponents: discoverComponents2 } = (init_componentDiscovery(), __toCommonJS(exports_componentDiscovery));
-    const { resolveComponentsInIR: resolveComponentsInIR2 } = (init_componentResolver(), __toCommonJS(exports_componentResolver));
-    const components = discoverComponents2(options.componentsDir);
-    ir = resolveComponentsInIR2(ir, components);
+  if (options?.components || options?.componentsDir) {
+    let components = options.components || new Map;
+    if (options.componentsDir) {
+      const discovered = discoverComponents(options.componentsDir);
+      components = new Map([...components, ...discovered]);
+    }
+    ir = resolveComponentsInIR(ir, components);
   }
   validateIr(ir);
   const compiled = transformTemplate(ir);
@@ -8549,7 +8660,7 @@ ${html}`;
           const compileTime = Math.round(compileEnd - compileStart);
           const renderTime = Math.round(renderEnd - renderStart);
           route("GET", pathname, 200, totalTime, compileTime, renderTime);
-          return new Response(html, { headers: { "Content-Type": "text/html" } });
+          return new Response(html, { headers: { "Content-Type": "text/html; charset=utf-8" } });
         }
       }
       route("GET", pathname, 404, Math.round(performance.now() - startTime), 0, 0);
@@ -8587,8 +8698,10 @@ function findPageForRoute(route2, pagesDir) {
     if (fs6.existsSync(singleDynamicPath))
       return singleDynamicPath;
     const catchAllPath = path9.join(baseDir, "[...slug].zen");
-    if (fs6.existsSync(catchAllPath))
+    if (fs6.existsSync(catchAllPath)) {
+      console.log(`[ZenithDev] MATCH! Found ${catchAllPath}`);
       return catchAllPath;
+    }
   }
   const rootCatchAll = path9.join(pagesDir, "[...slug].zen");
   if (fs6.existsSync(rootCatchAll))